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

Fix revive weapon switch

Browse Source
This commit is contained in:
Jbleezy
2023-04-20 19:24:06 -07:00
parent 0dd38e9641
commit 4d1ef8ecec
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,8 @@
revive_do_revive( playerbeingrevived, revivergun ) revive_do_revive( playerbeingrevived, revivergun )
{ {
self thread revive_check_for_weapon_change();
playerbeingrevived_player = playerbeingrevived; playerbeingrevived_player = playerbeingrevived;
playerbeingrevived_player.revive_hud.y = -160; playerbeingrevived_player.revive_hud.y = -160;
beingrevivedprogressbar_y = level.primaryprogressbary * -1; beingrevivedprogressbar_y = level.primaryprogressbary * -1;
@ -181,6 +183,19 @@ revive_do_revive( playerbeingrevived, revivergun )
return revived; return revived;
} }
revive_check_for_weapon_change()
{
self notify( "revive_check_for_weapon_change" );
self endon( "revive_check_for_weapon_change" );
self endon( "do_revive_ended_normally" );
self.revive_weapon_changed = 0;
self waittill_any( "weapon_change", "weapon_change_complete" );
self.revive_weapon_changed = 1;
}
laststand_clean_up_on_disconnect( playerbeingrevived, revivergun ) laststand_clean_up_on_disconnect( playerbeingrevived, revivergun )
{ {
self endon( "do_revive_ended_normally" ); self endon( "do_revive_ended_normally" );
@ -244,17 +259,17 @@ revive_give_back_weapons( gun )
return; return;
} }
if (cur_wep != revive_tool) if ( cur_wep != revive_tool && is_true( self.revive_weapon_changed ) )
{ {
return; return;
} }
if (self hasWeapon("item_meat_zm")) if ( self hasWeapon( "item_meat_zm" ) )
{ {
return; return;
} }
if (self hasWeapon("screecher_arms_zm")) if ( self hasWeapon( "screecher_arms_zm" ) )
{ {
return; return;
} }