X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstumpy.cpp;h=73dfc6b192591253172fcf337357a736948e0598;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=f4515461f30109409212da30bf1b0016fdd59ab4;hpb=22ebbf03379aad8d3fc704e47e6cfa7acca8651d;p=supertux.git

diff --git a/src/badguy/stumpy.cpp b/src/badguy/stumpy.cpp
index f4515461f..73dfc6b19 100644
--- a/src/badguy/stumpy.cpp
+++ b/src/badguy/stumpy.cpp
@@ -1,4 +1,4 @@
-//  $Id: stumpy.cpp 3980 2006-07-10 19:55:56Z sommer $
+//  $Id$
 //
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
@@ -32,7 +32,6 @@ Stumpy::Stumpy(const lisp::Lisp& reader)
 {
   walk_speed = WALKSPEED;
   max_drop_height = 16;
-  sound_manager->preload("sounds/mr_tree.ogg");
   sound_manager->preload("sounds/mr_treehit.ogg");
 }
 
@@ -55,7 +54,7 @@ Stumpy::write(lisp::Writer& writer)
 }
 
 void
-Stumpy::activate()
+Stumpy::initialize()
 {
   switch (mystate) {
     case STATE_INVINCIBLE:
@@ -64,7 +63,7 @@ Stumpy::activate()
       physic.set_velocity_x(0);
       break;
     case STATE_NORMAL:
-      WalkingBadguy::activate();
+      WalkingBadguy::initialize();
       break;
   }
 }
@@ -75,8 +74,8 @@ Stumpy::active_update(float elapsed_time)
   switch (mystate) {
     case STATE_INVINCIBLE:
       if (invincible_timer.check()) {
-	mystate = STATE_NORMAL;
-        WalkingBadguy::activate();
+        mystate = STATE_NORMAL;
+        WalkingBadguy::initialize();
       }
       BadGuy::active_update(elapsed_time);
       break;
@@ -150,10 +149,10 @@ Stumpy::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
   switch (mystate) {
     case STATE_INVINCIBLE:
       if(hit.top || hit.bottom) {
-	physic.set_velocity_y(0);
+        physic.set_velocity_y(0);
       }
       if(hit.left || hit.right) {
-	physic.set_velocity_x(0);
+        physic.set_velocity_x(0);
       }
       return CONTINUE;
       break;