#303: Typo fixes from mathnerd314

[supertux.git] / src / sector.hpp

diff --git a/src/sector.hpp b/src/sector.hpp
index 8bd8966..9c5ab6a 100644 (file)
--- 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;
@@ -49,6 +50,8 @@ class SpawnPoint;
 class MovingObject;
 class CollisionHit;
 class Level;
+class Portable;
+class DrawingContext;
 
 enum MusicType {
   LEVEL_MUSIC,
@@ -57,10 +60,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);
@@ -75,7 +79,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();
@@ -131,11 +135,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
@@ -164,6 +182,21 @@ 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();
+
+  /**
+   *  set gravity throughout sector
+   */
+  void set_gravity(float gravity);
 
 private:
   Level* level; /**< Parent level containing this sector */
@@ -174,6 +207,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 +267,7 @@ public: // TODO make this private again
   GameObjects gameobjects;
   MovingObjects moving_objects;
   SpawnPoints spawnpoints;
+  Portables portables;
 
   std::string music;
   float gravity;