Archive/gta-re3
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix out of bound binding orders

Browse source
This commit is contained in:
erorcun 2021-01-24 19:08:07 +03:00
parent ca1de3cd17
commit b728f8de64
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/ControllerConfig.cpp
View file

@ -2755,9 +2755,10 @@ wchar *CControllerConfigManager::GetButtonComboText(e_ControllerAction action)
void CControllerConfigManager::SetControllerKeyAssociatedWithAction(e_ControllerAction action, int32 key, eControllerType type) void CControllerConfigManager::SetControllerKeyAssociatedWithAction(e_ControllerAction action, int32 key, eControllerType type)
{ {
ResetSettingOrder(action); ResetSettingOrder(action);
int numOfSettings = GetNumOfSettingsForAction(action);
m_aSettings[action][type].m_Key = key; m_aSettings[action][type].m_Key = key;
m_aSettings[action][type].m_ContSetOrder = GetNumOfSettingsForAction(action) + 1; m_aSettings[action][type].m_ContSetOrder = numOfSettings + 1;
} }
int32 CControllerConfigManager::GetMouseButtonAssociatedWithAction(e_ControllerAction action) int32 CControllerConfigManager::GetMouseButtonAssociatedWithAction(e_ControllerAction action)
@ -2767,8 +2768,10 @@ int32 CControllerConfigManager::GetMouseButtonAssociatedWithAction(e_ControllerA
void CControllerConfigManager::SetMouseButtonAssociatedWithAction(e_ControllerAction action, int32 button) void CControllerConfigManager::SetMouseButtonAssociatedWithAction(e_ControllerAction action, int32 button)
{ {
int numOfSettings = GetNumOfSettingsForAction(action);
m_aSettings[action][MOUSE].m_Key = button; m_aSettings[action][MOUSE].m_Key = button;
m_aSettings[action][MOUSE].m_ContSetOrder = GetNumOfSettingsForAction(action) + 1; m_aSettings[action][MOUSE].m_ContSetOrder = numOfSettings + 1;
} }
void CControllerConfigManager::ResetSettingOrder(e_ControllerAction action) void CControllerConfigManager::ResetSettingOrder(e_ControllerAction action)