zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-05-31 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into zscript

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-14 15:03:14 +01:00
commit 85ff172ee3
18 changed files with 879 additions and 592 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/p_actionfunctions.cpp
View file

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