*possible* fix for bugs #453 and #373

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

diff --git a/src/badguy/igel.hpp b/src/badguy/igel.hpp
index e368f1f..4d2b82f 100644 (file)
--- a/src/badguy/igel.hpp
+++ b/src/badguy/igel.hpp
@@ -20,22 +20,19 @@
 #ifndef __IGEL_H__
 #define __IGEL_H__
 
-#include "badguy.hpp"
+#include "walking_badguy.hpp"
 #include "moving_object.hpp"
 
 /**
  * Badguy "Igel" - a hedgehog that can absorb bullets
  */
-class Igel : public BadGuy
+class Igel : public WalkingBadguy
 {
 public:
   Igel(const lisp::Lisp& reader);
   Igel(const Vector& pos, Direction d);
 
-  void activate();
   void write(lisp::Writer& writer);
-  void collision_solid(const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   HitResponse collision_bullet(Bullet& bullet, const CollisionHit& hit);
 
   void active_update(float elapsed_time);
@@ -43,18 +40,14 @@ public:
   virtual Igel* clone() const { return new Igel(*this); }
 
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
   void be_normal(); /**< switch to state STATE_NORMAL */
   void turn_around(); /**< reverse direction, assumes we are in STATE_NORMAL */
   bool can_see(const MovingObject& o); /**< check if we can see o */
 
 private:
-  enum State {
-    STATE_NORMAL /**< walking around */
-  };
-  State state;
   Timer turn_recover_timer; /**< wait time until we will turn around again when shot at */
+
 };
 
 #endif
-