X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fjumpy.cpp;h=012adaa5c80f5ff945eaefcae09d3bb38adb03ca;hb=4a486d92343d1824b311c234e9321e08f280fe68;hp=4059219a3e14e76b750d018ba407be3f2e37a142;hpb=7bbb0ef907ebec48718560425a0147b31307f7fd;p=supertux.git

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index 4059219a3..012adaa5c 100644
--- a/src/badguy/jumpy.cpp
+++ b/src/badguy/jumpy.cpp
@@ -1,17 +1,33 @@
+//  $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 JUMPSPEED=-600;
+static const float JUMPY_MID_TOLERANCE=4;
 static const float JUMPY_LOW_TOLERANCE=2;
 
 Jumpy::Jumpy(const lisp::Lisp& reader)
+    : 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("jumpy");
 }
 
 void
@@ -25,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
@@ -40,10 +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);
-  } else if(chit.normal.y < .5) { // bumped on roof
+    // TODO create a nice sound for this...
+    //sound_manager->play("sounds/skid.wav");
+  } else if(chit.top) {
     physic.set_velocity_y(0);
   }
 
@@ -51,20 +74,29 @@ Jumpy::hit(const CollisionHit& chit)
 }
 
 void
-Jumpy::active_action(float elapsed_time)
+Jumpy::active_update(float elapsed_time)
 {
-  BadGuy::active_action(elapsed_time);
-  
-  dir = Sector::current()->player->get_pos().x > get_pos().x
-    ? RIGHT : LEFT;
-    //FIXME: add middle and up here
-  
-  if ( get_pos().y >= (start_position.y - JUMPY_MID_TOLERANCE) )
+  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");
-  else if ( get_pos().y >= (start_position.y - JUMPY_LOW_TOLERANCE) )
-    sprite->set_action(dir == LEFT ? "left-down" : "right-down");
-  else
+    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) &&
+      get_pos().y < (pos_groundhit.y - JUMPY_LOW_TOLERANCE) )
+    sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
+  else
+    sprite->set_action(dir == LEFT ? "left-down" : "right-down");
 }
 
 IMPLEMENT_FACTORY(Jumpy, "jumpy")