Finally!!

[supertux.git] / src / badguy.h

diff --git a/src/badguy.h b/src/badguy.h
index d338d48..c95d706 100644 (file)
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -20,11 +20,11 @@
 #include "texture.h"
 #include "physic.h"
 #include "collision.h"
+#include "sprite.h"
 
-extern texture_type img_bsod_left[4];
-extern texture_type img_bsod_right[4];
-extern texture_type img_laptop_left[4];
-extern texture_type img_money_left[2];
+extern Sprite* img_bsod_left;
+extern Sprite* img_bsod_right;
+extern Sprite* img_laptop_left;
 
 /* Enemy modes: */
 enum {
@@ -96,11 +96,12 @@ public:
 private:
   bool seen;
   base_type old_base;
-  timer_type timer;
+  Timer timer;
   Physic physic;
 
-  texture_type* texture_left;
-  texture_type* texture_right;
+  Sprite*   sprite_left;
+  Sprite*   sprite_right;
+
   int animation_offset;
   size_t animation_length;
   float animation_speed;
@@ -108,7 +109,7 @@ private:
 public:
   void init(float x, float y, BadGuyKind kind);
 
-  void action();
+  void action(float frame_ratio);
   void draw();
 
   void collision(void* p_c_object, int c_object,
@@ -120,18 +121,18 @@ public:
   void kill_me();
   
 private:
-  void action_bsod();
-  void action_laptop();
-  void action_money(); 
-  void action_bomb();
-  void action_mrbomb();
-  void action_stalactite();
-  void action_flame();
-  void action_fish();
-  void action_bouncingsnowball();
-  void action_flyingsnowball();
-  void action_spiky();
-  void action_snowball();
+  void action_bsod(float frame_ratio);
+  void action_laptop(float frame_ratio);
+  void action_money(float frame_ratio); 
+  void action_bomb(float frame_ratio);
+  void action_mrbomb(float frame_ratio);
+  void action_stalactite(float frame_ratio);
+  void action_flame(float frame_ratio);
+  void action_fish(float frame_ratio);
+  void action_bouncingsnowball(float frame_ratio);
+  void action_flyingsnowball(float frame_ratio);
+  void action_spiky(float frame_ratio);
+  void action_snowball(float frame_ratio);
 
   /** handles falling down. disables gravity calculation when we're back on
    * ground */
@@ -154,7 +155,7 @@ private:
   /** squish ourself, give player score and set dying to DYING_SQICHED */
   void squish_me(Player* player);
   /** set image of the badguy */
-  void set_texture(texture_type* left, texture_type* right,
+  void set_sprite(Sprite* left, Sprite* right,
         int animlength = 1, float animspeed = 1);
 };