From 281ac985afab0cb120e8645f0aa1d9b1dac20aa3 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Fri, 5 Jan 2024 20:02:38 -0800
Subject: [PATCH] Initialize menu client dvars in lua

---
 scripts/zm/zgrief/zgrief_reimagined.csc | 14 --------------
 ui_mp/t6/hud/scoreboard.lua             | 12 ++++++++++++
 zone_source/includes/clientscripts.zone |  1 -
 3 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 scripts/zm/zgrief/zgrief_reimagined.csc

diff --git a/scripts/zm/zgrief/zgrief_reimagined.csc b/scripts/zm/zgrief/zgrief_reimagined.csc
deleted file mode 100644
index d8c943fb..00000000
--- a/scripts/zm/zgrief/zgrief_reimagined.csc
+++ /dev/null
@@ -1,14 +0,0 @@
-#include clientscripts\mp\_utility;
-#include clientscripts\mp\zombies\_zm_utility;
-
-init()
-{
-	init_dvars();
-}
-
-init_dvars()
-{
-	setdvar("ui_gametype_obj", "");
-	setdvar("ui_gametype_pro", 0);
-	setdvar("ui_round_number", 0);
-}
\ No newline at end of file
diff --git a/ui_mp/t6/hud/scoreboard.lua b/ui_mp/t6/hud/scoreboard.lua
index c1480e5a..dcd955f0 100644
--- a/ui_mp/t6/hud/scoreboard.lua
+++ b/ui_mp/t6/hud/scoreboard.lua
@@ -31,6 +31,18 @@ local f0_local41 = f0_local40
 local SCOREBOARD_MAX_ROWS = CoD.MPZM(23, 18)
 local IsDLCMap2, IsDLCMap4, IsClassic = nil, nil, nil
 
+if UIExpression.DvarString(nil, "ui_gametype_obj") == "" then
+	Engine.SetDvar("ui_gametype_obj", "")
+end
+
+if UIExpression.DvarString(nil, "ui_gametype_pro") == "" then
+	Engine.SetDvar("ui_gametype_pro", 0)
+end
+
+if UIExpression.DvarString(nil, "ui_round_number") == "" then
+	Engine.SetDvar("ui_round_number", 0)
+end
+
 CoD.ScoreboardRow = InheritFrom(LUI.UIElement)
 
 local ScoreboardWidgetSetOwnerFunc = function (ScoreboardWidget, LocalClientIndex)
diff --git a/zone_source/includes/clientscripts.zone b/zone_source/includes/clientscripts.zone
index d98bc084..bb2e3462 100644
--- a/zone_source/includes/clientscripts.zone
+++ b/zone_source/includes/clientscripts.zone
@@ -1,5 +1,4 @@
 script,scripts/zm/_zm_reimagined.csc
 script,scripts/zm/zm_buried/zm_buried_reimagined.csc
-script,scripts/zm/zgrief/zgrief_reimagined.csc
 script,scripts/zm/replaced/_zm.csc
 script,scripts/zm/replaced/_zm_weapons.csc
\ No newline at end of file