- memleak fix and menu fix from MatzeB

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index 343ef61..f94017f 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include <string>
 
-#include <SDL_mixer.h>
+#include "musicref.h"
 
 namespace WorldMapNS {
 
@@ -46,8 +46,12 @@ struct Point
   int y;
 };
 
-struct Tile
+class Tile
 {
+public:
+  Tile();
+  ~Tile();
+  
   Surface* sprite;
 
   // Directions in which Tux is allowed to walk from this tile
@@ -65,13 +69,11 @@ class TileManager
 private:
   typedef std::vector<Tile*> Tiles;
   Tiles tiles;
-  static TileManager* instance_ ;
 
- TileManager();
 public:
-  static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
+  TileManager();
+  ~TileManager();
 
-  void load();
   Tile* get(int i);
 };
 
@@ -102,6 +104,7 @@ private:
   void stop();
 public: 
   Tux(WorldMap* worldmap_);
+  ~Tux();
   
   void draw(const Point& offset);
   void update(float delta);
@@ -133,12 +136,15 @@ private:
   int width;
   int height;
 
+  TileManager* tile_manager;
+
 public:
   struct Level
   {
     int x;
     int y;
     std::string name;
+    std::string title;
     bool solved;
 
     // Directions which are walkable from this level
@@ -152,7 +158,7 @@ private:
   typedef std::vector<Level> Levels;
   Levels levels;
 
-  Mix_Music* song;
+  MusicRef song;
 
   Direction input_direction;
   bool enter_level;
@@ -160,6 +166,8 @@ private:
   Point offset;
   std::string savegame_file;
 
+  void get_level_title(Levels::pointer level);
+
   void draw_status();
 public:
   WorldMap();
@@ -188,6 +196,8 @@ public:
 
   void savegame(const std::string& filename);
   void loadgame(const std::string& filename);
+private:
+  void on_escape_press();
 };
 
 } // namespace WorldMapNS