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

VGUI: CTextOverlay cleanup

Browse Source 
- Mark 'con_drawnotify' FCVAR_MATERIAL_SYSTEM_THREAD
- Add assert for char* in CTextOverlay::AddLog()
- Make buffer stack based in CTextOverlay::DrawFormat()
- Make color var struct const in CTextOverlay::DrawCrosshairMaterial()
This commit is contained in:
Kawe Mazidjatari 2024-02-25 23:53:19 +01:00
parent 9e6559a244
commit 0255157a41
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
r5dev/vgui/vgui_debugpanel.cpp
View File

@ -22,7 +22,7 @@
#include <engine/client/clientstate.h> #include <engine/client/clientstate.h>
#include <materialsystem/cmaterialglue.h> #include <materialsystem/cmaterialglue.h>
static ConVar con_drawnotify("con_drawnotify", "0", FCVAR_RELEASE, "Draws the RUI console to the hud"); static ConVar con_drawnotify("con_drawnotify", "0", FCVAR_RELEASE | FCVAR_MATERIAL_SYSTEM_THREAD, "Draws the RUI console to the hud");
// Various cvars that dictate how many lines and how long the text is shown // Various cvars that dictate how many lines and how long the text is shown
static ConVar con_notifylines("con_notifylines", "3", FCVAR_MATERIAL_SYSTEM_THREAD, "Number of console lines to overlay for debugging", true, 1.f, false, 0.f); static ConVar con_notifylines("con_notifylines", "3", FCVAR_MATERIAL_SYSTEM_THREAD, "Number of console lines to overlay for debugging", true, 1.f, false, 0.f);
@ -115,6 +115,8 @@ void CTextOverlay::Update(void)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CTextOverlay::AddLog(const eDLL_T context, const char* pszText) void CTextOverlay::AddLog(const eDLL_T context, const char* pszText)
{ {
Assert(pszText);
if (!con_drawnotify.GetBool() || !VALID_CHARSTAR(pszText)) if (!con_drawnotify.GetBool() || !VALID_CHARSTAR(pszText))
{ {
return; return;
@ -185,7 +187,7 @@ void CTextOverlay::DrawNotify(void)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CTextOverlay::DrawFormat(const int x, const int y, const Color c, const char* pszFormat, ...) const void CTextOverlay::DrawFormat(const int x, const int y, const Color c, const char* pszFormat, ...) const
{ {
static char szLogbuf[4096]{}; char szLogbuf[4096];
{///////////////////////////// {/////////////////////////////
va_list args{}; va_list args{};
va_start(args, pszFormat); va_start(args, pszFormat);
@ -209,7 +211,7 @@ void CTextOverlay::ShouldDraw(const float flFrameTime)
{ {
AUTO_LOCK(m_Mutex); AUTO_LOCK(m_Mutex);
for (int i = m_NotifyLines.Count() - 1; i >= 0; i--) FOR_EACH_VEC_BACK(m_NotifyLines, i)
{ {
CTextNotify* pNotify = &m_NotifyLines[i]; CTextNotify* pNotify = &m_NotifyLines[i];
pNotify->m_flLifeRemaining -= flFrameTime; pNotify->m_flLifeRemaining -= flFrameTime;
@ -283,7 +285,7 @@ void CTextOverlay::DrawCrosshairMaterial(void) const
if (!pMaterialGlue) if (!pMaterialGlue)
return; return;
static Color c = { 255, 255, 255, 255 }; static const Color c = { 255, 255, 255, 255 };
DrawFormat(cl_materialinfo_offset_x.GetInt(), cl_materialinfo_offset_y.GetInt(), c, "name: %s\nguid: %llx\ndimensions: %d x %d\nsurface: %s/%s\nstc: %i\ntc: %i", DrawFormat(cl_materialinfo_offset_x.GetInt(), cl_materialinfo_offset_y.GetInt(), c, "name: %s\nguid: %llx\ndimensions: %d x %d\nsurface: %s/%s\nstc: %i\ntc: %i",
pMaterialGlue->name, pMaterialGlue->name,
pMaterialGlue->assetGuid, pMaterialGlue->assetGuid,