Improve fix for #3099

This commit is contained in:
auria.mg 2018-01-15 20:58:05 -05:00
parent 1d9d628855
commit 10831b210e

View File

@ -388,8 +388,11 @@ InputDevice *DeviceManager::mapGamepadInput(Input::InputType type,
if (gPad != NULL)
{
// Ignore deadzone events if this isn't the latest used device
if (m_latest_used_device != gPad && *value > -250 && *value < 250 /* TODO: use deadzone config */)
// Ignore deadzone events if this isn't the latest used device in
// single-player mode (allowing the player to switch device at any time)
int dz = static_cast<GamepadConfig*>(gPad->getConfiguration())->getDeadzone();
if (m_single_player != NULL && m_latest_used_device != gPad
&& *value > -dz && *value < dz)
{
*player = NULL;
return NULL;