fix

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

diff --git a/src/badguy/mriceblock.h b/src/badguy/mriceblock.h
index 7275c0e..906b0f4 100644 (file)
--- a/src/badguy/mriceblock.h
+++ b/src/badguy/mriceblock.h
@@ -1,3 +1,23 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  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.
+
 #ifndef __MRICEBLOCK_H__
 #define __MRICEBLOCK_H__
 
@@ -6,14 +26,15 @@
 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);
+  void active_update(float elapsed_time);
 
 protected:
   bool collision_squished(Player& player);
@@ -25,7 +46,7 @@ private:
     ICESTATE_KICKED
   };
   IceState ice_state;
-  Timer2 flat_timer;
+  Timer flat_timer;
   int squishcount;
   bool set_direction;
   Direction initial_direction;