incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incorrect parsing of map patches

Browse source
This commit is contained in:
GenericHeroGuy 2025-05-19 20:44:38 +02:00
parent cfe10eb5c1
commit 6e8e027a6e
1 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/p_setup.c
View file

@ -1514,12 +1514,12 @@ static boolean TextmapCount(size_t size, boolean patch)
if (udmf_version > UDMF_CURRENT_VERSION) 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); 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);
} }
tkn = M_TokenizerRead(0);
} }
// check hash for patches // check hash for patches
if (patch) if (patch)
{ {
tkn = M_TokenizerRead(0);
if (!fastcmp(tkn, "checksum")) if (!fastcmp(tkn, "checksum"))
{ {
CONS_Alert(CONS_ERROR, "No checksum in lump!\n"); CONS_Alert(CONS_ERROR, "No checksum in lump!\n");
@ -1546,44 +1546,42 @@ static boolean TextmapCount(size_t size, boolean patch)
hashstr = end + 1; hashstr = end + 1;
} }
while (*end); while (*end);
tkn = M_TokenizerRead(0);
if (!foundhash) if (!foundhash)
CONS_Alert(CONS_WARNING, "This map patch is not compatible with the current map (checksum: " HASHFMT "). The patch may not work.\n", maphash); CONS_Alert(CONS_WARNING, "This map patch is not compatible with the current map (checksum: " HASHFMT "). The patch may not work.\n", maphash);
} }
// check for things to remove from the base map // check for things to remove from the base map
if (patch) if (patch && fastcmp(tkn, "basemaptyperemoval"))
{ {
tkn = M_TokenizerRead(0); tkn = M_TokenizerRead(0);
if (fastcmp(tkn, "basemaptyperemoval")) const char *typestr = tkn;
char *end;
// check for types separated by pipes
// e.g. 300|2001|2004
do
{ {
tkn = M_TokenizerRead(0); UINT16 types = strtoull(typestr, &end, 10);
const char *typestr = tkn;
char *end;
// check for types separated by pipes if (types)
// e.g. 300|2001|2004
do
{ {
UINT16 types = strtoull(typestr, &end, 10); // Set type to removed.
basemaptyperemoval[types] = true;
if (types) CONS_Debug(DBG_SETUP,"Ignoring base mapthing type %d for patch\n", types);
{
// Set type to removed.
basemaptyperemoval[types] = true;
CONS_Debug(DBG_SETUP,"Ignoring base mapthing type %d for patch\n", types);
}
if (end == typestr || (*end && *end != '|'))
{
CONS_Alert(CONS_ERROR, "Invalid basemaptyperemoval string '%s'\n", tkn);
return false;
}
typestr = end + 1;
} }
while (*end);
if (end == typestr || (*end && *end != '|'))
{
CONS_Alert(CONS_ERROR, "Invalid basemaptyperemoval string '%s'\n", tkn);
return false;
}
typestr = end + 1;
} }
while (*end);
tkn = M_TokenizerRead(0);
} }
nummapthings = 0; nummapthings = 0;
@ -1595,7 +1593,7 @@ static boolean TextmapCount(size_t size, boolean patch)
numsectors = 0; numsectors = 0;
} }
while ((tkn = M_TokenizerRead(0)) && M_TokenizerGetEndPos() < size) while (M_TokenizerGetEndPos() < size)
{ {
// Avoid anything inside bracketed stuff, only look for external keywords. // Avoid anything inside bracketed stuff, only look for external keywords.
if (brackets) if (brackets)
@ -1620,6 +1618,10 @@ static boolean TextmapCount(size_t size, boolean patch)
TextmapStorePos(&sectorBlocks, &numsectors); TextmapStorePos(&sectorBlocks, &numsectors);
else else
CONS_Alert(CONS_NOTICE, "Unknown field '%s'.\n", tkn); CONS_Alert(CONS_NOTICE, "Unknown field '%s'.\n", tkn);
tkn = M_TokenizerRead(0);
if (!tkn)
break;
} }
if (brackets) if (brackets)