commited Matzes Win32 patch

[supertux.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index 9425bee..0dbd85e 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -7,23 +7,31 @@
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/supertux/
   
-  April 11, 2000 - April 21, 2000
+  April 11, 2000 - March 15, 2004
 */
 
 
-#ifndef GLOBALS_H
-#define GLOBALS_H
+#ifndef SUPERTUX_GLOBALS_H
+#define SUPERTUX_GLOBALS_H
 
+#include <string>
 #include <SDL.h>
-#include <SDL_image.h>
+#include "text.h"
+#include "menu.h"
 
-SDL_Surface * screen;
-SDL_Surface * letters_black, * letters_gold, * letters_blue, * letters_red;
+extern std::string datadir;
 
-int use_joystick, use_sound, use_fullscreen;
+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;
 
-#ifdef JOY_YES
-SDL_Joystick * js;
-#endif
+extern int use_gl, use_joystick, use_fullscreen, debug_mode, show_fps;
 
-#endif /* GLOBALS_H */
+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 SDL_Joystick * js;
+
+#endif /* SUPERTUX_GLOBALS_H */