- Fixed: SXF_NOPOINTERS didn't clear LastHeard, causing monsters to spawn with targets.

This commit is contained in:
MajorCooke 2014-09-27 16:50:24 -05:00
parent 68a5db3c8c
commit 97d5d614c4
2 changed files with 5239 additions and 5175 deletions

63
.gitattributes vendored Normal file
View file

@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

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;