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

Merge branch 'setmasterfix' of https://github.com/MajorCooke/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-09-19 09:15:33 +02:00
commit c2377ff8e1
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/thingdef/thingdef_codeptr.cpp
View file

@ -1843,6 +1843,10 @@ static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
// If this is a missile or something else set the target to the originator // If this is a missile or something else set the target to the originator
mo->target = originator ? originator : self; mo->target = originator ? originator : self;
} }
if (flags & SIXF_SETMASTER)
{
mo->master = originator;
}
if (flags & SIXF_TRANSFERSCALE) if (flags & SIXF_TRANSFERSCALE)
{ {
mo->scaleX = self->scaleX; mo->scaleX = self->scaleX;