Some more sounds from Some_Person

[supertux.git] / src / worldmap / worldmap.hpp

diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp
index 3f0dc32..f206ad1 100644 (file)
--- a/src/worldmap/worldmap.hpp
+++ b/src/worldmap/worldmap.hpp
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "control/controller.hpp"
-#include "lisp/lisp.hpp"
+#include "util/reader_fwd.hpp"
 #include "math/vector.hpp"
 #include "supertux/console.hpp"
 #include "supertux/game_object.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.
  */
@@ -70,7 +66,15 @@ class WorldMap : public Screen
   static Color level_title_color;
   static Color message_color;
   static Color teleporter_message_color;
+
 private:
+  typedef std::vector<SpecialTile*> SpecialTiles;
+  typedef std::vector<SpriteChange*> SpriteChanges;
+  typedef std::vector<SpawnPoint*> SpawnPoints;
+  typedef std::vector<LevelTile*> LevelTiles;
+  typedef std::vector<GameObject*> GameObjects;
+  typedef std::vector<HSQOBJECT> ScriptList;
+
   Tux* tux;
 
   TileSet *tileset;
@@ -86,7 +90,6 @@ private:
   std::string music;
   std::string init_script;
 
-  typedef std::vector<GameObject*> GameObjects;
   GameObjects game_objects;
   std::list<TileMap*> solid_tilemaps;
 
@@ -99,20 +102,15 @@ private:
   std::string map_filename;
   std::string levels_path;
 
-  typedef std::vector<SpecialTile*> SpecialTiles;
   SpecialTiles special_tiles;
-  typedef std::vector<LevelTile*> LevelTiles;
   LevelTiles levels;
-  typedef std::vector<SpriteChange*> SpriteChanges;
   SpriteChanges sprite_changes;
-  typedef std::vector<SpawnPoint*> SpawnPoints;
   SpawnPoints spawn_points;
   std::vector<Teleporter*> teleporters;
 
   Statistics total_stats;
 
   HSQOBJECT worldmap_table;
-  typedef std::vector<HSQOBJECT> ScriptList;
   ScriptList scripts;
 
   Color ambient_light;
@@ -235,7 +233,7 @@ private:
   WorldMap& operator=(const WorldMap&);
 };
 
-} // namespace WorldMapNS
+} // namespace worldmap
 
 #endif