ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken map fire to select which lead to duplicated events

Browse Source
This commit is contained in:
Benau
2020-03-29 09:32:01 +08:00
parent da5cbee577
commit da4b985b8f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/input/device_manager.cpp
View File

@@ -494,10 +494,13 @@ bool DeviceManager::translateInput( Input::InputType type,
// that should be mapped to select
if(!device && m_map_fire_to_select)
{
PlayerAction fire_action = PA_BEFORE_FIRST;
device = mapKeyboardInput(button_id, InputManager::INGAME, player,
action);
if(device && *action == PA_FIRE)
&fire_action);
if (device && fire_action == PA_FIRE)
*action = PA_MENU_SELECT;
else
device = NULL;
}
break;
case Input::IT_STICKBUTTON:
@@ -506,10 +509,13 @@ bool DeviceManager::translateInput( Input::InputType type,
mode, player, action);
if(!device && m_map_fire_to_select)
{
PlayerAction fire_action = PA_BEFORE_FIRST;
device = mapGamepadInput(type, device_id, button_id, axis_dir, value,
InputManager::INGAME, player, action);
if(device && *action == PA_FIRE)
InputManager::INGAME, player, &fire_action);
if (device && fire_action == PA_FIRE)
*action = PA_MENU_SELECT;
else
device = NULL;
}
break;
default: