projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small translation update
[supertux.git]
/
src
/
trigger
/
sequence_trigger.cpp
diff --git
a/src/trigger/sequence_trigger.cpp
b/src/trigger/sequence_trigger.cpp
index
98789cd
..
91f9c98
100644
(file)
--- a/
src/trigger/sequence_trigger.cpp
+++ b/
src/trigger/sequence_trigger.cpp
@@
-1,13
+1,19
@@
#include <config.h>
#include "sequence_trigger.h"
#include <config.h>
#include "sequence_trigger.h"
-#include "utils/lispwriter.h"
#include "gameloop.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)
@@
-23,7
+29,7
@@
SequenceTrigger::~SequenceTrigger()
}
void
}
void
-SequenceTrigger::write(
Lisp
Writer& writer)
+SequenceTrigger::write(
lisp::
Writer& writer)
{
writer.start_list("sequencetrigger");
{
writer.start_list("sequencetrigger");