fix bug 215 (unpausing doesn't always work)

[supertux.git] / src / sector.hpp

diff --git a/src/sector.hpp b/src/sector.hpp
index cdc59b6..1fc487e 100644 (file)
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -19,16 +19,13 @@
 #ifndef SUPERTUX_SECTOR_H
 #define SUPERTUX_SECTOR_H
 
-#include <string>
 #include <vector>
 #include <list>
 #include <memory>
 #include <squirrel.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 +36,7 @@ namespace collision {
 class Constraints;
 }
 
+class Vector;
 class Rect;
 class Sprite;
 class GameObject;
@@ -52,6 +50,7 @@ class MovingObject;
 class CollisionHit;
 class Level;
 class Portable;
+class DrawingContext;
 
 enum MusicType {
   LEVEL_MUSIC,
@@ -134,20 +133,20 @@ public:
   void collision_tilemap(collision::Constraints* constraints,
       const Vector& movement, const Rect& dest) const;
 
-  /** 
+  /**
    * 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;
-  /** 
-   * Checks if the specified rectangle is free of both 
+  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;
-  /** 
-   * Checks if the specified rectangle is free of both 
+  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
    * 2.) MovingObjects in COLGROUP_STATIC, COLGROUP_MOVINGSTATIC or COLGROUP_MOVING.
    * This includes badguys and players.