Fixed hotspot square drawing in debug mode.

[supertux.git] / src / badguy.h

diff --git a/src/badguy.h b/src/badguy.h
index c7b03cc..caaa8e9 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,
@@ -50,7 +45,8 @@ enum BadGuyKind {
   BAD_BOUNCINGSNOWBALL,
   BAD_FLYINGSNOWBALL,
   BAD_SPIKY,
-  BAD_SNOWBALL
+  BAD_SNOWBALL,
+  NUM_BadGuyKinds
 };
 
 BadGuyKind  badguykind_from_string(const std::string& str);
@@ -58,24 +54,10 @@ std::string badguykind_to_string(BadGuyKind kind);
 void load_badguy_gfx();
 void free_badguy_gfx();
 
-struct BadGuyData
-{
-  BadGuyKind kind;
-  int x;
-  int y;
-  bool stay_on_platform;
-
-  BadGuyData(BadGuyKind kind_, int x_, int y_, bool stay_on_platform_) 
-    : kind(kind_), x(x_), y(y_), stay_on_platform(stay_on_platform_) {}
-
-  BadGuyData()
-    : kind(BAD_BSOD), x(0), y(0), stay_on_platform(false) {}
-};
-
 class Player;
 
 /* Badguy type: */
-class BadGuy
+class BadGuy : public GameObject
 {
 public:
   /* Enemy modes: */
@@ -85,7 +67,7 @@ public:
     KICK,
     HELD,
 
-    MONEY_JUMP,
+    JUMPY_JUMP,
 
     BOMB_TICKING,
     BOMB_EXPLODE,
@@ -100,7 +82,6 @@ public:
   };
 public:
   DyingType  dying;
-  base_type  base;
   BadGuyKind kind;
   BadGuyMode mode;
 
@@ -114,7 +95,7 @@ public:
 private:
   bool removable;
   bool seen;
-  base_type old_base;
+  int squishcount; /// number of times this enemy was squiched
   Timer timer;
   Physic physic;
 
@@ -126,8 +107,11 @@ private:
 public:
   BadGuy(float x, float y, BadGuyKind kind, bool stay_on_platform);
 
-  void action(float frame_ratio);
+  void action(double frame_ratio);
   void draw();
+  std::string type() { return "BadGuy"; };
+
+  void explode(BadGuy* badguy);
 
   void collision(void* p_c_object, int c_object,
                  CollisionType type = COLLISION_NORMAL);
@@ -135,7 +119,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,18 +129,17 @@ 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_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);
+  void action_mriceblock(double frame_ratio);
+  void action_jumpy(double frame_ratio); 
+  void action_bomb(double frame_ratio);
+  void action_mrbomb(double frame_ratio);
+  void action_stalactite(double frame_ratio);
+  void action_flame(double frame_ratio);
+  void action_fish(double frame_ratio);
+  void action_bouncingsnowball(double frame_ratio);
+  void action_flyingsnowball(double frame_ratio);
+  void action_spiky(double frame_ratio);
+  void action_snowball(double frame_ratio);
 
   /** handles falling down. disables gravity calculation when we're back on
    * ground */
@@ -179,6 +162,21 @@ private:
   void set_sprite(Sprite* left, Sprite* right);
 };
 
+struct BadGuyData
+{
+  BadGuyKind kind;
+  int x;
+  int y;
+  bool stay_on_platform;
+
+  BadGuyData(BadGuy* pbadguy) : kind(pbadguy->kind), x((int)pbadguy->base.x), y((int)pbadguy->base.y), stay_on_platform(pbadguy->stay_on_platform)  {};
+  BadGuyData(BadGuyKind kind_, int x_, int y_, bool stay_on_platform_) 
+    : kind(kind_), x(x_), y(y_), stay_on_platform(stay_on_platform_) {}
+
+  BadGuyData()
+    : kind(BAD_SNOWBALL), x(0), y(0), stay_on_platform(false) {}
+};
+
 #endif /*SUPERTUX_BADGUY_H*/
 
 /* Local Variables: */