Fade out and pause music on death and resume on restart of level, fixes #1064

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

diff --git a/src/supertux/sector.hpp b/src/supertux/sector.hpp
index 4bf38d4..e21d1d4 100644 (file)
--- a/src/supertux/sector.hpp
+++ b/src/supertux/sector.hpp
@@ -23,10 +23,12 @@
 
 #include "scripting/ssector.hpp"
 #include "supertux/direction.hpp"
+#include "supertux/game_object_ptr.hpp"
 #include "util/reader_fwd.hpp"
 #include "util/writer_fwd.hpp"
 #include "util/currenton.hpp"
 #include "video/color.hpp"
+#include "object/anchor_point.hpp"
 
 namespace collision {
 class Constraints;
@@ -74,7 +76,7 @@ public:
   /// read sector from lisp file
   void parse(const Reader& lisp);
   void parse_old_format(const Reader& lisp);
-  
+
   /// activates this sector (change music, initialize player class, ...)
   void activate(const std::string& spawnpoint);
   void activate(const Vector& player_pos);
@@ -92,10 +94,10 @@ public:
   HSQUIRRELVM run_script(std::istream& in, const std::string& sourcename);
 
   /// adds a gameobject
-  void add_object(GameObject* object);
+  void add_object(GameObjectPtr object);
 
-  void set_name(const std::string& name)
-  { this->name = name; }
+  void set_name(const std::string& name_)
+  { this->name = name_; }
   const std::string& get_name() const
   { return name; }
 
@@ -106,9 +108,11 @@ public:
   bool inside(const Rectf& rectangle) const;
 
   void play_music(MusicType musictype);
+  void resume_music();
   MusicType get_music_type();
 
-  bool add_bullet(const Vector& pos, const PlayerStatus* player_status, float xm, Direction dir);
+  int get_active_bullets()
+  { return (int)bullets.size(); }
   bool add_smoke_cloud(const Vector& pos);
 
   /** get currently activated sector. */
@@ -123,7 +127,7 @@ public:
   {
     int total = 0;
     for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) {
-      if (dynamic_cast<T*>(*i)) total++;
+      if (dynamic_cast<T*>(i->get())) total++;
     }
     return total;
   }
@@ -159,9 +163,17 @@ public:
     return std::vector<Player*>(1, this->player);
   }
   Player *get_nearest_player (const Vector& pos);
+  Player *get_nearest_player (const Rectf& pos)
+  {
+    return (get_nearest_player (get_anchor_pos (pos, ANCHOR_MIDDLE)));
+  }
+
+  std::vector<MovingObject*> get_nearby_objects (const Vector& center, float max_distance);
 
   Rectf get_active_region();
 
+  int get_foremost_layer();
+
   /**
    * returns the width (in px) of a sector)
    */
@@ -177,9 +189,9 @@ public:
    */
   void change_solid_tiles(uint32_t old_tile_id, uint32_t new_tile_id);
 
-  typedef std::vector<GameObject*> GameObjects;
+  typedef std::vector<GameObjectPtr> GameObjects;
   typedef std::vector<MovingObject*> MovingObjects;
-  typedef std::vector<SpawnPoint*> SpawnPoints;
+  typedef std::vector<std::shared_ptr<SpawnPoint> > SpawnPoints;
   typedef std::vector<Portable*> Portables;
 
   // --- scripting ---
@@ -200,11 +212,11 @@ public:
 private:
   uint32_t collision_tile_attributes(const Rectf& dest) const;
 
-  void before_object_remove(GameObject* object);
-  bool before_object_add(GameObject* object);
+  void before_object_remove(GameObjectPtr object);
+  bool before_object_add(GameObjectPtr object);
 
-  void try_expose(GameObject* object);
-  void try_unexpose(GameObject* object);
+  void try_expose(GameObjectPtr object);
+  void try_unexpose(GameObjectPtr object);
   void try_expose_me();
   void try_unexpose_me();
 
@@ -233,10 +245,12 @@ private:
 
   void collision_static_constrains(MovingObject& object);
 
-  GameObject* parse_object(const std::string& name, const Reader& lisp);
+  GameObjectPtr parse_object(const std::string& name, const Reader& lisp);
 
   void fix_old_tiles();
 
+  int calculate_foremost_layer();
+
 private:
   static Sector* _current;
 
@@ -260,6 +274,8 @@ private:
 
   Color ambient_light;
 
+  int foremost_layer;
+
 public: // TODO make this private again
   /// show collision rectangles of moving objects (for debugging)
   static bool show_collrects;