zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 22:33:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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) else if (amount <= 0)
{ {
// Remove it all. //Remove it all.
if (item) res = (mobj->TakeInventory(itemtype, item->Amount, true, false));
{
item->DepleteOrDestroy();
res = true;
}
ACTION_RETURN_BOOL(res); ACTION_RETURN_BOOL(res);
} }
else if (amount < item->Amount) else if (amount < item->Amount)