mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-08-31 18:32:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed mouse binding

Browse Source
This commit is contained in:
Fire_Head
2019-12-01 01:02:34 +03:00
committed by GitHub
parent 37a7c48e63
commit c07272dfa0
1 changed files with 49 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/ControllerConfig.cpp
View File

@@ -1443,8 +1443,6 @@ bool CControllerConfigManager::GetIsMouseButtonDown(RsKeyCodes keycode)
bool CControllerConfigManager::GetIsMouseButtonUp(RsKeyCodes keycode)
{
if (keycode > rsMOUSEX2BUTTON)
{
switch (keycode)
{
case rsMOUSELEFTBUTTON:
@@ -1476,7 +1474,6 @@ bool CControllerConfigManager::GetIsMouseButtonUp(RsKeyCodes keycode)
return true;
break;
}
}
return false;
}
@@ -1662,9 +1659,6 @@ void CControllerConfigManager::DeleteMatchingActionInitiators(e_ControllerAction
bool CControllerConfigManager::GetIsKeyBlank(int32 key, eControllerType type)
{
if (type > JOYSTICK)
return true;
switch (type)
{
case KEYBOARD:
@@ -1755,8 +1749,6 @@ e_ControllerActionType CControllerConfigManager::GetActionType(e_ControllerActio
void CControllerConfigManager::ClearSettingsAssociatedWithAction(e_ControllerAction action, eControllerType type)
{
if (type <= JOYSTICK)
{
switch (type)
{
case KEYBOARD:
@@ -1776,7 +1768,6 @@ void CControllerConfigManager::ClearSettingsAssociatedWithAction(e_ControllerAct
m_aSettings[action][type].m_ContSetOrder = SETORDER_NONE;
break;
}
}
ResetSettingOrder(action);
}
@@ -2257,6 +2248,7 @@ void CControllerConfigManager::UpdateJoyButtonState(int32 padnumber)
for (int32 i = 0; i < MAX_BUTTONS; i++)
m_aButtonStates[i] = false;
#ifdef __DINPUT_INCLUDED__
for (int32 i = 0; i < MAX_BUTTONS; i++)
{
if (m_NewState.rgbButtons[i] & 0x80)
@@ -2264,6 +2256,7 @@ void CControllerConfigManager::UpdateJoyButtonState(int32 padnumber)
else
m_aButtonStates[i] = false;
}
#endif
}
bool CControllerConfigManager::GetIsActionAButtonCombo(e_ControllerAction action)