projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
re-organized resource files
[supertux.git]
/
src
/
worldmap.h
diff --git
a/src/worldmap.h
b/src/worldmap.h
index
55eddfc
..
8c19d74
100644
(file)
--- a/
src/worldmap.h
+++ b/
src/worldmap.h
@@
-26,15
+26,13
@@
#include "audio/musicref.h"
#include "video/screen.h"
#include "lisp/lisp.h"
#include "audio/musicref.h"
#include "video/screen.h"
#include "lisp/lisp.h"
+#include "control/controller.h"
#include "statistics.h"
#include "timer.h"
#include "tile_manager.h"
#include "statistics.h"
#include "timer.h"
#include "tile_manager.h"
-namespace SuperTux {
- class Menu;
- class Sprite;
-}
-
+class Sprite;
+class Menu;
extern Menu* worldmap_menu;
namespace WorldMapNS {
extern Menu* worldmap_menu;
namespace WorldMapNS {
@@
-68,6
+66,7
@@
public:
private:
WorldMap* worldmap;
Sprite* tux_sprite;
private:
WorldMap* worldmap;
Sprite* tux_sprite;
+ Controller* controller;
Direction input_direction;
Direction direction;
Direction input_direction;
Direction direction;
@@
-179,7
+178,7
@@
public:
};
/** Variables to deal with the passive map messages */
};
/** Variables to deal with the passive map messages */
- Timer
2
passive_message_timer;
+ Timer passive_message_timer;
std::string passive_message;
private:
std::string passive_message;
private:
@@
-194,8
+193,6
@@
private:
MusicRef song;
MusicRef song;
- bool enter_level;
-
Vector offset;
std::string savegame_file;
Vector offset;
std::string savegame_file;