zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move receiver NULL check above the orresult check (#695)

Browse source 
This is to prevent a VM abort from happening here if orresult is false.
This commit is contained in:
Cacodemon345 2019-01-07 06:04:09 +06:00 committed by Christoph Oelckers
parent 7666997580
commit 70a07e154c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wadsrc/static/zscript/actor_inventory.txt
View file

@ -393,14 +393,14 @@ extend class Actor
{ {
int paramnum = 0; int paramnum = 0;
if (!orresult)
{
receiver = receiver.GetPointer(setreceiver);
}
if (receiver == NULL) if (receiver == NULL)
{ // If there's nothing to receive it, it's obviously a fail, right? { // If there's nothing to receive it, it's obviously a fail, right?
return false; return false;
} }
if (!orresult)
{
receiver = receiver.GetPointer(setreceiver);
}
// Owned inventory items cannot own anything because their Inventory pointer is repurposed for the owner's linked list. // Owned inventory items cannot own anything because their Inventory pointer is repurposed for the owner's linked list.
if (receiver is 'Inventory' && Inventory(receiver).Owner != null) if (receiver is 'Inventory' && Inventory(receiver).Owner != null)
{ {