X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnowball.hpp;h=ef32818c3e0127dd1d0d9b9b5627aea61ee6ac58;hb=7a6f00e27bdc0aac2107506c3b00cbf0bf1cccc5;hp=49bfa9f943e5085d54634f1fbbe4e8ea9bd8feb2;hpb=7c2f8e23f9accd00bd9ee2319da8ab8aa341c7cf;p=supertux.git diff --git a/src/badguy/snowball.hpp b/src/badguy/snowball.hpp index 49bfa9f94..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); - HitResponse collision_solid(GameObject& other, 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 -