supertux/sector.[ch]pp: Implement Sector::get_nearest_player.

[supertux.git] / src / supertux / sector.hpp

diff --git a/src/supertux/sector.hpp b/src/supertux/sector.hpp
index 0b19f0e..4bf38d4 100644 (file)
--- a/src/supertux/sector.hpp
+++ b/src/supertux/sector.hpp
@@ -33,10 +33,11 @@ class Constraints;
 }
 
 class Vector;
-class Rect;
+class Rectf;
 class Sprite;
 class GameObject;
 class Player;
+class PlayerStatus;
 class Camera;
 class TileMap;
 class Bullet;
@@ -60,7 +61,7 @@ enum MusicType {
  *
  * Sectors contain GameObjects, e.g. Badguys and Players.
  */
-class Sector : public Scripting::SSector,
+class Sector : public scripting::SSector,
                public Currenton<Sector>
 {
 public:
@@ -102,12 +103,12 @@ public:
    * tests if a given rectangle is inside the sector
    * (a rectangle that is on top of the sector is considered inside)
    */
-  bool inside(const Rect& rectangle) const;
+  bool inside(const Rectf& rectangle) const;
 
   void play_music(MusicType musictype);
   MusicType get_music_type();
 
-  bool add_bullet(const Vector& pos, float xm, Direction dir);
+  bool add_bullet(const Vector& pos, const PlayerStatus* player_status, float xm, Direction dir);
   bool add_smoke_cloud(const Vector& pos);
 
   /** get currently activated sector. */
@@ -128,27 +129,28 @@ public:
   }
 
   void collision_tilemap(collision::Constraints* constraints,
-                         const Vector& movement, const Rect& dest) const;
+                         const Vector& movement, const Rectf& dest,
+                         MovingObject &object) 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 bool ignoreUnisolid = false) const;
+  bool is_free_of_tiles(const Rectf& 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 ignoreUnisolid = false) const;
+  bool is_free_of_statics(const Rectf& 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;
+  bool is_free_of_movingstatics(const Rectf& rect, const MovingObject* ignore_object = 0) const;
 
   /**
    * returns a list of players currently in the sector
@@ -156,8 +158,9 @@ public:
   std::vector<Player*> get_players() {
     return std::vector<Player*>(1, this->player);
   }
+  Player *get_nearest_player (const Vector& pos);
 
-  Rect get_active_region();
+  Rectf get_active_region();
 
   /**
    * returns the width (in px) of a sector)
@@ -179,7 +182,7 @@ public:
   typedef std::vector<SpawnPoint*> SpawnPoints;
   typedef std::vector<Portable*> Portables;
 
-  // --- Scripting ---
+  // --- scripting ---
   /**
    *  get/set color of ambient light
    */
@@ -195,7 +198,7 @@ public:
   float get_gravity() const;
 
 private:
-  uint32_t collision_tile_attributes(const Rect& dest) const;
+  uint32_t collision_tile_attributes(const Rectf& dest) const;
 
   void before_object_remove(GameObject* object);
   bool before_object_add(GameObject* object);
@@ -226,7 +229,7 @@ private:
    * (because of ABORT_MOVE in the collision response or no collisions)
    */
   void collision_static(collision::Constraints* constraints,
-                        const Vector& movement, const Rect& dest, GameObject& object);
+                        const Vector& movement, const Rectf& dest, MovingObject& object);
 
   void collision_static_constrains(MovingObject& object);