remove debug printf

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

diff --git a/lib/special/sprite.h b/lib/special/sprite.h
index 54f3476..e8b8d85 100644 (file)
--- a/lib/special/sprite.h
+++ b/lib/special/sprite.h
@@ -22,104 +22,77 @@
 
 #include <string>
 #include <vector>
+#include <cassert>
 #include <map>
 
-#include "../utils/lispreader.h"
-#include "../video/surface.h"
-#include "../math/vector.h"
+#include "video/surface.h"
+#include "math/vector.h"
+#include "sprite_data.h"
 
 namespace SuperTux
-  {
-
+{
   class Sprite
+  {
+  public:
+    Sprite(SpriteData& data);
+    Sprite(const Sprite& other);
+    ~Sprite();
+    
+    /** Draw sprite, automatically calculates next frame */
+    void draw(DrawingContext& context, const Vector& pos, int layer,
+        Uint32 drawing_effect = NONE_EFFECT);
+
+    void draw_part(DrawingContext& context, const Vector& source,
+        const Vector& size, const Vector& pos, int layer,
+        Uint32 drawing_effect = NONE_EFFECT);
+
+    /** Set action (or state) */
+    void set_action(std::string act, int loops = -1);
+
+    /* Stop animation */
+    void stop_animation()
+    { animation_loops = 0; }
+    /** Check if animation is stopped or not */
+    bool check_animation();
+
+    float get_fps() const
+    { return action->fps; }
+    /** Get current action total frames */
+    int get_frames() const
+    { return action->surfaces.size(); }
+    /** Get sprite's name */
+    const std::string& get_name() const
+    { return data.name; }
+    /** Get current action name */
+    const std::string& get_action_name() const
+    { return action->name; }
+
+    int get_width() const;
+    int get_height() const;
+
+    /** Get current frame */
+    int get_frame() const
+    { return (int)frame; }
+    /** Set current frame */
+    void set_frame(int frame_)
+    { if(frame_ > get_frames()) frame = 0; else frame = frame_; }
+    Surface* get_frame(unsigned int frame)
     {
-    private:
-
-      struct Action
-        {
-        std::string name;
-
-        int x_hotspot;
-        int y_hotspot;
-
-        /** Frames per second */
-        float fps;
-
-        std::vector<Surface*> surfaces;
-        };
-
-    public:
-      /** cur has to be a pointer to data in the form of ((x-hotspot 5)
-          (y-hotspot 10) ...) */
-      Sprite(lisp_object_t* cur);
-      ~Sprite();
-
-      /** Draw sprite, automatically calculates next frame */
-      void draw(DrawingContext& context, const Vector& pos, int layer,
-                Uint32 drawing_effect = NONE_EFFECT);
-
-      /** Set action (or state) */
-      void set_action(std::string act);
-
-      /* Start an animation
-          -1 - for infinite
-          0  - stopped
-          1,2,3  - one, two, three times...
-          If next_act specified, that action will be used when animation ends. */
-      void start_animation(int loops, std::string next_act = "");
-      /** Check if animation is stopped or not */
-      bool check_animation();
-      /** Reverse the animation */
-      void reverse_animation();
-
-      float get_fps()
-        { return action->fps; }
-      /** Get current action total frames */
-      int get_frames()
-        { return action->surfaces.size(); }
-      /** Get sprite's name */
-      std::string get_name() const
-        { return name; }
-      /** Get current action name */
-      std::string get_action_name() const
-        { return action->name; }
-      int get_width();
-      int get_height();
-
-      /** Get current frame */
-      int get_frame()
-        { return (int)frame; }
-      /** Set current frame */
-      void set_frame(int frame_)
-        { if(frame_ > get_frames()) frame = 0; else frame = frame_; }
-      Surface* get_frame(unsigned int frame)
-      {
-        if(frame < action->surfaces.size())
-          return action->surfaces[frame];
-        else
-          return action->surfaces[0];
-      }    
-    private:
-      void init_defaults(Action* act);
-      void parse_action(LispReader& lispreader);
-
-      void update();
-      void reset();
-
-      std::string name;
-
-      float frame;
-      int animation_loops;
-      bool animation_reversed;
-      float last_tick;
-
-      typedef std::map <std::string, Action*> Actions;
-      Actions actions;
-
-      Action* action;
-      std::string next_action;
-    };
+      assert(frame < action->surfaces.size());
+      return action->surfaces[frame];
+    }    
+
+  private:
+    void update();
+
+    SpriteData& data;
+
+    float frame;
+    int animation_loops;
+    Uint32 last_ticks;
 
+    SpriteData::Action* action;
+  };
 } //namespace SuperTux
 
 #endif /*SUPERTUX_SPRITE_H*/