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
/
background.cpp
diff --git
a/src/object/background.cpp
b/src/object/background.cpp
index
2d6cc41
..
50b01d0
100644
(file)
--- a/
src/object/background.cpp
+++ b/
src/object/background.cpp
@@
-23,25
+23,27
@@
#include "app/globals.h"
#include "camera.h"
#include "video/drawing_context.h"
#include "app/globals.h"
#include "camera.h"
#include "video/drawing_context.h"
-#include "utils/lispwriter.h"
+#include "lisp/lisp.h"
+#include "lisp/writer.h"
+#include "object_factory.h"
Background::Background()
: type(INVALID), layer(LAYER_BACKGROUND0), image(0)
{
}
Background::Background()
: type(INVALID), layer(LAYER_BACKGROUND0), image(0)
{
}
-Background::Background(
LispReader
& reader)
+Background::Background(
const lisp::Lisp
& reader)
: type(INVALID), layer(LAYER_BACKGROUND0), image(0)
{
: type(INVALID), layer(LAYER_BACKGROUND0), image(0)
{
- reader.
read_in
t("layer", layer);
- if(reader.
read_string
("image", imagefile)
- && reader.
read_floa
t("speed", speed)) {
+ reader.
ge
t("layer", layer);
+ if(reader.
get
("image", imagefile)
+ && reader.
ge
t("speed", speed)) {
set_image(imagefile, speed);
}
std::vector <unsigned int> bkgd_top_color, bkgd_bottom_color;
set_image(imagefile, speed);
}
std::vector <unsigned int> bkgd_top_color, bkgd_bottom_color;
- if(reader.
read_in
t_vector("top_color", bkgd_top_color) &&
- reader.
read_in
t_vector("bottom_color", bkgd_bottom_color))
+ if(reader.
ge
t_vector("top_color", bkgd_top_color) &&
+ reader.
ge
t_vector("bottom_color", bkgd_bottom_color))
set_gradient(Color(bkgd_top_color), Color(bkgd_bottom_color));
}
set_gradient(Color(bkgd_top_color), Color(bkgd_bottom_color));
}
@@
-51,7
+53,7
@@
Background::~Background()
}
void
}
void
-Background::write(
Lisp
Writer& writer)
+Background::write(
lisp::
Writer& writer)
{
if(type == INVALID)
return;
{
if(type == INVALID)
return;
@@
-127,3
+129,4
@@
Background::draw(DrawingContext& context)
}
}
}
}
+IMPLEMENT_FACTORY(Background, "background");