X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.hpp;h=5033959c1716ba729d04dc7c8a08641c9163df98;hb=8b67b0dc71efddc4b668bde525ba94d701f622ac;hp=487f4a2bfdecdb51361ae339d92cf0adaba2da19;hpb=a983f6648d43492632c41e2b7519b70458b53cf4;p=supertux.git

diff --git a/src/sector.hpp b/src/sector.hpp
index 487f4a2bf..5033959c1 100644
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -19,16 +19,14 @@
 #ifndef SUPERTUX_SECTOR_H
 #define SUPERTUX_SECTOR_H
 
-#include <string>
 #include <vector>
 #include <list>
 #include <memory>
 #include <squirrel.h>
+#include <stdint.h>
 
 #include "direction.hpp"
-#include "math/vector.hpp"
-#include "video/drawing_context.hpp"
-#include "script_interface.hpp"
+#include "video/color.hpp"
 #include "scripting/ssector.hpp"
 
 namespace lisp {
@@ -39,6 +37,7 @@ namespace collision {
 class Constraints;
 }
 
+class Vector;
 class Rect;
 class Sprite;
 class GameObject;
@@ -52,6 +51,7 @@ class MovingObject;
 class CollisionHit;
 class Level;
 class Portable;
+class DrawingContext;
 
 enum MusicType {
   LEVEL_MUSIC,
@@ -60,8 +60,9 @@ enum MusicType {
 };
 
 /**
- * This class holds a sector (a part of a level) and all the game objects in
- * the sector
+ * Represents one of (potentially) multiple, separate parts of a Level.
+ *
+ * Sectors contain GameObjects, e.g. Badguys and Players.
  */
 class Sector : public Scripting::SSector
 {
@@ -138,14 +139,14 @@ public:
    * Checks if the specified rectangle is free of (solid) tiles.
    * Note that this does not include static objects, e.g. bonus blocks.
    */
-  bool is_free_of_tiles(const Rect& rect) const;
+  bool is_free_of_tiles(const Rect& rect, const bool ignoreUnisolid = false) const;
   /**
    * Checks if the specified rectangle is free of both
    * 1.) solid tiles and
    * 2.) MovingObjects in COLGROUP_STATIC.
    * Note that this does not include badguys or players.
    */
-  bool is_free_of_statics(const Rect& rect, const MovingObject* ignore_object = 0) const;
+  bool is_free_of_statics(const Rect& rect, const MovingObject* ignore_object = 0, const bool ignoreUnisolid = false) const;
   /**
    * Checks if the specified rectangle is free of both
    * 1.) solid tiles and