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

diff --git a/src/badguy/mrrocket.hpp b/src/badguy/mrrocket.hpp
index 5cb37b77d..4ff120945 100644
--- a/src/badguy/mrrocket.hpp
+++ b/src/badguy/mrrocket.hpp
@@ -22,7 +22,6 @@
 
 #include "badguy.hpp"
 #include "timer.hpp"
-#include "rocketexplosion.hpp"
 
 class MrRocket : public BadGuy
 {
@@ -30,19 +29,16 @@ public:
   MrRocket(const lisp::Lisp& reader);
   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
-