Using filename instead of author and level name

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

diff --git a/src/badguy/captainsnowball.cpp b/src/badguy/captainsnowball.cpp
index 4eeaa13..4e3e7da 100644 (file)
--- a/src/badguy/captainsnowball.cpp
+++ b/src/badguy/captainsnowball.cpp
@@ -21,7 +21,7 @@
 #include "supertux/sector.hpp"
 
 namespace{
-  static const float WALK_SPEED = 100; 
+  static const float CAPTAIN_WALK_SPEED = 100; 
   static const float BOARDING_SPEED = 200;
 }
 
@@ -61,7 +61,8 @@ CaptainSnowball::might_climb(int width, int height)
     x1 = bbox.p2.x + 1;
     x2 = bbox.p2.x + width;
   }
-  return ((!Sector::current()->is_free_of_statics(Rect(x1, y1a, x2, y2a))) && (Sector::current()->is_free_of_statics(Rect(x1, y1b, x2, y2b))));
+  return ((!Sector::current()->is_free_of_statics(Rectf(x1, y1a, x2, y2a))) && 
+          (Sector::current()->is_free_of_statics(Rectf(x1, y1b, x2, y2b))));
 }
 
 void
@@ -81,7 +82,7 @@ void
 CaptainSnowball::collision_solid(const CollisionHit& hit)
 {
   if (is_active() && (walk_speed == BOARDING_SPEED)) {
-    walk_speed = WALK_SPEED;
+    walk_speed = CAPTAIN_WALK_SPEED;
     physic.set_velocity_x(dir == LEFT ? -walk_speed : walk_speed);
   }
   WalkingBadguy::collision_solid(hit);
@@ -95,6 +96,4 @@ CaptainSnowball::collision_squished(GameObject& object)
   return true;
 }
 
-IMPLEMENT_FACTORY(CaptainSnowball, "captainsnowball");
-
 /* EOF */