Author: shadowmaster
Date: Tue Oct 18 03:03:25 2011
New Revision: 51534
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51534&view=rev
Log:
Fixed "error parsing image modifications" message caused by subsequent image
mod additions using the add attribute in [effect] apply_to=image_mod
Modified:
trunk/changelog
trunk/data/scenario-test.cfg
trunk/src/unit.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=51534&r1=51533&r2=51534&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Tue Oct 18 03:03:25 2011
@@ -51,6 +51,8 @@
* [illuminated_time], which has been obsolete for a long time, is no longer
valid. Using it will cause errors to be thrown
* Reintroduced support for [unit][event]s (was until 1.7.10, bug #16259)
+ * Fixed "error parsing image modifications" message caused by subsequent
image
+ mod additions using the add attribute in [effect] apply_to=image_mod
* Miscellaneous and bug fixes:
* Fixed compilation on all Debian architectures (Debian bug #636193)
* Fixed handling of #ifver and #ifnver preprocessor directives in wmllint
Modified: trunk/data/scenario-test.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/scenario-test.cfg?rev=51534&r1=51533&r2=51534&view=diff
==============================================================================
--- trunk/data/scenario-test.cfg (original)
+++ trunk/data/scenario-test.cfg Tue Oct 18 03:03:25 2011
@@ -567,6 +567,10 @@
[effect]
apply_to=image_mod
add="PAL(FFDC02,EA9752,C4793A,C35029,6B2C29,A34C29,D5561F,343424,353624,BF5746
> BCBCBC,7D7D7D,5E5E5E,434343,232323,3B3B3B,494949,232323,232323,484848)"
+ [/effect]
+ [effect]
+ apply_to=image_mod
+ add="B(50)~R(-50)"
[/effect]
[/object]
[attack]
Modified: trunk/src/unit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.cpp?rev=51534&r1=51533&r2=51534&view=diff
==============================================================================
--- trunk/src/unit.cpp (original)
+++ trunk/src/unit.cpp Tue Oct 18 03:03:25 2011
@@ -2522,6 +2522,10 @@
LOG_UT << "applying image_mod \n";
mod = effect["add"].str();
if (!mod.empty()){
+ if(!image_mods_.empty()) {
+ image_mods_ += '~';
+ }
+
image_mods_ += mod;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
