zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 07:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Fixed weapon switching while using Voodoo Doll playing its idle animation.

Browse source 
* Fixes #517.
This commit is contained in:
Mitchell Richters 2021-08-24 07:25:52 +10:00
parent feb11a2f9a
commit 542f005565
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2029,7 +2029,8 @@ void WeaponProcess(PLAYER *pPlayer) {
pPlayer->weaponTimer -= 4; pPlayer->weaponTimer -= 4;
bool bShoot = pPlayer->input.actions & SB_FIRE; bool bShoot = pPlayer->input.actions & SB_FIRE;
bool bShoot2 = pPlayer->input.actions & SB_ALTFIRE; bool bShoot2 = pPlayer->input.actions & SB_ALTFIRE;
if ((bShoot || bShoot2) && pPlayer->weaponQav == qavGetCorrectID(kQAVVDIDLE2)) pPlayer->weaponTimer = 0; const int prevNewWeaponVal = pPlayer->input.getNewWeapon(); // used to fix scroll issue for banned weapons
if ((bShoot || bShoot2 || prevNewWeaponVal) && pPlayer->weaponQav == qavGetCorrectID(kQAVVDIDLE2)) pPlayer->weaponTimer = 0;
if (pPlayer->qavLoop && pPlayer->pXSprite->health > 0) if (pPlayer->qavLoop && pPlayer->pXSprite->health > 0)
{ {
if (bShoot && CheckAmmo(pPlayer, pPlayer->weaponAmmo, 1)) if (bShoot && CheckAmmo(pPlayer, pPlayer->weaponAmmo, 1))
@ -2084,7 +2085,6 @@ void WeaponProcess(PLAYER *pPlayer) {
return; return;
break; break;
} }
const int prevNewWeaponVal = pPlayer->input.getNewWeapon(); // used to fix scroll issue for banned weapons
if (VanillaMode()) if (VanillaMode())
{ {
if (pPlayer->nextWeapon) if (pPlayer->nextWeapon)