zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: A_SetInventory with an amount of 0 was not truly eliminating the actor.

This commit is contained in:
Major Cooke 2016-11-13 19:27:59 -06:00
parent 472f35d2ce
commit 02435b46a0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_actionfunctions.cpp
View File

@ -2665,8 +2665,12 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetInventory)
} }
else if (amount <= 0) else if (amount <= 0)
{ {
//Remove it all. // Remove it all.
res = (mobj->TakeInventory(itemtype, item->Amount, true, false)); if (item)
{
item->DepleteOrDestroy();
res = true;
}
ACTION_RETURN_BOOL(res); ACTION_RETURN_BOOL(res);
} }
else if (amount < item->Amount) else if (amount < item->Amount)