- Cleanups

[supertux.git] / src / sector.h

diff --git a/src/sector.h b/src/sector.h
index 3eb5945..5d9822b 100644 (file)
--- a/src/sector.h
+++ b/src/sector.h
@@ -16,18 +16,26 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __SECTOR_H__
-#define __SECTOR_H__
+
+#ifndef SUPERTUX_SECTOR_H
+#define SUPERTUX_SECTOR_H
 
 #include <string>
 #include <vector>
-#include "vector.h"
+
+#include "math/vector.h"
 #include "badguy.h"
 #include "special.h"
-#include "musicref.h"
-#include "screen/drawing_context.h"
+#include "audio/musicref.h"
+#include "video/drawing_context.h"
+
+using namespace SuperTux;
 
+namespace SuperTux {
 class GameObject;
+class LispReader;
+}
+
 class InteractiveObject;
 class Background;
 class Player;
@@ -38,8 +46,6 @@ class TileMap;
 class Upgrade;
 class Bullet;
 class BadGuy;
-class Vector;
-class LispReader;
 class Tile;
 
 struct SpawnPoint
@@ -67,6 +73,8 @@ public:
   void activate(const std::string& spawnpoint = "main");
 
   void action(float elapsed_time);
+  void update_game_objects();
+
   void draw(DrawingContext& context);
 
   /// adds a gameobject
@@ -108,6 +116,10 @@ public:
       the tile which the badguy is walking on an killing him this way */
   void trybumpbadguy(const Vector& pos);
 
+  /** 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@ */
   static Sector* current()
   { return _current; }
@@ -119,11 +131,11 @@ private:
   
   std::string name;
 
-  std::string song_title;
   MusicRef level_song;
   MusicRef level_song_fast;
 
 public:
+  std::string song_title;
   float gravity;
 
   // some special objects, where we need direct access
@@ -148,6 +160,7 @@ public: // ugly
   InteractiveObjects interactive_objects;
   typedef std::vector<GameObject*> GameObjects;
   GameObjects gameobjects;
+  GameObjects gameobjects_new; // For newly created objects
 
 private:
   typedef std::vector<SpawnPoint*> SpawnPoints;