X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.hpp;h=bcc87670fbaf037c831f62a7b8825aeb39e5f047;hb=3d0fc88a41d3774bbbcaee76efdb996bbacc6c45;hp=50edf73d86e122bd20926ec3ac8e805536b02671;hpb=ca86583fae991aa3280c5d70bf20dbf0504a93cb;p=supertux.git

diff --git a/src/sector.hpp b/src/sector.hpp
index 50edf73d8..bcc87670f 100644
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -19,15 +19,15 @@
 #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 "video/color.hpp"
+#include "scripting/ssector.hpp"
 
 namespace lisp {
 class Lisp;
@@ -37,6 +37,7 @@ namespace collision {
 class Constraints;
 }
 
+class Vector;
 class Rect;
 class Sprite;
 class GameObject;
@@ -50,6 +51,8 @@ class MovingObject;
 class CollisionHit;
 class Level;
 class Portable;
+class DrawingContext;
+class DisplayEffect;
 
 enum MusicType {
   LEVEL_MUSIC,
@@ -58,10 +61,11 @@ 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
+class Sector : public Scripting::SSector
 {
 public:
   Sector(Level* parent);
@@ -76,7 +80,7 @@ public:
   /// write sector to lisp file
   void write(lisp::Writer& writer);
 
-  /// activates this sector (change music, intialize player class, ...)
+  /// activates this sector (change music, initialize player class, ...)
   void activate(const std::string& spawnpoint);
   void activate(const Vector& player_pos);
   void deactivate();
@@ -132,11 +136,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_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_space(const Rect& rect) 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
+   * 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
@@ -167,6 +185,20 @@ public:
   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();
+
+  /**
+   *  set gravity throughout sector
+   */
+  void set_gravity(float gravity);
+
 private:
   Level* level; /**< Parent level containing this sector */
   uint32_t collision_tile_attributes(const Rect& dest) const;
@@ -176,6 +208,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
@@ -244,6 +278,7 @@ public: // TODO make this private again
   Player* player;
   std::list<TileMap*> solid_tilemaps;
   Camera* camera;
+  DisplayEffect* effect;
 };
 
 #endif