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

Check and clear console vector even if console is not drawn

Browse Source 
The vector could still overflow if user plays the game for a long time while not opening the console at least once.
This commit is contained in:
Amos 2022-01-16 00:59:20 +01:00
parent f909635526
commit d182652211
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
r5dev/client/cdll_engine_int.cpp
View File

@ -10,6 +10,7 @@
#include "engine/net_chan.h"
#include "public/include/bansystem.h"
#include "vpc/keyvalues.h"
#include "gameui/IConsole.h"
/*****************************************************************************/
//-----------------------------------------------------------------------------
@ -97,7 +98,7 @@ void __fastcall HFrameStageNotify(CHLClient* rcx, ClientFrameStage_t frameStage)
break;
}
}
g_pIConsole->Think();
CHLClient_FrameStageNotify(rcx, (int)frameStage);
}

31
r5dev/gameui/IConsole.cpp
View File

@ -60,18 +60,6 @@ void CConsole::Draw(const char* pszTitle, bool* bDraw)
SetStyleVar();
m_bInitialized = true;
}
if (g_pImGuiConfig->IConsole_Config.m_bAutoClear) // Check if Auto-Clear is enabled.
{
// Loop and clear the beginning of the vector until we are below our limit.
while (m_ivConLog.Size > g_pImGuiConfig->IConsole_Config.m_nAutoClearLimit)
{
m_ivConLog.erase(m_ivConLog.begin());
}
while (m_ivHistory.Size > 512)
{
m_ivHistory.erase(m_ivHistory.begin());
}
}
//ImGui::ShowStyleEditor();
@ -214,6 +202,25 @@ void CConsole::Options()
ImGui::EndPopup();
}
//-----------------------------------------------------------------------------
// Purpose: runs tasks for the console while not being drawn
//-----------------------------------------------------------------------------
void CConsole::Think()
{
if (g_pImGuiConfig->IConsole_Config.m_bAutoClear) // Check if Auto-Clear is enabled.
{
// Loop and clear the beginning of the vector until we are below our limit.
while (m_ivConLog.Size > g_pImGuiConfig->IConsole_Config.m_nAutoClearLimit)
{
m_ivConLog.erase(m_ivConLog.begin());
}
while (m_ivHistory.Size > 512)
{
m_ivHistory.erase(m_ivHistory.begin());
}
}
}
//-----------------------------------------------------------------------------
// Purpose: executes submitted commands in a separate thread
//-----------------------------------------------------------------------------

1
r5dev/gameui/IConsole.h
View File

@ -25,6 +25,7 @@ public:
void Draw(const char* title, bool* bDraw);
void Options();
void Think();
void ProcessCommand(const char* command_line);
int TextEditCallback(ImGuiInputTextCallbackData* data);