zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 15:52:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3 from rheit/master

Browse source
This commit is contained in:
MajorCooke 2014-09-27 18:49:28 -05:00
commit 1fe5082eac
1 changed files with 5176 additions and 5175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/thingdef/thingdef_codeptr.cpp
View file

@ -1824,7 +1824,7 @@ static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
mo->Destroy(); mo->Destroy();
return false; return false;
} }
else if (originator) else if (originator && !(flags & SIXF_NOPOINTERS))
{ {
if (originator->flags3 & MF3_ISMONSTER) if (originator->flags3 & MF3_ISMONSTER)
{ {
@ -1858,6 +1858,7 @@ static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
if (flags & SIXF_NOPOINTERS) if (flags & SIXF_NOPOINTERS)
{ {
//[MC]Intentionally eliminate pointers. Overrides TRANSFERPOINTERS, but is overridden by SETMASTER/TARGET/TRACER. //[MC]Intentionally eliminate pointers. Overrides TRANSFERPOINTERS, but is overridden by SETMASTER/TARGET/TRACER.
mo->LastHeard = NULL; //Sanity check.
mo->target = NULL; mo->target = NULL;
mo->master = NULL; mo->master = NULL;
mo->tracer = NULL; mo->tracer = NULL;