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 7853f8b..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
    */
@@ -175,8 +175,6 @@ protected:
    */
   Player* get_nearest_player();
 
-  Physic physic;
-
   /// is the enemy activated
   bool activated;
   /**
@@ -227,6 +225,9 @@ protected:
   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();