patch contributed by markos_64:

[supertux.git] / src / sector.h

diff --git a/src/sector.h b/src/sector.h
index 05595ab..45a2cd5 100644 (file)
--- a/src/sector.h
+++ b/src/sector.h
@@ -24,16 +24,18 @@
 #include <vector>
 
 #include "math/vector.h"
-#include "badguy.h"
 #include "audio/musicref.h"
 #include "video/drawing_context.h"
+#include "defines.h"
 
 using namespace SuperTux;
 
 namespace SuperTux {
 class GameObject;
 class LispReader;
+class LispWriter;
 class Sprite;
+class Rectangle;
 }
 
 class InteractiveObject;
@@ -65,8 +67,6 @@ 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);
@@ -86,6 +86,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; }
 
@@ -100,19 +102,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; }
@@ -125,7 +118,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, LispReader& reader);
   
   static Sector* _current;
   
@@ -141,7 +134,6 @@ public:
   // some special objects, where we need direct access
   Player* player;
   TileMap* solids;
-  Background* background;
   Camera* camera;
   
 private:
@@ -154,6 +146,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;