projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The BIG COMMIT(tm)
[supertux.git]
/
src
/
worldmap.h
diff --git
a/src/worldmap.h
b/src/worldmap.h
index
f44ba50
..
45431d7
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 "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;
extern Menu* worldmap_menu;
@@
-216,7
+220,7
@@
public:
};
/** Variables to deal with the passive map messages */
};
/** Variables to deal with the passive map messages */
- Timer passive_message_timer;
+ Timer
2
passive_message_timer;
std::string passive_message;
private:
std::string passive_message;
private:
@@
-244,7
+248,7
@@
private:
Statistics total_stats;
void calculate_total_stats();
Statistics total_stats;
void calculate_total_stats();
- Timer frame_timer;
+ Timer
2
frame_timer;
public:
WorldMap();
public:
WorldMap();