X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=5899f8c14f0bf962045f77287c1e42bd6380c533;hb=be3627a9c6fc5bb27e5297da512d59a7eb4033a2;hp=55eddfce3f0a182aa94b945d6565c3e5e49711fd;hpb=495f8b77cb935fe8eff81bec755efca8e34e8a99;p=supertux.git diff --git a/src/worldmap.h b/src/worldmap.h index 55eddfce3..5899f8c14 100644 --- 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 "control/controller.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 { @@ -68,6 +66,7 @@ public: private: WorldMap* worldmap; Sprite* tux_sprite; + Controller* controller; Direction input_direction; Direction direction; @@ -194,8 +193,6 @@ private: MusicRef song; - bool enter_level; - Vector offset; std::string savegame_file;