INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 07:37:56 -05:00
Code Issues Releases Wiki Activity

Fix being revived bar not being destroyed if EMP'd

Browse Source
This commit is contained in:
Jbleezy
2022-01-06 18:28:08 -08:00
parent a416983d93
commit cb9ca2a60c
1 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
scripts/zm/replaced/_zm_laststand.gsc
View File

@ -43,13 +43,13 @@ revive_do_revive( playerbeingrevived, revivergun )
{ {
self.revivetexthud = newclienthudelem( self ); self.revivetexthud = newclienthudelem( self );
} }
self thread maps/mp/zombies/_zm_laststand::laststand_clean_up_on_disconnect( playerbeingrevived, revivergun ); self thread laststand_clean_up_on_disconnect( playerbeingrevived, revivergun );
if ( !isDefined( self.is_reviving_any ) ) if ( !isDefined( self.is_reviving_any ) )
{ {
self.is_reviving_any = 0; self.is_reviving_any = 0;
} }
self.is_reviving_any++; self.is_reviving_any++;
self thread maps/mp/zombies/_zm_laststand::laststand_clean_up_reviving_any( playerbeingrevived ); self thread laststand_clean_up_reviving_any( playerbeingrevived );
self.reviveprogressbar updatebar( 0.01, 1 / revivetime ); self.reviveprogressbar updatebar( 0.01, 1 / revivetime );
playerbeingrevived.beingrevivedprogressbar updatebar( 0.01, 1 / revivetime ); playerbeingrevived.beingrevivedprogressbar updatebar( 0.01, 1 / revivetime );
self.revivetexthud.alignx = "center"; self.revivetexthud.alignx = "center";
@ -125,6 +125,52 @@ revive_do_revive( playerbeingrevived, revivergun )
return revived; return revived;
} }
laststand_clean_up_on_disconnect( playerbeingrevived, revivergun )
{
self endon( "do_revive_ended_normally" );
revivetrigger = playerbeingrevived.revivetrigger;
playerbeingrevived waittill( "disconnect" );
if ( isDefined( revivetrigger ) )
{
revivetrigger delete();
}
self maps/mp/zombies/_zm_laststand::cleanup_suicide_hud();
if ( isDefined( self.reviveprogressbar ) )
{
self.reviveprogressbar destroyelem();
}
if ( isDefined( self.revivetexthud ) )
{
self.revivetexthud destroy();
}
self maps/mp/zombies/_zm_laststand::revive_give_back_weapons( revivergun );
}
laststand_clean_up_reviving_any( playerbeingrevived ) //checked changed to match cerberus output
{
self endon( "do_revive_ended_normally" );
playerbeingrevived waittill_any( "disconnect", "zombified", "stop_revive_trigger" );
self.is_reviving_any--;
if ( self.is_reviving_any < 0 )
{
self.is_reviving_any = 0;
}
if ( isDefined( playerbeingrevived.beingrevivedprogressbar ) )
{
playerbeingrevived.beingrevivedprogressbar destroyelem();
}
}
revive_weapon_switch_watcher() revive_weapon_switch_watcher()
{ {
self endon( "disconnect" ); self endon( "disconnect" );
@ -146,31 +192,6 @@ revive_weapon_switch_watcher()
self.revive_weapon_switched = 1; self.revive_weapon_switched = 1;
} }
laststand_clean_up_on_disconnect( playerbeingrevived, revivergun )
{
self endon( "do_revive_ended_normally" );
revivetrigger = playerbeingrevived.revivetrigger;
playerbeingrevived waittill( "disconnect" );
if ( isDefined( revivetrigger ) )
{
revivetrigger delete();
}
self maps/mp/zombies/_zm_laststand::cleanup_suicide_hud();
if ( isDefined( playerbeingrevived.beingrevivedprogressbar ) )
{
playerbeingrevived.beingrevivedprogressbar destroyelem();
}
if ( isDefined( self.reviveprogressbar ) )
{
self.reviveprogressbar destroyelem();
}
if ( isDefined( self.revivetexthud ) )
{
self.revivetexthud destroy();
}
self maps/mp/zombies/_zm_laststand::revive_give_back_weapons( revivergun );
}
revive_give_back_weapons( gun ) revive_give_back_weapons( gun )
{ {
self takeweapon( level.revive_tool ); self takeweapon( level.revive_tool );