X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.hpp;h=cdc59b6f4d51efb1d229f02c944180f4586da1e4;hb=6f5f82abb84b33fd400c3b82a5e2be2a6cf8ce21;hp=8bd89669ebc4aff483d38379c4527d1778e5ac38;hpb=c62f4f7c11116b2ba6d6a9dfdb74bc7f07e840d0;p=supertux.git

diff --git a/src/sector.hpp b/src/sector.hpp
index 8bd89669e..cdc59b6f4 100644
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -28,6 +28,8 @@
 #include "direction.hpp"
 #include "math/vector.hpp"
 #include "video/drawing_context.hpp"
+#include "script_interface.hpp"
+#include "scripting/ssector.hpp"
 
 namespace lisp {
 class Lisp;
@@ -49,6 +51,7 @@ class SpawnPoint;
 class MovingObject;
 class CollisionHit;
 class Level;
+class Portable;
 
 enum MusicType {
   LEVEL_MUSIC,
@@ -60,7 +63,7 @@ enum MusicType {
  * This class holds a sector (a part of a level) and all the game objects in
  * the sector
  */
-class Sector
+class Sector : public Scripting::SSector
 {
 public:
   Sector(Level* parent);
@@ -131,11 +134,25 @@ public:
   void collision_tilemap(collision::Constraints* constraints,
       const Vector& movement, const Rect& dest) const;
 
-  /** Checks if at the specified rectangle are gameobjects with STATIC flag set
-   * (or solid tiles from the tilemap).
-   * This does not(!) include badguys or players.
+  /** 
+   * 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_space(const Rect& rect) const;
+  bool is_free_of_tiles(const Rect& rect) 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 
+   * 1.) solid tiles and
+   * 2.) MovingObjects in COLGROUP_STATIC, COLGROUP_MOVINGSTATIC or COLGROUP_MOVING.
+   * This includes badguys and players.
+   */
+  bool is_free_of_movingstatics(const Rect& rect, const MovingObject* ignore_object = 0) const;
 
   /**
    * returns a list of players currently in the sector
@@ -164,6 +181,16 @@ public:
   typedef std::vector<GameObject*> GameObjects;
   typedef std::vector<MovingObject*> MovingObjects;
   typedef std::vector<SpawnPoint*> SpawnPoints;
+  typedef std::vector<Portable*> Portables;
+
+  // --- Scripting ---
+  /**
+   *  get/set color of ambient light
+   */
+  void set_ambient_light(float red, float green, float blue);
+  float get_ambient_red();
+  float get_ambient_green();
+  float get_ambient_blue();
 
 private:
   Level* level; /**< Parent level containing this sector */
@@ -174,6 +201,8 @@ private:
 
   void try_expose(GameObject* object);
   void try_unexpose(GameObject* object);
+  void try_expose_me();
+  void try_unexpose_me();
 
   /** Checks for all possible collisions. And calls the
       collision_handlers, which the collision_objects provide for this
@@ -232,6 +261,7 @@ public: // TODO make this private again
   GameObjects gameobjects;
   MovingObjects moving_objects;
   SpawnPoints spawnpoints;
+  Portables portables;
 
   std::string music;
   float gravity;