edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

CBinds::GetModifierMask: Make the method actually returning the mask

Browse source 
... instead of the modifier enum value.

This fixes CMenusKeyBinder which now saves the bindings into the right slot.
This commit is contained in:
Alexander Akulich 2022-02-07 01:30:19 +03:00
parent ae482d018f
commit 2233ca98c1
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/game/client/components/binds.cpp
View file

@ -87,14 +87,24 @@ void CBinds::Bind(int KeyID, const char *pStr, bool FreeOnly, int ModifierCombin
int CBinds::GetModifierMask(IInput *i)
{
int Mask = 0;
Mask |= i->KeyIsPressed(KEY_LSHIFT) << CBinds::MODIFIER_SHIFT;
Mask |= i->KeyIsPressed(KEY_RSHIFT) << CBinds::MODIFIER_SHIFT;
Mask |= i->KeyIsPressed(KEY_LCTRL) << CBinds::MODIFIER_CTRL;
Mask |= i->KeyIsPressed(KEY_RCTRL) << CBinds::MODIFIER_CTRL;
Mask |= i->KeyIsPressed(KEY_LALT) << CBinds::MODIFIER_ALT;
Mask |= i->KeyIsPressed(KEY_RALT) << CBinds::MODIFIER_ALT;
Mask |= i->KeyIsPressed(KEY_LGUI) << CBinds::MODIFIER_GUI;
Mask |= i->KeyIsPressed(KEY_RGUI) << CBinds::MODIFIER_GUI;
static const auto ModifierKeys = {
KEY_LSHIFT,
KEY_RSHIFT,
KEY_LCTRL,
KEY_RCTRL,
KEY_LALT,
KEY_RALT,
KEY_LGUI,
KEY_RGUI,
};
for(const auto Key : ModifierKeys)
{
if(i->KeyIsPressed(Key))
{
Mask |= GetModifierMaskOfKey(Key);
}
}
if(!Mask)
return 1 << CBinds::MODIFIER_NONE;