fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/mriceblock.hpp b/src/badguy/mriceblock.hpp
index 35700fa..26546c4 100644 (file)
--- a/src/badguy/mriceblock.hpp
+++ b/src/badguy/mriceblock.hpp
@@ -20,10 +20,10 @@
 #ifndef __MRICEBLOCK_H__
 #define __MRICEBLOCK_H__
 
-#include "badguy.hpp"
+#include "walking_badguy.hpp"
 #include "object/portable.hpp"
 
-class MrIceBlock : public BadGuy, public Portable
+class MrIceBlock : public WalkingBadguy, public Portable
 {
 public:
   MrIceBlock(const lisp::Lisp& reader);
@@ -32,14 +32,15 @@ public:
   void activate();
   void write(lisp::Writer& writer);
   HitResponse collision(GameObject& object, const CollisionHit& hit);
-  HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   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 can_break();
 
   virtual MrIceBlock* clone() const { return new MrIceBlock(*this); }
 
@@ -55,13 +56,10 @@ private:
   };
 
   void set_state(IceState state);
- 
+
   IceState ice_state;
   Timer flat_timer;
   int squishcount;
-  bool set_direction;
-  Direction initial_direction;
 };
 
 #endif
-