X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmriceblock.hpp;h=98c4225d1596487ebfaa7f1ad8a0e96bea883a21;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=d3ad9dbb26fb0892a4862382dc948ebad2548c91;hpb=58eb3364f724b2100859fd39da9bba5a9a09cafc;p=supertux.git

diff --git a/src/badguy/mriceblock.hpp b/src/badguy/mriceblock.hpp
index d3ad9dbb2..98c4225d1 100644
--- a/src/badguy/mriceblock.hpp
+++ b/src/badguy/mriceblock.hpp
@@ -20,19 +20,19 @@
 #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);
-  MrIceBlock(float pos_x, float pos_y, Direction d);
+  MrIceBlock(const Vector& pos, Direction d);
 
   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);
 
@@ -40,6 +40,7 @@ public:
   
   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); }
 
@@ -59,8 +60,6 @@ private:
   IceState ice_state;
   Timer flat_timer;
   int squishcount;
-  bool set_direction;
-  Direction initial_direction;
 };
 
 #endif