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

Implement UDMF versioning system and add support for srb2kart namespace

Browse source
This commit is contained in:
NepDisk 2024-10-04 13:21:07 -04:00
parent d48cd0f28f
commit d674634875
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_setup.c
View file

@ -115,6 +115,7 @@ unsigned char mapmd5[16];
//
boolean udmf;
INT32 udmf_version;
size_t numvertexes, numsegs, numsectors, numsubsectors, numnodes, numlines, numsides, nummapthings;
size_t num_orig_vertexes;
vertex_t *vertexes;
@ -1539,8 +1540,18 @@ static boolean TextmapCount(size_t size)
// Check if namespace is valid.
tkn = M_TokenizerRead(0);
if (!(fastcmp(tkn, "srb2") || fastcmp(tkn, "ringracers"))) // Would like to use "ringracers", but it turns off features in UZB.
CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'srb2' or 'ringracers' is supported.\n", tkn);
if (!(fastcmp(tkn, "srb2") || fastcmp(tkn, "ringracers") || fastcmp(tkn, "srb2kart")))
CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'srb2' or 'ringracers' or 'srb2kart' is supported.\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)
{
@ -2503,6 +2514,7 @@ static void P_WriteTextmap(void)
}
fprintf(f, "namespace = \"srb2\";\n");
fprintf(f, "version = %d;\n", UDMF_CURRENT_VERSION);
for (i = k = 0; i < nummapthings; i++)
{
if (wmapthings[i].type == mobjinfo[MT_WAYPOINT].doomednum
@ -7232,6 +7244,7 @@ static boolean P_LoadMapFromFile(void)
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
size_t i;
udmf = textmap != NULL;
udmf_version = 0;
if (!P_LoadMapData(virt))
return false;

1
src/r_state.h
View file

@ -63,6 +63,7 @@ extern size_t numspritelumps, max_spritelumps;
//
// Lookup tables for map data.
//
#define UDMF_CURRENT_VERSION (1)
extern boolean udmf;
extern size_t numsprites;