X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Figel.hpp;h=4d2b82f793c128d655ad40a065ed26372aeb7414;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=bdb7b75e03d1d8d17aede92250985383a3aca3ac;hpb=78e9b27b7059c9b9b16a7f871ab71f751ec75323;p=supertux.git diff --git a/src/badguy/igel.hpp b/src/badguy/igel.hpp index bdb7b75e0..4d2b82f79 100644 --- a/src/badguy/igel.hpp +++ b/src/badguy/igel.hpp @@ -1,4 +1,4 @@ -// $Id: igel.hpp 3452 2006-04-27 18:19:15Z sommer $ +// $Id$ // // SuperTux - Badguy "Igel" // Copyright (C) 2006 Christoph Sommer @@ -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); - HitResponse collision_solid(GameObject& object, 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,20 +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 */ - bool set_direction; - Direction initial_direction; + }; #endif -