Rename g_FlagSet to g_FlagCharSet to avoid some confusion.

This commit is contained in:
Nicholas Hastings 2015-02-03 10:26:28 -05:00
parent cf9dd08c45
commit 19be28cc2e

View File

@ -48,7 +48,7 @@
AdminCache g_Admins; AdminCache g_Admins;
char g_ReverseFlags[26]; char g_ReverseFlags[26];
AdminFlag g_FlagLetters[26]; AdminFlag g_FlagLetters[26];
bool g_FlagSet[26]; bool g_FlagCharSet[26];
/* Default flags */ /* Default flags */
AdminFlag g_DefaultFlags[26] = AdminFlag g_DefaultFlags[26] =
@ -72,9 +72,9 @@ public:
memcpy(g_FlagLetters, g_DefaultFlags, sizeof(AdminFlag) * 26); memcpy(g_FlagLetters, g_DefaultFlags, sizeof(AdminFlag) * 26);
for (unsigned int i=0; i<20; i++) for (unsigned int i=0; i<20; i++)
{ {
g_FlagSet[i] = true; g_FlagCharSet[i] = true;
} }
g_FlagSet[25] = true; g_FlagCharSet[25] = true;
} }
} }
private: private:
@ -104,7 +104,7 @@ private:
{ {
m_LevelState = LEVEL_STATE_NONE; m_LevelState = LEVEL_STATE_NONE;
m_IgnoreLevel = 0; m_IgnoreLevel = 0;
memset(g_FlagSet, 0, sizeof(g_FlagSet)); memset(g_FlagCharSet, 0, sizeof(g_FlagCharSet));
} }
SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name) SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name)
{ {
@ -164,7 +164,7 @@ private:
return SMCResult_Continue; return SMCResult_Continue;
} }
g_FlagSet[c] = true; g_FlagCharSet[c] = true;
return SMCResult_Continue; return SMCResult_Continue;
} }
@ -1585,7 +1585,7 @@ bool AdminCache::FindFlag(char c, AdminFlag *pAdmFlag)
{ {
if (c < 'a' if (c < 'a'
|| c > 'z' || c > 'z'
|| !g_FlagSet[(unsigned)c - (unsigned)'a']) || !g_FlagCharSet[(unsigned)c - (unsigned)'a'])
{ {
return false; return false;
} }
@ -1600,7 +1600,7 @@ bool AdminCache::FindFlag(char c, AdminFlag *pAdmFlag)
bool AdminCache::FindFlagChar(AdminFlag flag, char *c) bool AdminCache::FindFlagChar(AdminFlag flag, char *c)
{ {
if (!g_FlagSet[flag]) if (!g_FlagCharSet[flag])
{ {
return false; return false;
} }