- just doing some C++ifying

[supertux.git] / src / badguy.h

diff --git a/src/badguy.h b/src/badguy.h
index b4c3f52..c6b6eec 100644 (file)
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -24,16 +24,13 @@
 #define SUPERTUX_BADGUY_H
 
 #include "SDL.h"
-#include "defines.h"
-#include "bitmask.h"
-#include "type.h"
 #include "timer.h"
-#include "texture.h"
+#include "screen/texture.h"
 #include "physic.h"
-#include "collision.h"
 #include "sprite.h"
+#include "defines.h"
 #include "moving_object.h"
-#include "drawable.h"
+#include "collision.h"
 #include "serializable.h"
 
 /* Bad guy kinds: */
@@ -49,7 +46,11 @@ enum BadGuyKind {
   BAD_FLYINGSNOWBALL,
   BAD_SPIKY,
   BAD_SNOWBALL,
-  NUM_BadGuyKinds
+  BAD_WINGLING,
+  BAD_WALKINGTREE,
+  NUM_BadGuyKinds,
+
+  BAD_INVALID
 };
 
 BadGuyKind  badguykind_from_string(const std::string& str);
@@ -60,7 +61,7 @@ void free_badguy_gfx();
 class Player;
 
 /* Badguy type: */
-class BadGuy : public MovingObject, public Drawable, public Serializable
+class BadGuy : public MovingObject, public Serializable
 {
 public:
   /* Enemy modes: */
@@ -81,7 +82,10 @@ public:
     FISH_WAIT,
 
     FLY_UP,
-    FLY_DOWN
+    FLY_DOWN,
+
+    BGM_BIG,
+    BGM_SMALL
   };
 public:
   DyingType  dying;
@@ -101,6 +105,7 @@ private:
   bool removable;
   bool seen;
   int squishcount; /// number of times this enemy was squiched
+  Vector target; // Target that badguy is aiming for (wingling uses this)
   Timer timer;
   Vector start_position;
   Physic physic;
@@ -112,14 +117,14 @@ private:
   int animation_offset;
 
 public:
-  BadGuy(DisplayManager& display_manager, BadGuyKind kind, float x, float y);
-  BadGuy(DisplayManager& display_manager, BadGuyKind kind, LispReader& reader);
+  BadGuy(BadGuyKind kind, float x, float y);
+  BadGuy(BadGuyKind kind, LispReader& reader);
   virtual ~BadGuy();
 
   virtual void write(LispWriter& writer);
 
   virtual void action(float frame_ratio);
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
   virtual void collision(const MovingObject& other, int type);
 
   void collision(void* p_c_object, int c_object,
@@ -144,6 +149,8 @@ private:
   void action_flyingsnowball(double frame_ratio);
   void action_spiky(double frame_ratio);
   void action_snowball(double frame_ratio);
+  void action_wingling(double frame_ratio);
+  void action_walkingtree(double frame_ratio);
 
   /** initializes the badguy (when he appears on screen) */
   void activate(Direction direction);
@@ -155,7 +162,8 @@ private:
   /** let the player jump a bit (used when you hit a badguy) */
   void make_player_jump(Player* player);
 
-  void explode();
+  /** Turn enemy into a bomb. To explode right way pass true */
+  void explode(bool right_away);
 
   /** check if we're running left or right in a wall and eventually change
    * direction