X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.hpp;h=44613e47f7fd526f83b290dbeae72007b7dd20ad;hb=e7042da286e68756298cc205910b35c1da551167;hp=182ab6e0aee42ec36fdbf5428c24212862999c3d;hpb=25ed951bc477e74992cbb0bd86103f8732e25a38;p=supertux.git

diff --git a/src/badguy/badguy.hpp b/src/badguy/badguy.hpp
index 182ab6e0a..44613e47f 100644
--- a/src/badguy/badguy.hpp
+++ b/src/badguy/badguy.hpp
@@ -23,8 +23,7 @@
 // moved them here to make it less typing when implementing new badguys
 #include <math.h>
 #include "timer.hpp"
-#include "moving_object.hpp"
-#include "sprite/sprite.hpp"
+#include "object/moving_sprite.hpp"
 #include "physic.hpp"
 #include "object/player.hpp"
 #include "serializable.hpp"
@@ -38,13 +37,13 @@
 #include "video/drawing_context.hpp"
 #include "audio/sound_manager.hpp"
 #include "audio/sound_source.hpp"
-#include "sprite/sprite_manager.hpp"
 
-class BadGuy : public MovingObject, public Serializable
+class BadGuy : public MovingSprite, public Serializable
 {
 public:
-  BadGuy();
-  ~BadGuy();
+  BadGuy(const Vector& pos, const std::string& sprite_name, int layer = LAYER_OBJECTS);
+  BadGuy(const Vector& pos, Direction direction, const std::string& sprite_name, int layer = LAYER_OBJECTS);
+  BadGuy(const lisp::Lisp& reader, const std::string& sprite_name, int layer = LAYER_OBJECTS);
 
   /** Called when the badguy is drawn. The default implementation simply draws
    * the badguy sprite on screen
@@ -58,8 +57,7 @@ public:
    * implemetnation calls collision_player, collision_solid, collision_badguy
    * and collision_squished
    */
-  virtual HitResponse collision(GameObject& other,
-      const CollisionHit& hit);
+  virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
 
   /** Called when a collision with tile with special attributes occured */
   virtual void collision_tile(uint32_t tile_attributes);
@@ -97,14 +95,11 @@ protected:
   };
  
   /** Called when the badguy collided with a player */
-  virtual HitResponse collision_player(Player& player,
-      const CollisionHit& hit);
+  virtual HitResponse collision_player(Player& player, const CollisionHit& hit);
   /** Called when the badguy collided with solid ground */
-  virtual HitResponse collision_solid(GameObject& other,
-      const CollisionHit& hit);
+  virtual void collision_solid(const CollisionHit& hit);
   /** Called when the badguy collided with another badguy */
-  virtual HitResponse collision_badguy(BadGuy& other,
-      const CollisionHit& hit);
+  virtual HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
  
   /** Called when the player hit the badguy from above. You should return true
    * if the badguy was squished, false if squishing wasn't possible
@@ -112,8 +107,7 @@ protected:
   virtual bool collision_squished(Player& player);
 
   /** Called when the badguy collided with a bullet */
-  virtual HitResponse collision_bullet(Bullet& bullet, 
-      const CollisionHit& hit);
+  virtual HitResponse collision_bullet(Bullet& bullet, const CollisionHit& hit);
 
   /** called each frame when the badguy is activated. */
   virtual void active_update(float elapsed_time);
@@ -139,7 +133,6 @@ protected:
    */
   Player* get_nearest_player();
   
-  Sprite* sprite;
   Physic physic;
 
   /// is the enemy activated
@@ -157,19 +150,39 @@ protected:
 
   Vector start_position;
 
+  /**
+   * The direction we currently face in
+   */
   Direction dir;
 
   /**
-   * z-position at which to draw the sprite.
-   * e.g. LAYER_OBJECTS, LAYER_OBJECTS - 1, LAYER_FLOATINGOBJECTS
+   * The direction we initially faced in
+   */
+  Direction start_dir;
+
+  /**
+   *  Get Direction from String.
+   */ 
+  Direction str2dir( std::string dir_str );
+
+  /**
+   * Update on_ground_flag judging by solid collision @c hit.
+   * This gets called from the base implementation of collision_solid, so call this when overriding collision_solid's default behaviour.
+   */
+  void update_on_ground_flag(const CollisionHit& hit);
+
+  /**
+   * Returns true if we touched ground in the past frame
+   * This only works if update_on_ground_flag() gets called in collision_solid.
    */
-  int layer;
+  bool on_ground();
 
 private:
   void try_activate();
   
   State state;
   Timer state_timer;
+  bool on_ground_flag;
 };
 
 #endif