X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.hpp;h=1fc487ea0b3486c9efcfc2d0f433220b2ef32d86;hb=665b4a4a6b0edae82fb830528f16d2176da44aa4;hp=487f4a2bfdecdb51361ae339d92cf0adaba2da19;hpb=a983f6648d43492632c41e2b7519b70458b53cf4;p=supertux.git diff --git a/src/sector.hpp b/src/sector.hpp index 487f4a2bf..1fc487ea0 100644 --- a/src/sector.hpp +++ b/src/sector.hpp @@ -19,16 +19,13 @@ #ifndef SUPERTUX_SECTOR_H #define SUPERTUX_SECTOR_H -#include #include #include #include #include #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, @@ -138,14 +137,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