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

Fix melee weapon not always switching back to correct weapon

Browse Source 
Optimize melee weapon switch code
This commit is contained in:
Jbleezy
2022-01-03 05:23:42 -08:00
parent 2e4e1e9e61
commit 137738997d
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/zm/_zm_reimagined.gsc
View File

@ -1743,28 +1743,21 @@ melee_weapon_switch_watcher()
melee_wep = self get_player_melee_weapon(); melee_wep = self get_player_melee_weapon();
curr_wep = self getCurrentWeapon(); curr_wep = self getCurrentWeapon();
if(curr_wep != "none" && !is_offhand_weapon(curr_wep))
{
prev_wep = curr_wep;
}
if(self actionSlotTwoButtonPressed() && !self hasWeapon("equip_dieseldrone_zm")) if(self actionSlotTwoButtonPressed() && !self hasWeapon("equip_dieseldrone_zm"))
{ {
if(curr_wep != melee_wep) if(curr_wep != melee_wep)
{ {
prev_wep = curr_wep;
self switchToWeapon(melee_wep); self switchToWeapon(melee_wep);
} }
else else
{ {
if(isDefined(prev_wep) && self hasWeapon(prev_wep)) self maps/mp/zombies/_zm_weapons::switch_back_primary_weapon(prev_wep);
{
self switchToWeapon(prev_wep);
}
else
{
self switchToWeapon(self getWeaponsListPrimaries()[0]);
}
prev_wep = undefined;
} }
self waittill("weapon_change");
} }
wait 0.05; wait 0.05;