edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 09:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add assertions to CBinds::Bind and Get functions

Browse source
This commit is contained in:
Robert Müller 2024-08-04 21:27:08 +02:00
parent 8fd40efe36
commit 9f6cb92cb9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,8 +51,8 @@ CBinds::~CBinds()
void CBinds::Bind(int KeyId, const char *pStr, bool FreeOnly, int ModifierCombination) void CBinds::Bind(int KeyId, const char *pStr, bool FreeOnly, int ModifierCombination)
{ {
if(KeyId < 0 || KeyId >= KEY_LAST) dbg_assert(KeyId >= KEY_FIRST && KeyId < KEY_LAST, "KeyId invalid");
return; dbg_assert(ModifierCombination >= MODIFIER_NONE && ModifierCombination < MODIFIER_COMBINATION_COUNT, "ModifierCombination invalid");
if(FreeOnly && Get(KeyId, ModifierCombination)[0]) if(FreeOnly && Get(KeyId, ModifierCombination)[0])
return; return;
@ -189,9 +189,9 @@ void CBinds::UnbindAll()
const char *CBinds::Get(int KeyId, int ModifierCombination) const char *CBinds::Get(int KeyId, int ModifierCombination)
{ {
if(KeyId > 0 && KeyId < KEY_LAST && m_aapKeyBindings[ModifierCombination][KeyId]) dbg_assert(KeyId >= KEY_FIRST && KeyId < KEY_LAST, "KeyId invalid");
return m_aapKeyBindings[ModifierCombination][KeyId]; dbg_assert(ModifierCombination >= MODIFIER_NONE && ModifierCombination < MODIFIER_COMBINATION_COUNT, "ModifierCombination invalid");
return ""; return m_aapKeyBindings[ModifierCombination][KeyId] ? m_aapKeyBindings[ModifierCombination][KeyId] : "";
} }
void CBinds::GetKey(const char *pBindStr, char *pBuf, size_t BufSize) void CBinds::GetKey(const char *pBindStr, char *pBuf, size_t BufSize)