X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Ftoad.cpp;h=0f0582b14eec3601c0a6051aa748cbd6d2680a79;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=9115e338f8020ae0c8db1accef80699852c154ab;hpb=aa4d915cb7b05dec5722c4ad88141d4c4f9599ea;p=supertux.git

diff --git a/src/badguy/toad.cpp b/src/badguy/toad.cpp
index 9115e338f..0f0582b14 100644
--- a/src/badguy/toad.cpp
+++ b/src/badguy/toad.cpp
@@ -1,4 +1,4 @@
-//  $Id: toad.cpp 4192 2006-08-16 23:25:39Z sommer $
+//  $Id$
 //
 //  Toad - A jumping toad
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
@@ -30,13 +30,13 @@ namespace {
 }
 
 Toad::Toad(const lisp::Lisp& reader)
-	: BadGuy(reader, "images/creatures/toad/toad.sprite")
+        : BadGuy(reader, "images/creatures/toad/toad.sprite")
 {
   sound_manager->preload(HOP_SOUND);
 }
 
 Toad::Toad(const Vector& pos, Direction d)
-	: BadGuy(pos, d, "images/creatures/toad/toad.sprite")
+        : BadGuy(pos, d, "images/creatures/toad/toad.sprite")
 {
   sound_manager->preload(HOP_SOUND);
 }
@@ -51,7 +51,7 @@ Toad::write(lisp::Writer& writer)
 }
 
 void
-Toad::activate()
+Toad::initialize()
 {
   // initial state is JUMPING, because we might start airborne
   state = JUMPING;
@@ -86,10 +86,10 @@ Toad::set_state(ToadState newState)
 }
 
 bool
-Toad::collision_squished(Player& player)
+Toad::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  kill_squished(player);
+  kill_squished(object);
   return true;
 }