X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Fsequence_trigger.cpp;h=91f9c98685dc36d2917b8a2457489a79e399ec43;hb=74dd78e6fe41f686057eeca65a88dc23547f9803;hp=b02bb5ebcb73003f2ad04c2406ba77de47fb09f6;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git

diff --git a/src/trigger/sequence_trigger.cpp b/src/trigger/sequence_trigger.cpp
index b02bb5ebc..91f9c9868 100644
--- a/src/trigger/sequence_trigger.cpp
+++ b/src/trigger/sequence_trigger.cpp
@@ -1,17 +1,22 @@
 #include <config.h>
 
 #include "sequence_trigger.h"
-#include "utils/lispwriter.h"
 #include "gameloop.h"
+#include "lisp/lisp.h"
+#include "lisp/writer.h"
 
-SequenceTrigger::SequenceTrigger(LispReader& reader)
+SequenceTrigger::SequenceTrigger(const lisp::Lisp& reader)
 {
-  (void) reader;
-  // TODO
+  reader.get("x", bbox.p1.x);
+  reader.get("y", bbox.p1.y);
+  float w, h;
+  reader.get("width", w);
+  reader.get("height", h);
+  bbox.set_size(w, h);
+  reader.get("sequence", sequence_name);
 }
 
-SequenceTrigger::SequenceTrigger(const Vector& pos,
-    const std::string& sequence)
+SequenceTrigger::SequenceTrigger(const Vector& pos, const std::string& sequence)
 {
   bbox.set_pos(pos);
   bbox.set_size(32, 32);
@@ -24,7 +29,7 @@ SequenceTrigger::~SequenceTrigger()
 }
 
 void
-SequenceTrigger::write(LispWriter& writer)
+SequenceTrigger::write(lisp::Writer& writer)
 {
   writer.start_list("sequencetrigger");