X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmriceblock.h;h=54ec05d3f29149dd9b4b5a85a4d8e042c85deaec;hb=7bbb0ef907ebec48718560425a0147b31307f7fd;hp=3b9169003e57cc5e6580d2e539212f7e2a0d9e89;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/badguy/mriceblock.h b/src/badguy/mriceblock.h
index 3b9169003..54ec05d3f 100644
--- a/src/badguy/mriceblock.h
+++ b/src/badguy/mriceblock.h
@@ -6,11 +6,13 @@
 class MrIceBlock : public BadGuy
 {
 public:
-  MrIceBlock(LispReader& reader);
+  MrIceBlock(const lisp::Lisp& reader);
+  MrIceBlock(float pos_x, float pos_y, Direction d);
 
   void activate();
-  void write(LispWriter& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void write(lisp::Writer& writer);
+  HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
+  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
 
   void active_action(float elapsed_time);
 
@@ -26,6 +28,8 @@ private:
   IceState ice_state;
   Timer2 flat_timer;
   int squishcount;
+  bool set_direction;
+  Direction initial_direction;  
 };
 
 #endif