X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Figel.hpp;h=4d2b82f793c128d655ad40a065ed26372aeb7414;hb=2d1bc69993923150eb701d3cacb917ab4e23d5ef;hp=e368f1f055640a574d33610116232f7399e82853;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git diff --git a/src/badguy/igel.hpp b/src/badguy/igel.hpp index e368f1f05..4d2b82f79 100644 --- 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 -