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

diff --git a/src/sector.h b/src/sector.h
index ee0851436..5f31dc96e 100644
--- a/src/sector.h
+++ b/src/sector.h
@@ -40,19 +40,11 @@ class Lisp;
 class Writer;
 }
 
-class InteractiveObject;
-class Background;
 class Player;
 class Camera;
-class Trampoline;
-class FlyingPlatform;
 class TileMap;
-class Upgrade;
 class Bullet;
-class SmokeCloud;
-class Particles;
-class BadGuy;
-class Tile;
+class CollisionGrid;
 
 struct SpawnPoint
 {
@@ -115,8 +107,10 @@ public:
   /** Get total number of badguys */
   int get_total_badguys();
 
-private:
+  // make this private again soon
   void collision_tilemap(MovingObject* object, int depth);
+
+private:
   void collision_object(MovingObject* object1, MovingObject* object2);
   
   void load_music();
@@ -142,11 +136,11 @@ private:
   std::vector<Bullet*> bullets;
 
 public: // TODO make this private again
-  typedef std::vector<InteractiveObject*> InteractiveObjects;
-  InteractiveObjects interactive_objects;
   typedef std::vector<GameObject*> GameObjects;
   GameObjects gameobjects;
 
+  Rectangle get_active_region();
+
 private:
   void fix_old_tiles();
   
@@ -157,6 +151,8 @@ private:
   SpawnPoints spawnpoints;
 
   int currentmusic;
+
+  CollisionGrid* grid;
 };
 
 #endif