X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fpoisonivy.hpp;h=783f23254b5810c7d901046b28453234294807ff;hb=c655b296af60a436a8ce2bf0e6ede4f72eae0580;hp=0005eaa343af6840462963f015c595309e31247a;hpb=58eb3364f724b2100859fd39da9bba5a9a09cafc;p=supertux.git diff --git a/src/badguy/poisonivy.hpp b/src/badguy/poisonivy.hpp index 0005eaa34..783f23254 100644 --- a/src/badguy/poisonivy.hpp +++ b/src/badguy/poisonivy.hpp @@ -20,25 +20,20 @@ #ifndef __POISONIVY_H__ #define __POISONIVY_H__ -#include "badguy.hpp" +#include "walking_badguy.hpp" -class PoisonIvy : public BadGuy +class PoisonIvy : public WalkingBadguy { public: PoisonIvy(const lisp::Lisp& reader); - PoisonIvy(float pos_x, float pos_y, Direction d); + PoisonIvy(const Vector& pos, Direction d); - void activate(); void write(lisp::Writer& writer); - HitResponse collision_solid(GameObject& other, const CollisionHit& hit); - HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit); - virtual PoisonIvy* clone() const { return new PoisonIvy(*this); } protected: - bool collision_squished(Player& player); - bool set_direction; - Direction initial_direction; + bool collision_squished(GameObject& object); + }; #endif