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

- fixed: DECORATE tried to resolved null states again, causing a type conflict.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-15 14:53:01 +01:00
parent d4d6b739e0
commit 97e643c7e1
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/scripting/decorate/thingdef_exp.cpp
View file

@ -477,9 +477,12 @@ static FxExpression *ParseExpression0 (FScanner &sc, PClassActor *cls)
exp = new FxRuntimeStateIndex(ParseExpressionM(sc, cls)); exp = new FxRuntimeStateIndex(ParseExpressionM(sc, cls));
} }
// The parsed expression is of type 'statelabel', but we want a real state here so we must convert it. // The parsed expression is of type 'statelabel', but we want a real state here so we must convert it.
FArgumentList args; if (!exp->isConstant())
args.Push(exp); {
exp = new FxFunctionCall(NAME_ResolveState, NAME_None, args, sc); FArgumentList args;
args.Push(exp);
exp = new FxFunctionCall(NAME_ResolveState, NAME_None, args, sc);
}
sc.MustGetToken(')'); sc.MustGetToken(')');
return exp; return exp;
} }