X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fjumpy.cpp;h=1117d64c8ba0ebf9dcfad98f22209d1e2def12e2;hb=99afe85eeb29c5366525df392910b92ed69d8ad6;hp=02ceeb1bb08e4f174c85379598cd6862a6940353;hpb=36afad72b6c66d4619372892f589a4131afed638;p=supertux.git

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index 02ceeb1bb..1117d64c8 100644
--- a/src/badguy/jumpy.cpp
+++ b/src/badguy/jumpy.cpp
@@ -1,12 +1,10 @@
-//  $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 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 3 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
@@ -14,37 +12,31 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include "badguy/jumpy.hpp"
 
-#include "jumpy.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
-static const float JUMPSPEED=-600;
+static const float JUMPYSPEED=-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)
+Jumpy::Jumpy(const Reader& reader) :
+  BadGuy(reader, "images/creatures/snowjumpy/snowjumpy.sprite"), 
+  pos_groundhit(),
+  groundhit_pos_set(false)
 {
+  // TODO create a nice sound for this...
+  //sound_manager->preload("sounds/skid.wav");
 }
 
 void
-Jumpy::write(lisp::Writer& writer)
+Jumpy::collision_solid(const CollisionHit& chit)
 {
-  writer.start_list("jumpy");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("jumpy");
-}
-
-HitResponse
-Jumpy::collision_solid(GameObject& , const CollisionHit& chit)
-{
-  return hit(chit);
+  hit(chit);
 }
 
 HitResponse
@@ -56,18 +48,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);
+
+    physic.set_velocity_y((frozen || get_state() == STATE_FALLING) ? 0 : JUMPYSPEED);
     // 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);
   }
 
@@ -78,26 +69,43 @@ void
 Jumpy::active_update(float elapsed_time)
 {
   BadGuy::active_update(elapsed_time);
-  
+
+  if(frozen)
+    return;
+
   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) &&
-      get_pos().y < (pos_groundhit.y - JUMPY_LOW_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")
+void
+Jumpy::freeze()
+{
+  BadGuy::freeze();
+  physic.set_velocity_y(std::max(0.0f, physic.get_velocity_y()));
+  sprite->set_action(dir == LEFT ? "left-iced" : "right-iced");
+}
+
+bool
+Jumpy::is_freezable() const
+{
+  return true;
+}
+
+/* EOF */