From 38d9d431c9aaef1ede7b6ceb594aa9b9971c261f Mon Sep 17 00:00:00 2001
From: Amos <48657826+Mauler125@users.noreply.github.com>
Date: Mon, 10 Jan 2022 02:03:31 +0100
Subject: [PATCH] Fix potential bug where 'cm_return_false_cmdquery_all' cvar
 would never work

---
 r5dev/tier0/ConCommand.cpp |  2 +-
 r5dev/tier0/IConVar.cpp    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/r5dev/tier0/ConCommand.cpp b/r5dev/tier0/ConCommand.cpp
index 72ba0552..c0cf8f94 100644
--- a/r5dev/tier0/ConCommand.cpp
+++ b/r5dev/tier0/ConCommand.cpp
@@ -125,7 +125,7 @@ bool ConCommandBase::IsFlagSet(ConCommandBase* pCommandBase, int nFlags)
 		printf(" Verify: %08X\n", nFlags);
 		printf("--------------------------------------------------\n");
 	}
-	if (nFlags & FCVAR_RELEASE && cm_return_false_cmdquery_all->GetBool())
+	if (nFlags & FCVAR_RELEASE && !cm_return_false_cmdquery_all->GetBool())
 	{
 		// Default retail behaviour.
 		return ConCommandBase_IsFlagSet(pCommandBase, nFlags);
diff --git a/r5dev/tier0/IConVar.cpp b/r5dev/tier0/IConVar.cpp
index 5f48239e..079aa2c4 100644
--- a/r5dev/tier0/IConVar.cpp
+++ b/r5dev/tier0/IConVar.cpp
@@ -525,12 +525,12 @@ bool ConVar::ClampValue(float& flValue)
 //-----------------------------------------------------------------------------
 bool ConVar::IsFlagSet(ConVar* pConVar, int nFlags)
 {
-	if (cm_debug_cmdquery->m_pParent->m_iValue > 0)
+	if (cm_debug_cmdquery->GetBool())
 	{
 		printf("--------------------------------------------------\n");
 		printf(" Flaged: %08X\n", pConVar->m_ConCommandBase.m_nFlags);
 	}
-	if (cm_return_false_cmdquery_cheats->m_pParent->m_iValue > 0)
+	if (cm_return_false_cmdquery_cheats->GetBool())
 	{
 		// Mask off FCVAR_CHEATS and FCVAR_DEVELOPMENTONLY.
 		pConVar->m_ConCommandBase.RemoveFlags(FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT);
@@ -539,18 +539,18 @@ bool ConVar::IsFlagSet(ConVar* pConVar, int nFlags)
 	{
 		pConVar->m_ConCommandBase.RemoveFlags(FCVAR_DEVELOPMENTONLY);
 	}
-	if (cm_debug_cmdquery->m_pParent->m_iValue > 0)
+	if (cm_debug_cmdquery->GetBool())
 	{
 		printf(" Masked: %08X\n", pConVar->m_ConCommandBase.m_nFlags);
 		printf(" Verify: %08X\n", nFlags);
 		printf("--------------------------------------------------\n");
 	}
-	if (nFlags & FCVAR_RELEASE && cm_return_false_cmdquery_all->m_pParent->m_iValue <= 0)
+	if (nFlags & FCVAR_RELEASE && !cm_return_false_cmdquery_all->GetBool())
 	{
 		// Default retail behaviour.
 		return IConVar_IsFlagSet(pConVar, nFlags);
 	}
-	if (cm_return_false_cmdquery_all->m_pParent->m_iValue > 0)
+	if (cm_return_false_cmdquery_all->GetBool())
 	{
 		// Returning false on all queries may cause problems.
 		return false;