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

Cleanup CConsole

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-03-25 13:31:31 +01:00
parent 96bf41655a
commit 687446eade
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
r5dev/gameui/IConsole.cpp
View File

@ -220,9 +220,7 @@ void CConsole::BasePanel(bool* bDraw)
std::string svConVar = m_vsvSuggest[m_nSuggestPos].substr(0, m_vsvSuggest[m_nSuggestPos].find(' ')) + " ";
memmove(m_szInputBuf, svConVar.c_str(), svConVar.size() + 1);
m_bSuggestActive = false;
m_nSuggestPos = -1;
m_bReclaimFocus = true;
ResetAutoComplete();
}
else
{
@ -232,9 +230,7 @@ void CConsole::BasePanel(bool* bDraw)
memset(m_szInputBuf, '\0', 1);
}
m_bSuggestActive = false;
m_nSuggestPos = -1;
m_bReclaimFocus = true;
ResetAutoComplete();
}
}
@ -266,9 +262,7 @@ void CConsole::BasePanel(bool* bDraw)
ProcessCommand(m_szInputBuf);
memset(m_szInputBuf, '\0', 1);
}
m_bReclaimFocus = true;
m_nSuggestPos = -1;
m_bSuggestActive = false;
ResetAutoComplete();
}
ImGui::End();
}
@ -333,9 +327,7 @@ void CConsole::SuggestPanel(void)
std::string svConVar = m_vsvSuggest[i].substr(0, m_vsvSuggest[i].find(' ')) + " ";
memmove(m_szInputBuf, svConVar.c_str(), svConVar.size() + 1);
m_bSuggestActive = false;
m_nSuggestPos = -1;
m_bReclaimFocus = true;
ResetAutoComplete();
}
ImGui::PopID();
@ -393,14 +385,23 @@ bool CConsole::CanAutoComplete(void)
// Don't suggest if user tries to assign value to ConVar or execute ConCommand.
if (strstr(m_szInputBuf, " ") || strstr(m_szInputBuf, ";"))
{
m_bSuggestActive = false;
m_nSuggestPos = -1;
ResetAutoComplete();
return false;
}
m_bSuggestActive = true;
return true;
}
//-----------------------------------------------------------------------------
// Purpose: resets the autocomplete window
//-----------------------------------------------------------------------------
void CConsole::ResetAutoComplete(void)
{
m_bSuggestActive = false;
m_nSuggestPos = -1;
m_bReclaimFocus = true;
}
//-----------------------------------------------------------------------------
// Purpose: find ConVars/ConCommands from user input and add to vector
//-----------------------------------------------------------------------------
@ -641,7 +642,7 @@ int CConsole::TextEditCallback(ImGuiInputTextCallbackData* iData)
}
}
}
return 0;
return NULL;
}
//-----------------------------------------------------------------------------

3
r5dev/gameui/IConsole.h
View File

@ -61,8 +61,9 @@ public:
void OptionsPanel(void);
void SuggestPanel(void);
bool CanAutoComplete(void);
void ResetAutoComplete(void);
void FindFromPartial(void);
void ProcessCommand(const char* pszCommand);