X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fskullyhop.cpp;h=258adec212d30fe56a16e1a4bcad557694f2ec2a;hb=788a9153f60fb3d25a52fd184387ebbde7636719;hp=76339f82149d474ba7207747b417f1f36f760c8f;hpb=4c676c4c0c70f0efa7f1536b92de01976b1977a0;p=supertux.git diff --git a/src/badguy/skullyhop.cpp b/src/badguy/skullyhop.cpp index 76339f821..258adec21 100644 --- a/src/badguy/skullyhop.cpp +++ b/src/badguy/skullyhop.cpp @@ -21,6 +21,10 @@ #include "skullyhop.hpp" #include "random_generator.hpp" +#include "lisp/writer.hpp" +#include "object_factory.hpp" +#include "audio/sound_manager.hpp" +#include "sprite/sprite.hpp" namespace { const float VERTICAL_SPEED = -450; /**< y-speed when jumping */ @@ -31,13 +35,13 @@ namespace { } SkullyHop::SkullyHop(const lisp::Lisp& reader) - : BadGuy(reader, "images/creatures/skullyhop/skullyhop.sprite") + : BadGuy(reader, "images/creatures/skullyhop/skullyhop.sprite") { sound_manager->preload( HOP_SOUND ); } SkullyHop::SkullyHop(const Vector& pos, Direction d) - : BadGuy(pos, d, "images/creatures/skullyhop/skullyhop.sprite") + : BadGuy(pos, d, "images/creatures/skullyhop/skullyhop.sprite") { sound_manager->preload( HOP_SOUND ); } @@ -46,13 +50,13 @@ void SkullyHop::write(lisp::Writer& writer) { writer.start_list("skullyhop"); - writer.write_float("x", start_position.x); - writer.write_float("y", start_position.y); + writer.write("x", start_position.x); + writer.write("y", start_position.y); writer.end_list("skullyhop"); } void -SkullyHop::activate() +SkullyHop::initialize() { // initial state is JUMPING, because we might start airborne state = JUMPING;