Author: alink
Date: Sat May 5 22:31:21 2007
New Revision: 17347
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17347&view=rev
Log:
Activate the use of flag_icon in status bar. (the current themes shrink a
little the images, must be adapted)
Modified:
trunk/src/reports.cpp
Modified: trunk/src/reports.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/reports.cpp?rev=17347&r1=17346&r2=17347&view=diff
==============================================================================
--- trunk/src/reports.cpp (original)
+++ trunk/src/reports.cpp Sat May 5 22:31:21 2007
@@ -446,24 +446,24 @@
case SIDE_PLAYING: {
- std::string flag = teams[playing_side-1].flag();
+ std::string flag_icon = teams[playing_side-1].flag_icon();
std::string new_rgb;
std::string old_rgb;
std::string mods;
- if(flag.empty()) {
- flag = game_config::flag_image;
+ 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_image(sub_items[0],mods);
- return
report("",flag_image,teams[playing_side-1].current_player());
+ //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);
+ return
report("",flag_icon_image,teams[playing_side-1].current_player());
}
case OBSERVERS: {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
