Added conversion from and to Vector to Sizef

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

diff --git a/src/supertux/globals.hpp b/src/supertux/globals.hpp
index 8902619..6aca5eb 100644 (file)
--- a/src/supertux/globals.hpp
+++ b/src/supertux/globals.hpp
@@ -1,5 +1,5 @@
 //  SuperTux
-//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmail.com>
 //
 //  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
@@ -20,7 +20,7 @@
 typedef struct SDL_Surface SDL_Surface;
 namespace tinygettext { class DictionaryManager; }
 class Config;
-class JoystickKeyboardController;
+class InputManager;
 class PlayerStatus;
 class ScreenManager;
 class SoundManager;
@@ -40,7 +40,7 @@ extern int SCREEN_WIDTH;
 extern int SCREEN_HEIGHT;
 
 // global variables
-extern JoystickKeyboardController* g_jk_controller;
+extern InputManager* g_input_manager;
 
 extern ScreenManager* g_screen_manager;