X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmriceblock.hpp;h=ddf3847aa48e8b836ff8ed60682b35582f55f74e;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=ca6c59d85df51d2dad70fd3508bb4d93bfd659b5;hpb=12966e3f986f7202125ae590c74a4d0c227441dd;p=supertux.git

diff --git a/src/badguy/mriceblock.hpp b/src/badguy/mriceblock.hpp
index ca6c59d85..ddf3847aa 100644
--- a/src/badguy/mriceblock.hpp
+++ b/src/badguy/mriceblock.hpp
@@ -20,31 +20,34 @@
 #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(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   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 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 {
@@ -55,14 +58,11 @@ private:
   };
 
   void set_state(IceState state);
- 
+
   IceState ice_state;
+  Timer nokick_timer;
   Timer flat_timer;
   int squishcount;
-  bool set_direction;
-  Direction initial_direction;
-  std::string direction;
 };
 
 #endif
-