1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-10 23:27:57 -05:00

Destroy HUD elements on intermission

This commit is contained in:
Jbleezy
2022-01-24 20:16:50 -08:00
parent c493996e86
commit 4e4e54810a
2 changed files with 55 additions and 6 deletions

View File

@ -355,6 +355,11 @@ health_bar_hud()
health_bar_text.hidewheninmenu = 1; health_bar_text.hidewheninmenu = 1;
health_bar_text.foreground = 1; health_bar_text.foreground = 1;
health_bar endon("death");
health_bar thread destroy_on_intermission();
health_bar_text thread destroy_on_intermission();
while (1) while (1)
{ {
if(isDefined(self.e_afterlife_corpse)) if(isDefined(self.e_afterlife_corpse))
@ -406,6 +411,10 @@ enemy_counter_hud()
enemy_counter_hud.foreground = 1; enemy_counter_hud.foreground = 1;
enemy_counter_hud.label = &"Enemies Remaining: "; enemy_counter_hud.label = &"Enemies Remaining: ";
enemy_counter_hud endon("death");
enemy_counter_hud thread destroy_on_intermission();
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
enemy_counter_hud.alpha = 1; enemy_counter_hud.alpha = 1;
@ -428,7 +437,6 @@ enemy_counter_hud()
timer_hud() timer_hud()
{ {
level thread round_timer_hud(); level thread round_timer_hud();
timer_hud = newHudElem(); timer_hud = newHudElem();
@ -445,6 +453,10 @@ timer_hud()
timer_hud.foreground = 1; timer_hud.foreground = 1;
timer_hud.label = &"Total: "; timer_hud.label = &"Total: ";
timer_hud endon("death");
timer_hud thread destroy_on_intermission();
level thread set_time_frozen_on_end_game(timer_hud); level thread set_time_frozen_on_end_game(timer_hud);
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
@ -476,6 +488,10 @@ round_timer_hud()
round_timer_hud.foreground = 1; round_timer_hud.foreground = 1;
round_timer_hud.label = &"Round: "; round_timer_hud.label = &"Round: ";
round_timer_hud endon("death");
round_timer_hud thread destroy_on_intermission();
level thread set_time_frozen_on_end_game(round_timer_hud); level thread set_time_frozen_on_end_game(round_timer_hud);
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
@ -582,6 +598,10 @@ zone_hud()
zone_hud.hidewheninmenu = 1; zone_hud.hidewheninmenu = 1;
zone_hud.foreground = 1; zone_hud.foreground = 1;
zone_hud endon("death");
zone_hud thread destroy_on_intermission();
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
prev_zone = self get_zone_name(); prev_zone = self get_zone_name();
@ -4539,6 +4559,21 @@ vulture_disable_stink_while_standing()
} }
} }
destroy_on_intermission()
{
self endon("death");
level waittill("intermission");
if(self.elemtype == "bar")
{
self.bar destroy();
self.barframe destroy();
}
self destroy();
}
test() test()
{ {
while(1) while(1)

View File

@ -60,7 +60,7 @@ init()
level thread sudden_death(); level thread sudden_death();
level thread unlimited_zombies(); level thread unlimited_zombies();
level thread remove_round_number(); level thread remove_round_number();
level thread remove_status_icons_on_end_game(); level thread remove_status_icons_on_intermission();
level thread random_map_rotation(); level thread random_map_rotation();
level thread spawn_bots(7); level thread spawn_bots(7);
} }
@ -231,6 +231,8 @@ grief_score_hud()
level.grief_hud.team["allies"].score["allies"].alpha = 0; level.grief_hud.team["allies"].score["allies"].alpha = 0;
level.grief_hud.team["allies"].score["allies"] setValue(0); level.grief_hud.team["allies"].score["allies"] setValue(0);
level thread destroy_grief_score_hud_on_intermission();
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
level.grief_hud.team["axis"].icon["axis"].alpha = 1; level.grief_hud.team["axis"].icon["axis"].alpha = 1;
@ -243,6 +245,20 @@ grief_score_hud()
level.grief_hud.team["allies"].score["allies"].alpha = 1; level.grief_hud.team["allies"].score["allies"].alpha = 1;
} }
destroy_grief_score_hud_on_intermission()
{
level waittill("intermission");
level.grief_hud.team["axis"].icon["axis"] destroy();
level.grief_hud.team["axis"].icon["allies"] destroy();
level.grief_hud.team["axis"].score["axis"] destroy();
level.grief_hud.team["axis"].score["allies"] destroy();
level.grief_hud.team["allies"].icon["axis"] destroy();
level.grief_hud.team["allies"].icon["allies"] destroy();
level.grief_hud.team["allies"].score["axis"] destroy();
level.grief_hud.team["allies"].score["allies"] destroy();
}
set_grief_vars() set_grief_vars()
{ {
level.noroundnumber = 1; level.noroundnumber = 1;
@ -1797,11 +1813,9 @@ remove_round_number()
} }
} }
remove_status_icons_on_end_game() remove_status_icons_on_intermission()
{ {
level waittill("end_game"); level waittill("intermission");
wait 5;
players = get_players(); players = get_players();
foreach(player in players) foreach(player in players)