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

- undid incorrect part of CheckClass fix.

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-09 17:55:43 +01:00
parent bcfb437302
commit 5261acce1d
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/thingdef/thingdef_expression.cpp
View file

@ -52,6 +52,7 @@
#include "thingdef_exp.h" #include "thingdef_exp.h"
#include "m_fixed.h" #include "m_fixed.h"
#include "vmbuilder.h" #include "vmbuilder.h"
#include "v_text.h"
ExpEmit::ExpEmit(VMFunctionBuilder *build, int type) ExpEmit::ExpEmit(VMFunctionBuilder *build, int type)
: RegNum(build->Registers[type].Get(1)), RegType(type), Konst(false), Fixed(false) : RegNum(build->Registers[type].Get(1)), RegType(type), Konst(false), Fixed(false)
@ -3546,15 +3547,25 @@ FxExpression *FxClassTypeCast::Resolve(FCompileContext &ctx)
if (clsname != NAME_None) if (clsname != NAME_None)
{ {
// for backwards compatibility with old times it cannot be made a fatal error, if the class is not defined. :( cls = PClass::FindClass(clsname);
cls = desttype->FindClassTentative(clsname, false); if (cls == NULL)
if (!cls->IsDescendantOf(desttype))
{ {
ScriptPosition.Message(MSG_ERROR,"class '%s' is not compatible with '%s'", clsname.GetChars(), desttype->TypeName.GetChars()); /* lax */
delete this; // Since this happens in released WADs it must pass without a terminal error... :(
return NULL; ScriptPosition.Message(MSG_WARNING,
"Unknown class name '%s'",
clsname.GetChars(), desttype->TypeName.GetChars());
} }
ScriptPosition.Message(MSG_DEBUG,"resolving '%s' as class name", clsname.GetChars()); else
{
if (!cls->IsDescendantOf(desttype))
{
ScriptPosition.Message(MSG_ERROR, "class '%s' is not compatible with '%s'", clsname.GetChars(), desttype->TypeName.GetChars());
delete this;
return NULL;
}
}
ScriptPosition.Message(MSG_DEBUG, "resolving '%s' as class name", clsname.GetChars());
} }
FxExpression *x = new FxConstant(cls, ScriptPosition); FxExpression *x = new FxConstant(cls, ScriptPosition);
delete this; delete this;