eliminated global scroll_x and scroll_y variables

[supertux.git] / src / badguy.h

diff --git a/src/badguy.h b/src/badguy.h
index 1511e6b..6ffafda 100644 (file)
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -32,6 +32,9 @@
 #include "physic.h"
 #include "collision.h"
 #include "sprite.h"
+#include "moving_object.h"
+#include "drawable.h"
+#include "serializable.h"
 
 /* Bad guy kinds: */
 enum BadGuyKind {
@@ -45,7 +48,8 @@ enum BadGuyKind {
   BAD_BOUNCINGSNOWBALL,
   BAD_FLYINGSNOWBALL,
   BAD_SPIKY,
-  BAD_SNOWBALL
+  BAD_SNOWBALL,
+  NUM_BadGuyKinds
 };
 
 BadGuyKind  badguykind_from_string(const std::string& str);
@@ -53,24 +57,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_SNOWBALL), x(0), y(0), stay_on_platform(false) {}
-};
-
 class Player;
 
 /* Badguy type: */
-class BadGuy
+class BadGuy : public MovingObject, public Drawable, public Serializable
 {
 public:
   /* Enemy modes: */
@@ -95,7 +85,6 @@ public:
   };
 public:
   DyingType  dying;
-  base_type  base;
   BadGuyKind kind;
   BadGuyMode mode;
 
@@ -106,13 +95,15 @@ public:
 
   Direction dir;
 
+  Timer frozen_timer;  // gets frozen when a ice shot hits it
+
 private:
   bool removable;
   bool seen;
   int squishcount; /// number of times this enemy was squiched
-  base_type old_base;
   Timer timer;
   Physic physic;
+  float angle;
 
   Sprite*   sprite_left;
   Sprite*   sprite_right;
@@ -120,10 +111,17 @@ private:
   int animation_offset;
 
 public:
-  BadGuy(float x, float y, BadGuyKind kind, bool stay_on_platform);
+  BadGuy(DisplayManager& display_manager, BadGuyKind kind, float x, float y);
+  BadGuy(DisplayManager& display_manager, BadGuyKind kind, LispReader& reader);
+  virtual ~BadGuy();
+
+  virtual void write(LispWriter& writer);
 
-  void action(float frame_ratio);
-  void draw();
+  virtual void action(float frame_ratio);
+  virtual void draw(ViewPort& viewport, int layer);
+  virtual void collision(const MovingObject& other, int type);
+  virtual std::string type() const
+  { return "BadGuy"; };
 
   void collision(void* p_c_object, int c_object,
                  CollisionType type = COLLISION_NORMAL);
@@ -133,25 +131,20 @@ public:
    */
   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
-   * this.
-   */
-  void remove_me();  
-  bool is_removable() const { return removable; }
- 
 private:
-  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);
-  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 init();
+  
+  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 */
@@ -160,6 +153,8 @@ private:
   /** let the player jump a bit (used when you hit a badguy) */
   void make_player_jump(Player* player);
 
+  void explode();
+
   /** check if we're running left or right in a wall and eventually change
    * direction
    */