-Incorporated Marcin Ko��cielnicki patch that reintroduces the flying

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

diff --git a/src/badguy/jumpy.h b/src/badguy/jumpy.h
index 8abd10c..f65d5fc 100644 (file)
--- a/src/badguy/jumpy.h
+++ b/src/badguy/jumpy.h
@@ -2,19 +2,20 @@
 #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);
 
-  virtual HitResponse collision_solid(GameObject& other,
-      const CollisionHit& hit);
+  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
 
-  virtual void write(LispWriter& writer);
+  void write(lisp::Writer& writer);
+  void active_action(float);
+
+private:
+  HitResponse hit(const CollisionHit& hit);
 };
 
 #endif