From 2b323d01edbd6c7c56ff818dd80218270ab7ead4 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 21 Dec 2014 21:22:14 -0600 Subject: [PATCH] Reorder pick parsing to require one parameter. - This function is pointless without any parameters, so don't allow that. --- src/thingdef/thingdef_exp.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/thingdef/thingdef_exp.cpp b/src/thingdef/thingdef_exp.cpp index daa7f1a9c..2ad741294 100644 --- a/src/thingdef/thingdef_exp.cpp +++ b/src/thingdef/thingdef_exp.cpp @@ -390,16 +390,14 @@ static FxExpression *ParseExpression0 (FScanner &sc, const PClass *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))