use spike flag again and don't replace spikes with objects

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

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index 6739a54..9b2a6b7 100644 (file)
--- a/src/badguy/jumpy.cpp
+++ b/src/badguy/jumpy.cpp
@@ -1,10 +1,32 @@
+//  $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"
+#include "jumpy.hpp"
 
 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)
 {
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
@@ -40,10 +62,43 @@ 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);
+    // 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);
   }
 
   return CONTINUE;
 }
+
+void
+Jumpy::active_update(float elapsed_time)
+{
+  BadGuy::active_update(elapsed_time);
+  
+  dir = Sector::current()->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) &&
+      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")