X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fjumpy.h;h=536cbdfaba5c796eeb0c454ceb28ef0d58200dce;hb=fedb7355c2a369399cc781e907ac961dfa11fdd9;hp=8abd10c70084617061cc44ba012ec2707d48cc2b;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/badguy/jumpy.h b/src/badguy/jumpy.h
index 8abd10c70..536cbdfab 100644
--- a/src/badguy/jumpy.h
+++ b/src/badguy/jumpy.h
@@ -1,20 +1,41 @@
+//  $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.
+
 #ifndef __JUMPY_H__
 #define __JUMPY_H__
 
 #include "badguy.h"
-#include "utils/lispreader.h"
-#include "utils/lispwriter.h"
-#include "serializable.h"
 
 class Jumpy : public BadGuy
 {
 public:
-  Jumpy(LispReader& reader);
+  Jumpy(const lisp::Lisp& reader);
+
+  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
 
-  virtual HitResponse collision_solid(GameObject& other,
-      const CollisionHit& hit);
+  void write(lisp::Writer& writer);
+  void active_action(float);
 
-  virtual void write(LispWriter& writer);
+private:
+  HitResponse hit(const CollisionHit& hit);
 };
 
 #endif