OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- cleaned up the class data organization:

Browse source 
* moved RestrictedToPlayerClass and ForbiddenToPlayerClass arrays to AInventory.
 * moved all copy-from-parent code into DeriveData functions.
This commit is contained in:
Christoph Oelckers 2016-02-10 00:46:51 +01:00
commit 3358181f18
6 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/thingdef/thingdef.cpp
View file

@ -145,23 +145,6 @@ PClassActor *CreateNewActor(const FScriptPosition &sc, FName typeName, FName par
ti = static_cast<PClassActor *>(parent->CreateDerivedClass (typeName, parent->Size));
}
// Copy class lists from parent
ti->ForbiddenToPlayerClass = parent->ForbiddenToPlayerClass;
ti->RestrictedToPlayerClass = parent->RestrictedToPlayerClass;
ti->VisibleToPlayerClass = parent->VisibleToPlayerClass;
if (parent->DamageFactors != NULL)
{
// copy damage factors from parent
ti->DamageFactors = new DmgFactors;
*ti->DamageFactors = *parent->DamageFactors;
}
if (parent->PainChances != NULL)
{
// copy pain chances from parent
ti->PainChances = new PainChanceList;
*ti->PainChances = *parent->PainChances;
}
ti->Replacee = ti->Replacement = NULL;
ti->DoomEdNum = -1;
return ti;