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

[supertux.git] / lib / app / globals.h

diff --git a/lib/app/globals.h b/lib/app/globals.h
index ca65289..2495017 100644 (file)
--- a/lib/app/globals.h
+++ b/lib/app/globals.h
@@ -26,58 +26,63 @@
 
 #include "SDL.h"
 
-#include "video/font.h"
-#include "gui/menu.h"
-#include "gui/mousecursor.h"
-
-extern std::string datadir;
-
-struct JoystickKeymap
-{
-  int a_button;
-  int b_button;
-  int start_button;
-
-  int x_axis;
-  int y_axis;
-  
-  int dead_zone;
-
-  JoystickKeymap();
-};
-
-extern JoystickKeymap joystick_keymap;
-
-extern SDL_Surface* screen;
-extern Font* gold_text;
-extern Font* white_text;
-extern Font* blue_text;
-extern Font* gray_text;
-extern Font* white_small_text;
-extern Font* white_big_text;
-extern Font* yellow_nums;
-
-extern MouseCursor * mouse_cursor;
-
-extern bool use_gl;
-extern bool use_joystick;
-extern bool use_fullscreen;
-extern bool debug_mode;
-extern bool show_fps;
-
-/** The number of the joystick that will be use in the game */
-extern int joystick_num;
-extern char* level_startup_file;
-extern bool launch_leveleditor_mode;
-extern bool launch_worldmap_mode;
-
-/* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
-extern char* st_dir;
-extern char* st_save_dir;
-
-extern float game_speed;
-extern SDL_Joystick * js;
-
-int wait_for_event(SDL_Event& event,unsigned int min_delay = 0, unsigned int max_delay = 0, bool empty_events = false);
+#include "../video/font.h"
+#include "../gui/menu.h"
+#include "../gui/mousecursor.h"
+
+namespace SuperTux
+  {
+
+  extern std::string datadir;
+
+  struct JoystickKeymap
+    {
+      int a_button;
+      int b_button;
+      int start_button;
+
+      int x_axis;
+      int y_axis;
+
+      int dead_zone;
+
+      JoystickKeymap();
+    };
+
+  extern JoystickKeymap joystick_keymap;
+
+  extern SDL_Surface* screen;
+  extern Font* gold_text;
+  extern Font* white_text;
+  extern Font* blue_text;
+  extern Font* gray_text;
+  extern Font* white_small_text;
+  extern Font* white_big_text;
+  extern Font* yellow_nums;
+
+  extern MouseCursor * mouse_cursor;
+
+  extern bool use_gl;
+  extern bool use_joystick;
+  extern bool use_fullscreen;
+  extern bool debug_mode;
+  extern bool show_fps;
+
+  /** The number of the joystick that will be use in the game */
+  extern int joystick_num;
+  extern char* level_startup_file;
+  extern bool launch_leveleditor_mode;
+  extern bool launch_worldmap_mode;
+
+  /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
+  extern char* st_dir;
+  extern char* st_save_dir;
+
+  extern float game_speed;
+  extern SDL_Joystick * js;
+
+  int wait_for_event(SDL_Event& event,unsigned int min_delay = 0, unsigned int max_delay = 0, bool empty_events = false);
+
+} //namespace SuperTux
 
 #endif /* SUPERTUX_GLOBALS_H */