* Fixed a typographic mistake in scripting.xml (closed a bracket)

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index 55eddfc..dd5d03a 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -26,15 +26,13 @@
 #include "audio/musicref.h"
 #include "video/screen.h"
 #include "lisp/lisp.h"
+#include "control/controller.h"
 #include "statistics.h"
 #include "timer.h"
 #include "tile_manager.h"
 
-namespace SuperTux {
-  class Menu;
-  class Sprite;
-}
-
+class Sprite;
+class Menu;
 extern Menu* worldmap_menu;
 
 namespace WorldMapNS {
@@ -68,6 +66,7 @@ public:
 private:
   WorldMap* worldmap;
   Sprite* tux_sprite;
+  Controller* controller;
 
   Direction input_direction;
   Direction direction;
@@ -83,7 +82,7 @@ public:
   ~Tux();
   
   void draw(DrawingContext& context);
-  void action(float elapsed_time);
+  void update(float elapsed_time);
 
   void set_direction(Direction dir);
 
@@ -179,7 +178,7 @@ public:
   };
 
   /** Variables to deal with the passive map messages */
-  Timer2 passive_message_timer;
+  Timer passive_message_timer;
   std::string passive_message;
 
 private:
@@ -194,8 +193,6 @@ private:
 
   MusicRef song;
 
-  bool enter_level;
-
   Vector offset;
   std::string savegame_file;
   
@@ -260,7 +257,8 @@ public:
 
 private:
   void on_escape_press();
-  void parse_special_tiles(const lisp::Lisp* lisp);
+  void parse_special_tile(const lisp::Lisp* lisp);
+  void parse_level_tile(const lisp::Lisp* lisp);
 };
 
 } // namespace WorldMapNS