projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-Started to move stuff from library back to main game
[supertux.git]
/
src
/
object
/
background.h
diff --git
a/src/object/background.h
b/src/object/background.h
index
7ed3e83
..
4b6253c
100644
(file)
--- a/
src/object/background.h
+++ b/
src/object/background.h
@@
-22,20
+22,25
@@
#include "video/surface.h"
#include "video/drawing_context.h"
#include "video/surface.h"
#include "video/drawing_context.h"
-#include "special/game_object.h"
-#include "utils/lispreader.h"
+#include "game_object.h"
#include "serializable.h"
#include "serializable.h"
+using namespace SuperTux;
+
class DisplayManager;
class DisplayManager;
+namespace lisp {
+class Lisp;
+}
+
class Background : public GameObject, public Serializable
{
public:
Background();
class Background : public GameObject, public Serializable
{
public:
Background();
- Background(
LispReader
& reader);
+ Background(
const lisp::Lisp
& reader);
virtual ~Background();
virtual ~Background();
- virtual void write(
Lisp
Writer& writer);
+ virtual void write(
lisp::
Writer& writer);
void set_image(const std::string& name, float bkgd_speed);
void set_image(const std::string& name, float bkgd_speed);