X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fjumpy.cpp;h=b1afc2d729e91572cacb97f1a6f6bcae11a536bf;hb=4c9b57d29e67f9db5605f378549b07f670baa837;hp=88340904153f402692a773d982e6c6eb26cf3531;hpb=1d613f782e21f55f915b6e5fa808e7435896461a;p=supertux.git

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index 883409041..b1afc2d72 100644
--- a/src/badguy/jumpy.cpp
+++ b/src/badguy/jumpy.cpp
@@ -1,17 +1,37 @@
+//  $Id$
+//
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
-#include "jumpy.h"
+#include "jumpy.hpp"
 
 static const float JUMPSPEED=600;
-static const float JUMPY_MID_TOLERANCE=8;
+static const float JUMPY_MID_TOLERANCE=4;
 static const float JUMPY_LOW_TOLERANCE=2;
 
 Jumpy::Jumpy(const lisp::Lisp& reader)
+    : 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("jumpy");
+  sprite = sprite_manager->create("images/creatures/jumpy/jumpy.sprite");
 }
 
 void
@@ -42,8 +62,15 @@ Jumpy::hit(const CollisionHit& chit)
 {
   // hit floor?
   if(chit.normal.y < -.5) {
+    if (!groundhit_pos_set)
+    {
+      pos_groundhit = get_pos();
+      groundhit_pos_set = true;
+    }
+    
     physic.set_velocity_y(JUMPSPEED);
-    SoundManager::get()->play_sound(IDToSound(SND_SKID));
+    // TODO create a nice sound for this...
+    //sound_manager->play("sounds/skid.wav");
   } else if(chit.normal.y < .5) { // bumped on roof
     physic.set_velocity_y(0);
   }
@@ -52,20 +79,29 @@ Jumpy::hit(const CollisionHit& chit)
 }
 
 void
-Jumpy::active_action(float elapsed_time)
+Jumpy::active_update(float elapsed_time)
 {
-  BadGuy::active_action(elapsed_time);
+  BadGuy::active_update(elapsed_time);
   
-  dir = Sector::current()->player->get_pos().x > get_pos().x
-    ? RIGHT : LEFT;
-    //FIXME: add middle and up here
+  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 >= (start_position.y - JUMPY_MID_TOLERANCE) )
+  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) &&
+      get_pos().y < (pos_groundhit.y - JUMPY_LOW_TOLERANCE) )
     sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
-  else if ( get_pos().y >= (start_position.y - JUMPY_LOW_TOLERANCE) )
-    sprite->set_action(dir == LEFT ? "left-down" : "right-down");
   else
-    sprite->set_action(dir == LEFT ? "left-up" : "right-up");
+    sprite->set_action(dir == LEFT ? "left-down" : "right-down");
 }
 
 IMPLEMENT_FACTORY(Jumpy, "jumpy")