diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-24 17:08:07 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-24 17:39:31 +0100 |
| commit | a0bf47cfd2e510dc9d3ce55fc3020bde6b8a668b (patch) | |
| tree | a9798b825ba3564b101619969a15b76ae30fee8c /src/core/ControllerConfig.cpp | |
| parent | Fix CCollision::DistToLine (diff) | |
| download | re3-a0bf47cfd2e510dc9d3ce55fc3020bde6b8a668b.tar re3-a0bf47cfd2e510dc9d3ce55fc3020bde6b8a668b.tar.gz re3-a0bf47cfd2e510dc9d3ce55fc3020bde6b8a668b.tar.bz2 re3-a0bf47cfd2e510dc9d3ce55fc3020bde6b8a668b.tar.lz re3-a0bf47cfd2e510dc9d3ce55fc3020bde6b8a668b.tar.xz re3-a0bf47cfd2e510dc9d3ce55fc3020bde6b8a668b.tar.zst re3-a0bf47cfd2e510dc9d3ce55fc3020bde6b8a668b.zip | |
Diffstat (limited to 'src/core/ControllerConfig.cpp')
| -rw-r--r-- | src/core/ControllerConfig.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp index 6e9db6e3..4115cd38 100644 --- a/src/core/ControllerConfig.cpp +++ b/src/core/ControllerConfig.cpp @@ -2784,9 +2784,10 @@ wchar *CControllerConfigManager::GetButtonComboText(e_ControllerAction action) void CControllerConfigManager::SetControllerKeyAssociatedWithAction(e_ControllerAction action, int32 key, eControllerType type) { ResetSettingOrder(action); + int numOfSettings = GetNumOfSettingsForAction(action); 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) @@ -2796,8 +2797,10 @@ int32 CControllerConfigManager::GetMouseButtonAssociatedWithAction(e_ControllerA void CControllerConfigManager::SetMouseButtonAssociatedWithAction(e_ControllerAction action, int32 button) { + int numOfSettings = GetNumOfSettingsForAction(action); + 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) |