Mirror actions now cache the horizontal flipped Surfaces, rather than flipping them...

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

diff --git a/lib/app/globals.cpp b/lib/app/globals.cpp
index 56f0fbf..0a328d4 100644 (file)
--- a/lib/app/globals.cpp
+++ b/lib/app/globals.cpp
@@ -18,13 +18,16 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include "app/globals.h"
+#include "../app/globals.h"
 
 namespace SuperTux {
 
 /** 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;
+  
 JoystickKeymap::JoystickKeymap()
 {
   a_button     = 0;
@@ -40,14 +43,6 @@ 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;
@@ -55,15 +50,15 @@ bool use_joystick;
 bool use_fullscreen;
 bool debug_mode;
 bool show_fps;
-float game_speed = 1.0f;
 
 int joystick_num = 0;
 char* level_startup_file = 0;
 bool launch_leveleditor_mode = false;
 bool launch_worldmap_mode = false;
+bool flip_levels_mode = false;
 
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
-char *st_dir, *st_save_dir;
+std::string st_dir, st_save_dir;
 
 SDL_Joystick * js;