X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fjumpy.h;h=f65d5fcfc0f1387e51b49458e4c865f3769bcf26;hb=58bf708dc9f036b2c7d8d3edfdbfa62f0da3481a;hp=8abd10c70084617061cc44ba012ec2707d48cc2b;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git diff --git a/src/badguy/jumpy.h b/src/badguy/jumpy.h index 8abd10c70..f65d5fcfc 100644 --- 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