X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.hpp;h=1fc487ea0b3486c9efcfc2d0f433220b2ef32d86;hb=7c579d3ef0a6667c18b53dad84c63c05d2760a84;hp=9706bce916016555e2c320261e546d2f82055979;hpb=a8b7979d199a2165fe25533943bd8972fd81b275;p=supertux.git

diff --git a/src/sector.hpp b/src/sector.hpp
index 9706bce91..1fc487ea0 100644
--- 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.
@@ -203,11 +202,6 @@ private:
   void try_unexpose(GameObject* object);
   void try_expose_me();
   void try_unexpose_me();
-  
-  /**
-   * Adds solid tilemaps to list, removes non-solid ones
-   */
-  void update_solid_tilemap_list();
 
   /** Checks for all possible collisions. And calls the
       collision_handlers, which the collision_objects provide for this
@@ -274,8 +268,7 @@ public: // TODO make this private again
   // some special objects, where we need direct access
   // (try to avoid accessing them directly)
   Player* player;
-  std::list<TileMap*> tilemaps; /**< list of all tilemaps in this sector */
-  std::list<TileMap*> solid_tilemaps; /**< list of tilemaps to consider for collision detection */
+  std::list<TileMap*> solid_tilemaps;
   Camera* camera;
 };