X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.hpp;h=53ed624c0d64f6ca377fa29f408944f74b121b8a;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=31a5a2dae7d8c337a80a98c82992f7145720a967;hpb=72fec61025ea98c4212a54edd2118af49825e8f2;p=supertux.git

diff --git a/src/badguy/badguy.hpp b/src/badguy/badguy.hpp
index 31a5a2dae..53ed624c0 100644
--- a/src/badguy/badguy.hpp
+++ b/src/badguy/badguy.hpp
@@ -27,11 +27,9 @@
 #include "physic.hpp"
 #include "object/player.hpp"
 #include "serializable.hpp"
-#include "resources.hpp"
 #include "sector.hpp"
 #include "direction.hpp"
 #include "object_factory.hpp"
-#include "lisp/parser.hpp"
 #include "lisp/lisp.hpp"
 #include "lisp/writer.hpp"
 #include "video/drawing_context.hpp"
@@ -56,13 +54,13 @@ public:
    * calls active_update and inactive_update
    */
   virtual void update(float elapsed_time);
-  /** Called when a collision with another object occured. The default
-   * implemetnation calls collision_player, collision_solid, collision_badguy
+  /** Called when a collision with another object occurred. The default
+   * implementation calls collision_player, collision_solid, collision_badguy
    * and collision_squished
    */
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
 
-  /** Called when a collision with tile with special attributes occured */
+  /** Called when a collision with tile with special attributes occurred */
   virtual void collision_tile(uint32_t tile_attributes);
 
   /** Set the badguy to kill/falling state, which makes him falling of the
@@ -162,6 +160,9 @@ protected:
   /** called each frame when the badguy is not activated. */
   virtual void inactive_update(float elapsed_time);
 
+  bool is_initialized; /**< true if initialize() has already been called */
+  /** called immediately before the first call to initialize */
+  virtual void initialize();
   /**
    * called when the badguy has been activated. (As a side effect the dir
    * variable might have been changed so that it faces towards the player.
@@ -181,8 +182,6 @@ protected:
    */
   Player* get_nearest_player();
 
-  /// is the enemy activated
-  bool activated;
   /**
    * initial position of the enemy. Also the position where enemy respawns when
    * after being deactivated.
@@ -238,6 +237,8 @@ protected:
    */
   bool is_active();
 
+  void set_colgroup_active(CollisionGroup group); /**< changes colgroup_active. Also calls set_group when badguy is in STATE_ACTIVE */
+
 private:
   void try_activate();
 
@@ -246,6 +247,7 @@ private:
   Timer state_timer;
   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 */
+  CollisionGroup colgroup_active; /**< CollisionGroup the badguy should be in while active */
 
 };