projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move over rewritten lispreader from tuxkart (with additional fixes), generalized...
[supertux.git]
/
src
/
sector.h
diff --git
a/src/sector.h
b/src/sector.h
index
a30e5d4
..
ee08514
100644
(file)
--- a/
src/sector.h
+++ b/
src/sector.h
@@
-32,11
+32,13
@@
using namespace SuperTux;
namespace SuperTux {
class GameObject;
namespace SuperTux {
class GameObject;
-class LispReader;
-class LispWriter;
class Sprite;
class Rectangle;
}
class Sprite;
class Rectangle;
}
+namespace lisp {
+class Lisp;
+class Writer;
+}
class InteractiveObject;
class Background;
class InteractiveObject;
class Background;
@@
-68,10
+70,10
@@
public:
~Sector();
/// read sector from lisp file
~Sector();
/// read sector from lisp file
- void parse(
LispReader& reader
);
- void parse_old_format(
LispReader& reader
);
+ void parse(
const lisp::Lisp& lisp
);
+ void parse_old_format(
const lisp::Lisp& lisp
);
/// write sector to lisp file
/// write sector to lisp file
- void write(
Lisp
Writer& writer);
+ void write(
lisp::
Writer& writer);
/// activates this sector (change music, intialize player class, ...)
void activate(const std::string& spawnpoint = "main");
/// activates this sector (change music, intialize player class, ...)
void activate(const std::string& spawnpoint = "main");
@@
-118,7
+120,7
@@
private:
void collision_object(MovingObject* object1, MovingObject* object2);
void load_music();
void collision_object(MovingObject* object1, MovingObject* object2);
void load_music();
- GameObject* parse_object(const std::string& name,
LispReader& reader
);
+ GameObject* parse_object(const std::string& name,
const lisp::Lisp& lisp
);
static Sector* _current;
static Sector* _current;
@@
-134,7
+136,6
@@
public:
// some special objects, where we need direct access
Player* player;
TileMap* solids;
// some special objects, where we need direct access
Player* player;
TileMap* solids;
- Background* background;
Camera* camera;
private:
Camera* camera;
private: