X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fapp%2Fglobals.h;h=850707d732891cb8fa9a663299d0676a32950649;hb=c0093d25093395cb62fc2526ab42be65a9f015b8;hp=f1ba02980d57c93cc461bec7685b737dcb4845af;hpb=ac9e53e5d668d20fcae8c6ac728602d5359a6004;p=supertux.git

diff --git a/lib/app/globals.h b/lib/app/globals.h
index f1ba02980..850707d73 100644
--- a/lib/app/globals.h
+++ b/lib/app/globals.h
@@ -26,7 +26,7 @@
 
 #include "SDL.h"
 
-#include "../video/font.h"
+#include "video/font.h"
 #include "tinygettext.h"
 
 namespace SuperTux
@@ -38,9 +38,6 @@ namespace SuperTux
   class MouseCursor;
 
   extern std::string datadir;
-  extern std::string package_symbol_name;
-  extern std::string package_name;
-  extern std::string package_version;
 
   struct JoystickKeymap
     {
@@ -58,26 +55,16 @@ namespace SuperTux
 
   extern JoystickKeymap joystick_keymap;
 
-  extern SDL_Surface* screen;
-
   extern MouseCursor * mouse_cursor;
 
-  extern bool use_gl;
-  extern bool use_joystick;
-  extern bool use_fullscreen;
-  extern bool debug_mode;
-  extern bool show_fps;
+#define SCREEN_WIDTH  800
+#define SCREEN_HEIGHT 600
 
   /** 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;
-  extern bool flip_levels_mode;
-
-  /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
-  extern std::string st_dir;
-  extern std::string st_save_dir;
+
+  /* SuperTux directory ($HOME/.supertux) */
+  extern std::string user_dir;
   
   extern SDL_Joystick * js;