nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-02-21 19:21:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: Fix for PaP giving duplicate primary weapon if there's no secondary

Browse source
This commit is contained in:
Steam Deck User 2023-03-04 23:24:33 -05:00
parent c3c2bfe65c
commit 8fc831684b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/server/entities/machines.qc
View file

@ -1943,8 +1943,12 @@ void touch_pap() {
useprint (other, 7, 0, 0); useprint (other, 7, 0, 0);
if (other.button7) { if (other.button7) {
if (!other.secondaryweapon) { // Back-up current weapon into second slot, it's getting replaced.
WeaponSwitch(other); if (!other.secondaryweapon && other.weapon != EqualPapWeapon(self.weapon)) {
other.secondaryweapon = other.weapon;
other.secondarymag = other.currentmag;
other.secondarymag2 = other.currentmag2;
other.secondaryammo = other.currentammo;
} }
other.weapon = EqualPapWeapon(self.weapon); other.weapon = EqualPapWeapon(self.weapon);