X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.cpp;h=0a92074dc7e4746f85a89be4d06b484bcf88b53e;hb=27f49a0b4a7d4ad50740128ec876624fd31c1e4f;hp=b88ec202cbc95dd66d631ad3a02f758fde2df3cc;hpb=8e13f4a4c6f373f40549f90cd2212815fd0d6eb7;p=supertux.git diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp index b88ec202c..0a92074dc 100644 --- a/src/badguy/dispenser.cpp +++ b/src/badguy/dispenser.cpp @@ -6,25 +6,24 @@ #include "badguy/mrbomb.h" #include "badguy/mriceblock.h" - -Dispenser::Dispenser(LispReader& reader) +Dispenser::Dispenser(const lisp::Lisp& reader) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); - reader.read_float("cycle", cycle); - reader.read_string("badguy", badguy); + reader.get("x", start_position.x); + reader.get("y", start_position.y); + reader.get("cycle", cycle); + reader.get("badguy", badguy); bbox.set_size(32, 32); sprite = sprite_manager->create("dispenser"); sprite->set_action("working"); } void -Dispenser::write(LispWriter& writer) +Dispenser::write(lisp::Writer& writer) { writer.start_list("dispenser"); - writer.write_float("x", get_pos().x); - writer.write_float("y", get_pos().y); + writer.write_float("x", start_position.x); + writer.write_float("y", start_position.y); writer.write_float("cycle", cycle); writer.write_string("badguy", badguy); @@ -93,3 +92,4 @@ Dispenser::launch_badguy() } } +IMPLEMENT_FACTORY(Dispenser, "dispenser")