0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Factor color code, and reinitialize to random upon deconnect

Browse source 
(part of the patch in bug #11582).
This commit is contained in:
Guillaume Melquiond 2005-01-19 22:02:22 +00:00
parent 4b0db13025
commit 5f3a0a7e6d
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/multiplayer_connect.cpp
View file

@ -677,11 +677,6 @@ lobby::RESULT mp_connect::process()
level_changed = true;
}
if (combos_color_[n].changed()) {
side["colour"] = lexical_cast_default<std::string>(combos_color_[n].selected()+1);
}
if (!save_ && combos_race_[n].changed()) {
const string_map& values = possible_sides[combos_race_[n].selected()]->values;
side["random_faction"] = "";
@ -693,6 +688,12 @@ lobby::RESULT mp_connect::process()
player_leaders_[n].update_leader_list(combos_race_[n].selected());
}
//Player colour
if (combos_color_[n].changed()) {
side["colour"] = lexical_cast_default<std::string>(combos_color_[n].selected()+1);
level_changed = true;
}
//Player leader
if (!save_ && combos_leader_[n].changed()) {
@ -706,10 +707,6 @@ lobby::RESULT mp_connect::process()
level_changed = true;
}
if (combos_color_[n].changed()) {
level_changed = true;
}
if(!save_){
const int cur_playergold = sliders_gold_[n].value();
std::stringstream playergold;
@ -921,6 +918,9 @@ void mp_connect::update_network()
i->first->values.erase("taken");
remove_player(i->first->values["description"]);
i->first->values["description"] = "";
i->first->values["name"] = player_races_.front();
i->first->values["random_faction"] = "yes";
i->first->values["type"] = "";
}
}
@ -950,6 +950,9 @@ void mp_connect::update_network()
pos->first->values.erase("taken");
remove_player(pos->first->values["description"]);
pos->first->values["description"] = "";
pos->first->values["name"] = player_races_.front();
pos->first->values["random_faction"] = "yes";
pos->first->values["type"] = "";
network::send_data(*level_);
}
return;