R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

CConsole::FindFromPartial light cleanup

Browse Source 
Improve readability by moving logic out of conditional scopes.
This commit is contained in:
Kawe Mazidjatari 2022-10-07 22:31:16 +02:00
parent 703caebe6b
commit 10f728081c
1 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
r5dev/gameui/IConsole.cpp
View File

@ -449,19 +449,26 @@ void CConsole::FindFromPartial(void)
for (size_t i = 0; i < m_vsvCommandBases.size(); i++) for (size_t i = 0; i < m_vsvCommandBases.size(); i++)
{ {
if (m_vSuggest.size() < con_suggestion_limit->GetSizeT()) if (m_vSuggest.size() >= con_suggestion_limit->GetSizeT())
{ {
if (m_vsvCommandBases[i].m_svName.find(m_szInputBuf) != string::npos) return;
}
if (m_vsvCommandBases[i].m_svName.find(m_szInputBuf) == string::npos)
{ {
continue;
}
if (std::find(m_vSuggest.begin(), m_vSuggest.end(), if (std::find(m_vSuggest.begin(), m_vSuggest.end(),
m_vsvCommandBases[i].m_svName) == m_vSuggest.end()) m_vsvCommandBases[i].m_svName) == m_vSuggest.end())
{ {
string svValue; int nFlags = 0; string svValue; int nFlags = FCVAR_NONE;
ConCommandBase* pCommandBase = g_pCVar->FindCommandBase(m_vsvCommandBases[i].m_svName.c_str());
if (ConCommandBase* pCommandBase = g_pCVar->FindCommandBase(m_vsvCommandBases[i].m_svName.c_str())) if (!pCommandBase || pCommandBase->IsFlagSet(FCVAR_HIDDEN))
{
if (!pCommandBase->IsFlagSet(FCVAR_HIDDEN))
{ {
continue;
}
if (!pCommandBase->IsCommand()) if (!pCommandBase->IsCommand())
{ {
ConVar* pConVar = reinterpret_cast<ConVar*>(pCommandBase); ConVar* pConVar = reinterpret_cast<ConVar*>(pCommandBase);
@ -502,10 +509,6 @@ void CConsole::FindFromPartial(void)
} }
m_vSuggest.push_back(CSuggest(m_vsvCommandBases[i].m_svName + svValue, nFlags)); m_vSuggest.push_back(CSuggest(m_vsvCommandBases[i].m_svName + svValue, nFlags));
} }
}
}
}
}
else { break; } else { break; }
} }
std::sort(m_vSuggest.begin(), m_vSuggest.end()); std::sort(m_vSuggest.begin(), m_vSuggest.end());