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

MP Staging: fixed display of sides with no or invalid leaders

Browse source 
This fixes a crash that happened if a side had no leader specified, and stops displaying the Random
image in the same case.
This commit is contained in:
Charles Dang 2016-10-11 18:50:52 +11:00
parent ecaec3bf07
commit 3576f2ae43
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/dialogs/multiplayer/mp_staging.cpp
View file

@ -373,10 +373,15 @@ void tmp_staging::update_leader_display(ng::side_engine_ptr side, tgrid& row_gri
const std::string current_gender = side->flg().current_gender() != "null" ? side->flg().current_gender() : utils::unicode_em_dash;
// Sprite
std::string new_image = "units/random-dice.png";
std::string new_image;
if(side->flg().is_random_faction() || current_leader == "random") {
new_image = ng::random_enemy_picture;
}
if(const unit_type* ut = unit_types.find(current_leader)) {
const unit_type& type = ut->get_gender_unit_type(current_gender);
if(!side->flg().is_random_faction() && current_leader != "random") {
const unit_type& type = unit_types.find(current_leader)->get_gender_unit_type(current_gender);
new_image = formatter() << type.image() << "~RC(magenta>" << side->color() + 1 << ")";
// We don't need the unit type id anymore, and can now replace this variable with the type name