Updating cherrybomb, adding juicebox (blue bomb).

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

diff --git a/src/badguy/mriceblock.hpp b/src/badguy/mriceblock.hpp
index bd0ff53..ea55065 100644 (file)
--- 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,11 +12,10 @@
 //  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__
@@ -28,7 +27,7 @@ class MrIceBlock : public BadGuy, 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);
@@ -42,6 +41,8 @@ public:
   void grab(MovingObject& object, const Vector& pos, Direction dir);
   void ungrab(MovingObject& object, Direction dir);
 
+  virtual MrIceBlock* clone() const { return new MrIceBlock(*this); }
+
 protected:
   bool collision_squished(Player& player);
 
@@ -58,8 +59,6 @@ private:
   IceState ice_state;
   Timer flat_timer;
   int squishcount;
-  bool set_direction;
-  Direction initial_direction;
 };
 
 #endif