X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fspecial%2Fsprite.cpp;h=48aa325658ad938e115128be9db629527af54cc0;hb=495f8b77cb935fe8eff81bec755efca8e34e8a99;hp=594cbd3c60c90388e61dec181349b55e0452446a;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/lib/special/sprite.cpp b/lib/special/sprite.cpp
index 594cbd3c6..48aa32565 100644
--- a/lib/special/sprite.cpp
+++ b/lib/special/sprite.cpp
@@ -20,28 +20,32 @@
 
 #include <iostream>
 #include <cmath>
+#include <cassert>
 #include <stdexcept>
 
-#include "../app/globals.h"
-#include "../app/setup.h"
-#include "../special/sprite.h"
-#include "../video/drawing_context.h"
+#include "app/globals.h"
+#include "app/setup.h"
+#include "sprite.h"
+#include "video/drawing_context.h"
 
 namespace SuperTux
 {
 
 Sprite::Sprite(SpriteData& newdata)
-  : data(newdata)
+  : data(newdata), frame(0), animation_loops(-1)
 {
-  action = data.actions.begin()->second;
-  reset();
+  action = data.get_action("normal");
+  if(!action)
+    action = data.actions.begin()->second;
+  last_ticks = SDL_GetTicks();
 }
 
 Sprite::Sprite(const Sprite& other)
   : data(other.data), frame(other.frame),
-    animation_loops(other.animation_loops), last_tick(other.last_tick),
-    action(other.action), next_action(other.next_action)
+    animation_loops(other.animation_loops),
+    action(other.action)
 {
+  last_ticks = SDL_GetTicks();
 }
 
 Sprite::~Sprite()
@@ -49,109 +53,48 @@ Sprite::~Sprite()
 }
 
 void
-Sprite::set_action(std::string name)
+Sprite::set_action(std::string name, int loops)
 {
-  if(!next_action.empty() && animation_loops > 0) {
-    next_action = name;
+  if(action && action->name == name)
     return;
-  }
+
   SpriteData::Action* newaction = data.get_action(name);
-  if(!action)
+  if(!newaction) {
+#ifdef DEBUG
+    std::cerr << "Action '" << name << "' not found.\n";
+#endif
     return;
+  }
 
   action = newaction;
-}
-
-void
-Sprite::start_animation(int loops)
-{
-  reset();
   animation_loops = loops;
-}
-
-void
-Sprite::reset()
-{
   frame = 0;
-  last_tick = SDL_GetTicks();
-  animation_reversed = false;
-  animation_loops = -1;
-  next_action.clear();
 }
 
 bool
 Sprite::check_animation()
 {
-  return animation_loops;
-}
-
-void
-Sprite::reverse_animation(bool reverse)
-{
-  animation_reversed = reverse;
-
-  if(animation_reversed)
-    frame = get_frames()-1;
-  else
-    frame = 0;
+  return animation_loops == 0;
 }
 
 void
 Sprite::update()
 {
   if(animation_loops == 0)
-  {
-    if(frame >= get_frames() || frame < 0)
-      frame = 0;
     return;
-  }
 
-  float frame_inc = (action->fps/1000.0) * (SDL_GetTicks() - last_tick);
-  last_tick = SDL_GetTicks();
+  Uint32 ticks = SDL_GetTicks();
+  float frame_inc = action->fps * float(ticks - last_ticks)/1000.0;
+  last_ticks = ticks;
 
-  if(animation_reversed)
-    frame -= frame_inc;
-  else
-    frame += frame_inc;
-
-  if(animation_reversed) {
-    if(frame < 0 || frame >= (float)get_frames()) {
-      // last case can happen when not used reverse_animation()
-      float excedent = frame - 0;
-      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(frame >= (float)get_frames())
-    {
-      float excedent = frame - get_frames();
+  frame += frame_inc;
+
+  if(frame >= get_frames()) {
+    frame = fmodf(frame+get_frames(), get_frames());
+    
+    animation_loops--;
+    if(animation_loops == 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;
-    }
   }
 }
 
@@ -159,6 +102,7 @@ void
 Sprite::draw(DrawingContext& context, const Vector& pos, int layer,
     Uint32 drawing_effect)
 {
+  assert(action != 0);
   update();
 
   if((int)frame >= get_frames() || (int)frame < 0)
@@ -175,6 +119,7 @@ void
 Sprite::draw_part(DrawingContext& context, const Vector& source,
     const Vector& size, const Vector& pos, int layer, Uint32 drawing_effect)
 {
+  assert(action != 0);
   update();
 
   if((int)frame >= get_frames() || (int)frame < 0)
@@ -201,4 +146,3 @@ Sprite::get_height() const
 
 }
 
-/* EOF */