Just added more info to warning.

[supertux.git] / lib / special / sprite.cpp

diff --git a/lib/special/sprite.cpp b/lib/special/sprite.cpp
index 3f28031..cc94821 100644 (file)
--- a/lib/special/sprite.cpp
+++ b/lib/special/sprite.cpp
@@ -92,8 +92,7 @@ Sprite::init_defaults(Action* act)
   act->y_hotspot = 0;
   act->fps = 10;
 
-  act->animation_loops = 0;
-  last_tick = 0;
+  start_animation(-1);
 }
 
 void
@@ -106,7 +105,7 @@ action = i->second;
 void
 Sprite::start_animation(int loops)
 {
-action->animation_loops = loops;
+animation_loops = loops;
 reset();
 }
 
@@ -115,25 +114,66 @@ Sprite::reset()
 {
 frame = 0;
 last_tick = SDL_GetTicks();
+animation_reversed = true;
 }
 
 bool
 Sprite::check_animation()
 {
-return action->animation_loops;
+return animation_loops;
+}
+
+void
+Sprite::reverse_animation()
+{
+animation_reversed = !animation_reversed;
+
+if(animation_reversed)
+  frame = get_frames()-1;
+else
+  frame = 0;
 }
 
 void
 Sprite::update()
 {
-frame += (action->fps/1000) * (SDL_GetTicks() - last_tick);
+if(animation_loops == 0)
+  return;
+
+float frame_inc = (action->fps/1000.0) * (SDL_GetTicks() - last_tick);
+
+if(animation_reversed)
+  frame -= frame_inc;
+else
+  frame += frame_inc;
+
 last_tick = SDL_GetTicks();
 
-if((unsigned int)frame >= action->surfaces.size())
+if(animation_reversed)
   {
-  frame = 0;
-  if(action->animation_loops > 0)
-    action->animation_loops--;
+  float excedent = frame - 0;
+  if(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(fabsf(excedent) < get_frames())
+      frame += excedent;
+    }
+  }
+else
+  {
+  float excedent = frame - action->surfaces.size();
+  if(excedent >= 0)
+    {
+    frame = 0;
+    if(animation_loops > 0)
+      animation_loops--;
+
+    if(excedent < get_frames())
+      frame += excedent;
+    }
   }
 }
 
@@ -143,8 +183,13 @@ Sprite::draw(DrawingContext& context, const Vector& pos, int layer,
 {
   update();
 
-  context.draw_surface(action->surfaces[(int)frame],
-          pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect);
+  if((int)frame >= get_frames() || (int)frame < 0)
+    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);
 }
 
 #if 0
@@ -162,13 +207,13 @@ Sprite::draw_part(float sx, float sy, float x, float y, float w, float h)
 int
 Sprite::get_width()
 {
-  return action->surfaces[get_current_frame()]->w;
+  return action->surfaces[get_frame()]->w;
 }
 
 int
 Sprite::get_height()
 {
-  return action->surfaces[get_current_frame()]->h;
+  return action->surfaces[get_frame()]->h;
 }
 
 /* EOF */