X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbouncing_snowball.hpp;h=933eb65089ad42647f0ee266ca27a9521db8067a;hb=7a6f00e27bdc0aac2107506c3b00cbf0bf1cccc5;hp=1bcb8ab5358e9255d79db6d7b691b95be7f59896;hpb=7c2f8e23f9accd00bd9ee2319da8ab8aa341c7cf;p=supertux.git diff --git a/src/badguy/bouncing_snowball.hpp b/src/badguy/bouncing_snowball.hpp index 1bcb8ab53..933eb6508 100644 --- a/src/badguy/bouncing_snowball.hpp +++ b/src/badguy/bouncing_snowball.hpp @@ -28,16 +28,15 @@ public: BouncingSnowball(const lisp::Lisp& reader); BouncingSnowball(const Vector& pos, Direction d); - void activate(); + void initialize(); void write(lisp::Writer& writer); - HitResponse collision_solid(GameObject& other, const CollisionHit& hit); + void collision_solid(const CollisionHit& hit); HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); virtual BouncingSnowball* clone() const { return new BouncingSnowball(*this); } protected: - bool collision_squished(Player& player); + bool collision_squished(GameObject& object); }; #endif -