- fix a bunch of msvc warnings (mostly assigning double constants to float variables)

[supertux.git] / src / badguy / mrrocket.cpp

diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp
index cbf5d31..410cc83 100644 (file)
--- a/src/badguy/mrrocket.cpp
+++ b/src/badguy/mrrocket.cpp
@@ -66,10 +66,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 +82,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);
   }
 }