X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy.h;h=3ec189bbe9228b93856307516f0d7a84c3503535;hb=b524515944583916655a9f2cf1a667e55e7ed4ce;hp=8ea7f2e658e4832587af81cd1f0df4725e9b73fb;hpb=ee6db785e8eff4883da70b404a9bdb4a42e75ac3;p=supertux.git

diff --git a/src/badguy.h b/src/badguy.h
index 8ea7f2e65..3ec189bbe 100644
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -24,57 +24,51 @@
 #define SUPERTUX_BADGUY_H
 
 #include "SDL.h"
-#include "bitmask.h"
-#include "type.h"
-#include "timer.h"
-#include "texture.h"
-#include "physic.h"
+
+#include "utils/lispreader.h"
+#include "special/timer.h"
+#include "math/physic.h"
+#include "defines.h"
+#include "special/moving_object.h"
 #include "collision.h"
-#include "sprite.h"
+#include "serializable.h"
+#include "scene.h"
+
+using namespace SuperTux;
+
+/* Timing constants (in ms): */
 
-extern Sprite* img_bsod_left;
-extern Sprite* img_bsod_right;
-extern Sprite* img_laptop_left;
+#define KICKING_TIME 200
 
 /* Bad guy kinds: */
 enum BadGuyKind {
-  BAD_BSOD,
-  BAD_LAPTOP,
-  BAD_MONEY,
+  BAD_MRICEBLOCK,
+  BAD_JUMPY,
   BAD_MRBOMB,
   BAD_BOMB,
   BAD_STALACTITE,
   BAD_FLAME,
   BAD_FISH,
+  BAD_FLAMEFISH,
   BAD_BOUNCINGSNOWBALL,
   BAD_FLYINGSNOWBALL,
   BAD_SPIKY,
-  BAD_SNOWBALL
+  BAD_SNOWBALL,
+  BAD_WINGLING,
+  BAD_WALKINGTREE,
+  NUM_BadGuyKinds,
+
+  BAD_INVALID
 };
 
 BadGuyKind  badguykind_from_string(const std::string& str);
 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;
+class BadGuySpecs;
 
 /* Badguy type: */
-class BadGuy
+class BadGuy : public MovingObject, public Serializable
 {
 public:
   /* Enemy modes: */
@@ -84,7 +78,7 @@ public:
     KICK,
     HELD,
 
-    MONEY_JUMP,
+    JUMPY_JUMP,
 
     BOMB_TICKING,
     BOMB_EXPLODE,
@@ -95,11 +89,13 @@ public:
     FISH_WAIT,
 
     FLY_UP,
-    FLY_DOWN
+    FLY_DOWN,
+
+    BGM_BIG,
+    BGM_SMALL
   };
 public:
   DyingType  dying;
-  base_type  base;
   BadGuyKind kind;
   BadGuyMode mode;
 
@@ -109,25 +105,35 @@ public:
   bool stay_on_platform;
 
   Direction dir;
+  Vector start_position;
+
+  Timer frozen_timer;  // gets frozen when a ice shot hits it
 
 private:
+  bool removable;
   bool seen;
-  base_type old_base;
+  int squishcount; /// number of times this enemy was squiched
+  Vector target; // Target that badguy is aiming for (wingling uses this)
   Timer timer;
   Physic physic;
+  float angle;
+
+  std::string action_left, action_right;
 
-  Sprite*   sprite_left;
-  Sprite*   sprite_right;
+  BadGuySpecs* specs;
 
   int animation_offset;
-  size_t animation_length;
-  float animation_speed;
 
 public:
-  void init(float x, float y, BadGuyKind kind, bool stay_on_platform);
+  BadGuy(BadGuyKind kind, float x, float y);
+  BadGuy(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(DrawingContext& context);
+  virtual void collision(const MovingObject& other, int type);
 
   void collision(void* p_c_object, int c_object,
                  CollisionType type = COLLISION_NORMAL);
@@ -135,32 +141,37 @@ 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);
+
+  /** 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 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 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);
+  void action_wingling(double frame_ratio);
+  void action_walkingtree(double frame_ratio);
 
   /** handles falling down. disables gravity calculation when we're back on
    * ground */
   void fall();
-  /** 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();  
-  /** let the player jump a bit (used when you hit a badguy) */
-  void make_player_jump(Player* player);
+
+  /** 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
    */
@@ -171,9 +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,
-                  int animlength = 1, float animspeed = 1);
+  /** set sprite's action of the badguy */
+  void set_action(std::string action_left, std::string action_right);
 };
 
 #endif /*SUPERTUX_BADGUY_H*/