X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fflame.cpp;h=e9d7f498944c3b62506ce15428ed2677c2974ed1;hb=40e6e7cdc59c09befbd2595aea0c6e10428315d4;hp=83845a6dd92f6fa816c7394c92bc18621ebbf1ce;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp index 83845a6dd..e9d7f4989 100644 --- a/src/badguy/flame.cpp +++ b/src/badguy/flame.cpp @@ -2,13 +2,13 @@ #include "flame.h" -Flame::Flame(LispReader& reader) +Flame::Flame(const lisp::Lisp& reader) : angle(0), radius(100), speed(2) { - reader.read_float("x", start_position.x); - reader.read_float("y", start_position.y); - reader.read_float("radius", radius); - reader.read_float("speed", speed); + reader.get("x", start_position.x); + reader.get("y", start_position.y); + reader.get("radius", radius); + reader.get("speed", speed); bbox.set_pos(Vector(start_position.x + cos(angle) * radius, start_position.y + sin(angle) * radius)); bbox.set_size(32, 32); @@ -16,7 +16,7 @@ Flame::Flame(LispReader& reader) } void -Flame::write(LispWriter& writer) +Flame::write(lisp::Writer& writer) { writer.start_list("flame"); @@ -42,3 +42,5 @@ Flame::kill_fall() { } +IMPLEMENT_FACTORY(Flame, "flame") +