OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'maint' into scripting

Browse source
This commit is contained in:
Christoph Oelckers 2013-07-28 10:47:17 +02:00
commit 909ec2e35a
8 changed files with 119 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/thingdef/thingdef_codeptr.cpp
View file

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