Author: alink
Date: Sat May 26 01:49:19 2007
New Revision: 17857
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17857&view=rev
Log:
simplify and clean the previous commit about the automatic side-coloring of
flag-icon
Modified:
trunk/src/reports.cpp
Modified: trunk/src/reports.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/reports.cpp?rev=17857&r1=17856&r2=17857&view=diff
==============================================================================
--- trunk/src/reports.cpp (original)
+++ trunk/src/reports.cpp Sat May 26 01:49:19 2007
@@ -448,25 +448,17 @@
}
case SIDE_PLAYING: {
-
std::string flag_icon = teams[playing_side-1].flag_icon();
- std::string new_rgb;
- std::string old_rgb;
- std::string mods;
+ std::string old_rgb = game_config::flag_rgb;
+ std::string new_rgb = team::get_side_colour_index(playing_side);
+ std::string mods = "~RC(" + old_rgb + ">" + new_rgb + ")";
if(flag_icon.empty()) {
flag_icon = game_config::flag_icon_image;
}
- old_rgb = game_config::flag_rgb;
- new_rgb =team::get_side_colour_index(playing_side);
- mods = "~RC(" + old_rgb + ">" + new_rgb + ")";
-
- // remove animation stuff we don't care about
- //const std::vector<std::string> items = utils::split(flag);
- //const std::vector<std::string> sub_items =
utils::split(items[0], ':');
-
- image::locator flag_icon_image(flag_icon, mods);
- return
report("",flag_icon_image,teams[playing_side-1].current_player());
+
+ image::locator flag_icon_img(flag_icon, mods);
+ return
report("",flag_icon_img,teams[playing_side-1].current_player());
}
case OBSERVERS: {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
