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

/W4: Fixed name shadowing bug

Browse Source 
'DrawAllOverlays' gets called with a boolean parameter indicating whether or not the render frame should be ran. This is so the rest of the logic could run in order to decay overlays to avoid memory leak or unnecessary high CPU time in overlay timing code. Parameter name has been renamed from 'bDraw' to 'bRender', and the local variable 'bDraw' which caused the shadow warning, has been renamed to 'bShouldDraw'. The local variable 'bOverlayEnabled' now takes into account the 'bRender' parameter.
This commit is contained in:
Kawe Mazidjatari 2023-04-02 09:27:54 +02:00
parent 678199d6ca
commit 1ef5287b56
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
r5dev/engine/debugoverlay.cpp
View File

@ -241,13 +241,13 @@ void DrawOverlay(OverlayBase_t* pOverlay)
//------------------------------------------------------------------------------
// Purpose : overlay drawing entrypoint
// Input : bDraw -
// Input : bRender - won't render anything if false
//------------------------------------------------------------------------------
void DrawAllOverlays(bool bDraw)
void DrawAllOverlays(bool bRender)
{
EnterCriticalSection(&*s_OverlayMutex);
const bool bOverlayEnabled = enable_debug_overlays->GetBool();
const bool bOverlayEnabled = (bRender && enable_debug_overlays->GetBool());
OverlayBase_t* pCurrOverlay = *s_pOverlays; // rdi
OverlayBase_t* pPrevOverlay = nullptr; // rsi
OverlayBase_t* pNextOverlay = nullptr; // rbx
@ -273,27 +273,27 @@ void DrawAllOverlays(bool bDraw)
}
else
{
bool bDraw{ };
bool bShouldDraw{ };
if (pCurrOverlay->m_nCreationTick == -1)
{
if (pCurrOverlay->m_nOverlayTick == *g_nOverlayTickCount)
{
// Draw overlay if unk0 == *overlay_tickcount
bDraw = true;
bShouldDraw = true;
}
if (pCurrOverlay->m_nOverlayTick == -1)
{
// Draw overlay if unk0 == -1
bDraw = true;
bShouldDraw = true;
}
}
else
{
bDraw = pCurrOverlay->m_nCreationTick == *g_nRenderTickCount;
bShouldDraw = pCurrOverlay->m_nCreationTick == *g_nRenderTickCount;
}
if (bOverlayEnabled && bDraw)
if (bOverlayEnabled && bShouldDraw)
{
if (bDraw)
if (bShouldDraw)
{
DrawOverlay(pCurrOverlay);
}