X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmriceblock.hpp;h=ddf3847aa48e8b836ff8ed60682b35582f55f74e;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=93aba4e135e14122ee2e01d1a6eeba8123d09a07;hpb=4a486d92343d1824b311c234e9321e08f280fe68;p=supertux.git

diff --git a/src/badguy/mriceblock.hpp b/src/badguy/mriceblock.hpp
index 93aba4e13..ddf3847aa 100644
--- a/src/badguy/mriceblock.hpp
+++ b/src/badguy/mriceblock.hpp
@@ -29,7 +29,7 @@ public:
   MrIceBlock(const lisp::Lisp& reader);
   MrIceBlock(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   void write(lisp::Writer& writer);
   HitResponse collision(GameObject& object, const CollisionHit& hit);
   void collision_solid(const CollisionHit& hit);
@@ -47,7 +47,7 @@ public:
   virtual MrIceBlock* clone() const { return new MrIceBlock(*this); }
 
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
 
 private:
   enum IceState {
@@ -60,6 +60,7 @@ private:
   void set_state(IceState state);
 
   IceState ice_state;
+  Timer nokick_timer;
   Timer flat_timer;
   int squishcount;
 };