mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-27 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang

Browse Source
This commit is contained in:
kalaposfos13 2025-03-29 10:15:37 +01:00
parent 7d80d133eb
commit e92481770c
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input/input_handler.cpp
View File

@ -22,11 +22,7 @@
#include "common/elf_info.h" #include "common/elf_info.h"
#include "common/io_file.h" #include "common/io_file.h"
#include "common/path_util.h" #include "common/path_util.h"
<<<<<<< HEAD
=======
#include "common/singleton.h" #include "common/singleton.h"
#include "common/version.h"
>>>>>>> ac515a2bb (Multiple controllers v0)
#include "input/controller.h" #include "input/controller.h"
#include "input/input_mouse.h" #include "input/input_mouse.h"
@ -585,20 +581,20 @@ void ControllerOutput::FinalizeUpdate(u8 gamepad_index) {
break; break;
case Axis::TriggerLeft: case Axis::TriggerLeft:
ApplyDeadzone(new_param, lefttrigger_deadzone); ApplyDeadzone(new_param, lefttrigger_deadzone);
controllers[gamepad_index]->Axis(0, c_axis, GetAxis(0x0, 0x80, *new_param)); controllers[gamepad_index]->Axis(0, c_axis, GetAxis(0x0, 0x7f, *new_param));
controllers[gamepad_index]->CheckButton(0, OrbisPadButtonDataOffset::L2, controllers[gamepad_index]->CheckButton(0, OrbisPadButtonDataOffset::L2,
*new_param > 0x20); *new_param > 0x20);
return; return;
case Axis::TriggerRight: case Axis::TriggerRight:
ApplyDeadzone(new_param, righttrigger_deadzone); ApplyDeadzone(new_param, righttrigger_deadzone);
controllers[gamepad_index]->Axis(0, c_axis, GetAxis(0x0, 0x80, *new_param)); controllers[gamepad_index]->Axis(0, c_axis, GetAxis(0x0, 0x7f, *new_param));
controllers[gamepad_index]->CheckButton(0, OrbisPadButtonDataOffset::R2, controllers[gamepad_index]->CheckButton(0, OrbisPadButtonDataOffset::R2,
*new_param > 0x20); *new_param > 0x20);
return; return;
default: default:
break; break;
} }
controllers[gamepad_index]->Axis(0, c_axis, GetAxis(-0x80, 0x80, *new_param * multiplier)); controllers[gamepad_index]->Axis(0, c_axis, GetAxis(-0x80, 0x7f, *new_param * multiplier));
} }
} }

3
src/sdl_window.cpp
View File

@ -301,8 +301,7 @@ void WindowSDL::OnKeyboardMouseInput(const SDL_Event* event) {
int player_count = Config::GetNumberOfPlayers(); int player_count = Config::GetNumberOfPlayers();
AddUserServiceEvent({OrbisUserServiceEventType::Logout, player_count}); AddUserServiceEvent({OrbisUserServiceEventType::Logout, player_count});
Config::SetNumberOfPlayers(player_count - 1); Config::SetNumberOfPlayers(player_count - 1);
} } else if (input_id == SDLK_F5) {
else if (input_id == SDLK_F5) {
int player_count = Config::GetNumberOfPlayers(); int player_count = Config::GetNumberOfPlayers();
AddUserServiceEvent({OrbisUserServiceEventType::Login, player_count + 1}); AddUserServiceEvent({OrbisUserServiceEventType::Login, player_count + 1});
Config::SetNumberOfPlayers(player_count + 1); Config::SetNumberOfPlayers(player_count + 1);