zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The expression evaluator must ignore the action function symbol for ACS_NamedExecuteWithResult.

Browse source 
This is necessary because otherwise the incompatible action function will take precedence over the special handling for this inside FxFunctionCall.
This commit is contained in:
Christoph Oelckers 2016-02-10 21:48:28 +01:00
parent 4428d073d5
commit 7e45c49c2f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/thingdef/thingdef_exp.cpp
View file

@ -467,7 +467,8 @@ static FxExpression *ParseExpression0 (FScanner &sc, PClassActor *cls)
PFunction *func = dyn_cast<PFunction>(cls->Symbols.FindSymbol(identifier, true)); PFunction *func = dyn_cast<PFunction>(cls->Symbols.FindSymbol(identifier, true));
try try
{ {
if (func != NULL) // There is an action function ACS_NamedExecuteWithResult which must be ignored here for this to work.
if (func != NULL && identifier != NAME_ACS_NamedExecuteWithResult)
{ {
sc.UnGet(); sc.UnGet();
ParseFunctionParameters(sc, cls, *args, func, "", NULL); ParseFunctionParameters(sc, cls, *args, func, "", NULL);