- Split thingdef.cpp into several files so that the state and property code
no longer gets in the way of the main parser. - Changed A_MissileAttack, A_MeleeAttack and A_ComboAttack so that they use metadata. Now all the hack code associated with these functions can be removed. SVN r538 (trunk)
This commit is contained in:
parent
50f75b6e8a
commit
8f6fdc1d21
14 changed files with 5303 additions and 5235 deletions
|
|
@ -49,7 +49,6 @@ FDecalLib DecalLibrary;
|
|||
|
||||
static fixed_t ReadScale ();
|
||||
static TArray<BYTE> DecalTranslations;
|
||||
extern TArray<char*> DecalNames;
|
||||
|
||||
// A decal group holds multiple decals and returns one randomly
|
||||
// when GetDecal() is called.
|
||||
|
|
@ -355,19 +354,12 @@ void FDecalLib::ReadAllDecals ()
|
|||
{
|
||||
AActor *def = (AActor*)GetDefaultByType (PClass::m_RuntimeActors[i]);
|
||||
|
||||
intptr_t v = (intptr_t)def->DecalGenerator;
|
||||
if (v > 0 && v <= (intptr_t)DecalNames.Size())
|
||||
FName v = ENamedName(intptr_t(def->DecalGenerator));
|
||||
if (v.IsValidName())
|
||||
{
|
||||
def->DecalGenerator = ScanTreeForName (DecalNames[v-1], Root);
|
||||
def->DecalGenerator = ScanTreeForName (v, Root);
|
||||
}
|
||||
}
|
||||
// Free the array which is no longer needed!
|
||||
for (i = 0; i < DecalNames.Size(); i++)
|
||||
{
|
||||
delete[] DecalNames[i];
|
||||
}
|
||||
DecalNames.Clear();
|
||||
DecalNames.ShrinkToFit();
|
||||
}
|
||||
|
||||
void FDecalLib::ReadDecals ()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue