Stop things from becoming Chocapic in THZ3, ACZ2, and special stages.
Temporarily revert function call order for mapthings.
This commit is contained in:
parent
ec9f727e53
commit
c64a9d7ae9
|
@ -1963,6 +1963,7 @@ static void LoadMapLUT (const virtres_t* virt)
|
||||||
static void LoadMapData (const virtres_t* virt)
|
static void 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;
|
||||||
|
#ifdef UDMF
|
||||||
virtlump_t* textmap = vres_Find(virt, "TEXTMAP");
|
virtlump_t* textmap = vres_Find(virt, "TEXTMAP");
|
||||||
|
|
||||||
// Count map data.
|
// Count map data.
|
||||||
|
@ -1978,6 +1979,7 @@ static void LoadMapData (const virtres_t* virt)
|
||||||
//TextmapCount(vtextmap->data, vtextmap->size);
|
//TextmapCount(vtextmap->data, vtextmap->size);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
virtthings = vres_Find(virt, "THINGS");
|
virtthings = vres_Find(virt, "THINGS");
|
||||||
virtvertexes = vres_Find(virt, "VERTEXES");
|
virtvertexes = vres_Find(virt, "VERTEXES");
|
||||||
|
@ -2008,11 +2010,13 @@ static void LoadMapData (const virtres_t* virt)
|
||||||
lines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
|
lines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
|
||||||
mapthings= Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
|
mapthings= Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
|
||||||
|
|
||||||
|
#ifdef UDMF
|
||||||
if (textmap)
|
if (textmap)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
// Strict map data
|
// Strict map data
|
||||||
P_LoadRawVertexes(virtvertexes->data);
|
P_LoadRawVertexes(virtvertexes->data);
|
||||||
|
@ -2020,7 +2024,6 @@ static void LoadMapData (const virtres_t* virt)
|
||||||
P_LoadRawLineDefs(virtlinedefs->data);
|
P_LoadRawLineDefs(virtlinedefs->data);
|
||||||
SetupLines();
|
SetupLines();
|
||||||
P_LoadRawSideDefs2(virtsidedefs->data);
|
P_LoadRawSideDefs2(virtsidedefs->data);
|
||||||
P_PrepareRawThings(virtthings->data);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2788,6 +2791,8 @@ boolean P_SetupLevel(boolean skipprecip)
|
||||||
P_LoadLineDefs2();
|
P_LoadLineDefs2();
|
||||||
P_GroupLines();
|
P_GroupLines();
|
||||||
|
|
||||||
|
P_PrepareRawThings(vres_Find(virt, "THINGS")->data);
|
||||||
|
|
||||||
P_MakeMapMD5(virt, &mapmd5);
|
P_MakeMapMD5(virt, &mapmd5);
|
||||||
|
|
||||||
vres_Free(virt);
|
vres_Free(virt);
|
||||||
|
|
Loading…
Reference in New Issue