Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

[supertux.git] / src / badguy / badguy.hpp

diff --git a/src/badguy/badguy.hpp b/src/badguy/badguy.hpp
index cf0adc2..f7ebbff 100644 (file)
--- a/src/badguy/badguy.hpp
+++ b/src/badguy/badguy.hpp
@@ -38,7 +38,7 @@
 #include "audio/sound_manager.hpp"
 #include "audio/sound_source.hpp"
 
-class BadGuy : public MovingSprite, public Serializable
+class BadGuy : public MovingSprite, protected UsesPhysic, public Serializable
 {
 public:
   BadGuy(const Vector& pos, const std::string& sprite_name, int layer = LAYER_OBJECTS);
@@ -107,7 +107,7 @@ public:
    * Returns whether to call ignite() when a badguy gets hit by a fire bullet
    */
   virtual bool is_flammable() const;
-  
+
   /**
    * Returns whether this badguys is currently on fire
    */
@@ -146,7 +146,7 @@ protected:
   /** Called when the player hit the badguy from above. You should return true
    * if the badguy was squished, false if squishing wasn't possible
    */
-  virtual bool collision_squished(Player& player);
+  virtual bool collision_squished(GameObject& object);
 
   /** Called when the badguy collided with a bullet */
   virtual HitResponse collision_bullet(Bullet& bullet, const CollisionHit& hit);
@@ -164,7 +164,7 @@ protected:
   /** called when the badguy has been deactivated */
   virtual void deactivate();
 
-  void kill_squished(Player& player);
+  void kill_squished(GameObject& object);
 
   void set_state(State state);
   State get_state() const
@@ -175,8 +175,6 @@ protected:
    */
   Player* get_nearest_player();
 
-  Physic physic;
-
   /// is the enemy activated
   bool activated;
   /**
@@ -219,15 +217,25 @@ protected:
    */
   bool on_ground();
 
+  /**
+   * Returns floor normal stored the last time when update_on_ground_flag was called and we touched something solid from above.
+   */
+  Vector get_floor_normal();
+
   bool frozen;
   bool ignited; /**< true if this badguy is currently on fire */
 
+  std::string dead_script; /**< script to execute when badguy is killed */
+  bool draw_dead_script_hint; /**< whether to draw a visual indication that this Badguy triggers a script */
+
 private:
   void try_activate();
 
   State state;
   Timer state_timer;
-  bool on_ground_flag;
+  bool on_ground_flag; /**< true if we touched something solid from above and update_on_ground_flag was called last frame */
+  Vector floor_normal; /**< floor normal stored the last time when update_on_ground_flag was called and we touched something solid from above */
+
 };
 
 #endif