From 8adffcaac9024a27cfdccae6b0a9b42f4af05ce4 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sun, 2 Jun 2024 02:04:53 -0700
Subject: [PATCH] Initialize all custom client dvars in main.lua

---
 ui_mp/t6/hud/scoreboard.lua        | 12 ------------
 ui_mp/t6/hud/weaponlabel.lua       |  4 ----
 ui_mp/t6/main.lua                  | 16 ++++++++++++++++
 ui_mp/t6/zombie/ammoareazombie.lua |  4 ----
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/ui_mp/t6/hud/scoreboard.lua b/ui_mp/t6/hud/scoreboard.lua
index 6a26b59d..29054fcd 100644
--- a/ui_mp/t6/hud/scoreboard.lua
+++ b/ui_mp/t6/hud/scoreboard.lua
@@ -1,15 +1,3 @@
-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
-
 local SCOREBOARD_BACKGROUND_OPACITY = 0.7
 local SCOREBOARD_COLUMN_BACKGROUND_OPACITY = 0.2
 local f0_local6 = 337
diff --git a/ui_mp/t6/hud/weaponlabel.lua b/ui_mp/t6/hud/weaponlabel.lua
index ba7a4011..2724cdc8 100644
--- a/ui_mp/t6/hud/weaponlabel.lua
+++ b/ui_mp/t6/hud/weaponlabel.lua
@@ -1,7 +1,3 @@
-if UIExpression.DvarString(nil, "additionalPrimaryWeaponName") == "" then
-	Engine.SetDvar("additionalPrimaryWeaponName", "")
-end
-
 CoD.WeaponLabel = {}
 CoD.WeaponLabel.TextHeight = 32
 CoD.WeaponLabel.FadeTime = 2000
diff --git a/ui_mp/t6/main.lua b/ui_mp/t6/main.lua
index 872bd7d0..8abffc07 100644
--- a/ui_mp/t6/main.lua
+++ b/ui_mp/t6/main.lua
@@ -167,6 +167,22 @@ local f0_local4 = function(f8_arg0, f8_arg1, f8_arg2, f8_arg3)
 end
 
 CoD.InitCustomDvars = function()
+	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
+
+	if UIExpression.DvarString(nil, "additionalPrimaryWeaponName") == "" then
+		Engine.SetDvar("additionalPrimaryWeaponName", "")
+	end
+
 	if UIExpression.DvarString(nil, "r_fog_settings") == "" then
 		Engine.Exec(nil, "seta r_fog_settings 0")
 	end
diff --git a/ui_mp/t6/zombie/ammoareazombie.lua b/ui_mp/t6/zombie/ammoareazombie.lua
index a040a0ba..652b98f2 100644
--- a/ui_mp/t6/zombie/ammoareazombie.lua
+++ b/ui_mp/t6/zombie/ammoareazombie.lua
@@ -1,9 +1,5 @@
 require("T6.HUD.HUDDigit")
 
-if UIExpression.DvarString(nil, "additionalPrimaryWeaponName") == "" then
-	Engine.SetDvar("additionalPrimaryWeaponName", "")
-end
-
 CoD.AmmoAreaZombie = {}
 CoD.AmmoAreaZombie.Right = -28
 CoD.AmmoAreaZombie.Bottom = -7