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

MP Join Game: fixed leader gender info being missing when loading saves

Browse source 
Like type=, I need to look in [unit] subtags for the gender info.
This commit is contained in:
Charles Dang 2018-02-13 16:19:22 +11:00
parent 7a1b918cde
commit 0bc03e14c7
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/gui/dialogs/multiplayer/mp_join_game.cpp
View file

@ -353,15 +353,15 @@ void mp_join_game::generate_side_list(window& window)
std::string leader_image = ng::random_enemy_picture;
std::string leader_type = side["type"];
std::string leader_gender = side["gender"];
std::string leader_name;
const std::string leader_gender = side["gender"];
// If there is a unit which can recruit, use it as a leader.
// Necessary to display leader information when loading saves.
for(const config& side_unit : side.child_range("unit")) {
if(side_unit["canrecruit"].to_bool()) {
leader_type = side_unit["type"].str();
leader_gender = side_unit["gender"].str();
break;
}
}
@ -388,9 +388,9 @@ void mp_join_game::generate_side_list(window& window)
data.emplace("leader_faction", item);
std::string gender_icon = "icons/icon-random.png";
if(side["gender"] != "null") {
if(leader_gender != "null") {
gender_icon = formatter() << "icons/icon-" << leader_gender << ".png";
item["tooltip"] = side["gender"];
item["tooltip"] = leader_gender;
}
item["label"] = gender_icon;