-Started to move stuff from library back to main game

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

diff --git a/lib/app/globals.cpp b/lib/app/globals.cpp
index 56f0fbf..5327778 100644 (file)
--- a/lib/app/globals.cpp
+++ b/lib/app/globals.cpp
@@ -18,12 +18,24 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
+#include <config.h>
+
 #include "app/globals.h"
+#include "special/timer.h"
 
 namespace SuperTux {
 
+TinyGetText::DictionaryManager dictionary_manager;
+TinyGetText::Dictionary* dictionary = 0;
+
 /** The datadir prefix prepended when loading game data file */
 std::string datadir;
+std::string package_symbol_name;
+std::string package_name;
+std::string package_version;
+
+int screen_width  = SCREEN_WIDTH;
+int screen_height = SCREEN_HEIGHT;
 
 JoystickKeymap::JoystickKeymap()
 {
@@ -40,35 +52,24 @@ JoystickKeymap::JoystickKeymap()
 JoystickKeymap joystick_keymap;
 
 SDL_Surface * screen;
-Font* gold_text;
-Font* blue_text;
-Font* gray_text;
-Font* yellow_nums;
-Font* white_text;
-Font* white_small_text;
-Font* white_big_text;
-
 MouseCursor * mouse_cursor;
 
-bool use_gl;
-bool use_joystick;
-bool use_fullscreen;
-bool debug_mode;
-bool show_fps;
-float game_speed = 1.0f;
-
+#if 0
 int joystick_num = 0;
 char* level_startup_file = 0;
 bool launch_leveleditor_mode = false;
 bool launch_worldmap_mode = false;
+bool flip_levels_mode = false;
+#endif
 
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
-char *st_dir, *st_save_dir;
+std::string user_dir;
 
 SDL_Joystick * js;
 
 /* Returns 1 for every button event, 2 for a quit event and 0 for no event. */
-int wait_for_event(SDL_Event& event,unsigned int min_delay, unsigned int max_delay, bool empty_events)
+int wait_for_event(SDL_Event& event, unsigned int min_delay,
+    unsigned int max_delay, bool empty_events)
 {
   int i;
   Timer maxdelay;