shrink tux bounding box to make him not fail on 1 or 2 tiles heigh places, also exten...

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index f44ba50..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;
@@ -216,7 +220,7 @@ public:
   };
 
   /** Variables to deal with the passive map messages */
-  Timer passive_message_timer;
+  Timer2 passive_message_timer;
   std::string passive_message;
 
 private:
@@ -244,8 +248,6 @@ private:
   Statistics total_stats;
   void calculate_total_stats();
 
-  Timer frame_timer;
-
 public:
   WorldMap();
   ~WorldMap();