Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't allocate planes / facets if there are none

Browse source
This commit is contained in:
smallmodel 2024-02-05 23:25:41 +01:00
parent c9aedf242d
commit 336ba6181e
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

40
code/qcommon/cm_patch.c
View file

@ -1131,10 +1131,37 @@ static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) {
// copy the results out
pf->numPlanes = numPlanes;
pf->numFacets = numFacets;
pf->facets = Hunk_Alloc(numFacets * sizeof(*pf->facets), h_dontcare);
Com_Memcpy(pf->facets, facets, numFacets * sizeof(*pf->facets));
pf->planes = Hunk_Alloc(numPlanes * sizeof(*pf->planes), h_dontcare);
Com_Memcpy(pf->planes, planes, numPlanes * sizeof(*pf->planes));
if (numPlanes >= 1) {
pf->facets = Hunk_Alloc(numFacets * sizeof(*pf->facets), h_dontcare);
Com_Memcpy(pf->facets, facets, numFacets * sizeof(*pf->facets));
} else {
pf->numPlanes = 0;
pf->planes = NULL;
Com_DPrintf(
"WARNING: CM_PatchCollideFromGrid: Degenerate patch - no planes (%i %i %i)-(%i %i %i)\n",
pf->bounds[0][0],
pf->bounds[0][1],
pf->bounds[0][2],
pf->bounds[1][0],
pf->bounds[1][1],
pf->bounds[1][2]);
}
if (numFacets >= 1) {
pf->planes = Hunk_Alloc(numPlanes * sizeof(*pf->planes), h_dontcare);
Com_Memcpy(pf->planes, planes, numPlanes * sizeof(*pf->planes));
} else {
pf->numFacets = 0;
pf->facets = NULL;
Com_DPrintf(
"WARNING: CM_PatchCollideFromGrid: Degenerate patch - no facets (%i %i %i)-(%i %i %i)\n",
pf->bounds[0][0],
pf->bounds[0][1],
pf->bounds[0][2],
pf->bounds[1][0],
pf->bounds[1][1],
pf->bounds[1][2]);
}
}
@ -1436,11 +1463,8 @@ void CM_TraceThroughPatchCollide( traceWork_t *tw, const struct patchCollide_s *
//never clip against the back side
if (hitnum == facet->numBorders - 1) continue;
if (enterFrac < leaveFrac && enterFrac >= 0) {
if (enterFrac <= leaveFrac && enterFrac >= 0) {
if (enterFrac < tw->trace.fraction) {
if (enterFrac < 0) {
enterFrac = 0;
}
#ifndef BSPC
if (!cv) {
cv = Cvar_Get( "r_debugSurfaceUpdate", "1", 0 );