qmax patch to fix bug #0000389 - colors in infoblocks

[supertux.git] / src / badguy / stumpy.hpp

diff --git a/src/badguy/stumpy.hpp b/src/badguy/stumpy.hpp
index a3bd203..1559bfe 100644 (file)
--- a/src/badguy/stumpy.hpp
+++ b/src/badguy/stumpy.hpp
@@ -1,4 +1,4 @@
-//  $Id: stumpy.hpp 3980 2006-07-10 19:55:56Z sommer $
+//  $Id$
 //
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
@@ -28,7 +28,7 @@ public:
   Stumpy(const lisp::Lisp& reader);
   Stumpy(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   void active_update(float elapsed_time);
   void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
@@ -43,8 +43,8 @@ protected:
   MyState mystate;
 
   Timer invincible_timer;
-   
-  bool collision_squished(Player& player);
+
+  bool collision_squished(GameObject& object);
 };
 
 #endif