- fixed some issues with setup parts for ZScript in the wrong place.
This never showed on GZDoom as an error but on Raze which has no actor classes it caused incompletely set up class descriptors.
This commit is contained in:
parent
248aa8b5a7
commit
75cd00a340
13 changed files with 74 additions and 167 deletions
|
|
@ -922,3 +922,31 @@ unsigned GetVirtualIndex(PClass *cls, const char *funcname)
|
|||
return VIndex;
|
||||
}
|
||||
|
||||
|
||||
void PClass::InitializeDefaults()
|
||||
{
|
||||
if (VMType != nullptr) // purely internal classes have no symbol table
|
||||
{
|
||||
if (bRuntimeClass)
|
||||
{
|
||||
// Copy parent values from the parent defaults.
|
||||
assert(ParentClass != nullptr);
|
||||
if (Defaults != nullptr) ParentClass->InitializeSpecials(Defaults, ParentClass->Defaults, &PClass::SpecialInits);
|
||||
for (const PField* field : Fields)
|
||||
{
|
||||
if (!(field->Flags & VARF_Native) && !(field->Flags & VARF_Meta))
|
||||
{
|
||||
field->Type->SetDefaultValue(Defaults, unsigned(field->Offset), &SpecialInits);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (Meta != nullptr) ParentClass->InitializeSpecials(Meta, ParentClass->Meta, &PClass::MetaInits);
|
||||
for (const PField* field : Fields)
|
||||
{
|
||||
if (!(field->Flags & VARF_Native) && (field->Flags & VARF_Meta))
|
||||
{
|
||||
field->Type->SetDefaultValue(Meta, unsigned(field->Offset), &MetaInits);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -46,6 +46,7 @@ public:
|
|||
int FindVirtualIndex(FName name, PFunction::Variant *variant, PFunction *parentfunc);
|
||||
PSymbol *FindSymbol(FName symname, bool searchparents) const;
|
||||
PField *AddField(FName name, PType *type, uint32_t flags);
|
||||
void InitializeDefaults();
|
||||
|
||||
static void StaticInit();
|
||||
static void StaticShutdown();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue