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

- added missing NULL pointer check to ACS's CheckInventory.

This commit is contained in:
Christoph Oelckers 2016-05-18 09:39:19 +02:00
parent fe966916d7
commit 661c2e5919
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_acs.cpp
View File

@ -1333,9 +1333,13 @@ static int CheckInventory (AActor *activator, const char *type, bool max)
if (max)
{
if (item)
{
return item->MaxAmount;
else
return ((AInventory *)GetDefaultByType (info))->MaxAmount;
}
else if (info != nullptr && info->IsDescendantOf(RUNTIME_CLASS(AInventory)))
{
return ((AInventory *)GetDefaultByType(info))->MaxAmount;
}
}
return item ? item->Amount : 0;
}