zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 04:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Repair weapon switching issue by adding missing guard from 6980e8b355 that got lost during e375c799ce.

Browse source 
* Fixes #366.
This commit is contained in:
Mitchell Richters 2021-07-17 09:14:08 +10:00
parent d77e143ee8
commit f022f197ab
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/games/blood/src/weapon.cpp
View file

@ -2087,12 +2087,15 @@ void WeaponProcess(PLAYER *pPlayer) {
return; return;
break; break;
} }
if (pPlayer->nextWeapon) if (VanillaMode())
{ {
sfxKill3DSound(pPlayer->pSprite, -1, 441); if (pPlayer->nextWeapon)
pPlayer->weaponState = 0; {
pPlayer->newWeapon = pPlayer->nextWeapon; sfxKill3DSound(pPlayer->pSprite, -1, 441);
pPlayer->nextWeapon = 0; pPlayer->weaponState = 0;
pPlayer->newWeapon = pPlayer->nextWeapon;
pPlayer->nextWeapon = 0;
}
} }
if (pPlayer->input.getNewWeapon() == WeaponSel_Next) if (pPlayer->input.getNewWeapon() == WeaponSel_Next)
{ {