a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 15:10:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #278 from Fire-Head/master

Browse source 
fixed mouse binding
This commit is contained in:
erorcun 2019-12-02 22:37:45 +03:00 committed by GitHub
parent 5289f398ea c07272dfa0
commit eea84b86b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/ControllerConfig.cpp
View file

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