- replaced YES/NO with true/false

[supertux.git] / src / globals.cpp

diff --git a/src/globals.cpp b/src/globals.cpp
index 20ad5e6..74b2e49 100644 (file)
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -12,19 +12,25 @@
 
 #include "globals.h"
 
+/** The datadir prefix prepended when loading game data file */
+std::string datadir;
+
 SDL_Surface * screen;
 text_type black_text, gold_text, blue_text, red_text, yellow_nums, white_text, white_small_text, white_big_text;
 
-int use_gl, use_joystick, use_fullscreen, debug_mode, show_fps;
+bool use_gl;
+bool use_joystick; 
+bool use_fullscreen;
+bool debug_mode;
+bool show_fps;
 
+int joystick_num = 0; 
 char* level_startup_file = 0;
 bool launch_worldmap_mode = false;
 
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
 char *st_dir, *st_save_dir;
 
-#ifdef JOY_YES
 SDL_Joystick * js;
-#endif