X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrrocket.cpp;h=618616063f8c53ab77e95b5146373814c6caccf8;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=cbf5d3126a9c74998ed2a156b225e13464f03972;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git

diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp
index cbf5d3126..618616063 100644
--- a/src/badguy/mrrocket.cpp
+++ b/src/badguy/mrrocket.cpp
@@ -20,16 +20,17 @@
 #include <config.h>
 
 #include "mrrocket.hpp"
+#include "object/explosion.hpp"
 
 static const float SPEED = 200;
 
 MrRocket::MrRocket(const lisp::Lisp& reader)
-	: BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite")
+        : BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite")
 {
 }
 
 MrRocket::MrRocket(const Vector& pos, Direction d)
-	: BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite")
+        : BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite")
 {
 }
 
@@ -45,7 +46,7 @@ MrRocket::write(lisp::Writer& writer)
 }
 
 void
-MrRocket::activate()
+MrRocket::initialize()
 {
   physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
   physic.enable_gravity(false);
@@ -56,7 +57,7 @@ void
 MrRocket::active_update(float elapsed_time)
 {
   if (collision_timer.check()) {
-    Sector::current()->add_object(new RocketExplosion(get_pos(), dir));
+    Sector::current()->add_object(new Explosion(get_bbox().get_middle()));
     remove_me();
   }
   else if (!collision_timer.started()) {
@@ -66,10 +67,10 @@ MrRocket::active_update(float elapsed_time)
 }
 
 bool
-MrRocket::collision_squished(Player& player)
+MrRocket::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  kill_squished(player);
+  kill_squished(object);
   kill_fall();
   return true;
 }
@@ -82,7 +83,7 @@ MrRocket::collision_solid(const CollisionHit& hit)
   } else if(hit.left || hit.right) {
     sprite->set_action(dir == LEFT ? "collision-left" : "collision-right");
     physic.set_velocity_x(0);
-    collision_timer.start(0.2, true);
+    collision_timer.start(0.2f, true);
   }
 }