zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into scripting

This commit is contained in:
Randy Heit 2014-12-21 21:24:05 -06:00
parent b5e4153c78 2b323d01ed
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('(');
while (!(sc.CheckToken(')')))
for (;;)
{
FxExpression *min = ParseExpressionM(sc, cls);
list.Push(min);
FxExpression *expr = ParseExpressionM(sc, cls);
list.Push(expr);
if (sc.CheckToken(')'))
break;
else
sc.MustGetToken(',');
sc.MustGetToken(',');
}
return new FxPick(rng, list, sc);
}
else if (sc.CheckToken(TK_FRandom))