X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Ftoad.hpp;h=bbdc35f5e31bb4b3874017e41ac5526d33d57a7e;hb=2ad3ecbc14b77d373c796ad04d6389489666cc01;hp=7460757e08a4642f47e17aa59e4726206add139a;hpb=aa4d915cb7b05dec5722c4ad88141d4c4f9599ea;p=supertux.git

diff --git a/src/badguy/toad.hpp b/src/badguy/toad.hpp
index 7460757e0..bbdc35f5e 100644
--- a/src/badguy/toad.hpp
+++ b/src/badguy/toad.hpp
@@ -1,4 +1,4 @@
-//  $Id: toad.hpp 4063 2006-07-21 21:05:23Z anmaster $
+//  $Id$
 //
 //  Toad - A jumping toad
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
@@ -32,11 +32,11 @@ public:
   Toad(const lisp::Lisp& reader);
   Toad(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);
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
   void active_update(float elapsed_time);
 
   virtual Toad* clone() const { return new Toad(*this); }