From 2ed4208a1b4ef65b339e543a4d05acc78988e329 Mon Sep 17 00:00:00 2001
From: Blue-Shadow <blueshadow_941@yahoo.com>
Date: Sat, 3 Sep 2016 18:55:19 +0300
Subject: [PATCH] Added IfCVarInt SBARINFO command

---
 src/g_shared/sbarinfo_commands.cpp | 77 +++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/g_shared/sbarinfo_commands.cpp b/src/g_shared/sbarinfo_commands.cpp
index b4a011510..ba83ce1c6 100644
--- a/src/g_shared/sbarinfo_commands.cpp
+++ b/src/g_shared/sbarinfo_commands.cpp
@@ -3464,6 +3464,78 @@ class CommandIfWaterLevel : public SBarInfoNegatableFlowControl
 
 ////////////////////////////////////////////////////////////////////////////////
 
+class CommandIfCVarInt : public SBarInfoNegatableFlowControl
+{
+	public:
+		CommandIfCVarInt(SBarInfo *script) : SBarInfoNegatableFlowControl(script),
+			equalcomp(false)
+		{
+		}
+
+		void	ParseNegatable(FScanner &sc, bool fullScreenOffsets)
+		{
+			if(!sc.CheckToken(TK_StringConst))
+			{
+				sc.MustGetToken(TK_Identifier);
+			}
+
+			cvarname = sc.String;
+			cvar = FindCVar(cvarname, nullptr);
+
+			if (cvar != nullptr)
+			{
+				ECVarType cvartype = cvar->GetRealType();
+
+				if (cvartype == CVAR_Bool || cvartype == CVAR_Int)
+				{
+					sc.MustGetToken(',');
+					sc.MustGetToken(TK_IntConst);
+					value = sc.Number;
+
+					if (sc.CheckToken(','))
+					{
+						sc.MustGetToken(TK_Identifier);
+
+						if(sc.Compare("equal"))
+						{
+							equalcomp = true;
+						}
+					}
+				}
+				else
+				{
+					sc.ScriptError("Type mismatch: console variable '%s' is not of type 'bool' or 'int'.", cvarname);
+				}
+			}
+			else
+			{
+				sc.ScriptError("Unknown console variable '%s'.", cvarname);
+			}
+		}
+		void	Tick(const SBarInfoMainBlock *block, const DSBarInfo *statusBar, bool hudChanged)
+		{
+			SBarInfoNegatableFlowControl::Tick(block, statusBar, hudChanged);
+
+			bool result = false;
+			cvar = GetCVar(statusBar->CPlayer->mo, cvarname);
+
+			if (cvar != nullptr)
+			{
+				int cvarvalue = cvar->GetGenericRep(CVAR_Int).Int;
+				result = equalcomp ? cvarvalue == value : cvarvalue >= value;
+			}
+
+			SetTruth(result, block, statusBar);
+		}
+	protected:
+		FString		cvarname;
+		FBaseCVar	*cvar;
+		int			value;
+		bool		equalcomp;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
 static const char *SBarInfoCommandNames[] =
 {
 	"drawimage", "drawnumber", "drawswitchableimage",
@@ -3474,7 +3546,7 @@ static const char *SBarInfoCommandNames[] =
 	"isselected", "usesammo", "usessecondaryammo",
 	"hasweaponpiece", "inventorybarnotvisible",
 	"weaponammo", "ininventory", "alpha", "ifhealth",
-	"ifinvulnerable", "ifwaterlevel",
+	"ifinvulnerable", "ifwaterlevel", "ifcvarint",
 	NULL
 };
 
@@ -3488,7 +3560,7 @@ enum SBarInfoCommands
 	SBARINFO_ISSELECTED, SBARINFO_USESAMMO, SBARINFO_USESSECONDARYAMMO,
 	SBARINFO_HASWEAPONPIECE, SBARINFO_INVENTORYBARNOTVISIBLE,
 	SBARINFO_WEAPONAMMO, SBARINFO_ININVENTORY, SBARINFO_ALPHA, SBARINFO_IFHEALTH,
-	SBARINFO_IFINVULNERABLE, SBARINFO_IFWATERLEVEL,
+	SBARINFO_IFINVULNERABLE, SBARINFO_IFWATERLEVEL, SBARINFO_IFCVARINT,
 };
 
 SBarInfoCommand *SBarInfoCommandFlowControl::NextCommand(FScanner &sc)
@@ -3524,6 +3596,7 @@ SBarInfoCommand *SBarInfoCommandFlowControl::NextCommand(FScanner &sc)
 			case SBARINFO_IFHEALTH: return new CommandIfHealth(script);
 			case SBARINFO_IFINVULNERABLE: return new CommandIfInvulnerable(script);
 			case SBARINFO_IFWATERLEVEL: return new CommandIfWaterLevel(script);
+			case SBARINFO_IFCVARINT: return new CommandIfCVarInt(script);
 		}
 
 		sc.ScriptError("Unknown command '%s'.\n", sc.String);