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

- Added SXF_TRANSFERSPECIAL and SXF_CLEARCALLERSPECIAL flags for A_SpawnItemEx.

Browse source 
SVN r4199 (trunk)
This commit is contained in:
Randy Heit 2013-03-23 01:22:37 +00:00
parent 044616a86f
commit c54ea7f6b7
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/thingdef/thingdef_codeptr.cpp
View file

@ -1736,6 +1736,8 @@ enum SIX_Flags
SIXF_CLEARCALLERTID = 1 << 12, SIXF_CLEARCALLERTID = 1 << 12,
SIXF_MULTIPLYSPEED = 1 << 13, SIXF_MULTIPLYSPEED = 1 << 13,
SIXF_TRANSFERSCALE = 1 << 14, SIXF_TRANSFERSCALE = 1 << 14,
SIXF_TRANSFERSPECIAL = 1 << 15,
SIXF_CLEARCALLERSPECIAL = 1 << 16,
}; };
static bool InitSpawnedItem(AActor *self, AActor *mo, int flags) static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
@ -1838,6 +1840,16 @@ static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
self->RemoveFromHash(); self->RemoveFromHash();
self->tid = 0; self->tid = 0;
} }
if (flags & SIXF_TRANSFERSPECIAL)
{
mo->special = self->special;
memcpy(mo->args, self->args, sizeof(self->args));
}
if (flags & SIXF_CLEARCALLERSPECIAL)
{
self->special = 0;
memset(self->args, 0, sizeof(self->args));
}
return true; return true;
} }

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

@ -57,6 +57,8 @@ const int SXF_USEBLOODCOLOR = 2048;
const int SXF_CLEARCALLERTID = 4096; const int SXF_CLEARCALLERTID = 4096;
const int SXF_MULTIPLYSPEED = 8192; const int SXF_MULTIPLYSPEED = 8192;
const int SXF_TRANSFERSCALE = 16384; const int SXF_TRANSFERSCALE = 16384;
const int SXF_TRANSFERSPECIAL = 32768;
const int SXF_CLEARCALLERSPECIAL = 65536;
// Flags for A_Chase // Flags for A_Chase
const int CHF_FASTCHASE = 1; const int CHF_FASTCHASE = 1;