Huge code merge. This reflects the current status of my rewrite/restructuring. A...

[supertux.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index c25c85f..cf9664d 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -11,23 +11,23 @@
 */
 
 
-#ifndef GLOBALS_H
-#define GLOBALS_H
+#ifndef SUPERTUX_GLOBALS_H
+#define SUPERTUX_GLOBALS_H
 
 #include <SDL.h>
-#include <SDL_image.h>
-
-#ifndef NOSOUND
-#include <SDL_mixer.h>
-#endif
 
 SDL_Surface * screen;
 SDL_Surface * letters_black, * letters_gold, * letters_blue, * letters_red;
 
-int use_joystick, use_sound, use_fullscreen;
+int use_gl, use_joystick, use_fullscreen, debug_mode;
+
+int game_started, level_editor_started;
+
+/* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
+char *st_dir, *st_save_dir;
 
 #ifdef JOY_YES
 SDL_Joystick * js;
 #endif
 
-#endif /* GLOBALS_H */
+#endif /* SUPERTUX_GLOBALS_H */