preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert checking for padId. Should fix #21869

Browse Source
This commit is contained in:
Henrik Rydgård
2026-06-30 09:57:28 +02:00
parent cfd9c62f17
commit bb32eb2987
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SDL/SDLJoystick.cpp
+5 -14
View File
@@ -171,32 +171,23 @@ InputKeyCode SDLJoystick::getKeycodeForButton(SDL_GamepadButton button) {
void SDLJoystick::ProcessInput(const SDL_Event &event){ void SDLJoystick::ProcessInput(const SDL_Event &event){
switch (event.type) { switch (event.type) {
case SDL_EVENT_GAMEPAD_BUTTON_DOWN: case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
{
auto code = getKeycodeForButton((SDL_GamepadButton)event.gbutton.button);
if (code != NKCODE_UNKNOWN) {
KeyInput key;
key.flags = KeyInputFlags::DOWN;
key.keyCode = code;
key.deviceId = DEVICE_ID_PAD_0 + getDeviceIndex(event.gbutton.which);
NativeKey(key);
}
break;
}
case SDL_EVENT_GAMEPAD_BUTTON_UP: case SDL_EVENT_GAMEPAD_BUTTON_UP:
{ {
auto code = getKeycodeForButton((SDL_GamepadButton)event.gbutton.button); auto code = getKeycodeForButton((SDL_GamepadButton)event.gbutton.button);
if (code != NKCODE_UNKNOWN) { if (code != NKCODE_UNKNOWN) {
const int padId = 0; // previously getDeviceIndex(event.gbutton.which), but for now we force all pads to pad0 for config compatibility.
KeyInput key; KeyInput key;
key.flags = KeyInputFlags::UP; key.flags = event.type == SDL_EVENT_GAMEPAD_BUTTON_DOWN ? KeyInputFlags::DOWN : KeyInputFlags::UP;
key.keyCode = code; key.keyCode = code;
key.deviceId = DEVICE_ID_PAD_0 + getDeviceIndex(event.gbutton.which); key.deviceId = DEVICE_ID_PAD_0 + padId;
NativeKey(key); NativeKey(key);
} }
break; break;
} }
case SDL_EVENT_GAMEPAD_AXIS_MOTION: case SDL_EVENT_GAMEPAD_AXIS_MOTION:
{ {
InputDeviceID deviceId = DEVICE_ID_PAD_0 + getDeviceIndex(event.gaxis.which); const int padId = 0; // previously getDeviceIndex(event.gaxis.which), but for now we force all pads to pad0 for config compatibility.
InputDeviceID deviceId = DEVICE_ID_PAD_0 + padId;
InputAxis axisId = (InputAxis)event.gaxis.axis; InputAxis axisId = (InputAxis)event.gaxis.axis;
float value = event.gaxis.value * (1.f / 32767.f); float value = event.gaxis.value * (1.f / 32767.f);
if (value > 1.0f) value = 1.0f; if (value > 1.0f) value = 1.0f;