<MatzeB> my patch fixes another leak in the levelsubset code and cleans that up a...

[supertux.git] / src / badguy.h

diff --git a/src/badguy.h b/src/badguy.h
index c7b03cc..1511e6b 100644 (file)
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -33,15 +33,10 @@
 #include "collision.h"
 #include "sprite.h"
 
-extern Sprite* img_bsod_left;
-extern Sprite* img_bsod_right;
-extern Sprite* img_laptop_left;
-
 /* Bad guy kinds: */
 enum BadGuyKind {
-  BAD_BSOD,
-  BAD_LAPTOP,
-  BAD_MONEY,
+  BAD_MRICEBLOCK,
+  BAD_JUMPY,
   BAD_MRBOMB,
   BAD_BOMB,
   BAD_STALACTITE,
@@ -69,7 +64,7 @@ struct BadGuyData
     : kind(kind_), x(x_), y(y_), stay_on_platform(stay_on_platform_) {}
 
   BadGuyData()
-    : kind(BAD_BSOD), x(0), y(0), stay_on_platform(false) {}
+    : kind(BAD_SNOWBALL), x(0), y(0), stay_on_platform(false) {}
 };
 
 class Player;
@@ -85,7 +80,7 @@ public:
     KICK,
     HELD,
 
-    MONEY_JUMP,
+    JUMPY_JUMP,
 
     BOMB_TICKING,
     BOMB_EXPLODE,
@@ -114,6 +109,7 @@ public:
 private:
   bool removable;
   bool seen;
+  int squishcount; /// number of times this enemy was squiched
   base_type old_base;
   Timer timer;
   Physic physic;
@@ -135,7 +131,7 @@ public:
   /** this functions tries to kill the badguy and lets him fall off the
    * screen. Some badguys like the flame might ignore this.
    */
-  void kill_me();
+  void kill_me(int score);
 
   /** remove ourself from the list of badguys. WARNING! This function will
    * invalidate all members. So don't do anything else with member after calling
@@ -145,9 +141,8 @@ public:
   bool is_removable() const { return removable; }
  
 private:
-  void action_bsod(float frame_ratio);
-  void action_laptop(float frame_ratio);
-  void action_money(float frame_ratio); 
+  void action_mriceblock(float frame_ratio);
+  void action_jumpy(float frame_ratio); 
   void action_bomb(float frame_ratio);
   void action_mrbomb(float frame_ratio);
   void action_stalactite(float frame_ratio);