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

diff --git a/src/sector.h b/src/sector.h
index 89270358b..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;
@@ -67,13 +69,11 @@ public:
   Sector();
   ~Sector();
 
-  /// create new sector
-  static Sector *create(const std::string& name, size_t width, size_t height);
   /// 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");
@@ -88,6 +88,8 @@ public:
   /// adds a gameobject
   void add_object(GameObject* object);
 
+  void set_name(const std::string& name)
+  { this->name = name; }
   const std::string& get_name() const
   { return name; }
 
@@ -102,19 +104,10 @@ public:
       case (or not). */
   void collision_handler();
 
-  void add_score(const Vector& pos, int s);
- 
   bool add_bullet(const Vector& pos, float xm, Direction dir);
   bool add_smoke_cloud(const Vector& pos);
-  bool add_particles(const Vector& epicenter, int min_angle, int max_angle,
-      const Vector& initial_velocity, const Vector& acceleration, int number,
-      Color color, int size, int life_time, int drawing_layer);
   void add_floating_text(const Vector& pos, const std::string& text);
                                                                                 
-  /** Flip the all the sector vertically. The purpose of this is to let
-      player to play the same level in a different way :) */
-  void do_vertical_flip();
-
   /** @evil@ but can#t always be avoided in current design... */
   static Sector* current()
   { return _current; }
@@ -127,7 +120,7 @@ private:
   void collision_object(MovingObject* object1, MovingObject* object2);
   
   void load_music();
-  GameObject* parseObject(const std::string& name, LispReader& reader);
+  GameObject* parse_object(const std::string& name, const lisp::Lisp& lisp);
   
   static Sector* _current;
   
@@ -143,7 +136,6 @@ public:
   // some special objects, where we need direct access
   Player* player;
   TileMap* solids;
-  Background* background;
   Camera* camera;
   
 private:
@@ -156,6 +148,8 @@ public: // TODO make this private again
   GameObjects gameobjects;
 
 private:
+  void fix_old_tiles();
+  
   /// container for newly created objects, they'll be added in Sector::action
   GameObjects gameobjects_new;