-Started to move stuff from library back to main game

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

diff --git a/lib/app/globals.h b/lib/app/globals.h
index 0fb80b7..850707d 100644 (file)
--- a/lib/app/globals.h
+++ b/lib/app/globals.h
@@ -26,17 +26,18 @@
 
 #include "SDL.h"
 
-#include "../video/font.h"
-#include "../gui/menu.h"
-#include "../gui/mousecursor.h"
+#include "video/font.h"
+#include "tinygettext.h"
 
 namespace SuperTux
   {
 
+  extern TinyGetText::DictionaryManager dictionary_manager;
+  extern TinyGetText::Dictionary* dictionary;
+  
+  class MouseCursor;
+
   extern std::string datadir;
-  extern std::string package_symbol_name;
-  extern std::string package_name;
-  extern std::string package_version;
 
   struct JoystickKeymap
     {
@@ -54,34 +55,17 @@ namespace SuperTux
 
   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;
+#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;
 
-  /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
-  extern char* st_dir;
-  extern char* st_save_dir;
+  /* SuperTux directory ($HOME/.supertux) */
+  extern std::string user_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);