X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrrocket.cpp;h=58f4df134184f3c0d641e9d85c4628c9ab7b5e6e;hb=788a9153f60fb3d25a52fd184387ebbde7636719;hp=cbe72b5c4e4b149eb20a42a693abe2273329d15d;hpb=78e9b27b7059c9b9b16a7f871ab71f751ec75323;p=supertux.git

diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp
index cbe72b5c4..58f4df134 100644
--- a/src/badguy/mrrocket.cpp
+++ b/src/badguy/mrrocket.cpp
@@ -21,19 +21,22 @@
 
 #include "mrrocket.hpp"
 
+#include "object/explosion.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "sector.hpp"
+#include "sprite/sprite.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")
 {
-  set_direction = false;
 }
 
 MrRocket::MrRocket(const Vector& pos, Direction d)
-	: BadGuy(pos, "images/creatures/mr_rocket/mr_rocket.sprite")
+        : BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite")
 {
-  set_direction = true;
-  initial_direction = d;
 }
 
 void
@@ -41,16 +44,15 @@ MrRocket::write(lisp::Writer& writer)
 {
   writer.start_list("mrrocket");
 
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
+  writer.write("x", start_position.x);
+  writer.write("y", start_position.y);
 
   writer.end_list("mrrocket");
 }
 
 void
-MrRocket::activate()
+MrRocket::initialize()
 {
-  if (set_direction) {dir = initial_direction;}
   physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
   physic.enable_gravity(false);
   sprite->set_action(dir == LEFT ? "left" : "right");
@@ -60,7 +62,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()) {
@@ -70,26 +72,24 @@ 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;
 }
 
-HitResponse
-MrRocket::collision_solid(GameObject& , const CollisionHit& hit)
+void
+MrRocket::collision_solid(const CollisionHit& hit)
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
+  if(hit.top || hit.bottom) {
     physic.set_velocity_y(0);
-  } else { // hit right or left
+  } 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);
   }
-
-  return CONTINUE;
 }
 
 IMPLEMENT_FACTORY(MrRocket, "mrrocket")