- memleak fix and menu fix from MatzeB

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index a96c4ff..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,22 +69,26 @@ 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);
 };
 
 enum Direction { NONE, WEST, EAST, NORTH, SOUTH };
 
+std::string direction_to_string(Direction d);
+Direction   string_to_direction(const std::string& d);
+Direction reverse_dir(Direction d);
+
 class WorldMap;
 
 class Tux
 {
+public:
+  Direction back_direction;
 private:
   WorldMap* worldmap;
   Surface* sprite;
@@ -96,6 +104,7 @@ private:
   void stop();
 public: 
   Tux(WorldMap* worldmap_);
+  ~Tux();
   
   void draw(const Point& offset);
   void update(float delta);
@@ -114,12 +123,12 @@ class WorldMap
 private:
   Tux* tux;
 
+  bool quit;
+
   Surface* level_sprite;
   Surface* leveldot_green;
   Surface* leveldot_red;
 
-  bool quit;
-
   std::string name;
   std::string music;
 
@@ -127,23 +136,37 @@ 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
+    bool north;
+    bool east;
+    bool south;
+    bool west;
   };
 
+private:
   typedef std::vector<Level> Levels;
   Levels levels;
 
-  Mix_Music* song;
+  MusicRef song;
 
   Direction input_direction;
   bool enter_level;
 
   Point offset;
+  std::string savegame_file;
+
+  void get_level_title(Levels::pointer level);
 
   void draw_status();
 public:
@@ -165,18 +188,20 @@ public:
 
   Point get_next_tile(Point pos, Direction direction);
   Tile* at(Point pos);
+  WorldMap::Level* at_level();
 
   /** Check if it is possible to walk from \a pos into \a direction,
       if possible, write the new position to \a new_pos */
   bool path_ok(Direction direction, Point pos, Point* new_pos);
 
   void savegame(const std::string& filename);
+  void loadgame(const std::string& filename);
+private:
+  void on_escape_press();
 };
 
 } // namespace WorldMapNS
 
-void worldmap_run();
-
 #endif
 
 /* Local Variables: */