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

Console bug fixes

Browse Source 
* Fixed bug where in several occasions 'm_bSuggestActive' would be true while we have nothing to suggest.
* Fixed bug where using the submit button in the console would not invoke the logic behind 'm_bModifyInput' in the text edit callback, but instead, being cleared within the scope of the submit button.
* Properly erase the ConVar past the ' ' or ';' character instead of null terminating it.
This commit is contained in:
Kawe Mazidjatari 2022-09-07 01:55:52 +02:00
parent 708e6992e4
commit 8c1d22f560
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
r5dev/gameui/IConsole.cpp
View File

@ -271,7 +271,7 @@ void CConsole::DrawSurface(void)
if (m_szInputBuf[0])
{
ProcessCommand(m_szInputBuf);
memset(m_szInputBuf, '\0', 1);
m_bModifyInput = true;
}
ResetAutoComplete();
BuildSummary();
@ -390,13 +390,17 @@ bool CConsole::AutoComplete(void)
}
if (m_vSuggest.empty())
{
m_bSuggestActive = false;
m_nSuggestPos = -1;
return false;
}
}
else
{
m_bSuggestActive = false;
m_nSuggestPos = -1;
return false;
}
@ -579,7 +583,7 @@ void CConsole::BuildSummary(string svConVar)
{
if (svConVar[i] == ' ' || svConVar[i] == ';')
{
svConVar[i] = '\0'; // Remove space or semicolon before we call 'g_pCVar->FindVar(..)'.
svConVar.erase(i, svConVar.length() - 1); // Remove space or semicolon before we call 'g_pCVar->FindVar(..)'.
}
}
@ -792,7 +796,6 @@ int CConsole::TextEditCallback(ImGuiInputTextCallbackData* iData)
if (nPrevHistoryPos != m_nHistoryPos)
{
string svHistory = (m_nHistoryPos >= 0) ? m_vHistory[m_nHistoryPos] : "";
if (!svHistory.empty())
{
if (m_vHistory[m_nHistoryPos].find(' ') == string::npos)
@ -814,6 +817,8 @@ int CConsole::TextEditCallback(ImGuiInputTextCallbackData* iData)
if (m_bModifyInput)
{
iData->DeleteChars(0, iData->BufTextLen);
m_bSuggestActive = false;
if (!m_svInputConVar.empty())
{
iData->InsertChars(0, m_svInputConVar.c_str());