X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnowball.hpp;h=ef32818c3e0127dd1d0d9b9b5627aea61ee6ac58;hb=c655b296af60a436a8ce2bf0e6ede4f72eae0580;hp=e7387ef51f9c2c8bbf1a970b30aca16c82d50c1d;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git diff --git a/src/badguy/snowball.hpp b/src/badguy/snowball.hpp index e7387ef51..ef32818c3 100644 --- a/src/badguy/snowball.hpp +++ b/src/badguy/snowball.hpp @@ -20,24 +20,20 @@ #ifndef __SNOWBALL_H__ #define __SNOWBALL_H__ -#include "badguy.hpp" +#include "walking_badguy.hpp" -class SnowBall : public BadGuy +class SnowBall : public WalkingBadguy { public: SnowBall(const lisp::Lisp& reader); SnowBall(const Vector& pos, Direction d); - void activate(); void write(lisp::Writer& writer); - void collision_solid(const CollisionHit& hit); - HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit); - virtual SnowBall* clone() const { return new SnowBall(*this); } protected: - bool collision_squished(Player& player); + bool collision_squished(GameObject& object); + }; #endif -