X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnowball.hpp;h=ef32818c3e0127dd1d0d9b9b5627aea61ee6ac58;hb=7a6f00e27bdc0aac2107506c3b00cbf0bf1cccc5;hp=d13c03fb8319a537bf72a451d9bd4011b984220d;hpb=78e9b27b7059c9b9b16a7f871ab71f751ec75323;p=supertux.git diff --git a/src/badguy/snowball.hpp b/src/badguy/snowball.hpp index d13c03fb8..ef32818c3 100644 --- a/src/badguy/snowball.hpp +++ b/src/badguy/snowball.hpp @@ -20,27 +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 set_direction; - Direction initial_direction; - //bool fluffy; + bool collision_squished(GameObject& object); + }; #endif -