X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=4bf2b69ceb96071c1a84e5dd312df9fd47d86ef7;hb=742f64dff3466f2b3ebab1851ee2993b4ac3072e;hp=f44ba506064c68736cfd0c97da02bd06a50adbd0;hpb=1db9b1a8cf477ba8a676eb2046342ae02c3d3b96;p=supertux.git

diff --git a/src/worldmap.h b/src/worldmap.h
index f44ba5060..4bf2b69ce 100644
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -16,7 +16,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #ifndef SUPERTUX_WORLDMAP_H
 #define SUPERTUX_WORLDMAP_H
 
@@ -27,7 +26,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 +59,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 +219,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 +247,6 @@ private:
   Statistics total_stats;
   void calculate_total_stats();
 
-  Timer frame_timer;
-
 public:
   WorldMap();
   ~WorldMap();