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

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

This reverts commit 02435b46a0.
This commit is contained in:
Christoph Oelckers 2016-11-14 15:52:49 +01:00
parent 109558d74d
commit 0111ec451a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_actionfunctions.cpp
View File

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