a first implementation of doors to switch between sectors

[supertux.git] / src / globals.cpp

diff --git a/src/globals.cpp b/src/globals.cpp
index b6096d4..0c16a30 100644 (file)
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -23,15 +23,31 @@
 /** The datadir prefix prepended when loading game data file */
 std::string datadir;
 
+JoystickKeymap::JoystickKeymap()
+{
+  a_button     = 0;
+  b_button     = 1;
+  start_button = 2;
+  
+  x_axis = 0;
+  y_axis = 1;
+    
+  dead_zone = 4096;
+}
+
+JoystickKeymap joystick_keymap;
+
 SDL_Surface * screen;
-Text* black_text;
-Text* gold_text;
-Text* blue_text;
-Text* red_text;
-Text* yellow_nums;
-Text* white_text;
-Text* white_small_text;
-Text* white_big_text;
+Font* black_text;
+Font* gold_text;
+Font* silver_text;
+Font* blue_text;
+Font* red_text;
+Font* green_text;
+Font* yellow_nums;
+Font* white_text;
+Font* white_small_text;
+Font* white_big_text;
 
 MouseCursor * mouse_cursor;
 
@@ -44,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;