X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrrocket.hpp;h=4ff1209454e2fe785f55abc47771bc6047c59067;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=fe4658e9555048e58a99bf254966512841611b99;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/badguy/mrrocket.hpp b/src/badguy/mrrocket.hpp
index fe4658e95..4ff120945 100644
--- a/src/badguy/mrrocket.hpp
+++ b/src/badguy/mrrocket.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,36 +12,33 @@
 //  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 __MRROCKET_H__
 #define __MRROCKET_H__
 
 #include "badguy.hpp"
 #include "timer.hpp"
-#include "rocketexplosion.hpp"
 
 class MrRocket : public BadGuy
 {
 public:
   MrRocket(const lisp::Lisp& reader);
-  MrRocket(float pos_x, float pos_y, Direction d);
+  MrRocket(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   void active_update(float elapsed_time);
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
+
+  virtual MrRocket* clone() const { return new MrRocket(*this); }
 
 protected:
-  bool collision_squished(Player& player);
-  bool set_direction;
-  Direction initial_direction;
+  bool collision_squished(GameObject& object);
   Timer collision_timer;
 };
 
 #endif
-