mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-28 23:11:58 +00:00
- fixed: DECORATE tried to resolved null states again, causing a type conflict.
This commit is contained in:
parent
d4d6b739e0
commit
97e643c7e1
1 changed files with 6 additions and 3 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue