OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Sync scriptbranch with trunk.

Browse source 
SVN r2269 (scripting)
This commit is contained in:
Randy Heit 2010-04-04 04:09:24 +00:00
commit 42ac75e894
127 changed files with 2532 additions and 958 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/thingdef/thingdef.cpp
View file

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