zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Christoph Oelckers 2013-07-24 23:10:32 +02:00
commit cf3d1aa2e3
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/thingdef/thingdef_codeptr.cpp
View file

@ -1747,6 +1747,7 @@ enum SIX_Flags
SIXF_TRANSFERSCALE = 1 << 14, SIXF_TRANSFERSCALE = 1 << 14,
SIXF_TRANSFERSPECIAL = 1 << 15, SIXF_TRANSFERSPECIAL = 1 << 15,
SIXF_CLEARCALLERSPECIAL = 1 << 16, SIXF_CLEARCALLERSPECIAL = 1 << 16,
SIXF_TRANSFERSTENCILCOL = 1 << 17,
}; };
static bool InitSpawnedItem(AActor *self, AActor *mo, int flags) static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
@ -1859,6 +1860,10 @@ static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
self->special = 0; self->special = 0;
memset(self->args, 0, sizeof(self->args)); memset(self->args, 0, sizeof(self->args));
} }
if (flags & SIXF_TRANSFERSTENCILCOL)
{
mo->fillcolor = self->fillcolor;
}
return true; return true;
} }

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

@ -59,6 +59,7 @@ const int SXF_MULTIPLYSPEED = 8192;
const int SXF_TRANSFERSCALE = 16384; const int SXF_TRANSFERSCALE = 16384;
const int SXF_TRANSFERSPECIAL = 32768; const int SXF_TRANSFERSPECIAL = 32768;
const int SXF_CLEARCALLERSPECIAL = 65536; const int SXF_CLEARCALLERSPECIAL = 65536;
const int SXF_TRANSFERSTENCILCOL = 131072;
// Flags for A_Chase // Flags for A_Chase
const int CHF_FASTCHASE = 1; const int CHF_FASTCHASE = 1;