diff options
Diffstat (limited to 'src/input_common')
-rw-r--r-- | src/input_common/drivers/mouse.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/sdl_driver.cpp | 6 | ||||
-rw-r--r-- | src/input_common/input_engine.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index aa69216c8..ac61591b0 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -31,7 +31,7 @@ Mouse::Mouse(std::string input_engine_) : InputEngine(std::move(input_engine_)) PreSetAxis(identifier, wheel_axis_x); PreSetAxis(identifier, wheel_axis_y); PreSetAxis(identifier, touch_axis_x); - PreSetAxis(identifier, touch_axis_x); + PreSetAxis(identifier, touch_axis_y); update_thread = std::jthread([this](std::stop_token stop_token) { UpdateThread(stop_token); }); } diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 757117f2b..41701e24d 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -201,6 +201,12 @@ public: return "XBox 360 Controller"; case SDL_CONTROLLER_TYPE_XBOXONE: return "XBox One Controller"; + case SDL_CONTROLLER_TYPE_PS3: + return "DualShock 3 Controller"; + case SDL_CONTROLLER_TYPE_PS4: + return "DualShock 4 Controller"; + case SDL_CONTROLLER_TYPE_PS5: + return "DualSense Controller"; default: break; } diff --git a/src/input_common/input_engine.cpp b/src/input_common/input_engine.cpp index b57330e51..0508b408d 100644 --- a/src/input_common/input_engine.cpp +++ b/src/input_common/input_engine.cpp @@ -173,7 +173,7 @@ void InputEngine::ResetButtonState() { SetButton(controller.first, button.first, false); } for (const auto& button : controller.second.hat_buttons) { - SetHatButton(controller.first, button.first, false); + SetHatButton(controller.first, button.first, 0); } } } |