- moved lots of code around, made gameloop even more into a class

[supertux.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index c476a3c..6ee3240 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -18,11 +18,21 @@
 #include <SDL.h>
 #include "text.h"
 #include "menu.h"
+#include "mousecursor.h"
 
 extern std::string datadir;
 
 extern SDL_Surface * screen;
-extern text_type black_text, gold_text, white_text, white_small_text, white_big_text, blue_text, red_text, yellow_nums;
+extern text_type black_text;
+extern text_type gold_text;
+extern text_type white_text;
+extern text_type white_small_text;
+extern text_type white_big_text;
+extern text_type blue_text;
+extern text_type red_text;
+extern text_type yellow_nums;
+
+extern MouseCursor * mouse_cursor;
 
 extern bool use_gl;
 extern bool use_joystick;
@@ -36,10 +46,13 @@ extern char* level_startup_file;
 extern bool launch_worldmap_mode;
 
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
-extern char *st_dir, *st_save_dir;
+extern char* st_dir;
+extern char* st_save_dir;
 
 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);
+
 #define JOYSTICK_DEAD_ZONE 4096
 
 #endif /* SUPERTUX_GLOBALS_H */