X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.h;h=ee08514364a0e48482ef559a9fe183dd744c67ac;hb=ef57479f613b900b73eba8e8f4d026aae0de25cc;hp=a30e5d41d273e0f2a78aec7e3ec3e842ef4539ea;hpb=6f801c22d97251799740317fb1d0caf2e744b321;p=supertux.git

diff --git a/src/sector.h b/src/sector.h
index a30e5d41d..ee0851436 100644
--- a/src/sector.h
+++ b/src/sector.h
@@ -32,11 +32,13 @@ using namespace SuperTux;
 
 namespace SuperTux {
 class GameObject;
-class LispReader;
-class LispWriter;
 class Sprite;
 class Rectangle;
 }
+namespace lisp {
+class Lisp;
+class Writer;
+}
 
 class InteractiveObject;
 class Background;
@@ -68,10 +70,10 @@ public:
   ~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
-  void write(LispWriter& writer);
+  void write(lisp::Writer& writer);
 
   /// 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();
-  GameObject* parse_object(const std::string& name, LispReader& reader);
+  GameObject* parse_object(const std::string& name, const lisp::Lisp& lisp);
   
   static Sector* _current;
   
@@ -134,7 +136,6 @@ public:
   // some special objects, where we need direct access
   Player* player;
   TileMap* solids;
-  Background* background;
   Camera* camera;
   
 private: