X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fpoisonivy.hpp;h=783f23254b5810c7d901046b28453234294807ff;hb=c655b296af60a436a8ce2bf0e6ede4f72eae0580;hp=09b6af643046ce2d2d017c58a5d253da618b6cf7;hpb=7c2f8e23f9accd00bd9ee2319da8ab8aa341c7cf;p=supertux.git diff --git a/src/badguy/poisonivy.hpp b/src/badguy/poisonivy.hpp index 09b6af643..783f23254 100644 --- a/src/badguy/poisonivy.hpp +++ b/src/badguy/poisonivy.hpp @@ -20,23 +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(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 collision_squished(GameObject& object); + }; #endif