- fix a bunch of msvc warnings (mostly assigning double constants to float variables)

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

diff --git a/src/badguy/mriceblock.hpp b/src/badguy/mriceblock.hpp
index 98c4225..a00c5e7 100644 (file)
--- a/src/badguy/mriceblock.hpp
+++ b/src/badguy/mriceblock.hpp
@@ -37,15 +37,17 @@ public:
   HitResponse collision_player(Player& player, const CollisionHit& hit);
 
   void active_update(float elapsed_time);
-  
+
   void grab(MovingObject& object, const Vector& pos, Direction dir);
   void ungrab(MovingObject& object, Direction dir);
+  bool is_portable() const;
+
   bool can_break();
 
   virtual MrIceBlock* clone() const { return new MrIceBlock(*this); }
 
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
 
 private:
   enum IceState {
@@ -56,11 +58,10 @@ private:
   };
 
   void set_state(IceState state);
- 
+
   IceState ice_state;
   Timer flat_timer;
   int squishcount;
 };
 
 #endif
-