mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-04-20 11:35:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

2
src/core/libraries/system/userservice.cpp
View file

@ -124,7 +124,7 @@ s32 PS4_SYSV_ABI sceUserServiceGetEvent(OrbisUserServiceEvent* event) {
event->userId = temp.userId;
user_service_event_queue.pop();
LOG_INFO(Lib_UserService, "Event processed by the game: {} {}", (u8)temp.event,
temp.userId);
temp.userId);
return ORBIS_OK;
}

10
src/input/input_handler.cpp
View file

@ -22,11 +22,7 @@
#include "common/elf_info.h"
#include "common/io_file.h"
#include "common/path_util.h"
<<<<<<< HEAD
=======
#include "common/singleton.h"
#include "common/version.h"
>>>>>>> ac515a2bb (Multiple controllers v0)
#include "input/controller.h"
#include "input/input_mouse.h"
@ -585,20 +581,20 @@ void ControllerOutput::FinalizeUpdate(u8 gamepad_index) {
break;
case Axis::TriggerLeft:
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,
*new_param > 0x20);
return;
case Axis::TriggerRight:
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,
*new_param > 0x20);
return;
default:
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();
AddUserServiceEvent({OrbisUserServiceEventType::Logout, player_count});
Config::SetNumberOfPlayers(player_count - 1);
}
else if (input_id == SDLK_F5) {
} else if (input_id == SDLK_F5) {
int player_count = Config::GetNumberOfPlayers();
AddUserServiceEvent({OrbisUserServiceEventType::Login, player_count + 1});
Config::SetNumberOfPlayers(player_count + 1);