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

Merge pull request #354 from MajorCooke/SXFSpawnPtrFlags

Browse source 
- Added SXF_IS<TARGET/MASTER/TRACER>.
This commit is contained in:
coelckers 2015-08-09 21:25:00 +02:00
commit f64d3a5723
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/thingdef/thingdef_codeptr.cpp
View file

@ -1857,6 +1857,9 @@ enum SIX_Flags
SIXF_ORIGINATOR = 0x00800000,
SIXF_TRANSFERSPRITEFRAME = 0x01000000,
SIXF_TRANSFERROLL = 0x02000000,
SIXF_ISTARGET = 0x04000000,
SIXF_ISMASTER = 0x08000000,
SIXF_ISTRACER = 0x10000000,
};
static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
@ -2014,6 +2017,18 @@ static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
mo->roll = self->roll;
}
if (flags & SIXF_ISTARGET)
{
self->target = mo;
}
if (flags & SIXF_ISMASTER)
{
self->master = mo;
}
if (flags & SIXF_ISTRACER)
{
self->tracer = mo;
}
return true;
}

3
wadsrc/static/actors/constants.txt
View file

@ -74,6 +74,9 @@ const int SXF_NOPOINTERS = 1 << 22;
const int SXF_ORIGINATOR = 1 << 23;
const int SXF_TRANSFERSPRITEFRAME = 1 << 24;
const int SXF_TRANSFERROLL = 1 << 25;
const int SXF_ISTARGET = 1 << 26,
const int SXF_ISMASTER = 1 << 27,
const int SXF_ISTRACER = 1 << 28,
// Flags for A_Chase
const int CHF_FASTCHASE = 1;