mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-14 08:30:49 +00:00
Merge branch 'master' into scripting
This commit is contained in:
commit
1ea03ffbec
1 changed files with 4 additions and 6 deletions
|
@ -388,16 +388,14 @@ static FxExpression *ParseExpression0 (FScanner &sc, PClassActor *cls)
|
||||||
}
|
}
|
||||||
sc.MustGetToken('(');
|
sc.MustGetToken('(');
|
||||||
|
|
||||||
while (!(sc.CheckToken(')')))
|
for (;;)
|
||||||
{
|
{
|
||||||
FxExpression *min = ParseExpressionM(sc, cls);
|
FxExpression *expr = ParseExpressionM(sc, cls);
|
||||||
list.Push(min);
|
list.Push(expr);
|
||||||
if (sc.CheckToken(')'))
|
if (sc.CheckToken(')'))
|
||||||
break;
|
break;
|
||||||
else
|
|
||||||
sc.MustGetToken(',');
|
sc.MustGetToken(',');
|
||||||
}
|
}
|
||||||
|
|
||||||
return new FxPick(rng, list, sc);
|
return new FxPick(rng, list, sc);
|
||||||
}
|
}
|
||||||
else if (sc.CheckToken(TK_FRandom))
|
else if (sc.CheckToken(TK_FRandom))
|
||||||
|
|
Loading…
Reference in a new issue