From e98d1db7a1c1ad739086d8ba929b1948713442d0 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sat, 22 Apr 2023 23:09:23 -0700
Subject: [PATCH] Show hud elems during pregame

---
 scripts/zm/_zm_reimagined.gsc           | 31 ++++++++++++++++++-------
 scripts/zm/replaced/_zm.gsc             |  7 ++++++
 scripts/zm/zgrief/zgrief_reimagined.gsc | 11 ++++-----
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
index c716f773..722ef4bb 100644
--- a/scripts/zm/_zm_reimagined.gsc
+++ b/scripts/zm/_zm_reimagined.gsc
@@ -497,7 +497,7 @@ health_bar_hud()
 {
 	self endon("disconnect");
 
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	x = 5;
 	y = -104;
@@ -602,9 +602,10 @@ enemy_counter_hud()
 
 	hud thread destroy_on_intermission();
 
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	hud.alpha = 1;
+
 	while (1)
 	{
 		enemies = get_round_enemy_array().size + level.zombie_total;
@@ -668,10 +669,15 @@ timer_hud()
 
 	level thread set_time_frozen_on_end_game(hud);
 
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	hud.alpha = 1;
 
+	if ( !flag( "initial_blackscreen_passed" ) )
+	{
+		set_time_frozen(hud, 0, "initial_blackscreen_passed");
+	}
+
 	if ( getDvar( "g_gametype" ) == "zgrief" )
 	{
 		set_time_frozen(hud, 0);
@@ -708,10 +714,15 @@ round_timer_hud()
 
 	level thread set_time_frozen_on_end_game(hud);
 
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	hud.alpha = 1;
 
+	if ( !flag( "initial_blackscreen_passed" ) )
+	{
+		set_time_frozen(hud, 0, "initial_blackscreen_passed");
+	}
+
 	if ( getDvar( "g_gametype" ) == "zgrief" )
 	{
 		set_time_frozen(hud, 0);
@@ -755,9 +766,13 @@ set_time_frozen_on_end_game(hud)
 	set_time_frozen(hud, time);
 }
 
-set_time_frozen(hud, time)
+set_time_frozen(hud, time, endon_notify)
 {
-	if ( getDvar( "g_gametype" ) == "zgrief" )
+	if ( isDefined( endon_notify ) )
+	{
+		level endon( endon_notify );
+	}
+	else if ( getDvar( "g_gametype" ) == "zgrief" )
 	{
 		level endon( "restart_round_start" );
 	}
@@ -818,7 +833,7 @@ zone_hud()
 
 	hud thread destroy_on_intermission();
 
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	vars = [];
 
@@ -1857,7 +1872,7 @@ bleedout_bar_hud()
 {
 	self endon("disconnect");
 
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	hud = self createbar((1, 0, 0), level.secondaryprogressbarwidth * 2, level.secondaryprogressbarheight);
 	hud setpoint("CENTER", undefined, level.secondaryprogressbarx, -1 * level.secondaryprogressbary);
diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc
index b661c774..ee927618 100644
--- a/scripts/zm/replaced/_zm.gsc
+++ b/scripts/zm/replaced/_zm.gsc
@@ -514,11 +514,16 @@ onallplayersready()
         thread start_zombie_logic_in_x_sec( 3.0 );
     }
 
+	setDvar("team_axis", "");
+	setDvar("team_allies", "");
+
     fade_out_intro_screen_zm( 5.0, 1.5, 1 );
 }
 
 fade_out_intro_screen_zm( hold_black_time, fade_out_time, destroyed_afterwards )
 {
+	flag_init( "hud_visible" );
+
     if ( !isdefined( level.introscreen ) )
     {
         level.introscreen = newhudelem();
@@ -555,6 +560,8 @@ fade_out_intro_screen_zm( hold_black_time, fade_out_time, destroyed_afterwards )
 		player setclientuivisibilityflag( "hud_visible", 1 );
 	}
 
+	flag_set( "hud_visible" );
+
 	if ( isDedicated() && isDefined( level.pregame_minplayers ) )
     {
 		pregame_hud = createServerFontString( "objective", 1.5 );
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index 34ea975a..6da41d28 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -122,7 +122,7 @@ grief_gamemode_hud()
 
 grief_gamemode_hud_wait_and_show()
 {
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	level.grief_gamemode_hud.alpha = 1;
 }
@@ -256,7 +256,7 @@ grief_score_hud()
 
 grief_score_hud_wait_and_show()
 {
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	level.grief_score_hud["axis"].icon["axis"].alpha = 1;
 	level.grief_score_hud["axis"].icon["allies"].alpha = 1;
@@ -971,7 +971,7 @@ add_grief_bleedout_score()
 
 team_player_waypoint()
 {
-	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "hud_visible" );
 
 	self.player_waypoint_origin = spawn( "script_model", self.origin );
 	self.player_waypoint_origin setmodel( "tag_origin" );
@@ -1151,9 +1151,6 @@ round_start_wait(time, initial)
 		level thread freeze_hotjoin_players();
 
 		flag_wait("initial_blackscreen_passed");
-
-		setDvar("team_axis", "");
-		setDvar("team_allies", "");
 	}
 	else
 	{
@@ -2746,7 +2743,7 @@ containment_think()
 {
 	level endon("end_game");
 
-	flag_wait("initial_blackscreen_passed");
+	flag_wait("hud_visible");
 
 	ind = 0;
 	containment_zones = containment_get_zones();