SERVER: Fix purchases while holding flamethrower

This commit is contained in:
cypress 2023-09-14 22:00:27 -04:00
parent dbb25354b4
commit 927a14adfd

View file

@ -1944,7 +1944,7 @@ void() CheckPlayer =
void () Weapon_Logic = void () Weapon_Logic =
{ {
// HACK HACK: Don't let the frame updater take control of hold fire. // HACK HACK: Don't let the frame updater take control of hold fire.
if (self.weaponframe == GetFrame(self.weapon, FIRE_HOLD) && GetFrame(self.weapon, FIRE_HOLD) != 0) { if (self.weaponframe == GetFrame(self.weapon, FIRE_HOLD) && GetFrame(self.weapon, FIRE_HOLD) != 0 && !self.isBuying) {
} else { } else {
W_Frame_Update(); W_Frame_Update();
@ -2043,7 +2043,8 @@ void () Weapon_Logic =
if (IsDualWeapon(self.weapon)) { self.semi2 = false; } else { self.semi = false; } if (IsDualWeapon(self.weapon)) { self.semi2 = false; } else { self.semi = false; }
// Hold fire weapons should get set back to base frame. // Hold fire weapons should get set back to base frame.
if (GetFrame(self.weapon, FIRE_HOLD) != 0 && self.weaponframe == GetFrame(self.weapon, FIRE_HOLD)) { if (GetFrame(self.weapon, FIRE_HOLD) != 0 && self.weaponframe == GetFrame(self.weapon, FIRE_HOLD) &&
!self.isBuying) {
self.weaponframe = 0; self.weaponframe = 0;
} }