X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fspecial%2Fsprite.cpp;h=d27ae05b7a17190775bc971da7db9a2db1ae1c69;hb=09cabd98fefc508488b696552107f11336f80493;hp=f676c085a113e9232225c16fa61900207cae3921;hpb=add0f0d960ae9c5e539f401efdaa9da4f157555e;p=supertux.git

diff --git a/lib/special/sprite.cpp b/lib/special/sprite.cpp
index f676c085a..d27ae05b7 100644
--- a/lib/special/sprite.cpp
+++ b/lib/special/sprite.cpp
@@ -39,6 +39,8 @@ Sprite::Sprite(lisp_object_t* cur)
       name = lisp_string(data);
     else if(token == "action")
       parse_action(reader);
+    else
+      std::cerr << "Warning: Unknown sprite field: " << token << std::endl;
     }
 
   if(name.empty())
@@ -68,8 +70,8 @@ Sprite::parse_action(LispReader& lispreader)
   if(!lispreader.read_string("name", action->name))
     if(!actions.empty())
       Termination::abort("Error: If there are more than one action, they need names!", "");
-  lispreader.read_int("x-hotspot", action->x_hotspot);
-  lispreader.read_int("y-hotspot", action->y_hotspot);
+  lispreader.read_int("x-offset", action->x_offset);
+  lispreader.read_int("y-offset", action->y_offset);
   lispreader.read_float("fps",     action->fps);
 
   std::vector<std::string> images;
@@ -88,26 +90,35 @@ Sprite::parse_action(LispReader& lispreader)
 void
 Sprite::init_defaults(Action* act)
 {
-  act->x_hotspot = 0;
-  act->y_hotspot = 0;
+  act->x_offset = 0;
+  act->y_offset = 0;
   act->fps = 10;
 
-  animation_loops = -1;
-  last_tick = 0;
+  start_animation(-1);
 }
 
 void
 Sprite::set_action(std::string act)
 {
+if(!next_action.empty() && animation_loops > 0)
+  {
+  next_action = act;
+  return;
+  }
 Actions::iterator i = actions.find(act);
+if(i == actions.end())
+  {
+  std::cerr << "Warning: Action '" << act << "' not found on Sprite '" << name << "'\n";
+  return;
+  }
 action = i->second;
 }
 
 void
 Sprite::start_animation(int loops)
 {
-animation_loops = loops;
 reset();
+animation_loops = loops;
 }
 
 void
@@ -116,6 +127,7 @@ Sprite::reset()
 frame = 0;
 last_tick = SDL_GetTicks();
 animation_reversed = false;
+next_action.clear();
 }
 
 bool
@@ -125,9 +137,9 @@ return animation_loops;
 }
 
 void
-Sprite::reverse_animation()
+Sprite::reverse_animation(bool reverse)
 {
-animation_reversed = !animation_reversed;
+animation_reversed = reverse;
 
 if(animation_reversed)
   frame = get_frames()-1;
@@ -141,31 +153,52 @@ Sprite::update()
 if(animation_loops == 0)
   return;
 
-float inc_frame = (action->fps/1000) * (SDL_GetTicks() - last_tick);
+float frame_inc = (action->fps/1000.0) * (SDL_GetTicks() - last_tick);
+last_tick = SDL_GetTicks();
 
 if(animation_reversed)
-  frame -= inc_frame;
+  frame -= frame_inc;
 else
-  frame += inc_frame;
-
-last_tick = SDL_GetTicks();
+  frame += frame_inc;
 
 if(animation_reversed)
   {
-  if((unsigned int)frame < 0)
-    {
-    frame = get_frames()-1;
+  float excedent = frame - 0;
+  if((int)excedent < 0 || excedent >= get_frames())
+    {  // last case can happen when not used reverse_animation()
+    frame = get_frames() - 1;
     if(animation_loops > 0)
+      {
       animation_loops--;
+      if(animation_loops == 0 && !next_action.empty())
+        {
+        set_action(next_action);
+        start_animation(-1);
+        }
+      }
+
+    if(fabsf(excedent) < get_frames())
+      frame += excedent;
     }
   }
 else
   {
-  if((unsigned int)frame >= action->surfaces.size())
+  float excedent = frame - action->surfaces.size();
+  if((int)excedent >= 0)
     {
     frame = 0;
     if(animation_loops > 0)
+      {
       animation_loops--;
+      if(animation_loops == 0 && !next_action.empty())
+        {
+        set_action(next_action);
+        start_animation(-1);
+        }
+      }
+
+    if(excedent < get_frames())
+      frame += excedent;
     }
   }
 }
@@ -177,10 +210,12 @@ Sprite::draw(DrawingContext& context, const Vector& pos, int layer,
   update();
 
   if((int)frame >= get_frames() || (int)frame < 0)
-    std::cerr << "Warning: frame higher than total frames or lower than 0!\n";
+    std::cerr << "Warning: frame out of range: " << (int)frame
+              << "/" << get_frames() << " at sprite: " << get_name()
+              << "/" << get_action_name() << std::endl;
   else
     context.draw_surface(action->surfaces[(int)frame],
-            pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect);
+            pos - Vector(action->x_offset, action->y_offset), layer, drawing_effect);
 }
 
 #if 0
@@ -191,7 +226,7 @@ Sprite::draw_part(float sx, float sy, float x, float y, float w, float h)
   unsigned int frame = get_current_frame();
 
   if (frame < surfaces.size())
-    surfaces[frame]->draw_part(sx, sy, x - x_hotspot, y - y_hotspot, w, h);
+    surfaces[frame]->draw_part(sx, sy, x - x_offset, y - y_offset, w, h);
 }
 #endif