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 0fe3f79..8f21b13 100644 (file)
--- a/src/supertux/globals.hpp
+++ b/src/supertux/globals.hpp
@@ -23,20 +23,24 @@ class Config;
 class JoystickKeyboardController;
 class PlayerStatus;
 class ScreenManager;
-class Size;
 class SoundManager;
 class SpriteManager;
 class TextureManager;
 class TileManager;
 class TileSet;
 
-/** The width/height of the display (this is a logical value, not the
+/** The width of the display (this is a logical value, not the
     physical value, since aspect_ration and projection_area might
     shrink or scale things) */
-extern Size SCREEN_SIZE;
+extern int SCREEN_WIDTH;
+
+/** The width of the display (this is a logical value, not the
+    physical value, since aspect_ration and projection_area might
+    shrink or scale things) */
+extern int SCREEN_HEIGHT;
 
 // global variables
-extern JoystickKeyboardController* g_main_controller;
+extern JoystickKeyboardController* g_jk_controller;
 
 extern SDL_Surface* g_screen;