stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-18 18:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop things from becoming Chocapic in THZ3, ACZ2, and special stages.

Browse source 
Temporarily revert function call order for mapthings.
This commit is contained in:
Nev3r 2019-12-12 11:37:48 +01:00
parent ec9f727e53
commit c64a9d7ae9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_setup.c
View file

@ -1963,6 +1963,7 @@ static void LoadMapLUT (const virtres_t* virt)
static void LoadMapData (const virtres_t* virt)
{
virtlump_t* virtvertexes = NULL, * virtsectors = NULL, * virtsidedefs = NULL, * virtlinedefs = NULL, * virtthings = NULL;
#ifdef UDMF
virtlump_t* textmap = vres_Find(virt, "TEXTMAP");
// Count map data.
@ -1978,6 +1979,7 @@ static void LoadMapData (const virtres_t* virt)
//TextmapCount(vtextmap->data, vtextmap->size);
}
else
#endif
{
virtthings = vres_Find(virt, "THINGS");
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);
mapthings= Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
#ifdef UDMF
if (textmap)
{
}
else
#endif
{
// Strict map data
P_LoadRawVertexes(virtvertexes->data);
@ -2020,7 +2024,6 @@ static void LoadMapData (const virtres_t* virt)
P_LoadRawLineDefs(virtlinedefs->data);
SetupLines();
P_LoadRawSideDefs2(virtsidedefs->data);
P_PrepareRawThings(virtthings->data);
}
}
@ -2788,6 +2791,8 @@ boolean P_SetupLevel(boolean skipprecip)
P_LoadLineDefs2();
P_GroupLines();
P_PrepareRawThings(vres_Find(virt, "THINGS")->data);
P_MakeMapMD5(virt, &mapmd5);
vres_Free(virt);