Changed the background feeding format for the new level format.

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index 5113c74..10b86d7 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -23,12 +23,19 @@
 #include <vector>
 #include <string>
 
-#include "vector.h"
-#include "musicref.h"
-#include "screen/screen.h"
+#include "math/vector.h"
+#include "audio/musicref.h"
+#include "video/screen.h"
+
+extern Menu* worldmap_menu;
 
 namespace WorldMapNS {
 
+enum WorldMapMenuIDs {
+  MNID_RETURNWORLDMAP,
+  MNID_QUITWORLDMAP
+  };
+
 class Tile
 {
 public:
@@ -98,7 +105,7 @@ public:
   void draw(DrawingContext& context, const Vector& offset);
   void action(float elapsed_time);
 
-  void set_direction(Direction d) { input_direction = d; }
+  void set_direction(Direction dir);
 
   bool is_moving() const { return moving; }
   Vector get_pos();
@@ -114,9 +121,9 @@ private:
 
   bool quit;
 
-  Surface* level_sprite;
   Surface* leveldot_green;
   Surface* leveldot_red;
+  Surface* messagedot;
 
   std::string name;
   std::string music;
@@ -131,11 +138,11 @@ private:
   TileManager* tile_manager;
 
 public:
-  struct Level
+  struct SpecialTile
   {
     int x;
     int y;
-    std::string name;
+    std::string level_name;
     std::string title;
     bool solved;
 
@@ -153,13 +160,17 @@ public:
 
     /** Message to show in the Map */
     std::string display_map_message;
+    bool passive_message;
 
     /** Go to this world */
-    std::string goto_worldmap;
+    std::string next_worldmap;
 
     /** Quit the worldmap */
     bool quit_worldmap;
 
+    /** If false, disables the auto walking after finishing a level */
+    bool auto_path;
+
     // Directions which are walkable from this level
     bool north;
     bool east;
@@ -167,21 +178,24 @@ public:
     bool west;
   };
 
+  /** Variables to deal with the passive map messages */
+  Timer passive_message_timer;
+  std::string passive_message;
+
 private:
   std::string map_filename;
 
-  typedef std::vector<Level> Levels;
-  Levels levels;
+  typedef std::vector<SpecialTile> SpecialTiles;
+  SpecialTiles special_tiles;
 
   MusicRef song;
 
-  Direction input_direction;
   bool enter_level;
 
   Vector offset;
   std::string savegame_file;
 
-  void get_level_title(Level& level);
+  void get_level_title(SpecialTile& special_tile);
 
   void draw_status(DrawingContext& context);
 public:
@@ -203,7 +217,7 @@ public:
 
   Vector get_next_tile(Vector pos, Direction direction);
   Tile* at(Vector pos);
-  WorldMap::Level* at_level();
+  WorldMap::SpecialTile* at_special_tile();
 
   /** Check if it is possible to walk from \a pos into \a direction,
       if possible, write the new position to \a new_pos */