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

Fix badly placed version check

Browse source 
Made old maps get malformed during reading
This commit is contained in:
Sally Coolatta 2023-08-21 03:42:03 -04:00
parent 65269736be
commit e4c8af058b
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_setup.c
View file

@ -1412,16 +1412,6 @@ static boolean TextmapCount(size_t size)
if (!fastcmp(tkn, "ringracers")) if (!fastcmp(tkn, "ringracers"))
CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'ringracers' is supported. This map may have issues loading.\n", tkn); CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'ringracers' is supported. This map may have issues loading.\n", tkn);
// Check for version
tkn = M_TokenizerRead(0);
if (fastcmp(tkn, "version"))
{
tkn = M_TokenizerRead(0);
udmf_version = atoi(tkn);
if (udmf_version > UDMF_CURRENT_VERSION)
CONS_Alert(CONS_WARNING, "Map is intended for future UDMF version '%d', current supported version is '%d'. This map may have issues loading.\n", udmf_version, UDMF_CURRENT_VERSION);
}
while ((tkn = M_TokenizerRead(0)) && M_TokenizerGetEndPos() < size) while ((tkn = M_TokenizerRead(0)) && M_TokenizerGetEndPos() < size)
{ {
// Avoid anything inside bracketed stuff, only look for external keywords. // Avoid anything inside bracketed stuff, only look for external keywords.
@ -1443,6 +1433,13 @@ static boolean TextmapCount(size_t size)
vertexesPos[numvertexes++] = M_TokenizerGetEndPos(); vertexesPos[numvertexes++] = M_TokenizerGetEndPos();
else if (fastcmp(tkn, "sector")) else if (fastcmp(tkn, "sector"))
sectorsPos[numsectors++] = M_TokenizerGetEndPos(); sectorsPos[numsectors++] = M_TokenizerGetEndPos();
else if (fastcmp(tkn, "version"))
{
tkn = M_TokenizerRead(0);
udmf_version = atoi(tkn);
if (udmf_version > UDMF_CURRENT_VERSION)
CONS_Alert(CONS_WARNING, "Map is intended for future UDMF version '%d', current supported version is '%d'. This map may have issues loading.\n", udmf_version, UDMF_CURRENT_VERSION);
}
else else
CONS_Alert(CONS_NOTICE, "Unknown field '%s'.\n", tkn); CONS_Alert(CONS_NOTICE, "Unknown field '%s'.\n", tkn);
} }