X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnail.hpp;h=0d31ca8c401fa546aa0a72ca06dd9b4525935d8c;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=0e804090e9237d8b59041e9660ed54991826f0a2;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/badguy/snail.hpp b/src/badguy/snail.hpp index 0e804090e..0d31ca8c4 100644 --- a/src/badguy/snail.hpp +++ b/src/badguy/snail.hpp @@ -31,7 +31,7 @@ public: Snail(const lisp::Lisp& reader); Snail(const Vector& pos, Direction d); - void activate(); + void initialize(); void write(lisp::Writer& writer); void collision_solid(const CollisionHit& hit); HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); @@ -42,7 +42,7 @@ public: virtual Snail* clone() const { return new Snail(*this); } protected: - bool collision_squished(Player& player); + bool collision_squished(GameObject& object); void be_normal(); /**< switch to state STATE_NORMAL */ void be_flat(); /**< switch to state STATE_FLAT */ void be_kicked(); /**< switch to state STATE_KICKED_DELAY */