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

- fixed class name checks for custom properties.

Browse source
This commit is contained in:
Christoph Oelckers 2017-01-16 20:44:52 +01:00
parent d3ab691afb
commit c5f100a61d
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/scripting/decorate/thingdef_parse.cpp
View file

@ -862,11 +862,16 @@ static void DispatchScriptProperty(FScanner &sc, PProperty *prop, AActor *defaul
sc.MustGetString(); sc.MustGetString();
auto cls = PClass::FindClass(sc.String); auto cls = PClass::FindClass(sc.String);
*(PClass**)addr = cls; *(PClass**)addr = cls;
if (!cls->IsDescendantOf(static_cast<PClassPointer*>(f->Type)->ClassRestriction)) if (cls == nullptr)
{ {
sc.ScriptMessage("class %s is not compatible with property type %s", cls->TypeName.GetChars(), static_cast<PClassPointer*>(f->Type)->ClassRestriction->TypeName.GetChars()); cls = static_cast<PClassPointer*>(f->Type)->ClassRestriction->FindClassTentative(sc.String);
}
else if (!cls->IsDescendantOf(static_cast<PClassPointer*>(f->Type)->ClassRestriction))
{
sc.ScriptMessage("class %s is not compatible with property type %s", sc.String, static_cast<PClassPointer*>(f->Type)->ClassRestriction->TypeName.GetChars());
FScriptPosition::ErrorCounter++; FScriptPosition::ErrorCounter++;
} }
*(PClass**)addr = cls;
} }
else else
{ {

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

@ -1960,12 +1960,17 @@ void ZCCCompiler::DispatchScriptProperty(PProperty *prop, ZCC_PropertyStmt *prop
} }
else if (f->Type->IsKindOf(RUNTIME_CLASS(PClassPointer))) else if (f->Type->IsKindOf(RUNTIME_CLASS(PClassPointer)))
{ {
auto cls = PClass::FindClass(GetString(exp)); auto clsname = GetString(exp);
*(PClass**)addr = cls; auto cls = PClass::FindClass(clsname);
if (!cls->IsDescendantOf(static_cast<PClassPointer*>(f->Type)->ClassRestriction)) if (cls == nullptr)
{ {
Error(property, "class %s is not compatible with property type %s", cls->TypeName.GetChars(), static_cast<PClassPointer*>(f->Type)->ClassRestriction->TypeName.GetChars()); cls = static_cast<PClassPointer*>(f->Type)->ClassRestriction->FindClassTentative(clsname);
} }
else if (!cls->IsDescendantOf(static_cast<PClassPointer*>(f->Type)->ClassRestriction))
{
Error(property, "class %s is not compatible with property type %s", clsname, static_cast<PClassPointer*>(f->Type)->ClassRestriction->TypeName.GetChars());
}
*(PClass**)addr = cls;
} }
else else
{ {