Add boolean variable that indicates if current map is in UDMF format
This commit is contained in:
parent
3c294b5e3d
commit
f689bc88aa
|
@ -87,6 +87,9 @@ int LUA_PushGlobals(lua_State *L, const char *word)
|
||||||
if (fastcmp(word,"gamemap")) {
|
if (fastcmp(word,"gamemap")) {
|
||||||
lua_pushinteger(L, gamemap);
|
lua_pushinteger(L, gamemap);
|
||||||
return 1;
|
return 1;
|
||||||
|
} else if (fastcmp(word,"udmf")) {
|
||||||
|
lua_pushboolean(L, udmf);
|
||||||
|
return 1;
|
||||||
} else if (fastcmp(word,"maptol")) {
|
} else if (fastcmp(word,"maptol")) {
|
||||||
lua_pushinteger(L, maptol);
|
lua_pushinteger(L, maptol);
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -96,6 +96,7 @@ unsigned char mapmd5[16];
|
||||||
// Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
|
// Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
boolean udmf;
|
||||||
size_t numvertexes, numsegs, numsectors, numsubsectors, numnodes, numlines, numsides, nummapthings;
|
size_t numvertexes, numsegs, numsectors, numsubsectors, numnodes, numlines, numsides, nummapthings;
|
||||||
vertex_t *vertexes;
|
vertex_t *vertexes;
|
||||||
seg_t *segs;
|
seg_t *segs;
|
||||||
|
@ -1737,11 +1738,11 @@ static void P_ProcessLinedefsAfterSidedefs(void)
|
||||||
static boolean P_LoadMapData(const virtres_t *virt)
|
static boolean P_LoadMapData(const virtres_t *virt)
|
||||||
{
|
{
|
||||||
virtlump_t *virtvertexes = NULL, *virtsectors = NULL, *virtsidedefs = NULL, *virtlinedefs = NULL, *virtthings = NULL;
|
virtlump_t *virtvertexes = NULL, *virtsectors = NULL, *virtsidedefs = NULL, *virtlinedefs = NULL, *virtthings = NULL;
|
||||||
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
|
|
||||||
|
|
||||||
// Count map data.
|
// Count map data.
|
||||||
if (textmap) // Count how many entries for each type we got in textmap.
|
if (udmf) // Count how many entries for each type we got in textmap.
|
||||||
{
|
{
|
||||||
|
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
|
||||||
if (!TextmapCount(textmap->data, textmap->size))
|
if (!TextmapCount(textmap->data, textmap->size))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -1796,7 +1797,7 @@ static boolean P_LoadMapData(const virtres_t *virt)
|
||||||
numlevelflats = 0;
|
numlevelflats = 0;
|
||||||
|
|
||||||
// Load map data.
|
// Load map data.
|
||||||
if (textmap)
|
if (udmf)
|
||||||
P_LoadTextmap();
|
P_LoadTextmap();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1975,7 +1976,7 @@ static nodetype_t P_GetNodetype(const virtres_t *virt, UINT8 **nodedata)
|
||||||
nodetype_t nodetype = NT_UNSUPPORTED;
|
nodetype_t nodetype = NT_UNSUPPORTED;
|
||||||
char signature[4 + 1];
|
char signature[4 + 1];
|
||||||
|
|
||||||
if (vres_Find(virt, "TEXTMAP"))
|
if (udmf)
|
||||||
{
|
{
|
||||||
*nodedata = vres_Find(virt, "ZNODES")->data;
|
*nodedata = vres_Find(virt, "ZNODES")->data;
|
||||||
supported[NT_XGLN] = supported[NT_XGL3] = true;
|
supported[NT_XGLN] = supported[NT_XGL3] = true;
|
||||||
|
@ -2832,11 +2833,13 @@ static INT32 P_MakeBufferMD5(const char *buffer, size_t len, void *resblock)
|
||||||
|
|
||||||
static void P_MakeMapMD5(virtres_t *virt, void *dest)
|
static void P_MakeMapMD5(virtres_t *virt, void *dest)
|
||||||
{
|
{
|
||||||
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
|
|
||||||
unsigned char resmd5[16];
|
unsigned char resmd5[16];
|
||||||
|
|
||||||
if (textmap)
|
if (udmf)
|
||||||
|
{
|
||||||
|
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
|
||||||
P_MakeBufferMD5((char*)textmap->data, textmap->size, resmd5);
|
P_MakeBufferMD5((char*)textmap->data, textmap->size, resmd5);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
unsigned char linemd5[16];
|
unsigned char linemd5[16];
|
||||||
|
@ -2868,6 +2871,7 @@ static boolean P_LoadMapFromFile(void)
|
||||||
{
|
{
|
||||||
virtres_t *virt = vres_GetMap(lastloadedmaplumpnum);
|
virtres_t *virt = vres_GetMap(lastloadedmaplumpnum);
|
||||||
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
|
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
|
||||||
|
udmf = textmap != NULL;
|
||||||
|
|
||||||
if (!P_LoadMapData(virt))
|
if (!P_LoadMapData(virt))
|
||||||
return false;
|
return false;
|
||||||
|
@ -2876,7 +2880,7 @@ static boolean P_LoadMapFromFile(void)
|
||||||
|
|
||||||
P_LinkMapData();
|
P_LinkMapData();
|
||||||
|
|
||||||
if (!textmap)
|
if (!udmf)
|
||||||
P_ConvertBinaryMap();
|
P_ConvertBinaryMap();
|
||||||
|
|
||||||
// Copy relevant map data for NetArchive purposes.
|
// Copy relevant map data for NetArchive purposes.
|
||||||
|
|
|
@ -52,6 +52,8 @@ extern size_t numspritelumps, max_spritelumps;
|
||||||
//
|
//
|
||||||
// Lookup tables for map data.
|
// Lookup tables for map data.
|
||||||
//
|
//
|
||||||
|
extern boolean udmf;
|
||||||
|
|
||||||
extern size_t numsprites;
|
extern size_t numsprites;
|
||||||
extern spritedef_t *sprites;
|
extern spritedef_t *sprites;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue