Had to change the #includes of dependend headers from "dir/header.h" to "../dir...

[supertux.git] / lib / gui / menu.cpp

diff --git a/lib/gui/menu.cpp b/lib/gui/menu.cpp
index 4dc253d..30c0b9c 100644 (file)
--- a/lib/gui/menu.cpp
+++ b/lib/gui/menu.cpp
@@ -29,39 +29,31 @@
 #include <string>
 #include <cassert>
 
-#include "app/globals.h"
-#include "gui/menu.h"
-#include "video/screen.h"
-#include "video/drawing_context.h"
-#include "app/setup.h"
-#include "audio/sound.h"
-#include "special/timer.h"
-#include "app/gettext.h"
+#include "../app/globals.h"
+#include "../gui/menu.h"
+#include "../video/screen.h"
+#include "../video/drawing_context.h"
+#include "../app/setup.h"
+#include "../audio/sound.h"
+#include "../special/timer.h"
+#include "../app/gettext.h"
+#include "../math/vector.h"
+
+using namespace SuperTux;
 
 #define FLICK_CURSOR_TIME 500
 
-Surface* checkbox;
-Surface* checkbox_checked;
-Surface* back;
-Surface* arrow_left;
-Surface* arrow_right;
-
-Menu* main_menu      = 0;
-Menu* game_menu      = 0;
-Menu* options_menu   = 0;
-Menu* options_keys_menu     = 0;
-Menu* options_joystick_menu = 0;
-Menu* highscore_menu = 0;
-Menu* load_game_menu = 0;
-Menu* save_game_menu = 0;
-Menu* contrib_menu   = 0;
-Menu* contrib_subset_menu   = 0;
+Surface* SuperTux::checkbox;
+Surface* SuperTux::checkbox_checked;
+Surface* SuperTux::back;
+Surface* SuperTux::arrow_left;
+Surface* SuperTux::arrow_right;
 
 std::vector<Menu*> Menu::last_menus;
 Menu* Menu::current_ = 0;
 
 /* just displays a Yes/No text that can be used to confirm stuff */
-bool confirm_dialog(Surface *background, std::string text)
+bool SuperTux::confirm_dialog(Surface *background, std::string text)
 {
   //Surface* cap_screen = Surface::CaptureScreen();