X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbadguy%2Fjumpy.cpp;h=34bf15d1f8fcd98959d5d33592af63106a5ac87d;hb=c0093d25093395cb62fc2526ab42be65a9f015b8;hp=6739a54a7808721119c7890651679b49dff3fe4a;hpb=45d21c1c59a58aa557b62d3aa22ba89a975e323c;p=supertux.git

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index 6739a54a7..34bf15d1f 100644
--- a/src/badguy/jumpy.cpp
+++ b/src/badguy/jumpy.cpp
@@ -1,8 +1,30 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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"
 
 static const float JUMPSPEED=600;
+static const float JUMPY_MID_TOLERANCE=8;
+static const float JUMPY_LOW_TOLERANCE=2;
 
 Jumpy::Jumpy(const lisp::Lisp& reader)
 {
@@ -41,9 +63,30 @@ Jumpy::hit(const CollisionHit& chit)
   // hit floor?
   if(chit.normal.y < -.5) {
     physic.set_velocity_y(JUMPSPEED);
+    // TODO create a nice sound for this...
+    //sound_manager->play_sound("skid");
   } else if(chit.normal.y < .5) { // bumped on roof
     physic.set_velocity_y(0);
   }
 
   return CONTINUE;
 }
+
+void
+Jumpy::active_action(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) )
+    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");
+}
+
+IMPLEMENT_FACTORY(Jumpy, "jumpy")