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

Store a copy of sectors, lines and sides in memory so that P_NetArchiveWorld() can soon use them instead of relying on re-opening the original lumps.

Browse source 
Fix print type issue.
This commit is contained in:
Nev3r 2019-12-13 13:43:22 +01:00
parent 967616f1dd
commit 2ee3711caa
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/p_setup.c
View file

@ -99,11 +99,11 @@ unsigned char mapmd5[16];
size_t numvertexes, numsegs, numsectors, numsubsectors, numnodes, numlines, numsides, nummapthings;
vertex_t *vertexes;
seg_t *segs;
sector_t *sectors;
sector_t *sectors, *spawnsectors;
subsector_t *subsectors;
node_t *nodes;
line_t *lines;
side_t *sides;
line_t *lines, *spawnlines;
side_t *sides, *spawnsides;
mapthing_t *mapthings;
INT32 numstarposts;
UINT16 bossdisabled;
@ -2565,7 +2565,7 @@ static boolean LoadMapBSP (const virtres_t* virt)
if (numvertexes != orivtx) /// If native vertex count doesn't match node original vertex count, bail out (broken data?).
{
CONS_Alert(CONS_WARNING, "Vertex count in map data (%d) and nodes' (%d) differ!\n", numvertexes, orivtx);
CONS_Alert(CONS_WARNING, "Vertex count in map data and nodes differ!\n");
return false;
}
@ -2707,7 +2707,7 @@ static boolean LoadMapBSP (const virtres_t* virt)
// Nodes
numnodes = READINT32(data);
nodes = Z_Calloc(numnodes * sizeof (*nodes), PU_LEVEL, NULL);
nodes = Z_Calloc(numnodes * sizeof (*nodes), PU_LEVEL, NULL);
if (nodetype == NT_XGL3)
{
UINT32 x, y, dx, dy;
@ -2888,6 +2888,15 @@ static boolean LoadMapData (const virtres_t* virt)
P_LoadLineDefs2();
P_GroupLines();
// Copy relevant map data for NetArchive purposes.
spawnsectors = Z_Calloc(numsectors * sizeof (*sectors), PU_LEVEL, NULL);
spawnlines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
spawnsides = Z_Calloc(numsides * sizeof (*sides), PU_LEVEL, NULL);
memcpy(spawnsectors, sectors, numsectors * sizeof (*sectors));
memcpy(spawnlines, lines, numlines * sizeof (*lines));
memcpy(spawnsides, sides, numsides * sizeof (*sides));
return true;
}

6
src/r_state.h
View file

@ -62,7 +62,7 @@ extern size_t numsegs;
extern seg_t *segs;
extern size_t numsectors;
extern sector_t *sectors;
extern sector_t *sectors, *spawnsectors;
extern size_t numsubsectors;
extern subsector_t *subsectors;
@ -71,10 +71,10 @@ extern size_t numnodes;
extern node_t *nodes;
extern size_t numlines;
extern line_t *lines;
extern line_t *lines, *spawnlines;
extern size_t numsides;
extern side_t *sides;
extern side_t *sides, *spawnsides;
//
// POV data.