- some indentation

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index 37b4133..10b86d7 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -105,7 +105,7 @@ public:
   void draw(DrawingContext& context, const Vector& offset);
   void action(float elapsed_time);
 
-  void set_direction(Direction d) { input_direction = d; }
+  void set_direction(Direction dir);
 
   bool is_moving() const { return moving; }
   Vector get_pos();
@@ -121,9 +121,9 @@ private:
 
   bool quit;
 
-  Surface* level_sprite;
   Surface* leveldot_green;
   Surface* leveldot_red;
+  Surface* messagedot;
 
   std::string name;
   std::string music;
@@ -160,6 +160,7 @@ public:
 
     /** Message to show in the Map */
     std::string display_map_message;
+    bool passive_message;
 
     /** Go to this world */
     std::string next_worldmap;
@@ -177,6 +178,10 @@ public:
     bool west;
   };
 
+  /** Variables to deal with the passive map messages */
+  Timer passive_message_timer;
+  std::string passive_message;
+
 private:
   std::string map_filename;
 
@@ -185,7 +190,6 @@ private:
 
   MusicRef song;
 
-  Direction input_direction;
   bool enter_level;
 
   Vector offset;