RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 14:37:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

input: move player_id to pad struct

Browse source
This commit is contained in:
Megamouse 2024-07-06 18:41:41 +02:00
parent 6948c0a30a
commit d23ac6f598
10 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Input/pad_thread.cpp
View file

@ -171,7 +171,7 @@ void pad_thread::Init()
}
cur_pad_handler->Init();
m_pads[i] = std::make_shared<Pad>(handler_type, CELL_PAD_STATUS_DISCONNECTED, pad_settings[i].device_capability, pad_settings[i].device_type);
m_pads[i] = std::make_shared<Pad>(handler_type, i, CELL_PAD_STATUS_DISCONNECTED, pad_settings[i].device_capability, pad_settings[i].device_type);
if (pad_settings[i].is_ldd_pad)
{
@ -179,11 +179,11 @@ void pad_thread::Init()
}
else
{
if (!cur_pad_handler->bindPadToDevice(m_pads[i], i))
if (!cur_pad_handler->bindPadToDevice(m_pads[i]))
{
// Failed to bind the device to cur_pad_handler so binds to NullPadHandler
input_log.error("Failed to bind device '%s' to handler %s. Falling back to NullPadHandler.", cfg->device.to_string(), handler_type);
nullpad->bindPadToDevice(m_pads[i], i);
nullpad->bindPadToDevice(m_pads[i]);
}
input_log.notice("Pad %d: device='%s', handler=%s, VID=0x%x, PID=0x%x, class_type=0x%x, class_profile=0x%x",