projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed a bug, added some debug messages
[supertux.git]
/
src
/
badguy
/
spike.cpp
diff --git
a/src/badguy/spike.cpp
b/src/badguy/spike.cpp
index
905e921
..
5d046ee
100644
(file)
--- a/
src/badguy/spike.cpp
+++ b/
src/badguy/spike.cpp
@@
-9,14
+9,14
@@
Spike::Spike(const Vector& pos, Direction dir)
set_direction(dir);
}
set_direction(dir);
}
-Spike::Spike(
LispReader
& reader)
+Spike::Spike(
const lisp::Lisp
& reader)
{
sprite = sprite_manager->create("spike");
{
sprite = sprite_manager->create("spike");
- reader.
read_floa
t("x", start_position.x);
- reader.
read_floa
t("y", start_position.y);
+ reader.
ge
t("x", start_position.x);
+ reader.
ge
t("y", start_position.y);
bbox.set_size(32, 32);
int idir = 0;
bbox.set_size(32, 32);
int idir = 0;
- reader.
read_in
t("direction", idir);
+ reader.
ge
t("direction", idir);
set_direction((Direction) idir);
}
set_direction((Direction) idir);
}
@@
-43,7
+43,7
@@
Spike::set_direction(Direction dir)
}
void
}
void
-Spike::write(
Lisp
Writer& writer)
+Spike::write(
lisp::
Writer& writer)
{
writer.start_list("spike");
writer.write_float("x", start_position.x);
{
writer.start_list("spike");
writer.write_float("x", start_position.x);
@@
-62,3
+62,5
@@
void
Spike::active_action(float )
{
}
Spike::active_action(float )
{
}
+
+IMPLEMENT_FACTORY(Spike, "spike")