projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added a bell object which is a new better way to do reset points
[supertux.git]
/
src
/
object
/
platform.cpp
diff --git
a/src/object/platform.cpp
b/src/object/platform.cpp
index
d72b7ac
..
69c6c0d
100644
(file)
--- a/
src/object/platform.cpp
+++ b/
src/object/platform.cpp
@@
-5,14
+5,16
@@
#include "resources.h"
#include "player.h"
#include "special/sprite_manager.h"
#include "resources.h"
#include "player.h"
#include "special/sprite_manager.h"
-#include "utils/lispreader.h"
+#include "lisp/lisp.h"
+#include "lisp/writer.h"
+#include "object_factory.h"
-Platform::Platform(
LispReader
& reader)
+Platform::Platform(
const lisp::Lisp
& reader)
{
sprite = sprite_manager->create("flying_platform");
movement = Vector(0, 1);
{
sprite = sprite_manager->create("flying_platform");
movement = Vector(0, 1);
- reader.
read_floa
t("x", bbox.p1.x);
- reader.
read_floa
t("y", bbox.p1.y);
+ reader.
ge
t("x", bbox.p1.x);
+ reader.
ge
t("y", bbox.p1.y);
bbox.set_size(sprite->get_width(), sprite->get_height());
flags |= FLAG_SOLID;
bbox.set_size(sprite->get_width(), sprite->get_height());
flags |= FLAG_SOLID;
@@
-73,3
+75,5
@@
Platform::draw(DrawingContext& context)
{
sprite->draw(context, get_pos(), LAYER_OBJECTS);
}
{
sprite->draw(context, get_pos(), LAYER_OBJECTS);
}
+
+IMPLEMENT_FACTORY(Platform, "flying_platform");