upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 21:08:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some cleaning of the code searching a vacant slot when joining a MP game.

Browse Source 
A bit safer for full game and maybe fix "allow_changes" key for side > 1.

This will also allow joiner to know which side and color they will
get, before choosing its faction and leader (UI feature in next
commit).
This commit is contained in:
Ali El Gariani 2008-07-08 19:31:49 +00:00
parent feba750892
commit cd3b7c743a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/multiplayer_wait.cpp
View File

@ -234,27 +234,27 @@ void wait::join_game(bool observe)
if (!observe) {
const config::child_list& sides_list = level_.get_children("side");
if(sides_list.empty()) {
set_result(QUIT);
throw config::error(_("No multiplayer sides available in this game"));
return;
}
//search for an appropriate vacant slot. If a description is set
//(i.e. we're loading from a saved game), then prefer to get the side
//with the same description as our login. Otherwise just choose the first
//available side.
int side_choice = 0;
int side_choice = -1;
for(config::child_list::const_iterator s = sides_list.begin(); s != sides_list.end(); ++s) {
if((**s)["controller"] == "network" && (**s)["id"].empty()) {
side_choice = s - sides_list.begin();
if((**s)["save_id"] == preferences::login() || (**s)["current_player"] == preferences::login()) {
side_choice = s - sides_list.begin();
break; // found the prefered one
}
}
}
if (side_choice < 0 || side_choice >= sides_list.size()) {
set_result(QUIT);
throw config::error(_("No multiplayer sides available in this game"));
return;
}
const bool allow_changes = (*sides_list[side_choice])["allow_changes"] != "no";
//if the client is allowed to choose their team, instead of having
//it set by the server, do that here.
std::string leader_choice, gender_choice;