improve exception feedback a bit

[supertux.git] / src / badguy.h

diff --git a/src/badguy.h b/src/badguy.h
index 6e53ec9..3ec189b 100644 (file)
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -25,14 +25,20 @@
 
 #include "SDL.h"
 
-#include "timer.h"
-#include "screen/surface.h"
-#include "physic.h"
-#include "sprite.h"
+#include "utils/lispreader.h"
+#include "special/timer.h"
+#include "math/physic.h"
 #include "defines.h"
-#include "moving_object.h"
+#include "special/moving_object.h"
 #include "collision.h"
 #include "serializable.h"
+#include "scene.h"
+
+using namespace SuperTux;
+
+/* Timing constants (in ms): */
+
+#define KICKING_TIME 200
 
 /* Bad guy kinds: */
 enum BadGuyKind {
@@ -43,6 +49,7 @@ enum BadGuyKind {
   BAD_STALACTITE,
   BAD_FLAME,
   BAD_FISH,
+  BAD_FLAMEFISH,
   BAD_BOUNCINGSNOWBALL,
   BAD_FLYINGSNOWBALL,
   BAD_SPIKY,
@@ -56,10 +63,9 @@ enum BadGuyKind {
 
 BadGuyKind  badguykind_from_string(const std::string& str);
 std::string badguykind_to_string(BadGuyKind kind);
-void load_badguy_gfx();
-void free_badguy_gfx();
 
 class Player;
+class BadGuySpecs;
 
 /* Badguy type: */
 class BadGuy : public MovingObject, public Serializable
@@ -99,6 +105,7 @@ public:
   bool stay_on_platform;
 
   Direction dir;
+  Vector start_position;
 
   Timer frozen_timer;  // gets frozen when a ice shot hits it
 
@@ -108,12 +115,12 @@ private:
   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;
   float angle;
 
-  Sprite*   sprite_left;
-  Sprite*   sprite_right;
+  std::string action_left, action_right;
+
+  BadGuySpecs* specs;
 
   int animation_offset;
 
@@ -136,6 +143,11 @@ public:
    */
   void kill_me(int score);
 
+  /** initializes the badguy (when he appears on screen) */
+  void activate(Direction direction);  // should only be used by BadGuy's objects
+
+  Surface* get_image();
+
 private:
   void init();
   
@@ -153,9 +165,6 @@ private:
   void action_wingling(double frame_ratio);
   void action_walkingtree(double frame_ratio);
 
-  /** initializes the badguy (when he appears on screen) */
-  void activate(Direction direction);
-
   /** handles falling down. disables gravity calculation when we're back on
    * ground */
   void fall();
@@ -173,8 +182,8 @@ private:
   void squish(Player* player);
   /** squish ourself, give player score and set dying to DYING_SQICHED */
   void squish_me(Player* player);
-  /** set image of the badguy */
-  void set_sprite(Sprite* left, Sprite* right);
+  /** set sprite's action of the badguy */
+  void set_action(std::string action_left, std::string action_right);
 };
 
 #endif /*SUPERTUX_BADGUY_H*/