upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-27 18:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix not being able to join a multiplayer game for a client.

Browse Source
This commit is contained in:
Jörg Hinrichs 2010-02-08 20:48:03 +00:00
parent 7f022fc110
commit c9cf66f22d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/multiplayer_wait.cpp
View File

@ -226,7 +226,7 @@ void wait::join_game(bool observe)
side_num = nb_sides; side_num = nb_sides;
break; break;
} }
if (sd["controller"] == "network" && sd["id"].empty()) if (sd["controller"] == "network" && sd["player_id"].empty())
{ {
if (!side_choice) { // found the first empty side if (!side_choice) { // found the first empty side
side_choice = &sd; side_choice = &sd;
@ -435,7 +435,7 @@ void wait::generate_menu()
} }
std::string description = sd["user_description"]; std::string description = sd["user_description"];
const std::string faction_id = sd["id"]; const std::string faction_id = sd["player_id"];
t_string side_name = sd["faction_name"]; t_string side_name = sd["faction_name"];
std::string leader_type = sd["type"]; std::string leader_type = sd["type"];
@ -452,8 +452,8 @@ void wait::generate_menu()
} }
} }
if(!sd["id"].empty()) if(!sd["player_id"].empty())
playerlist.push_back(sd["id"]); playerlist.push_back(sd["player_id"]);
std::string leader_name; std::string leader_name;
std::string leader_image; std::string leader_image;