X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=45431d786dbf2fe8e4751f0cb0d3619bbe0f05b3;hb=d46c78c842ab4090a3f46e560c891234167f124b;hp=f44ba506064c68736cfd0c97da02bd06a50adbd0;hpb=1db9b1a8cf477ba8a676eb2046342ae02c3d3b96;p=supertux.git diff --git a/src/worldmap.h b/src/worldmap.h index f44ba5060..45431d786 100644 --- 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; @@ -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,7 +248,7 @@ private: Statistics total_stats; void calculate_total_stats(); - Timer frame_timer; + Timer2 frame_timer; public: WorldMap();