RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-07 23:45:12 +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

12
rpcs3/Input/evdev_joystick_handler.cpp
View file

@ -1242,12 +1242,12 @@ void evdev_joystick_handler::apply_pad_data(const pad_ensemble& binding)
SetRumble(evdev_device, force_large, force_small);
}
bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad, u8 player_id)
bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
{
if (!pad || player_id >= g_cfg_input.player.size())
if (!pad || pad->m_player_id >= g_cfg_input.player.size())
return false;
const cfg_player* player_config = g_cfg_input.player[player_id];
const cfg_player* player_config = g_cfg_input.player[pad->m_player_id];
if (!pad)
return false;
@ -1255,9 +1255,9 @@ bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad, u8 player
m_dev = std::make_shared<EvdevDevice>();
m_pad_configs[player_id].from_string(player_config->config.to_string());
m_dev->config = &m_pad_configs[player_id];
m_dev->player_id = player_id;
m_pad_configs[pad->m_player_id].from_string(player_config->config.to_string());
m_dev->config = &m_pad_configs[pad->m_player_id];
m_dev->player_id = pad->m_player_id;
cfg_pad* cfg = m_dev->config;
if (!cfg)
return false;