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

Fix names to abide by naming conventions

Browse source
This commit is contained in:
Jordy Ruiz 2018-10-31 19:07:54 +01:00
parent 2e5831ad34
commit c27ce66b3a
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ void CBinds::Bind(int KeyID, int Modifier, const char *pStr)
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf); Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf);
} }
int CBinds::getMask(IInput *i) int CBinds::GetModifierMask(IInput *i)
{ {
int Mask = 0; int Mask = 0;
// since we only handle one modifier, when doing ctrl+q and shift+q, execute both // since we only handle one modifier, when doing ctrl+q and shift+q, execute both
@ -78,7 +78,7 @@ bool CBinds::ModifierMatchesKey(int Modifier, int Key)
bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event) bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event)
{ {
int Mask = getMask(Input()); int Mask = GetModifierMask(Input());
bool rtn = false; bool rtn = false;
// don't handle anything but FX and composed binds // don't handle anything but FX and composed binds
@ -102,7 +102,7 @@ bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event)
bool CBinds::OnInput(IInput::CEvent Event) bool CBinds::OnInput(IInput::CEvent Event)
{ {
int Mask = getMask(Input()); int Mask = GetModifierMask(Input());
// don't handle invalid events and keys that aren't set to anything // don't handle invalid events and keys that aren't set to anything
if(Event.m_Key <= 0 || Event.m_Key >= KEY_LAST) if(Event.m_Key <= 0 || Event.m_Key >= KEY_LAST)
@ -184,8 +184,8 @@ void CBinds::ConBind(IConsole::IResult *pResult, void *pUserData)
{ {
CBinds *pBinds = (CBinds *)pUserData; CBinds *pBinds = (CBinds *)pUserData;
const char *pKeyName = pResult->GetString(0); const char *pKeyName = pResult->GetString(0);
int modifier; int Modifier;
int id = pBinds->DecodeBindString(pKeyName, &modifier); int id = pBinds->DecodeBindString(pKeyName, &Modifier);
if(!id) if(!id)
{ {
@ -195,7 +195,7 @@ void CBinds::ConBind(IConsole::IResult *pResult, void *pUserData)
return; return;
} }
pBinds->Bind(id, modifier, pResult->GetString(1)); pBinds->Bind(id, Modifier, pResult->GetString(1));
} }
@ -203,8 +203,8 @@ void CBinds::ConUnbind(IConsole::IResult *pResult, void *pUserData)
{ {
CBinds *pBinds = (CBinds *)pUserData; CBinds *pBinds = (CBinds *)pUserData;
const char *pKeyName = pResult->GetString(0); const char *pKeyName = pResult->GetString(0);
int modifier; int Modifier;
int id = pBinds->DecodeBindString(pKeyName, &modifier); int id = pBinds->DecodeBindString(pKeyName, &Modifier);
if(!id) if(!id)
{ {
@ -214,7 +214,7 @@ void CBinds::ConUnbind(IConsole::IResult *pResult, void *pUserData)
return; return;
} }
pBinds->Bind(id, modifier, ""); pBinds->Bind(id, Modifier, "");
} }

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

@ -44,7 +44,7 @@ public:
const char *Get(int KeyID, int Modifier); const char *Get(int KeyID, int Modifier);
void GetKey(const char *pBindStr, char aBuf[64]); void GetKey(const char *pBindStr, char aBuf[64]);
static const char *GetModifierName(int m); static const char *GetModifierName(int m);
static int getMask(IInput *i); static int GetModifierMask(IInput *i);
static bool ModifierMatchesKey(int Modifier, int Key); static bool ModifierMatchesKey(int Modifier, int Key);
virtual void OnConsoleInit(); virtual void OnConsoleInit();

2
src/game/client/components/menus_settings.cpp
View file

@ -43,7 +43,7 @@ bool CMenusKeyBinder::OnInput(IInput::CEvent Event)
m_GotKey = true; m_GotKey = true;
m_TakeKey = false; m_TakeKey = false;
int Mask = CBinds::getMask(Input()); // always > 0 int Mask = CBinds::GetModifierMask(Input()); // always > 0
m_Modifier = 0; m_Modifier = 0;
while(!(Mask&1)) // this computes a log2, we take the first modifier flag in mask. while(!(Mask&1)) // this computes a log2, we take the first modifier flag in mask.
{ {