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

Client/CBinds: Rename arguments which refers to the ModifierCombination

Browse source 
The first dimention of m_aapKeyBindings is ModifierCombination
since commit 4326d00df9.

Rename the arguments to make it clear when the arg is a combination
(e.g. the arg value '2' refers to '1 << MODIFIER_SHIFT' instead of 'MODIFIER_CTRL')

This is needed to make the code cleaner and the bugs more obvious.
This commit is contained in:
Alexander Akulich 2022-02-07 00:57:04 +03:00
parent 25f7d42fae
commit 343b2543cc
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,35 +51,35 @@ CBinds::~CBinds()
free(apKeyBinding[i]);
}
void CBinds::Bind(int KeyID, const char *pStr, bool FreeOnly, int Modifier)
void CBinds::Bind(int KeyID, const char *pStr, bool FreeOnly, int ModifierCombination)
{
if(KeyID < 0 || KeyID >= KEY_LAST)
return;
if(FreeOnly && Get(KeyID, Modifier)[0])
if(FreeOnly && Get(KeyID, ModifierCombination)[0])
return;
if(m_aapKeyBindings[Modifier][KeyID])
if(m_aapKeyBindings[ModifierCombination][KeyID])
{
free(m_aapKeyBindings[Modifier][KeyID]);
m_aapKeyBindings[Modifier][KeyID] = 0;
free(m_aapKeyBindings[ModifierCombination][KeyID]);
m_aapKeyBindings[ModifierCombination][KeyID] = 0;
}
// skip modifiers for +xxx binds
if(pStr[0] == '+')
Modifier = 0;
ModifierCombination = 0;
char aBuf[256];
if(!pStr[0])
{
str_format(aBuf, sizeof(aBuf), "unbound %s%s (%d)", GetKeyBindModifiersName(Modifier), Input()->KeyName(KeyID), KeyID);
str_format(aBuf, sizeof(aBuf), "unbound %s%s (%d)", GetKeyBindModifiersName(ModifierCombination), Input()->KeyName(KeyID), KeyID);
}
else
{
int Size = str_length(pStr) + 1;
m_aapKeyBindings[Modifier][KeyID] = (char *)malloc(Size);
str_copy(m_aapKeyBindings[Modifier][KeyID], pStr, Size);
str_format(aBuf, sizeof(aBuf), "bound %s%s (%d) = %s", GetKeyBindModifiersName(Modifier), Input()->KeyName(KeyID), KeyID, m_aapKeyBindings[Modifier][KeyID]);
m_aapKeyBindings[ModifierCombination][KeyID] = (char *)malloc(Size);
str_copy(m_aapKeyBindings[ModifierCombination][KeyID], pStr, Size);
str_format(aBuf, sizeof(aBuf), "bound %s%s (%d) = %s", GetKeyBindModifiersName(ModifierCombination), Input()->KeyName(KeyID), KeyID, m_aapKeyBindings[ModifierCombination][KeyID]);
}
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
}
@ -191,10 +191,10 @@ void CBinds::UnbindAll()
}
}
const char *CBinds::Get(int KeyID, int Modifier)
const char *CBinds::Get(int KeyID, int ModifierCombination)
{
if(KeyID > 0 && KeyID < KEY_LAST && m_aapKeyBindings[Modifier][KeyID])
return m_aapKeyBindings[Modifier][KeyID];
if(KeyID > 0 && KeyID < KEY_LAST && m_aapKeyBindings[ModifierCombination][KeyID])
return m_aapKeyBindings[ModifierCombination][KeyID];
return "";
}
@ -389,22 +389,22 @@ int CBinds::GetKeyID(const char *pKeyName)
return 0;
}
int CBinds::GetBindSlot(const char *pBindString, int *Mod)
int CBinds::GetBindSlot(const char *pBindString, int *pModifierCombination)
{
*Mod = MODIFIER_NONE;
*pModifierCombination = MODIFIER_NONE;
char aMod[32];
aMod[0] = '\0';
const char *pKey = str_next_token(pBindString, "+", aMod, sizeof(aMod));
while(aMod[0] && *(pKey))
{
if(!str_comp(aMod, "shift"))
*Mod |= (1 << MODIFIER_SHIFT);
*pModifierCombination |= (1 << MODIFIER_SHIFT);
else if(!str_comp(aMod, "ctrl"))
*Mod |= (1 << MODIFIER_CTRL);
*pModifierCombination |= (1 << MODIFIER_CTRL);
else if(!str_comp(aMod, "alt"))
*Mod |= (1 << MODIFIER_ALT);
*pModifierCombination |= (1 << MODIFIER_ALT);
else if(!str_comp(aMod, "gui"))
*Mod |= (1 << MODIFIER_GUI);
*pModifierCombination |= (1 << MODIFIER_GUI);
else
return 0;
@ -413,7 +413,7 @@ int CBinds::GetBindSlot(const char *pBindString, int *Mod)
else
break;
}
return GetKeyID(*Mod == MODIFIER_NONE ? aMod : pKey + 1);
return GetKeyID(*pModifierCombination == MODIFIER_NONE ? aMod : pKey + 1);
}
const char *CBinds::GetModifierName(int Modifier)
@ -434,13 +434,13 @@ const char *CBinds::GetModifierName(int Modifier)
}
}
const char *CBinds::GetKeyBindModifiersName(int Modifier)
const char *CBinds::GetKeyBindModifiersName(int ModifierCombination)
{
static char aModifier[256];
aModifier[0] = '\0';
for(int k = 1; k < MODIFIER_COUNT; k++)
{
if(Modifier & (1 << k))
if(ModifierCombination & (1 << k))
{
str_append(aModifier, GetModifierName(k), sizeof(aModifier));
str_append(aModifier, "+", sizeof(aModifier));

8
src/game/client/components/binds.h
View file

@ -47,17 +47,17 @@ public:
CBindsSpecial m_SpecialBinds;
void Bind(int KeyID, const char *pStr, bool FreeOnly = false, int Modifier = MODIFIER_NONE);
void Bind(int KeyID, const char *pStr, bool FreeOnly = false, int ModifierCombination = MODIFIER_NONE);
void SetDefaults();
void UnbindAll();
const char *Get(int KeyID, int Modifier);
const char *Get(int KeyID, int ModifierCombination);
void GetKey(const char *pBindStr, char *aBuf, unsigned BufSize);
int GetBindSlot(const char *pBindString, int *Modifier);
int GetBindSlot(const char *pBindString, int *pModifierCombination);
static int GetModifierMask(IInput *i);
static int GetModifierMaskOfKey(int Key);
static bool ModifierMatchesKey(int Modifier, int Key);
static const char *GetModifierName(int Modifier);
static const char *GetKeyBindModifiersName(int Modifier);
static const char *GetKeyBindModifiersName(int ModifierCombination);
virtual void OnConsoleInit() override;
virtual bool OnInput(IInput::CEvent Event) override;