Author: alink
Date: Sat May 5 21:54:20 2007
New Revision: 17344
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17344&view=rev
Log:
* add a variable flag_icon_image (using the same _image suffix as other
variables of game.cfg)
* fix old incorrect paths in default variable of flags
Modified:
trunk/data/game.cfg
trunk/src/game_config.cpp
trunk/src/game_config.hpp
Modified: trunk/data/game.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/game.cfg?rev=17344&r1=17343&r2=17344&view=diff
==============================================================================
--- trunk/data/game.cfg (original)
+++ trunk/data/game.cfg Sat May 5 21:54:20 2007
@@ -91,6 +91,7 @@
enemy_ball_image="misc/ball-enemy.png"
ally_ball_image="misc/ball-ally.png"
flag_image="flags/flag-1.png:150,flags/flag-2.png:150,flags/flag-3.png:150,flags/flag-4.png:150"
+ flag_icon_image="flags/flag-icon.png"
flag_rgb=green
cross_image="misc/cross.png"
Modified: trunk/src/game_config.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_config.cpp?rev=17344&r1=17343&r2=17344&view=diff
==============================================================================
--- trunk/src/game_config.cpp (original)
+++ trunk/src/game_config.cpp Sat May 5 21:54:20 2007
@@ -52,8 +52,9 @@
std::string partmoved_ball_image = "misc/ball-partmoved.png";
std::string enemy_ball_image = "misc/ball-enemy.png";
std::string ally_ball_image = "misc/ball-ally.png";
- std::string flag_image =
"terrain/flag-1.png:150,terrain/flag-2.png:150";
- std::string flag_rgb;
+ std::string flag_image =
"flags/flag-1.png:150,flags/flag-2.png:150,flags/flag-3.png:150,flags/flag-4.png:150";
+ std::string flag_icon_image = "flags/flag_icon";
+ std::string flag_rgb = "green";
std::string cross_image = "misc/cross.png";
@@ -144,6 +145,7 @@
enemy_ball_image = v["enemy_ball_image"];
ally_ball_image = v["ally_ball_image"];
flag_image = v["flag_image"];
+ flag_icon_image = v["flag_icon_image"];
cross_image = v["cross_image"];
foot_left_nw = utils::split(v["footprint_left_nw"]);
Modified: trunk/src/game_config.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_config.hpp?rev=17344&r1=17343&r2=17344&view=diff
==============================================================================
--- trunk/src/game_config.hpp (original)
+++ trunk/src/game_config.hpp Sat May 5 21:54:20 2007
@@ -43,7 +43,7 @@
extern std::string game_icon, game_title, game_logo, title_music,
moved_ball_image, unmoved_ball_image, partmoved_ball_image,
enemy_ball_image, ally_ball_image, energy_image,
- flag_image, cross_image,
+ flag_image, flag_icon_image, cross_image,
terrain_mask_image, observer_image,
checked_menu_image, unchecked_menu_image, wml_menu_image,
level_image, ellipsis_image;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
