zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

A_FireCustomMissile's useammo parameter should NOT use ammo if not called from a weapon

Browse source
This commit is contained in:
Kyle Evans 2015-03-10 11:58:10 -04:00 committed by Randy Heit
parent 4f04fb4fbd
commit bc206f21af
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/thingdef/thingdef_codeptr.cpp
View file

@ -1337,7 +1337,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_FireCustomMissile)
AWeapon * weapon=player->ReadyWeapon; AWeapon * weapon=player->ReadyWeapon;
AActor *linetarget; AActor *linetarget;
if (UseAmmo && weapon) // Only use ammo if called from a weapon
if (UseAmmo && ACTION_CALL_FROM_WEAPON() && weapon)
{ {
if (!weapon->DepleteAmmo(weapon->bAltFire, true)) return; // out of ammo if (!weapon->DepleteAmmo(weapon->bAltFire, true)) return; // out of ammo
} }
@ -5892,4 +5893,4 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRipMax)
ACTION_PARAM_START(1); ACTION_PARAM_START(1);
ACTION_PARAM_INT(max, 1); ACTION_PARAM_INT(max, 1);
self->RipLevelMax = max; self->RipLevelMax = max;
} }