Reduced spawn distance for enemies to screen size (experimental change, if something...

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

diff --git a/src/badguy/plant.cpp b/src/badguy/plant.cpp
index 2bf14ff..2ddcd28 100644 (file)
--- a/src/badguy/plant.cpp
+++ b/src/badguy/plant.cpp
@@ -20,7 +20,7 @@
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
-static const float WALKSPEED = 80;
+static const float PLANT_SPEED = 80;
 static const float WAKE_TIME = .5;
 
 Plant::Plant(const Reader& reader) :
@@ -76,8 +76,8 @@ Plant::active_update(float elapsed_time) {
 
     Player* player = this->get_nearest_player();
     if (player) {
-      Rect mb = this->get_bbox();
-      Rect pb = player->get_bbox();
+      Rectf mb = this->get_bbox();
+      Rectf pb = player->get_bbox();
 
       bool inReach_left = (pb.p2.x >= mb.p2.x-((dir == LEFT) ? 256 : 0));
       bool inReach_right = (pb.p1.x <= mb.p1.x+((dir == RIGHT) ? 256 : 0));
@@ -97,13 +97,11 @@ Plant::active_update(float elapsed_time) {
     if(timer.check()) {
       // start walking
       sprite->set_action(dir == LEFT ? "left" : "right");
-      physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
+      physic.set_velocity_x(dir == LEFT ? -PLANT_SPEED : PLANT_SPEED);
       state = PLANT_WALKING;
     }
   }
 
 }
 
-IMPLEMENT_FACTORY(Plant, "plant");
-
 /* EOF */