zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 07:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: With the reorganization of the class data the setup of actor replacements must be delayed until after InitializeDefaults has been called.

Browse source
This commit is contained in:
Christoph Oelckers 2017-04-13 02:18:06 +02:00
parent 6599e2c425
commit 85d8244d03
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/scripting/zscript/zcc_compile.cpp
View file

@ -745,7 +745,7 @@ void ZCCCompiler::CreateClassTypes()
Classes.Push(c); Classes.Push(c);
} }
// Last but not least: Now that all classes have been created, we can create the symbols for the internal enums and link the treenode symbol tables and set up replacements // Last but not least: Now that all classes have been created, we can create the symbols for the internal enums and link the treenode symbol tables.
for (auto cd : Classes) for (auto cd : Classes)
{ {
for (auto e : cd->Enums) for (auto e : cd->Enums)
@ -762,12 +762,6 @@ void ZCCCompiler::CreateClassTypes()
break; break;
} }
} }
if (cd->cls->Replaces != nullptr && !static_cast<PClassActor *>(cd->ClassType())->SetReplacement(cd->cls->Replaces->Id))
{
Warn(cd->cls, "Replaced type '%s' not found for %s", FName(cd->cls->Replaces->Id).GetChars(), cd->Type()->TypeName.GetChars());
}
} }
} }
@ -2201,7 +2195,7 @@ void ZCCCompiler::InitDefaults()
// This may be removed if the conditions change, but right now only subclasses of Actor can define a Default block. // This may be removed if the conditions change, but right now only subclasses of Actor can define a Default block.
if (!c->ClassType()->IsDescendantOf(RUNTIME_CLASS(AActor))) if (!c->ClassType()->IsDescendantOf(RUNTIME_CLASS(AActor)))
{ {
if (c->Defaults.Size()) Error(c->cls, "%s: Non-actor classes may not have defaults", c->Type()->TypeName.GetChars()); if (c->Defaults.Size()) Error(c->cls, "%s: Non-actor classes may not have defaults", c->ClassType()->TypeName.GetChars());
if (c->ClassType()->ParentClass) if (c->ClassType()->ParentClass)
{ {
auto ti = static_cast<PClassActor *>(c->ClassType()); auto ti = static_cast<PClassActor *>(c->ClassType());
@ -2228,6 +2222,12 @@ void ZCCCompiler::InitDefaults()
ti->InitializeDefaults(); ti->InitializeDefaults();
// Replacements require that the meta data has been allocated by InitializeDefaults.
if (c->cls->Replaces != nullptr && !ti->SetReplacement(c->cls->Replaces->Id))
{
Warn(c->cls, "Replaced type '%s' not found for %s", FName(c->cls->Replaces->Id).GetChars(), ti->TypeName.GetChars());
}
// We need special treatment for this one field in AActor's defaults which cannot be made visible to DECORATE as a property. // We need special treatment for this one field in AActor's defaults which cannot be made visible to DECORATE as a property.
// It's better to do this here under controlled conditions than deeper down in the class type classes. // It's better to do this here under controlled conditions than deeper down in the class type classes.
if (ti == RUNTIME_CLASS(AActor)) if (ti == RUNTIME_CLASS(AActor))