zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-06-01 17:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Non-Actors cannot act as activators for action specials and must pass null when acticating one.

Browse source
This commit is contained in:
Christoph Oelckers 2016-12-11 21:39:35 +01:00
parent e61ae9a1f9
commit 77d9978b27
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/codegeneration/codegen.cpp
View file

@ -7083,7 +7083,7 @@ FxExpression *FxFunctionCall::Resolve(FCompileContext& ctx)
delete this; delete this;
return nullptr; return nullptr;
} }
FxExpression *self = (ctx.Function && ctx.Function->Variants[0].Flags & VARF_Method) ? new FxSelf(ScriptPosition) : (FxExpression*)new FxConstant(ScriptPosition); FxExpression *self = (ctx.Function && (ctx.Function->Variants[0].Flags & VARF_Method) && ctx.Class->IsKindOf(RUNTIME_CLASS(PClassActor))) ? new FxSelf(ScriptPosition) : (FxExpression*)new FxConstant(ScriptPosition);
FxExpression *x = new FxActionSpecialCall(self, special, ArgList, ScriptPosition); FxExpression *x = new FxActionSpecialCall(self, special, ArgList, ScriptPosition);
delete this; delete this;
return x->Resolve(ctx); return x->Resolve(ctx);