zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 23:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into scripting

Browse source
This commit is contained in:
Randy Heit 2014-12-21 21:24:05 -06:00
commit 1ea03ffbec
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/thingdef/thingdef_exp.cpp
View file

@ -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))