added rain ambient sound

[supertux.git] / src / sector.h

diff --git a/src/sector.h b/src/sector.h
index 64e2b3d..ad735f4 100644 (file)
--- a/src/sector.h
+++ b/src/sector.h
@@ -27,16 +27,12 @@
 #include "audio/musicref.h"
 #include "video/drawing_context.h"
 
-using namespace SuperTux;
-
-namespace SuperTux {
-class Rectangle;
-}
 namespace lisp {
 class Lisp;
 class Writer;
 }
 
+class Rect;
 class Sprite;
 class GameObject;
 class Player;
@@ -44,6 +40,7 @@ class Camera;
 class TileMap;
 class Bullet;
 class CollisionGrid;
+class ScriptInterpreter;
 
 class SpawnPoint
 {
@@ -90,7 +87,7 @@ public:
   { return name; }
 
   /// tests if a given rectangle is inside the sector
-  bool inside(const Rectangle& rectangle) const;
+  bool inside(const Rect& rectangle) const;
 
   void play_music(MusicType musictype);
   MusicType get_music_type();
@@ -138,13 +135,15 @@ public:
 private:
   std::vector<Bullet*> bullets;
 
+  std::string init_script;
+
 public: // TODO make this private again
   typedef std::vector<GameObject*> GameObjects;
   GameObjects gameobjects;
   typedef std::vector<SpawnPoint*> SpawnPoints;
   SpawnPoints spawnpoints;                       
 
-  Rectangle get_active_region();
+  Rect get_active_region();
 
 private:
   void fix_old_tiles();