0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug 18685 and avoid reopening bug 18792

Browse source
This commit is contained in:
Jérémy Rosen 2011-10-19 21:58:08 +00:00
parent 00fdec97df
commit d706fcb2cd
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/unit_animation.cpp
View file

@ -414,9 +414,11 @@ void unit_animation::fill_initial_animations( std::vector<unit_animation> & anim
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 @@ void unit_animation::add_anims( std::vector<unit_animation> & animations, const
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;