X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdarttrap.cpp;h=8d78c97dddbb1683c38b7dc8ea6f842c758e4800;hb=788a9153f60fb3d25a52fd184387ebbde7636719;hp=41cc5858a7c2c345610b572e80836def3dae6d54;hpb=af906b173f5e7118644397ce35145e6b88f40be8;p=supertux.git diff --git a/src/badguy/darttrap.cpp b/src/badguy/darttrap.cpp index 41cc5858a..8d78c97dd 100644 --- a/src/badguy/darttrap.cpp +++ b/src/badguy/darttrap.cpp @@ -22,12 +22,19 @@ #include "darttrap.hpp" #include "dart.hpp" +#include "object_factory.hpp" +#include "audio/sound_manager.hpp" +#include "lisp/writer.hpp" +#include "sector.hpp" +#include "lisp/lisp.hpp" +#include "sprite/sprite.hpp" + namespace { const float MUZZLE_Y = 25; /**< [px] muzzle y-offset from top */ } DartTrap::DartTrap(const lisp::Lisp& reader) - : BadGuy(reader, "images/creatures/darttrap/darttrap.sprite", LAYER_TILES-1), initial_delay(0), fire_delay(2), ammo(-1), state(IDLE) + : BadGuy(reader, "images/creatures/darttrap/darttrap.sprite", LAYER_TILES-1), initial_delay(0), fire_delay(2), ammo(-1), state(IDLE) { reader.get("initial-delay", initial_delay); reader.get("fire-delay", fire_delay); @@ -44,11 +51,11 @@ void DartTrap::write(lisp::Writer& writer) { writer.start_list("darttrap"); - writer.write_float("x", start_position.x); - writer.write_float("y", start_position.y); - writer.write_float("initial-delay", initial_delay); - writer.write_float("fire-delay", fire_delay); - writer.write_int("ammo", ammo); + writer.write("x", start_position.x); + writer.write("y", start_position.y); + writer.write("initial-delay", initial_delay); + writer.write("fire-delay", fire_delay); + writer.write("ammo", ammo); writer.end_list("darttrap"); }