X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fsspiky.cpp;h=013d8347f0cb5dd23f143ffce9bf6b529bf79dff;hb=1f5ff04e5283398473b4ac033258b17af0ed08f0;hp=63a311c65318815797bb2559155c7afeab79d1c9;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git

diff --git a/src/badguy/sspiky.cpp b/src/badguy/sspiky.cpp
index 63a311c65..013d8347f 100644
--- a/src/badguy/sspiky.cpp
+++ b/src/badguy/sspiky.cpp
@@ -20,13 +20,11 @@
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
-static const float WALKSPEED = 80;
-
 SSpiky::SSpiky(const Reader& reader)
   : WalkingBadguy(reader, "images/creatures/spiky/sleepingspiky.sprite", "left", "right"), state(SSPIKY_SLEEPING)
 {
-  walk_speed = WALKSPEED;
-  max_drop_height = -1;
+  walk_speed = 80;
+  max_drop_height = 600;
 }
 
 void
@@ -68,8 +66,8 @@ SSpiky::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));
@@ -101,7 +99,6 @@ void
 SSpiky::freeze()
 {
   WalkingBadguy::freeze();
-  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
   state = SSPIKY_WALKING; // if we get hit while sleeping, wake up :)
 }
 
@@ -111,6 +108,4 @@ SSpiky::is_freezable() const
   return true;
 }
 
-IMPLEMENT_FACTORY(SSpiky, "sspiky");
-
 /* EOF */