X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fworldmap%2Fworldmap.hpp;h=f206ad1ccb8f9415f9dacb1759352c29f85802fa;hb=13e56e5b8d9727128667bb42c3aa4850b4a8dd00;hp=b22cea131e499f280bf30a0adb3dec0defff75a4;hpb=045255cdf0a58161b908d769bc0bde1778c33e14;p=supertux.git diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp index b22cea131..f206ad1cc 100644 --- a/src/worldmap/worldmap.hpp +++ b/src/worldmap/worldmap.hpp @@ -42,7 +42,7 @@ class Menu; class GameObject; class TileMap; -namespace WorldMapNS { +namespace worldmap { class Tux; class LevelTile; @@ -58,10 +58,6 @@ enum { WEST_EAST_WAY }; -std::string direction_to_string(Direction d); -Direction string_to_direction(const std::string& d); -Direction reverse_dir(Direction d); - /** * Screen that runs a WorldMap, which lets the player choose a Level. */ @@ -237,7 +233,7 @@ private: WorldMap& operator=(const WorldMap&); }; -} // namespace WorldMapNS +} // namespace worldmap #endif