- fixed doubling of deprecation warnings for ZScript code

https://forum.zdoom.org/viewtopic.php?t=65617
This commit is contained in:
alexey.lysiuk 2019-08-15 16:31:50 +03:00 committed by drfrag
parent 54d0ed23e9
commit 12dee6ca91

View file

@ -7721,7 +7721,7 @@ FxExpression *FxFunctionCall::Resolve(FCompileContext& ctx)
if (ctx.Class != nullptr)
{
PFunction *afd = FindClassMemberFunction(ctx.Class, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version);
PFunction *afd = FindClassMemberFunction(ctx.Class, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version, !ctx.FromDecorate);
if (afd != nullptr)
{
@ -8123,7 +8123,7 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
if (novirtual)
{
bool error;
PFunction *afd = FindClassMemberFunction(ccls, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version);
PFunction *afd = FindClassMemberFunction(ccls, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version, !ctx.FromDecorate);
if ((nullptr != afd) && (afd->Variants[0].Flags & VARF_Method) && (afd->Variants[0].Flags & VARF_Virtual))
{
staticonly = false;
@ -8430,7 +8430,7 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
isresolved:
bool error = false;
PFunction *afd = FindClassMemberFunction(cls, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version);
PFunction *afd = FindClassMemberFunction(cls, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version, !ctx.FromDecorate);
if (error)
{
delete this;