delete useless include and open joystick in InputSourceGameController constructor.

client/eventsSDL/GameControllerShortcuts.cpp

@@ -7,6 +7,7 @@
 * Full text of license available in license.txt file, in main folder
 *
 */
+#include <SDL.h>
 
 #include "StdInc.h"
 #include "GameControllerShortcuts.h"

client/eventsSDL/GameControllerShortcuts.h

@@ -10,8 +10,6 @@
 
 #pragma once
 
-#include <map>
-#include <SDL.h>
 #include "../gui/Shortcut.h"
 
 using ButtonShortcutsMap = std::map<int, std::vector<EShortcut> >;

client/eventsSDL/InputHandler.cpp

@@ -349,8 +349,3 @@ const Point & InputHandler::getCursorPosition() const
 {
 	return cursorPosition;
 }
-
-void InputHandler::tryOpenGameController()
-{
-    gameControllerHandler->tryOpenAllGameControllers();
-}

client/eventsSDL/InputHandler.h

@@ -87,6 +87,4 @@ public:
 	bool isKeyboardCtrlDown() const;
 	bool isKeyboardShiftDown() const;
 
-    /// If any game controller available, use it.
-    void tryOpenGameController();
 };

client/eventsSDL/InputSourceGameController.cpp

@@ -34,7 +34,7 @@ InputSourceGameController::InputSourceGameController():
     planDisX(0.0),
     planDisY(0.0)
 {
-    // SDL_init has not been called. so it is unnecessary to open joystick.
+    tryOpenAllGameControllers();
 }
 
 void InputSourceGameController::tryOpenAllGameControllers()

client/eventsSDL/InputSourceGameController.h

@@ -10,10 +10,8 @@
 
 #pragma once
 
-#include <memory>
 #include <SDL.h>
 
-#include "../../lib/Point.h"
 #include "../gui/Shortcut.h"
 
 

client/gui/CGuiHandler.cpp

@@ -79,9 +79,6 @@ void CGuiHandler::init()
 	inputHandlerInstance = std::make_unique<InputHandler>(); // Must be after windowHandlerInstance
 	shortcutsHandlerInstance = std::make_unique<ShortcutHandler>();
 	framerateManagerInstance = std::make_unique<FramerateManager>(settings["video"]["targetfps"].Integer());
-
-    // This must be called after SDL_init(), so put after screenHandlerInstance init.
-    inputHandlerInstance->tryOpenGameController();
 }
 
 void CGuiHandler::handleEvents()