zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-17 17:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a crash with A_JumpIfNoAmmo

Browse source 
Non-weapon layers can pass the caller check even when there is no ReadyWeapon
This commit is contained in:
Leonard2 2016-06-17 09:35:10 +02:00
parent 68c483c041
commit 24c73071f4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/thingdef/thingdef_codeptr.cpp
View file

@ -1740,7 +1740,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIfNoAmmo)
PARAM_ACTION_PROLOGUE;
PARAM_STATE(jump);
if (!ACTION_CALL_FROM_PSPRITE())
if (!ACTION_CALL_FROM_PSPRITE() || self->player->ReadyWeapon == nullptr)
{
ACTION_RETURN_STATE(NULL);
}