stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-17 23:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens.

Browse source
This commit is contained in:
Nev3r 2019-12-30 13:38:52 +01:00
parent 4aee4e3684
commit c6c00aa7d5
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/p_setup.c
View file

@ -1249,6 +1249,7 @@ UINT32 sectorsPos[UINT16_MAX];
static boolean TextmapCount(UINT8 *data, size_t size) static boolean TextmapCount(UINT8 *data, size_t size)
{ {
char *tkn = M_GetToken((char *)data); char *tkn = M_GetToken((char *)data);
UINT8 brackets = 0;
nummapthings = 0; nummapthings = 0;
numlines = 0; numlines = 0;
@ -1275,21 +1276,13 @@ static boolean TextmapCount(UINT8 *data, size_t size)
while (tkn && M_GetTokenPos() < size) while (tkn && M_GetTokenPos() < size)
{ {
// Avoid anything inside bracketed stuff, only look for external keywords. // Avoid anything inside bracketed stuff, only look for external keywords.
// Assuming there's only one level of bracket nesting. if (brackets)
if (fastcmp(tkn, "{"))
{ {
do if (fastcmp(tkn, "}"))
{ brackets--;
Z_Free(tkn);
tkn = M_GetToken(NULL);
if (!tkn || M_GetTokenPos() >= size)
{
Z_Free(tkn);
CONS_Alert(CONS_WARNING, "Opening bracket not closed!\n");
return false;
}
} while (!fastcmp(tkn, "}"));
} }
else if (fastcmp(tkn, "{"))
brackets++;
// Check for valid fields. // Check for valid fields.
else if (fastcmp(tkn, "thing")) else if (fastcmp(tkn, "thing"))
mapthingsPos[nummapthings++] = M_GetTokenPos(); mapthingsPos[nummapthings++] = M_GetTokenPos();