Author: alink
Date: Sat May 5 21:04:29 2007
New Revision: 17340
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17340&view=rev
Log:
Custom flags in the status bar was broken, always displayed the local (or human
player) side, not the active side
(also with standard flags but apply the coloring so it was hidden)
I prefer fix this before implementing the new flag_icon support.
Modified:
trunk/src/reports.cpp
Modified: trunk/src/reports.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/reports.cpp?rev=17340&r1=17339&r2=17340&view=diff
==============================================================================
--- trunk/src/reports.cpp (original)
+++ trunk/src/reports.cpp Sat May 5 21:04:29 2007
@@ -446,18 +446,16 @@
case SIDE_PLAYING: {
- std::string flag;
+ std::string flag = teams[playing_side-1].flag();
std::string new_rgb;
std::string old_rgb;
std::string mods;
- if(current_team.flag().empty()) {
+ if(flag.empty()) {
flag = game_config::flag_image;
old_rgb = game_config::flag_rgb;
new_rgb = team::get_side_colour_index(playing_side);
mods = "~RC(" + old_rgb + ">" + new_rgb + ")";
- } else {
- flag = current_team.flag();
}
// remove animation stuff we don't care about
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
