mirror of
https://github.com/ZDoom/acc.git
synced 2025-03-13 03:42:17 +00:00
- 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)
This commit is contained in:
parent
6ca6cf011c
commit
5b2ebfbb01
1 changed files with 6 additions and 2 deletions
8
parse.c
8
parse.c
|
@ -1079,7 +1079,11 @@ static void OuterWorldVar(boolean isGlobal)
|
||||||
while(tk_Token == TK_LBRACKET);
|
while(tk_Token == TK_LBRACKET);
|
||||||
}
|
}
|
||||||
sym = SY_InsertGlobal(tk_String, isGlobal ? SY_GLOBALARRAY : SY_WORLDARRAY);
|
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)
|
if (isGlobal)
|
||||||
pa_GlobalArrayCount++;
|
pa_GlobalArrayCount++;
|
||||||
else
|
else
|
||||||
|
@ -3698,7 +3702,7 @@ static void ParseArrayIndices(symbolNode_t *sym, int requiredIndices)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
EvalExpression();
|
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_AppendPushVal(sym->info.array.dimensions[i]);
|
||||||
PC_AppendCmd(PCD_MULTIPLY);
|
PC_AppendCmd(PCD_MULTIPLY);
|
||||||
|
|
Loading…
Reference in a new issue