X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fspecial%2Fsprite.cpp;h=6ffea6a0443cea2fbffca449e4d7c4b8e37548ce;hb=be7f9f65018ed21515d389e8bd50f6f1eb988375;hp=be2b81f8e54549f1619986b08dd1285a7ee67f1d;hpb=4d3df5a40dfea474da0f15d8f2c6c755738bb7f6;p=supertux.git

diff --git a/lib/special/sprite.cpp b/lib/special/sprite.cpp
index be2b81f8e..6ffea6a04 100644
--- a/lib/special/sprite.cpp
+++ b/lib/special/sprite.cpp
@@ -98,17 +98,20 @@ Sprite::init_defaults(Action* act)
 void
 Sprite::set_action(std::string act)
 {
+if(!next_action.empty() && animation_loops > 0)
+  {
+  next_action = act;
+  return;
+  }
 Actions::iterator i = actions.find(act);
 action = i->second;
 }
 
 void
-Sprite::start_animation(int loops, std::string next_act)
+Sprite::start_animation(int loops)
 {
 reset();
 animation_loops = loops;
-if(!next_act.empty())
-  next_action = next_act;
 }
 
 void