From 5b2ebfbb018110ace95c275b838f56ea1def7330 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 9 Jun 2006 08:19:46 +0000 Subject: [PATCH] - Changed music name handling in MAPINFO so that music can be specified by full path of a file in a Zip. - Fixed: intermusic in MAPINFO was limited to WAD lumps and couldn't handle external data. ACS: - Fixed: Global and World array symbols didn't initialize their array information. SVN r182 (trunk) --- parse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/parse.c b/parse.c index d870d39..e46a807 100644 --- a/parse.c +++ b/parse.c @@ -1079,7 +1079,11 @@ static void OuterWorldVar(boolean isGlobal) while(tk_Token == TK_LBRACKET); } sym = SY_InsertGlobal(tk_String, isGlobal ? SY_GLOBALARRAY : SY_WORLDARRAY); - sym->info.var.index = index; + sym->info.array.index = index; + sym->info.array.ndim = 1; + sym->info.array.size = 0x7fffffff; // not used + memset(sym->info.array.dimensions, 0, sizeof(sym->info.array.dimensions)); + if (isGlobal) pa_GlobalArrayCount++; else @@ -3698,7 +3702,7 @@ static void ParseArrayIndices(symbolNode_t *sym, int requiredIndices) } } EvalExpression(); - if(i < sym->info.array.ndim - 1) + if(i < sym->info.array.ndim - 1 && sym->info.array.dimensions[i] > 1) { PC_AppendPushVal(sym->info.array.dimensions[i]); PC_AppendCmd(PCD_MULTIPLY);