mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-30 07:51:28 +00:00
- fixed doubling of deprecation warnings for ZScript code
https://forum.zdoom.org/viewtopic.php?t=65617
This commit is contained in:
parent
06e0c88622
commit
28ea567c22
1 changed files with 3 additions and 3 deletions
|
@ -7717,7 +7717,7 @@ FxExpression *FxFunctionCall::Resolve(FCompileContext& ctx)
|
||||||
|
|
||||||
if (ctx.Class != nullptr)
|
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)
|
if (afd != nullptr)
|
||||||
{
|
{
|
||||||
|
@ -8119,7 +8119,7 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
|
||||||
if (novirtual)
|
if (novirtual)
|
||||||
{
|
{
|
||||||
bool error;
|
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))
|
if ((nullptr != afd) && (afd->Variants[0].Flags & VARF_Method) && (afd->Variants[0].Flags & VARF_Virtual))
|
||||||
{
|
{
|
||||||
staticonly = false;
|
staticonly = false;
|
||||||
|
@ -8426,7 +8426,7 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
|
||||||
|
|
||||||
isresolved:
|
isresolved:
|
||||||
bool error = false;
|
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)
|
if (error)
|
||||||
{
|
{
|
||||||
delete this;
|
delete this;
|
||||||
|
|
Loading…
Reference in a new issue