From 8d460f64dc22384f905c6f243511c2ea5e991ebc Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sun, 2 Jun 2024 02:11:50 -0700
Subject: [PATCH] Update loading screen game mode name before map rotate

---
 scripts/zm/server/_zm_reimagined_server.gsc | 9 +++++++++
 ui_mp/t6/hud/loading.lua                    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/zm/server/_zm_reimagined_server.gsc b/scripts/zm/server/_zm_reimagined_server.gsc
index 0c8446af..cc870c54 100644
--- a/scripts/zm/server/_zm_reimagined_server.gsc
+++ b/scripts/zm/server/_zm_reimagined_server.gsc
@@ -465,12 +465,21 @@ map_vote()
 		}
 
 		setDvar("ui_gametype_obj_cur", maps[index]["obj_name"]);
+
+		level thread wait_and_setclientdvarall(1.5, "ui_gametype_obj", getDvar("ui_gametype_obj_cur"));
 	}
 
 	level.zombie_vars["vote_input_hud"].alpha = 0;
 	level.zombie_vars["vote_timer_hud"].alpha = 0;
 }
 
+wait_and_setclientdvarall(time, dvar, value)
+{
+	wait time;
+
+	scripts\zm\_zm_reimagined::setclientdvarall(dvar, value);
+}
+
 create_map_image_hud(image, x, y)
 {
 	hud = newHudElem();
diff --git a/ui_mp/t6/hud/loading.lua b/ui_mp/t6/hud/loading.lua
index 5857bbcc..56be1ee6 100644
--- a/ui_mp/t6/hud/loading.lua
+++ b/ui_mp/t6/hud/loading.lua
@@ -598,7 +598,7 @@ function CoD.Loading.GetGametypeDisplayName(gametype)
 		return Engine.Localize("ZMUI_ZCLASSIC_GAMEMODE_CAPS")
 	end
 
-	if gametype == CoD.Zombie.GAMETYPE_ZGRIEF then
+	if gametype == CoD.Zombie.GAMETYPE_ZGRIEF and UIExpression.DvarString(nil, "ui_gametype_obj") ~= "" then
 		return Engine.Localize("ZMUI_" .. UIExpression.DvarString(nil, "ui_gametype_obj") .. "_CAPS")
 	end