Patch for multiple joysticks from const86 <const@mimas.ru>

[supertux.git] / src / supertux / globals.hpp

diff --git a/src/supertux/globals.hpp b/src/supertux/globals.hpp
index eb9a252..8f21b13 100644 (file)
--- a/src/supertux/globals.hpp
+++ b/src/supertux/globals.hpp
@@ -17,7 +17,17 @@
 #ifndef HEADER_SUPERTUX_SUPERTUX_GLOBALS_HPP
 #define HEADER_SUPERTUX_SUPERTUX_GLOBALS_HPP
 
-#include <SDL.h>
+typedef struct SDL_Surface SDL_Surface;
+namespace tinygettext { class DictionaryManager; }
+class Config;
+class JoystickKeyboardController;
+class PlayerStatus;
+class ScreenManager;
+class SoundManager;
+class SpriteManager;
+class TextureManager;
+class TileManager;
+class TileSet;
 
 /** The width of the display (this is a logical value, not the
     physical value, since aspect_ration and projection_area might
@@ -30,11 +40,32 @@ extern int SCREEN_WIDTH;
 extern int SCREEN_HEIGHT;
 
 // global variables
-class  JoystickKeyboardController;
-extern JoystickKeyboardController* g_main_controller;
+extern JoystickKeyboardController* g_jk_controller;
 
 extern SDL_Surface* g_screen;
 
+extern ScreenManager* g_screen_manager;
+
+extern TextureManager* texture_manager;
+
+extern SoundManager* sound_manager;
+
+extern Config* g_config;
+
+extern tinygettext::DictionaryManager* dictionary_manager;
+
+extern float game_time;
+extern float real_time;
+
+extern TileManager *tile_manager;
+
+/** this is only set while loading a map */
+extern TileSet     *current_tileset;
+
+extern SpriteManager* sprite_manager;
+
+extern float g_game_speed;
+
 #endif
 
 /* EOF */