OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Pick can now hold unlimited numbers to choose from.

Browse source 
- I.e. pick(1,4,12,16)
This commit is contained in:
MajorCooke 2014-12-14 04:45:39 -06:00
commit 3f3aab42f1
3 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/thingdef/thingdef_exp.cpp
View file

@ -374,6 +374,9 @@ static FxExpression *ParseExpression0 (FScanner &sc, const PClass *cls)
else if (sc.CheckToken(TK_Pick))
{
FRandom *rng;
TArray<FxExpression*> list;
list.Clear();
int index = 0;
if (sc.CheckToken('['))
{
@ -387,12 +390,17 @@ static FxExpression *ParseExpression0 (FScanner &sc, const PClass *cls)
}
sc.MustGetToken('(');
FxExpression *min = ParseExpressionM(sc, cls);
sc.MustGetToken(',');
FxExpression *max = ParseExpressionM(sc, cls);
sc.MustGetToken(')');
while (!(sc.CheckToken(')')))
{
FxExpression *min = ParseExpressionM(sc, cls);
list.Push(min);
if (sc.CheckToken(')'))
break;
else
sc.MustGetToken(',');
}
return new FxPick(rng, min, max, sc);
return new FxPick(rng, list, sc);
}
else if (sc.CheckToken(TK_FRandom))
{