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

diff --git a/src/badguy/mrrocket.hpp b/src/badguy/mrrocket.hpp
index f756d020a..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,17 +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 collision_squished(GameObject& object);
   Timer collision_timer;
 };
 
 #endif
-