OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: The sight checker's portalgroup variable was not initialized.

Browse source 
- got rid of glsegextras.

This was probably one of the most ill-conceived means to save some memory in ZDoom, but now, when a pure software rendered engine no longer needs to be considered it's just totally useless to keep this mess in.
This commit is contained in:
Christoph Oelckers 2017-01-09 01:28:07 +01:00
commit b9ac44e8f2
8 changed files with 39 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/nodebuild_extract.cpp
View file

@ -53,7 +53,7 @@
#endif
void FNodeBuilder::Extract (node_t *&outNodes, int &nodeCount,
seg_t *&outSegs, glsegextra_t *&outSegExtras, int &segCount,
seg_t *&outSegs, int &segCount,
subsector_t *&outSubs, int &subCount,
TStaticArray<vertex_t> &outVerts)
{
@ -116,7 +116,6 @@ void FNodeBuilder::Extract (node_t *&outNodes, int &nodeCount,
segCount = segs.Size ();
outSegs = new seg_t[segCount];
outSegExtras = new glsegextra_t[segCount];
for (i = 0; i < segCount; ++i)
{
@ -124,11 +123,11 @@ void FNodeBuilder::Extract (node_t *&outNodes, int &nodeCount,
if (segs[i].Partner != DWORD_MAX)
{
outSegExtras[i].PartnerSeg = Segs[segs[i].Partner].storedseg;
outSegs[i].PartnerSeg = &outSegs[Segs[segs[i].Partner].storedseg];
}
else
{
outSegExtras[i].PartnerSeg = DWORD_MAX;
outSegs[i].PartnerSeg = nullptr;
}
}
}
@ -137,7 +136,6 @@ void FNodeBuilder::Extract (node_t *&outNodes, int &nodeCount,
memcpy (outSubs, &Subsectors[0], subCount*sizeof(subsector_t));
segCount = Segs.Size ();
outSegs = new seg_t[segCount];
outSegExtras = NULL;
for (i = 0; i < segCount; ++i)
{
const FPrivSeg *org = &Segs[SegList[i].SegNum];
@ -151,6 +149,7 @@ void FNodeBuilder::Extract (node_t *&outNodes, int &nodeCount,
out->frontsector = org->frontsector;
out->linedef = Level.Lines + org->linedef;
out->sidedef = Level.Sides + org->sidedef;
out->PartnerSeg = nullptr;
}
}
for (i = 0; i < subCount; ++i)