fix some more timings and the long standing gradient software bug (which was function...

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index 287d055..2018d85 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -27,7 +27,11 @@
 #include "audio/musicref.h"
 #include "video/screen.h"
 #include "statistics.h"
-#include "special/timer.h"
+#include "timer.h"
+
+namespace SuperTux {
+  class Menu;
+}
 
 extern Menu* worldmap_menu;
 
@@ -56,7 +60,7 @@ public:
   void draw(DrawingContext& context, Vector pos);
 
   std::vector<Surface*> images;
-  int anim_speed;
+  float anim_fps;
 
   // Directions in which Tux is allowed to walk from this tile
   bool north;
@@ -158,9 +162,32 @@ private:
 public:
   struct SpecialTile
   {
-    int x;
-    int y;
-    std::string level_name;
+    Vector pos;
+
+    /** Optional flags: */
+
+    /** Position to swap to player */
+    Vector teleport_dest;
+
+    /** Message to show in the Map */
+    std::string map_message;
+    bool passive_message;
+
+    /** Hide special tile */
+    bool invisible;
+
+    /** Only applies actions (ie. passive messages) when going to that direction */
+    bool apply_action_north;
+    bool apply_action_east;
+    bool apply_action_south;
+    bool apply_action_west;
+  };
+
+  struct Level
+  {
+    Vector pos;
+
+    std::string name;
     std::string title;
     bool solved;
 
@@ -176,16 +203,6 @@ public:
         successfully completed */
     std::string extro_filename;
 
-    /** Position to swap to player */
-    int teleport_dest_x, teleport_dest_y;
-
-    /** Message to show in the Map */
-    std::string map_message;
-    bool passive_message;
-
-    /** Hide special tile */
-    bool invisible;
-
     /** Go to this world */
     std::string next_worldmap;
 
@@ -200,16 +217,10 @@ public:
     bool east;
     bool south;
     bool west;
-
-    /** Only applies actions (ie. passive messages) when going to that direction */
-    bool apply_action_north;
-    bool apply_action_east;
-    bool apply_action_south;
-    bool apply_action_west;
   };
 
   /** Variables to deal with the passive map messages */
-  Timer passive_message_timer;
+  Timer2 passive_message_timer;
   std::string passive_message;
 
 private:
@@ -218,6 +229,9 @@ private:
   typedef std::vector<SpecialTile> SpecialTiles;
   SpecialTiles special_tiles;
 
+  typedef std::vector<Level> Levels;
+  Levels levels;
+
   MusicRef song;
 
   bool enter_level;
@@ -225,7 +239,7 @@ private:
   Vector offset;
   std::string savegame_file;
 
-  void get_level_title(SpecialTile& special_tile);
+  void get_level_title(Level& level);
 
   void draw_status(DrawingContext& context);
 
@@ -234,8 +248,6 @@ private:
   Statistics total_stats;
   void calculate_total_stats();
 
-  Timer frame_timer;
-
 public:
   WorldMap();
   ~WorldMap();
@@ -255,6 +267,8 @@ public:
 
   Vector get_next_tile(Vector pos, Direction direction);
   Tile* at(Vector pos);
+
+  WorldMap::Level* at_level();
   WorldMap::SpecialTile* at_special_tile();
 
   /** Check if it is possible to walk from \a pos into \a direction,