1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-12 08:08:00 -05:00

Tombstone: fix switching out of animation weapon

This commit is contained in:
Jbleezy
2022-01-09 06:10:19 -08:00
parent c14952b608
commit cfc1d3776b

View File

@ -4310,7 +4310,16 @@ tombstone_give()
return ;
}
self takeAllWeapons(); // fixes player always having knife_zm
primary_weapons = self getWeaponsListPrimaries();
foreach(weapon in primary_weapons)
{
self takeWeapon(weapon);
}
self takeWeapon(self get_player_melee_weapon());
self takeWeapon(self get_player_lethal_grenade());
self takeWeapon(self get_player_tactical_grenade());
self takeWeapon(self get_player_placeable_mine());
primary_weapons_returned = 0;
i = 0;
@ -4424,8 +4433,11 @@ tombstone_give()
}
}
primaries = self getweaponslistprimaries();
current_wep = self getCurrentWeapon();
if(!isSubStr(current_wep, "perk_bottle") && !isSubStr(current_wep, "knuckle_crack") && !isSubStr(current_wep, "flourish"))
{
switched = 0;
primaries = self getweaponslistprimaries();
foreach ( weapon in primaries )
{
if ( isDefined( self.tombstone_savedweapon_currentweapon ) && self.tombstone_savedweapon_currentweapon == weapon )
@ -4442,6 +4454,7 @@ tombstone_give()
self switchtoweapon( primaries[ 0 ] );
}
}
}
if ( isDefined( self.tombstone_perks ) && self.tombstone_perks.size > 0 )
{