olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qbsp: make BuildSurfaces not rely on map iteration order

This commit is contained in:
Eric Wasylishen 2016-11-01 15:07:58 -06:00
parent 40c090c604
commit 1b9d5538c2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qbsp/csg4.cc
View File

@ -384,13 +384,18 @@ surface_t *
BuildSurfaces(const std::map<int, face_t *> &planefaces) BuildSurfaces(const std::map<int, face_t *> &planefaces)
{ {
surface_t *surfaces = NULL; surface_t *surfaces = NULL;
for (const auto &entry : planefaces) {
for (int i = 0; i < map.numplanes(); i++) {
const auto entry = planefaces.find(i);
if (entry == planefaces.end() || entry->second == nullptr) // FIXME: entry->second == nullptr should never happen, turn into Q_assert
continue;
/* create a new surface to hold the faces on this plane */ /* create a new surface to hold the faces on this plane */
surface_t *surf = (surface_t *)AllocMem(SURFACE, 1, true); surface_t *surf = (surface_t *)AllocMem(SURFACE, 1, true);
surf->planenum = entry.first; surf->planenum = entry->first;
surf->next = surfaces; surf->next = surfaces;
surfaces = surf; surfaces = surf;
surf->faces = entry.second; surf->faces = entry->second;
for (const face_t *face = surf->faces; face; face = face->next) for (const face_t *face = surf->faces; face; face = face->next)
csgmergefaces++; csgmergefaces++;