new versions of all fonts

[supertux.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index d80e8cf..5a68fc8 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -24,29 +24,35 @@
 
 #include <string>
 #include <SDL.h>
-#include "text.h"
+#include "screen/font.h"
 #include "menu.h"
 #include "mousecursor.h"
 
 extern std::string datadir;
 
-/* Joystick buttons and axes: */
-extern int JOY_A;
-extern int JOY_B;
-extern int JOY_START;
+struct JoystickKeymap
+{
+  int a_button;
+  int b_button;
+  int start_button;
 
-extern int JOY_X;
-extern int JOY_Y;
+  int x_axis;
+  int y_axis;
+  
+  int dead_zone;
 
-extern SDL_Surface * screen;
-extern Text* black_text;
-extern Text* gold_text;
-extern Text* white_text;
-extern Text* white_small_text;
-extern Text* white_big_text;
-extern Text* blue_text;
-extern Text* red_text;
-extern Text* yellow_nums;
+  JoystickKeymap();
+};
+
+extern JoystickKeymap joystick_keymap;
+
+extern SDL_Surface* screen;
+extern Font* gold_text;
+extern Font* white_text;
+extern Font* white_small_text;
+extern Font* white_big_text;
+extern Font* blue_text;
+extern Font* yellow_nums;
 
 extern MouseCursor * mouse_cursor;
 
@@ -59,7 +65,7 @@ extern bool show_fps;
 /** The number of the joystick that will be use in the game */
 extern int joystick_num;
 extern char* level_startup_file;
-extern bool launch_worldmap_mode;
+extern bool launch_leveleditor_mode;
 
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
 extern char* st_dir;
@@ -70,6 +76,4 @@ extern SDL_Joystick * js;
 
 int wait_for_event(SDL_Event& event,unsigned int min_delay = 0, unsigned int max_delay = 0, bool empty_events = false);
 
-#define JOYSTICK_DEAD_ZONE 4096
-
 #endif /* SUPERTUX_GLOBALS_H */