teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-14 16:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Re-fix lighter when changing from TNT to aerosol.

Browse source 
* Fixes #564.
This commit is contained in:
Mitch Richters 2021-10-20 20:54:08 +11:00
parent fc73c67bb1
commit d30c94c709
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -748,14 +748,20 @@ void WeaponLower(PLAYER *pPlayer)
switch (prevState) switch (prevState)
{ {
case 1: case 1:
if (!VanillaMode() && (pPlayer->newWeapon == kWeapSpraycan)) // do not put away lighter after TNT is thrown if while throwing the weapon was switched already to spray if (VanillaMode())
{ {
pPlayer->weaponState = 2; StartQAV(pPlayer, kQAVLITECLO2);
StartQAV(pPlayer, kQAVBUNDOWN); }
WeaponRaise(pPlayer); else
return; {
if (pPlayer->newWeapon == kWeapSpraycan) // do not put away lighter if TNT was selected while throwing a spray can
{
pPlayer->weaponState = 2;
StartQAV(pPlayer, kQAVCANDOWN);
WeaponRaise(pPlayer);
return;
}
} }
StartQAV(pPlayer, kQAVLITECLO2);
break; break;
case 2: case 2:
WeaponRaise(pPlayer); WeaponRaise(pPlayer);
@ -836,14 +842,6 @@ void WeaponLower(PLAYER *pPlayer)
} }
pPlayer->curWeapon = kWeapNone; pPlayer->curWeapon = kWeapNone;
pPlayer->qavLoop = 0; pPlayer->qavLoop = 0;
// BloodGDX fix for aerosol lighter just appearing when switching to it.
// https://gitlab.com/m210/BloodGDX/-/commit/bea4dedd0c429eb9639333165b6f656483c9a7f7
if(!VanillaMode() && pPlayer->curWeapon != kWeapDynamite)
{
pPlayer->weaponState = 0;
}
} }
void WeaponUpdateState(PLAYER *pPlayer) void WeaponUpdateState(PLAYER *pPlayer)