X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fglobals.h;h=5a68fc810953cffedcfa26ac55b39030c18ffc0f;hb=28dcc843a7500b395730e5f5eb821577f0b9d797;hp=e205c5bf4c0de06364e253dcab5e384248bf010a;hpb=9e082fc66762cb43a25955a971082a0a5aab0840;p=supertux.git

diff --git a/src/globals.h b/src/globals.h
index e205c5bf4..5a68fc810 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,36 +1,58 @@
-/*
-  globals.h
-  
-  Super Tux - Global Variabls
-  
-  by Bill Kendrick
-  bill@newbreedsoftware.com
-  http://www.newbreedsoftware.com/supertux/
-  
-  April 11, 2000 - March 15, 2004
-*/
-
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 Bill Kendrick <bill@newbreedsoftware.com>
+//                     Tobias Glaesser <tobi.web@gmx.de>
+//                     Ingo Ruhnke <grumbel@gmx.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef SUPERTUX_GLOBALS_H
 #define SUPERTUX_GLOBALS_H
 
 #include <string>
 #include <SDL.h>
-#include "text.h"
+#include "screen/font.h"
 #include "menu.h"
 #include "mousecursor.h"
 
 extern std::string datadir;
 
-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;
+struct JoystickKeymap
+{
+  int a_button;
+  int b_button;
+  int start_button;
+
+  int x_axis;
+  int y_axis;
+  
+  int dead_zone;
+
+  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;
 
@@ -43,16 +65,15 @@ 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;
 extern char* st_save_dir;
 
+extern float game_speed;
 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 */