furhter improve collision detection by reintroducing time of collision, still more...

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

diff --git a/lib/app/globals.cpp b/lib/app/globals.cpp
index b363ec0..8b6e9e5 100644 (file)
--- a/lib/app/globals.cpp
+++ b/lib/app/globals.cpp
@@ -18,10 +18,16 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include "../app/globals.h"
+#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;
@@ -58,7 +64,7 @@ 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;