Reverted bigger parts of tuxdev patch:

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

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index b1afc2d..012adaa 100644 (file)
--- a/src/badguy/jumpy.cpp
+++ b/src/badguy/jumpy.cpp
@@ -21,17 +21,13 @@
 
 #include "jumpy.hpp"
 
-static const float JUMPSPEED=600;
+static const float JUMPSPEED=-600;
 static const float JUMPY_MID_TOLERANCE=4;
 static const float JUMPY_LOW_TOLERANCE=2;
 
 Jumpy::Jumpy(const lisp::Lisp& reader)
-    : groundhit_pos_set(false)
+    : BadGuy(reader, "images/creatures/jumpy/jumpy.sprite"), groundhit_pos_set(false)
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/jumpy/jumpy.sprite");
 }
 
 void
@@ -45,10 +41,10 @@ Jumpy::write(lisp::Writer& writer)
   writer.end_list("jumpy");
 }
 
-HitResponse
-Jumpy::collision_solid(GameObject& , const CollisionHit& chit)
+void
+Jumpy::collision_solid(const CollisionHit& chit)
 {
-  return hit(chit);
+  hit(chit);
 }
 
 HitResponse
@@ -60,18 +56,17 @@ Jumpy::collision_badguy(BadGuy& , const CollisionHit& chit)
 HitResponse
 Jumpy::hit(const CollisionHit& chit)
 {
-  // hit floor?
-  if(chit.normal.y < -.5) {
+  if(chit.bottom) {
     if (!groundhit_pos_set)
     {
       pos_groundhit = get_pos();
       groundhit_pos_set = true;
     }
-    
+
     physic.set_velocity_y(JUMPSPEED);
     // TODO create a nice sound for this...
     //sound_manager->play("sounds/skid.wav");
-  } else if(chit.normal.y < .5) { // bumped on roof
+  } else if(chit.top) {
     physic.set_velocity_y(0);
   }
 
@@ -82,19 +77,19 @@ void
 Jumpy::active_update(float elapsed_time)
 {
   BadGuy::active_update(elapsed_time);
-  
+
   Player* player = this->get_nearest_player();
   if (player)
   {
     dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
   }
-    
+
   if (!groundhit_pos_set)
   {
     sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
     return;
   }
-  
+
   if ( get_pos().y < (pos_groundhit.y - JUMPY_MID_TOLERANCE ) )
     sprite->set_action(dir == LEFT ? "left-up" : "right-up");
   else if ( get_pos().y >= (pos_groundhit.y - JUMPY_MID_TOLERANCE) &&