thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser

Browse source
This commit is contained in:
Nev3r 2019-12-30 14:48:10 +01:00
commit e0b4921855
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_setup.c
View file

@ -1462,13 +1462,19 @@ static void TextmapThing(UINT32 i, char *param)
*/ */
static void TextmapParse(UINT32 dataPos, size_t num, void (*parser)(UINT32, char *)) static void TextmapParse(UINT32 dataPos, size_t num, void (*parser)(UINT32, char *))
{ {
char *open; char *tkn;
M_SetTokenPos(dataPos); M_SetTokenPos(dataPos);
open = M_GetToken(NULL); tkn = M_GetToken(NULL);
if (fastcmp(open, "{")) if (!fastcmp(tkn, "{"))
{ {
char *tkn = M_GetToken(NULL); Z_Free(tkn);
CONS_Alert(CONS_WARNING, "Invalid UDMF data capsule!\n");
return;
}
Z_Free(tkn);
tkn = M_GetToken(NULL);
while (!fastcmp(tkn, "}")) while (!fastcmp(tkn, "}"))
{ {
dat = NULL; dat = NULL;
@ -1481,10 +1487,6 @@ static void TextmapParse(UINT32 dataPos, size_t num, void (*parser)(UINT32, char
} }
Z_Free(tkn); Z_Free(tkn);
} }
else
CONS_Alert(CONS_WARNING, "Invalid UDMF data capsule!\n");
Z_Free(open);
}
/** Provides a fix to the flat alignment coordinate transform from standard Textmaps. /** Provides a fix to the flat alignment coordinate transform from standard Textmaps.
*/ */