Author: esr
Date: Fri Aug 22 20:36:39 2008
New Revision: 28849
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28849&view=rev
Log:
Address bug #12050: Different leader names in game/status table.
Modified:
trunk/src/menu_events.cpp
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=28849&r1=28848&r2=28849&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Fri Aug 22 20:36:39 2008
@@ -434,8 +434,13 @@
} else {
leader_bools.push_back(false);
}
+ std::string side_name;
+ if (gamestate_.campaign_type == "multiplayer")
+ side_name = teams_[n].current_player();
+ else
+ side_name = teams_[n].user_team_name();
str << COLUMN_SEPARATOR << team::get_side_highlight(n)
- << teams_[n].current_player() << COLUMN_SEPARATOR
+ << side_name << COLUMN_SEPARATOR
<< (data.teamname.empty() ? teams_[n].team_name() :
data.teamname)
<< COLUMN_SEPARATOR;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
