INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-13 00:28:03 -05:00
Code Issues Releases Wiki Activity

Timers stop on end_game

Browse Source
This commit is contained in:
Jbleezy
2021-12-17 20:45:12 -08:00
parent 51c427256d
commit 3f813b7c35
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/zm/main/_zm_reimagined.gsc
View File

@ -358,6 +358,7 @@ enemy_counter_hud()
timer_hud() timer_hud()
{ {
level endon("end_game");
self endon("disconnect"); self endon("disconnect");
self thread round_timer_hud(); self thread round_timer_hud();
@ -375,6 +376,8 @@ timer_hud()
timer_hud.hidewheninmenu = 1; timer_hud.hidewheninmenu = 1;
timer_hud.label = &"Total: "; timer_hud.label = &"Total: ";
self thread set_time_frozen_on_end_game(timer_hud);
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
timer_hud.alpha = 1; timer_hud.alpha = 1;
@ -385,10 +388,12 @@ timer_hud()
} }
timer_hud setTimerUp(0); timer_hud setTimerUp(0);
timer_hud.start_time = int(getTime() / 1000);
} }
round_timer_hud() round_timer_hud()
{ {
level endon("end_game");
self endon("disconnect"); self endon("disconnect");
round_timer_hud = newClientHudElem(self); round_timer_hud = newClientHudElem(self);
@ -404,6 +409,8 @@ round_timer_hud()
round_timer_hud.hidewheninmenu = 1; round_timer_hud.hidewheninmenu = 1;
round_timer_hud.label = &"Round: "; round_timer_hud.label = &"Round: ";
self thread set_time_frozen_on_end_game(round_timer_hud);
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
round_timer_hud.alpha = 1; round_timer_hud.alpha = 1;
@ -416,7 +423,8 @@ round_timer_hud()
while (1) while (1)
{ {
round_timer_hud setTimerUp(0); round_timer_hud setTimerUp(0);
start_time = int(getTime() / 1000); round_timer_hud.start_time = int(getTime() / 1000);
round_timer_hud.end_time = undefined;
if ( getDvar( "g_gametype" ) == "zgrief" ) if ( getDvar( "g_gametype" ) == "zgrief" )
{ {
@ -427,13 +435,29 @@ round_timer_hud()
level waittill( "end_of_round" ); level waittill( "end_of_round" );
} }
end_time = int(getTime() / 1000); round_timer_hud.end_time = int(getTime() / 1000);
time = end_time - start_time; time = round_timer_hud.end_time - round_timer_hud.start_time;
set_time_frozen(round_timer_hud, time); set_time_frozen(round_timer_hud, time);
} }
} }
set_time_frozen_on_end_game(hud)
{
self endon("disconnect");
level waittill("end_game");
if(!isDefined(hud.end_time))
{
hud.end_time = int(getTime() / 1000);
}
time = hud.end_time - hud.start_time;
set_time_frozen(hud, time);
}
set_time_frozen(hud, time) set_time_frozen(hud, time)
{ {
if ( getDvar( "g_gametype" ) == "zgrief" ) if ( getDvar( "g_gametype" ) == "zgrief" )