Author: boucman
Date: Wed Oct 19 23:58:08 2011
New Revision: 51546
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51546&view=rev
Log:
fix bug 18685 and avoid reopening bug 18792
Modified:
trunk/src/unit_animation.cpp
Modified: trunk/src/unit_animation.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_animation.cpp?rev=51546&r1=51545&r2=51546&view=diff
==============================================================================
--- trunk/src/unit_animation.cpp (original)
+++ trunk/src/unit_animation.cpp Wed Oct 19 23:58:08 2011
@@ -414,9 +414,11 @@
animations.push_back(*itor);
animations.back().event_ = utils::split("pre_movement");
+ animations.back().unit_anim_.override(0,1,particule::NO_CYCLE);
animations.push_back(*itor);
animations.back().event_ = utils::split("post_movement");
+ animations.back().unit_anim_.override(0,1,particule::NO_CYCLE);
animations.push_back(*itor);
animations.back().event_ = utils::split("movement");
@@ -519,7 +521,16 @@
foreach (const animation_branch &ab, prepare_animation(cfg,
"standing_anim"))
{
config anim = ab.merge();
- anim["apply_to"] = "standing,default";
+ anim["apply_to"] = "default";
+ anim["cycles"] = "false";
+ if (anim["layer"].empty()) anim["layer"] = default_layer;
+ if (anim["offscreen"].empty()) anim["offscreen"] = false;
+ animations.push_back(unit_animation(anim));
+ }
+ foreach (const animation_branch &ab, prepare_animation(cfg,
"standing_anim"))
+ {
+ config anim = ab.merge();
+ anim["apply_to"] = "standing";
anim["cycles"] = "true";
if (anim["layer"].empty()) anim["layer"] = default_layer;
if (anim["offscreen"].empty()) anim["offscreen"] = false;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
