added more cvsignores because scons is placing .sconsign files all over the place :-/

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

diff --git a/lib/app/globals.h b/lib/app/globals.h
index 2894b2b..39299cd 100644 (file)
--- a/lib/app/globals.h
+++ b/lib/app/globals.h
@@ -27,12 +27,12 @@
 #include "SDL.h"
 
 #include "../video/font.h"
-#include "../gui/menu.h"
-#include "../gui/mousecursor.h"
 
 namespace SuperTux
   {
 
+  class MouseCursor;
+
   extern std::string datadir;
   extern std::string package_symbol_name;
   extern std::string package_name;
@@ -72,8 +72,8 @@ namespace SuperTux
   extern bool flip_levels_mode;
 
   /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
-  extern char* st_dir;
-  extern char* st_save_dir;
+  extern std::string st_dir;
+  extern std::string st_save_dir;
   
   extern SDL_Joystick * js;