X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fworldmap.hpp;h=87c83a9385fbb5914748c8b5a6a9746aac243946;hb=5667d7e94d85f968ab914bc457edd689fc907253;hp=ea847054b4b5df4a9c5f5964e36b99d4e6913559;hpb=d6c0f1db91b8ff4c3a21d75a8113819afb478fc4;p=supertux.git
diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp
index ea847054b..87c83a938 100644
--- a/src/worldmap/worldmap.hpp
+++ b/src/worldmap/worldmap.hpp
@@ -36,10 +36,11 @@
#include "worldmap/special_tile.hpp"
#include "worldmap/sprite_change.hpp"
#include "worldmap/teleporter.hpp"
+#include "worldmap/spawn_point.hpp"
+#include "worldmap/direction.hpp"
class Sprite;
class Menu;
-class SpawnPoint;
class GameObject;
class TileMap;
@@ -59,20 +60,24 @@ enum {
WEST_EAST_WAY
};
-enum Direction { D_NONE, D_WEST, D_EAST, D_NORTH, D_SOUTH };
-
std::string direction_to_string(Direction d);
Direction string_to_direction(const std::string& d);
Direction reverse_dir(Direction d);
/**
- * Screen that displays a worldmap
+ * Screen that runs a WorldMap, which lets the player choose a Level.
*/
class WorldMap : public Screen
{
+ static Color level_title_color;
+ static Color message_color;
+ static Color teleporter_message_color;
private:
Tux* tux;
+ TileSet *tileset;
+ bool free_tileset;
+
static WorldMap* current_;
std::auto_ptr