- Upgraded ambient sound source to rounded rectangule dimension

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index 5899f8c..dd5d03a 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -82,7 +82,7 @@ public:
   ~Tux();
   
   void draw(DrawingContext& context);
-  void action(float elapsed_time);
+  void update(float elapsed_time);
 
   void set_direction(Direction dir);
 
@@ -178,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:
@@ -257,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