OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added a 'player.clearcolorset' property so that inherited color sets can be removed.

Browse source 
- fixed: Player color sets were not inheritable.


SVN r2202 (trunk)
This commit is contained in:
Christoph Oelckers 2010-03-07 09:13:41 +00:00
commit 0569d948df
7 changed files with 80 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/thingdef/thingdef.cpp
View file

@ -159,6 +159,12 @@ FActorInfo *CreateNewActor(const FScriptPosition &sc, FName typeName, FName pare
info->PainChances = new PainChanceList;
*info->PainChances = *parent->ActorInfo->PainChances;
}
if (parent->ActorInfo->ColorSets != NULL)
{
// copy color sets from parent
info->ColorSets = new FPlayerColorSetMap;
*info->ColorSets = *parent->ActorInfo->ColorSets;
}
info->Replacee = info->Replacement = NULL;
info->DoomEdNum = -1;
return info;