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 f6b9dfc..8f21b13 100644 (file)
--- a/src/supertux/globals.hpp
+++ b/src/supertux/globals.hpp
@@ -40,7 +40,7 @@ extern int SCREEN_WIDTH;
 extern int SCREEN_HEIGHT;
 
 // global variables
-extern JoystickKeyboardController* g_main_controller;
+extern JoystickKeyboardController* g_jk_controller;
 
 extern SDL_Surface* g_screen;
 
@@ -62,9 +62,6 @@ extern TileManager *tile_manager;
 /** this is only set while loading a map */
 extern TileSet     *current_tileset;
 
-// global player state
-extern PlayerStatus* player_status;
-
 extern SpriteManager* sprite_manager;
 
 extern float g_game_speed;