Replaced std::auto_ptr<> with std::unique_ptr<>

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

diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp
index f206ad1..0925edc 100644 (file)
--- a/src/worldmap/worldmap.hpp
+++ b/src/worldmap/worldmap.hpp
@@ -41,6 +41,7 @@ class Sprite;
 class Menu;
 class GameObject;
 class TileMap;
+class PlayerStatus;
 
 namespace worldmap {
 
@@ -77,12 +78,14 @@ private:
 
   Tux* tux;
 
+  PlayerStatus* player_status;
+
   TileSet *tileset;
   bool     free_tileset;
 
   static WorldMap* current_;
 
-  std::auto_ptr<Menu> worldmap_menu;
+  std::unique_ptr<Menu> worldmap_menu;
 
   Vector camera_offset;
 
@@ -123,7 +126,7 @@ private:
   bool panning;
 
 public:
-  WorldMap(const std::string& filename, const std::string& force_spawnpoint = "");
+  WorldMap(const std::string& filename, PlayerStatus* player_status, const std::string& force_spawnpoint = "");
   ~WorldMap();
 
   void add_object(GameObject* object);
@@ -168,6 +171,9 @@ public:
   /** returns current Tux incarnation */
   Tux* get_tux() { return tux; }
 
+  /** returns player status */
+  PlayerStatus* get_player_status() { return player_status; }
+
   LevelTile* at_level();
   SpecialTile* at_special_tile();
   SpriteChange* at_sprite_change(const Vector& pos);
@@ -219,6 +225,7 @@ public:
 
 private:
   void get_level_title(LevelTile& level);
+  void get_level_target_time(LevelTile& level);
   void draw_status(DrawingContext& context);
   void calculate_total_stats();
 
@@ -227,6 +234,8 @@ private:
 
   Vector get_camera_pos_for_tux();
   void clamp_camera_position(Vector& c);
+  Vector last_position;
+  float last_target_time;
 
 private:
   WorldMap(const WorldMap&);