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

qbsp: access f->w through local pointer in SplitFaceForTjunc 

No functional changes, just making the previous cleanup more consistent.
Pointer is non-const now, but no matter.

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-06-23 14:19:47 +09:30
parent 91ae3d16d9
commit 3cfc4a27cc
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qbsp/tjunc.c
View File

@ -255,7 +255,7 @@ static face_t *newlist;
static void
SplitFaceForTjunc(face_t *f, face_t *original)
{
const winding_t *w = &f->w;
winding_t *w = &f->w;
face_t *newf, *chain;
vec3_t edgevec[2];
vec_t angle;
@ -308,10 +308,10 @@ SplitFaceForTjunc(face_t *f, face_t *original)
/* rotate the point winding */
vec3_t point0;
VectorCopy(f->w.points[0], point0);
for (i = 1; i < f->w.numpoints; i++)
VectorCopy(f->w.points[i], f->w.points[i - 1]);
VectorCopy(point0, f->w.points[f->w.numpoints - 1]);
VectorCopy(w->points[0], point0);
for (i = 1; i < w->numpoints; i++)
VectorCopy(w->points[i], w->points[i - 1]);
VectorCopy(point0, w->points[w->numpoints - 1]);
goto restart;
}
@ -327,20 +327,20 @@ SplitFaceForTjunc(face_t *f, face_t *original)
chain = newf;
newf->next = newlist;
newlist = newf;
if (f->w.numpoints - firstcorner <= MAXPOINTS)
if (w->numpoints - firstcorner <= MAXPOINTS)
newf->w.numpoints = firstcorner + 2;
else if (lastcorner + 2 < MAXPOINTS &&
f->w.numpoints - lastcorner <= MAXPOINTS)
w->numpoints - lastcorner <= MAXPOINTS)
newf->w.numpoints = lastcorner + 2;
else
newf->w.numpoints = MAXPOINTS;
for (i = 0; i < newf->w.numpoints; i++)
VectorCopy(f->w.points[i], newf->w.points[i]);
for (i = newf->w.numpoints - 1; i < f->w.numpoints; i++)
VectorCopy(f->w.points[i], f->w.points[i - (newf->w.numpoints - 2)]);
VectorCopy(w->points[i], newf->w.points[i]);
for (i = newf->w.numpoints - 1; i < w->numpoints; i++)
VectorCopy(w->points[i], w->points[i - (newf->w.numpoints - 2)]);
f->w.numpoints -= (newf->w.numpoints - 2);
w->numpoints -= (newf->w.numpoints - 2);
} while (1);
}