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

[supertux.git] / src / object / player.cpp

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 86318a5..c456dec 100644 (file)
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -152,7 +152,7 @@ Player::Player(PlayerStatus* _player_status, const std::string& name) :
   climbing(0)
 {
   this->name = name;
-  controller = g_main_controller;
+  controller = g_jk_controller->get_main_controller();
   scripting_controller.reset(new CodeController());
   // if/when we have complete penny gfx, we can
   // load those instead of Tux's sprite in the