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

diff --git a/src/badguy/mriceblock.hpp b/src/badguy/mriceblock.hpp
index 4031e0d2c..ddf3847aa 100644
--- a/src/badguy/mriceblock.hpp
+++ b/src/badguy/mriceblock.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,45 +12,57 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __MRICEBLOCK_H__
 #define __MRICEBLOCK_H__
 
-#include "badguy.hpp"
+#include "walking_badguy.hpp"
+#include "object/portable.hpp"
 
-class MrIceBlock : public BadGuy
+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 initialize();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
+  HitResponse collision(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 {
     ICESTATE_NORMAL,
     ICESTATE_FLAT,
+    ICESTATE_GRABBED,
     ICESTATE_KICKED
   };
+
+  void set_state(IceState state);
+
   IceState ice_state;
+  Timer nokick_timer;
   Timer flat_timer;
   int squishcount;
-  bool set_direction;
-  Direction initial_direction;  
 };
 
 #endif
-