games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

delete useless include and open joystick in InputSourceGameController constructor.

Browse Source
This commit is contained in:
kdmcser
2024-04-15 22:43:37 +08:00
parent cee8d34fc5
commit 876bae0b73
7 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/eventsSDL/GameControllerShortcuts.cpp
View File

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

2
client/eventsSDL/GameControllerShortcuts.h
View File

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

5
client/eventsSDL/InputHandler.cpp
View File

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

2
client/eventsSDL/InputHandler.h
View File

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

2
client/eventsSDL/InputSourceGameController.cpp
View File

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

2
client/eventsSDL/InputSourceGameController.h
View File

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

3
client/gui/CGuiHandler.cpp
View File

@ -79,9 +79,6 @@ void CGuiHandler::init()
inputHandlerInstance = std::make_unique<InputHandler>(); // Must be after windowHandlerInstance inputHandlerInstance = std::make_unique<InputHandler>(); // Must be after windowHandlerInstance
shortcutsHandlerInstance = std::make_unique<ShortcutHandler>(); shortcutsHandlerInstance = std::make_unique<ShortcutHandler>();
framerateManagerInstance = std::make_unique<FramerateManager>(settings["video"]["targetfps"].Integer()); 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() void CGuiHandler::handleEvents()