Updated email address, grumbel@gmx.de -> grumbel@gmail.com

[supertux.git] / src / worldmap / tux.cpp

diff --git a/src/worldmap/tux.cpp b/src/worldmap/tux.cpp
index 1e6ba7b..dda69c6 100644 (file)
--- a/src/worldmap/tux.cpp
+++ b/src/worldmap/tux.cpp
@@ -1,5 +1,5 @@
 //  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmail.com>
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "control/joystickkeyboardcontroller.hpp"
+#include "control/input_manager.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
@@ -290,7 +290,7 @@ Tux::tryContinueWalking(float elapsed_time)
 void
 Tux::updateInputDirection()
 {
-  Controller *controller = g_jk_controller->get_main_controller();
+  Controller* controller = g_input_manager->get_controller();
   if(controller->hold(Controller::UP))
     input_direction = D_NORTH;
   else if(controller->hold(Controller::DOWN))