Some more cleanup of map loading code
This commit is contained in:
parent
bb3440d021
commit
79350992df
|
@ -413,25 +413,15 @@ static inline float P_SegLengthFloat(seg_t *seg)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/** Loads the SEGS resource from a level.
|
// Loads the SEGS resource from a level.
|
||||||
*
|
static void P_LoadRawSegs(UINT8 *data)
|
||||||
* \param lump Lump number of the SEGS resource.
|
|
||||||
* \sa ::ML_SEGS
|
|
||||||
*/
|
|
||||||
static void P_LoadRawSegs(UINT8 *data, size_t i)
|
|
||||||
{
|
{
|
||||||
INT32 linedef, side;
|
INT32 linedef, side;
|
||||||
mapseg_t *ml;
|
mapseg_t *ml = (mapseg_t*)data;
|
||||||
seg_t *li;
|
seg_t *li = segs;
|
||||||
line_t *ldef;
|
line_t *ldef;
|
||||||
|
size_t i;
|
||||||
|
|
||||||
numsegs = i / sizeof (mapseg_t);
|
|
||||||
if (numsegs <= 0)
|
|
||||||
I_Error("Level has no segs"); // instead of crashing
|
|
||||||
segs = Z_Calloc(numsegs * sizeof (*segs), PU_LEVEL, NULL);
|
|
||||||
|
|
||||||
ml = (mapseg_t *)data;
|
|
||||||
li = segs;
|
|
||||||
for (i = 0; i < numsegs; i++, li++, ml++)
|
for (i = 0; i < numsegs; i++, li++, ml++)
|
||||||
{
|
{
|
||||||
li->v1 = &vertexes[SHORT(ml->v1)];
|
li->v1 = &vertexes[SHORT(ml->v1)];
|
||||||
|
@ -466,22 +456,12 @@ static void P_LoadRawSegs(UINT8 *data, size_t i)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Loads the SSECTORS resource from a level.
|
// Loads the SSECTORS resource from a level.
|
||||||
*
|
static inline void P_LoadRawSubsectors(void *data)
|
||||||
* \param lump Lump number of the SSECTORS resource.
|
|
||||||
* \sa ::ML_SSECTORS
|
|
||||||
*/
|
|
||||||
static inline void P_LoadRawSubsectors(void *data, size_t i)
|
|
||||||
{
|
{
|
||||||
mapsubsector_t *ms;
|
mapsubsector_t *ms = (mapsubsector_t*)data;
|
||||||
subsector_t *ss;
|
subsector_t *ss = subsectors;
|
||||||
|
size_t i;
|
||||||
numsubsectors = i / sizeof (mapsubsector_t);
|
|
||||||
if (numsubsectors <= 0)
|
|
||||||
I_Error("Level has no subsectors (did you forget to run it through a nodesbuilder?)");
|
|
||||||
ss = subsectors = Z_Calloc(numsubsectors * sizeof (*subsectors), PU_LEVEL, NULL);
|
|
||||||
|
|
||||||
ms = (mapsubsector_t *)data;
|
|
||||||
|
|
||||||
for (i = 0; i < numsubsectors; i++, ss++, ms++)
|
for (i = 0; i < numsubsectors; i++, ss++, ms++)
|
||||||
{
|
{
|
||||||
|
@ -761,19 +741,12 @@ static void P_LoadRawSectors(UINT8 *data)
|
||||||
//
|
//
|
||||||
// P_LoadNodes
|
// P_LoadNodes
|
||||||
//
|
//
|
||||||
static void P_LoadRawNodes(UINT8 *data, size_t i)
|
static void P_LoadRawNodes(UINT8 *data)
|
||||||
{
|
{
|
||||||
UINT8 j, k;
|
UINT8 j, k;
|
||||||
mapnode_t *mn;
|
mapnode_t *mn = (mapnode_t*)data;
|
||||||
node_t *no;
|
node_t *no = nodes;
|
||||||
|
size_t i;
|
||||||
numnodes = i / sizeof (mapnode_t);
|
|
||||||
if (numnodes <= 0)
|
|
||||||
I_Error("Level has no nodes");
|
|
||||||
nodes = Z_Calloc(numnodes * sizeof (*nodes), PU_LEVEL, NULL);
|
|
||||||
|
|
||||||
mn = (mapnode_t *)data;
|
|
||||||
no = nodes;
|
|
||||||
|
|
||||||
for (i = 0; i < numnodes; i++, no++, mn++)
|
for (i = 0; i < numnodes; i++, no++, mn++)
|
||||||
{
|
{
|
||||||
|
@ -1933,10 +1906,25 @@ static void P_LoadMapBSP(const virtres_t* virt)
|
||||||
virtlump_t* virtsegs = vres_Find(virt, "SEGS");
|
virtlump_t* virtsegs = vres_Find(virt, "SEGS");
|
||||||
virtlump_t* virtnodes = vres_Find(virt, "NODES");
|
virtlump_t* virtnodes = vres_Find(virt, "NODES");
|
||||||
|
|
||||||
|
numsubsectors = virtssectors->size / sizeof(mapsubsector_t);
|
||||||
|
numnodes = virtnodes->size / sizeof(mapnode_t);
|
||||||
|
numsegs = virtsegs->size / sizeof(mapseg_t);
|
||||||
|
|
||||||
|
if (numsubsectors <= 0)
|
||||||
|
I_Error("Level has no subsectors (did you forget to run it through a nodesbuilder?)");
|
||||||
|
if (numnodes <= 0)
|
||||||
|
I_Error("Level has no nodes");
|
||||||
|
if (numsegs <= 0)
|
||||||
|
I_Error("Level has no segs");
|
||||||
|
|
||||||
|
subsectors = Z_Calloc(numsubsectors * sizeof(*subsectors), PU_LEVEL, NULL);
|
||||||
|
nodes = Z_Calloc(numnodes * sizeof(*nodes), PU_LEVEL, NULL);
|
||||||
|
segs = Z_Calloc(numsegs * sizeof(*segs), PU_LEVEL, NULL);
|
||||||
|
|
||||||
// Nodes
|
// Nodes
|
||||||
P_LoadRawSubsectors(virtssectors->data, virtssectors->size);
|
P_LoadRawSubsectors(virtssectors->data);
|
||||||
P_LoadRawNodes(virtnodes->data, virtnodes->size);
|
P_LoadRawNodes(virtnodes->data);
|
||||||
P_LoadRawSegs(virtsegs->data, virtsegs->size);
|
P_LoadRawSegs(virtsegs->data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void P_LoadMapLUT(const virtres_t* virt)
|
static void P_LoadMapLUT(const virtres_t* virt)
|
||||||
|
@ -1981,7 +1969,7 @@ static void P_LoadMapData(const virtres_t* virt)
|
||||||
virtsidedefs = vres_Find(virt, "SIDEDEFS");
|
virtsidedefs = vres_Find(virt, "SIDEDEFS");
|
||||||
virtlinedefs = vres_Find(virt, "LINEDEFS");
|
virtlinedefs = vres_Find(virt, "LINEDEFS");
|
||||||
|
|
||||||
// Traditional doom map format just assumes the number of elements from the lump sixes.
|
// Traditional doom map format just assumes the number of elements from the lump sizes.
|
||||||
numvertexes = virtvertexes->size / sizeof (mapvertex_t);
|
numvertexes = virtvertexes->size / sizeof (mapvertex_t);
|
||||||
numsectors = virtsectors->size / sizeof (mapsector_t);
|
numsectors = virtsectors->size / sizeof (mapsector_t);
|
||||||
numsides = virtsidedefs->size / sizeof (mapsidedef_t);
|
numsides = virtsidedefs->size / sizeof (mapsidedef_t);
|
||||||
|
|
Loading…
Reference in a new issue