Prevent "Return to Level Editor" from working, if no levelsubset is loaded. This...

[supertux.git] / src / globals.cpp

diff --git a/src/globals.cpp b/src/globals.cpp
index 7660620..1da3e4a 100644 (file)
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -23,18 +23,27 @@
 /** The datadir prefix prepended when loading game data file */
 std::string datadir;
 
-int JOY_A = 0;
-int JOY_B = 1;
-int JOY_START = 9;
+JoystickKeymap::JoystickKeymap()
+{
+  a_button     = 0;
+  b_button     = 1;
+  start_button = 2;
+  
+  x_axis = 0;
+  y_axis = 1;
+    
+  dead_zone = 4096;
+}
 
-int JOY_X = 0;
-int JOY_Y = 1;
+JoystickKeymap joystick_keymap;
 
 SDL_Surface * screen;
 Text* black_text;
 Text* gold_text;
+Text* silver_text;
 Text* blue_text;
 Text* red_text;
+Text* green_text;
 Text* yellow_nums;
 Text* white_text;
 Text* white_small_text;
@@ -51,7 +60,7 @@ float game_speed = 1.0f;
 
 int joystick_num = 0;
 char* level_startup_file = 0;
-bool launch_worldmap_mode = false;
+bool launch_leveleditor_mode = false;
 
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
 char *st_dir, *st_save_dir;