X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fjumpy.cpp;h=7a6eaaaddedddcce304a4ea55998e3139f2b01ac;hb=146cb5cf3c1ea9bd8f884e3c99a7789c42d598f1;hp=706a7d7bb2ac1ca486e9ebe5213c6a8b277446d4;hpb=3655d32f63f75b2af054ec68d4176e55a561ba96;p=supertux.git

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index 706a7d7bb..7a6eaaadd 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,31 +12,25 @@
 //  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)
 {
-}
-
-void
-Jumpy::write(lisp::Writer& writer)
-{
-  writer.start_list("jumpy");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("jumpy");
+  // TODO create a nice sound for this...
+  //SoundManager::current()->preload("sounds/skid.wav");
 }
 
 void
@@ -63,9 +55,9 @@ Jumpy::hit(const CollisionHit& chit)
       groundhit_pos_set = true;
     }
 
-    physic.set_velocity_y(frozen ? 0 : 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");
+    //SoundManager::current()->play("sounds/skid.wav");
   } else if(chit.top) {
     physic.set_velocity_y(0);
   }
@@ -96,7 +88,7 @@ Jumpy::active_update(float elapsed_time)
   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");
@@ -107,7 +99,6 @@ 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
@@ -116,4 +107,4 @@ Jumpy::is_freezable() const
   return true;
 }
 
-IMPLEMENT_FACTORY(Jumpy, "jumpy")
+/* EOF */