Okay, the big whitespace reformat. There is some silliness (case

statements, variable declarations), but all in all it's not bad.
2025-05-30 08:40:39 +00:00 · 2000-12-08 06:51:37 +00:00 · 2000-12-08 06:51:37 +00:00 · 54e2a4d9d3
commit 54e2a4d9d3
parent b62d75a774
172 changed files with 26949 additions and 26640 deletions
--- a/source/r_draw.c
+++ b/source/r_draw.c
@ -27,10 +27,11 @@
 */

 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 #include "r_local.h"
-#include "d_local.h"	// FIXME: shouldn't need to include this
+#include "d_local.h"					// FIXME: shouldn't need to include
+										// this

 #define MAXLEFTCLIPEDGES		100

@ -38,44 +39,43 @@
 #define FULLY_CLIPPED_CACHED	0x80000000
 #define FRAMECOUNT_MASK			0x7FFFFFFF

-unsigned int	cacheoffset;
+unsigned int cacheoffset;

-int			c_faceclip;					// number of faces clipped
+int         c_faceclip;					// number of faces clipped

-zpointdesc_t	r_zpointdesc;
+zpointdesc_t r_zpointdesc;

-polydesc_t		r_polydesc;
+polydesc_t  r_polydesc;



-clipplane_t	*entity_clipplanes;
-clipplane_t	view_clipplanes[4];
-clipplane_t	world_clipplanes[16];
+clipplane_t *entity_clipplanes;
+clipplane_t view_clipplanes[4];
+clipplane_t world_clipplanes[16];

-medge_t			*r_pedge;
+medge_t    *r_pedge;

-qboolean		r_leftclipped, r_rightclipped;
-static qboolean	makeleftedge, makerightedge;
-qboolean		r_nearzionly;
+qboolean    r_leftclipped, r_rightclipped;
+static qboolean makeleftedge, makerightedge;
+qboolean    r_nearzionly;

-int		sintable[1280];
-int		intsintable[1280];
+int         sintable[1280];
+int         intsintable[1280];

-mvertex_t	r_leftenter, r_leftexit;
-mvertex_t	r_rightenter, r_rightexit;
+mvertex_t   r_leftenter, r_leftexit;
+mvertex_t   r_rightenter, r_rightexit;

-typedef struct
-{
-	float	u,v;
-	int		ceilv;
+typedef struct {
+	float       u, v;
+	int         ceilv;
 } evert_t;

-int				r_emitted;
-float			r_nearzi;
-float			r_u1, r_v1, r_lzi1;
-int				r_ceilv1;
+int         r_emitted;
+float       r_nearzi;
+float       r_u1, r_v1, r_lzi1;
+int         r_ceilv1;

-qboolean	r_lastvertvalid;
+qboolean    r_lastvertvalid;


 #ifndef USE_INTEL_ASM
@ -85,53 +85,51 @@ qboolean	r_lastvertvalid;
 R_EmitEdge
 ================
 */
-void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
+void
+R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
 {
-	edge_t	*edge, *pcheck;
-	int		u_check;
-	float	u, u_step;
-	vec3_t	local, transformed;
-	float	*world;
-	int		v, v2, ceilv0;
-	float	scale, lzi0, u0, v0;
-	int		side;
+	edge_t     *edge, *pcheck;
+	int         u_check;
+	float       u, u_step;
+	vec3_t      local, transformed;
+	float      *world;
+	int         v, v2, ceilv0;
+	float       scale, lzi0, u0, v0;
+	int         side;

-	if (r_lastvertvalid)
-	{
+	if (r_lastvertvalid) {
 		u0 = r_u1;
 		v0 = r_v1;
 		lzi0 = r_lzi1;
 		ceilv0 = r_ceilv1;
-	}
-	else
-	{
+	} else {
 		world = &pv0->position[0];
-	
-	// transform and project
+
+		// transform and project
 		VectorSubtract (world, modelorg, local);
 		TransformVector (local, transformed);
-	
+
 		if (transformed[2] < NEAR_CLIP)
 			transformed[2] = NEAR_CLIP;
-	
+
 		lzi0 = 1.0 / transformed[2];
-	
-	// FIXME: build x/yscale into transform?
+
+		// FIXME: build x/yscale into transform?
 		scale = xscale * lzi0;
-		u0 = (xcenter + scale*transformed[0]);
+		u0 = (xcenter + scale * transformed[0]);
 		if (u0 < r_refdef.fvrectx_adj)
 			u0 = r_refdef.fvrectx_adj;
 		if (u0 > r_refdef.fvrectright_adj)
 			u0 = r_refdef.fvrectright_adj;
-	
+
 		scale = yscale * lzi0;
-		v0 = (ycenter - scale*transformed[1]);
+		v0 = (ycenter - scale * transformed[1]);
 		if (v0 < r_refdef.fvrecty_adj)
 			v0 = r_refdef.fvrecty_adj;
 		if (v0 > r_refdef.fvrectbottom_adj)
 			v0 = r_refdef.fvrectbottom_adj;
-	
-		ceilv0 = (int) ceil(v0);
+
+		ceilv0 = (int) ceil (v0);
 	}

 	world = &pv1->position[0];
@ -146,14 +144,14 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
 	r_lzi1 = 1.0 / transformed[2];

 	scale = xscale * r_lzi1;
-	r_u1 = (xcenter + scale*transformed[0]);
+	r_u1 = (xcenter + scale * transformed[0]);
 	if (r_u1 < r_refdef.fvrectx_adj)
 		r_u1 = r_refdef.fvrectx_adj;
 	if (r_u1 > r_refdef.fvrectright_adj)
 		r_u1 = r_refdef.fvrectright_adj;

 	scale = yscale * r_lzi1;
-	r_v1 = (ycenter - scale*transformed[1]);
+	r_v1 = (ycenter - scale * transformed[1]);
 	if (r_v1 < r_refdef.fvrecty_adj)
 		r_v1 = r_refdef.fvrecty_adj;
 	if (r_v1 > r_refdef.fvrectbottom_adj)
@ -162,7 +160,7 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
 	if (r_lzi1 > lzi0)
 		lzi0 = r_lzi1;

-	if (lzi0 > r_nearzi)	// for mipmap finding
+	if (lzi0 > r_nearzi)				// for mipmap finding
 		r_nearzi = lzi0;

 // for right edges, all we want is the effect on 1/z
@ -171,20 +169,18 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)

 	r_emitted = 1;

-	r_ceilv1 = (int) ceil(r_v1);
+	r_ceilv1 = (int) ceil (r_v1);


 // create the edge
-	if (ceilv0 == r_ceilv1)
-	{
-	// we cache unclipped horizontal edges as fully clipped
-		if (cacheoffset != 0x7FFFFFFF)
-		{
+	if (ceilv0 == r_ceilv1) {
+		// we cache unclipped horizontal edges as fully clipped
+		if (cacheoffset != 0x7FFFFFFF) {
 			cacheoffset = FULLY_CLIPPED_CACHED |
-					(r_framecount & FRAMECOUNT_MASK);
+				(r_framecount & FRAMECOUNT_MASK);
 		}

-		return;		// horizontal edge
+		return;							// horizontal edge
 	}

 	side = ceilv0 > r_ceilv1;
@ -195,9 +191,8 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)

 	edge->nearzi = lzi0;

-	if (side == 0)
-	{
-	// trailing edge (go from p1 to p2)
+	if (side == 0) {
+		// trailing edge (go from p1 to p2)
 		v = ceilv0;
 		v2 = r_ceilv1 - 1;

@ -205,11 +200,9 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
 		edge->surfs[1] = 0;

 		u_step = ((r_u1 - u0) / (r_v1 - v0));
-		u = u0 + ((float)v - v0) * u_step;
-	}
-	else
-	{
-	// leading edge (go from p2 to p1)
+		u = u0 + ((float) v - v0) * u_step;
+	} else {
+		// leading edge (go from p2 to p1)
 		v2 = ceilv0 - 1;
 		v = r_ceilv1;

@ -217,11 +210,11 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
 		edge->surfs[1] = surface_p - surfaces;

 		u_step = ((u0 - r_u1) / (v0 - r_v1));
-		u = r_u1 + ((float)v - r_v1) * u_step;
+		u = r_u1 + ((float) v - r_v1) * u_step;
 	}

-	edge->u_step = u_step*0x100000;
-	edge->u = u*0x100000 + 0xFFFFF;
+	edge->u_step = u_step * 0x100000;
+	edge->u = u * 0x100000 + 0xFFFFF;

 // we need to do this to avoid stepping off the edges if a very nearly
 // horizontal edge is less than epsilon above a scan, and numeric error causes
@ -238,15 +231,12 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
 //
 	u_check = edge->u;
 	if (edge->surfs[0])
-		u_check++;	// sort trailers after leaders
+		u_check++;						// sort trailers after leaders

-	if (!newedges[v] || newedges[v]->u >= u_check)
-	{
+	if (!newedges[v] || newedges[v]->u >= u_check) {
 		edge->next = newedges[v];
 		newedges[v] = edge;
-	}
-	else
-	{
+	} else {
 		pcheck = newedges[v];
 		while (pcheck->next && pcheck->next->u < u_check)
 			pcheck = pcheck->next;
@ -264,88 +254,74 @@ void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1)
 R_ClipEdge
 ================
 */
-void R_ClipEdge (mvertex_t *pv0, mvertex_t *pv1, clipplane_t *clip)
+void
+R_ClipEdge (mvertex_t *pv0, mvertex_t *pv1, clipplane_t *clip)
 {
-	float		d0, d1, f;
-	mvertex_t	clipvert;
+	float       d0, d1, f;
+	mvertex_t   clipvert;

-	if (clip)
-	{
-		do
-		{
+	if (clip) {
+		do {
 			d0 = DotProduct (pv0->position, clip->normal) - clip->dist;
 			d1 = DotProduct (pv1->position, clip->normal) - clip->dist;

-			if (d0 >= 0)
-			{
-			// point 0 is unclipped
-				if (d1 >= 0)
-				{
-				// both points are unclipped
+			if (d0 >= 0) {
+				// point 0 is unclipped
+				if (d1 >= 0) {
+					// both points are unclipped
 					continue;
 				}
+				// only point 1 is clipped

-			// only point 1 is clipped
-
-			// we don't cache clipped edges
+				// we don't cache clipped edges
 				cacheoffset = 0x7FFFFFFF;

 				f = d0 / (d0 - d1);
 				clipvert.position[0] = pv0->position[0] +
-						f * (pv1->position[0] - pv0->position[0]);
+					f * (pv1->position[0] - pv0->position[0]);
 				clipvert.position[1] = pv0->position[1] +
-						f * (pv1->position[1] - pv0->position[1]);
+					f * (pv1->position[1] - pv0->position[1]);
 				clipvert.position[2] = pv0->position[2] +
-						f * (pv1->position[2] - pv0->position[2]);
+					f * (pv1->position[2] - pv0->position[2]);

-				if (clip->leftedge)
-				{
+				if (clip->leftedge) {
 					r_leftclipped = true;
 					r_leftexit = clipvert;
-				}
-				else if (clip->rightedge)
-				{
+				} else if (clip->rightedge) {
 					r_rightclipped = true;
 					r_rightexit = clipvert;
 				}

 				R_ClipEdge (pv0, &clipvert, clip->next);
 				return;
-			}
-			else
-			{
-			// point 0 is clipped
-				if (d1 < 0)
-				{
-				// both points are clipped
-				// we do cache fully clipped edges
+			} else {
+				// point 0 is clipped
+				if (d1 < 0) {
+					// both points are clipped
+					// we do cache fully clipped edges
 					if (!r_leftclipped)
 						cacheoffset = FULLY_CLIPPED_CACHED |
-								(r_framecount & FRAMECOUNT_MASK);
+							(r_framecount & FRAMECOUNT_MASK);
 					return;
 				}
-
-			// only point 0 is clipped
+				// only point 0 is clipped
 				r_lastvertvalid = false;

-			// we don't cache partially clipped edges
+				// we don't cache partially clipped edges
 				cacheoffset = 0x7FFFFFFF;

 				f = d0 / (d0 - d1);
 				clipvert.position[0] = pv0->position[0] +
-						f * (pv1->position[0] - pv0->position[0]);
+					f * (pv1->position[0] - pv0->position[0]);
 				clipvert.position[1] = pv0->position[1] +
-						f * (pv1->position[1] - pv0->position[1]);
+					f * (pv1->position[1] - pv0->position[1]);
 				clipvert.position[2] = pv0->position[2] +
-						f * (pv1->position[2] - pv0->position[2]);
+					f * (pv1->position[2] - pv0->position[2]);

-				if (clip->leftedge)
-				{
+				if (clip->leftedge) {
 					r_leftclipped = true;
 					r_leftenter = clipvert;
-				}
-				else if (clip->rightedge)
-				{
+				} else if (clip->rightedge) {
 					r_rightclipped = true;
 					r_rightenter = clipvert;
 				}
@ -355,12 +331,11 @@ void R_ClipEdge (mvertex_t *pv0, mvertex_t *pv1, clipplane_t *clip)
 			}
 		} while ((clip = clip->next) != NULL);
 	}
-
 // add the edge
 	R_EmitEdge (pv0, pv1);
 }

-#endif	// !USE_INTEL_ASM
+#endif // !USE_INTEL_ASM


 /*
@ -368,18 +343,19 @@ void R_ClipEdge (mvertex_t *pv0, mvertex_t *pv1, clipplane_t *clip)
 R_EmitCachedEdge
 ================
 */
-void R_EmitCachedEdge (void)
+void
+R_EmitCachedEdge (void)
 {
-	edge_t		*pedge_t;
+	edge_t     *pedge_t;

-	pedge_t = (edge_t *)((unsigned long)r_edges + r_pedge->cachededgeoffset);
+	pedge_t = (edge_t *) ((unsigned long) r_edges + r_pedge->cachededgeoffset);

 	if (!pedge_t->surfs[0])
 		pedge_t->surfs[0] = surface_p - surfaces;
 	else
 		pedge_t->surfs[1] = surface_p - surfaces;

-	if (pedge_t->nearzi > r_nearzi)	// for mipmap finding
+	if (pedge_t->nearzi > r_nearzi)		// for mipmap finding
 		r_nearzi = pedge_t->nearzi;

 	r_emitted = 1;
@ -391,26 +367,24 @@ void R_EmitCachedEdge (void)
 R_RenderFace
 ================
 */
-void R_RenderFace (msurface_t *fa, int clipflags)
+void
+R_RenderFace (msurface_t *fa, int clipflags)
 {
-	int			i, lindex;
-	unsigned int	mask;
-	mplane_t	*pplane;
-	float		distinv;
-	vec3_t		p_normal;
-	medge_t		*pedges, tedge;
-	clipplane_t	*pclip;
+	int         i, lindex;
+	unsigned int mask;
+	mplane_t   *pplane;
+	float       distinv;
+	vec3_t      p_normal;
+	medge_t    *pedges, tedge;
+	clipplane_t *pclip;

 // skip out if no more surfs
-	if ((surface_p) >= surf_max)
-	{
+	if ((surface_p) >= surf_max) {
 		r_outofsurfaces++;
 		return;
 	}
-
 // ditto if not enough edges left, or switch to auxedges if possible
-	if ((edge_p + fa->numedges + 4) >= edge_max)
-	{
+	if ((edge_p + fa->numedges + 4) >= edge_max) {
 		r_outofedges += fa->numedges;
 		return;
 	}
@ -420,10 +394,8 @@ void R_RenderFace (msurface_t *fa, int clipflags)
 // set up clip planes
 	pclip = NULL;

-	for (i=3, mask = 0x08 ; i>=0 ; i--, mask >>= 1)
-	{
-		if (clipflags & mask)
-		{
+	for (i = 3, mask = 0x08; i >= 0; i--, mask >>= 1) {
+		if (clipflags & mask) {
 			view_clipplanes[i].next = pclip;
 			pclip = &view_clipplanes[i];
 		}
@ -437,46 +409,37 @@ void R_RenderFace (msurface_t *fa, int clipflags)
 	pedges = currententity->model->edges;
 	r_lastvertvalid = false;

-	for (i=0 ; i<fa->numedges ; i++)
-	{
+	for (i = 0; i < fa->numedges; i++) {
 		lindex = currententity->model->surfedges[fa->firstedge + i];

-		if (lindex > 0)
-		{
+		if (lindex > 0) {
 			r_pedge = &pedges[lindex];

-		// if the edge is cached, we can just reuse the edge
-			if (!insubmodel)
-			{
-				if (r_pedge->cachededgeoffset & FULLY_CLIPPED_CACHED)
-				{
+			// if the edge is cached, we can just reuse the edge
+			if (!insubmodel) {
+				if (r_pedge->cachededgeoffset & FULLY_CLIPPED_CACHED) {
 					if ((r_pedge->cachededgeoffset & FRAMECOUNT_MASK) ==
-						r_framecount)
-					{
+						r_framecount) {
 						r_lastvertvalid = false;
 						continue;
 					}
-				}
-				else
-				{
-					if ((((unsigned long)edge_p - (unsigned long)r_edges) >
+				} else {
+					if ((((unsigned long) edge_p - (unsigned long) r_edges) >
 						 r_pedge->cachededgeoffset) &&
-						(((edge_t *)((unsigned long)r_edges +
-						 r_pedge->cachededgeoffset))->owner == r_pedge))
-					{
+						(((edge_t *) ((unsigned long) r_edges +
+									  r_pedge->cachededgeoffset))->owner ==
+						 r_pedge)) {
 						R_EmitCachedEdge ();
 						r_lastvertvalid = false;
 						continue;
 					}
 				}
 			}
-
-		// assume it's cacheable
-			cacheoffset = (byte *)edge_p - (byte *)r_edges;
+			// assume it's cacheable
+			cacheoffset = (byte *) edge_p - (byte *) r_edges;
 			r_leftclipped = r_rightclipped = false;
 			R_ClipEdge (&r_pcurrentvertbase[r_pedge->v[0]],
-						&r_pcurrentvertbase[r_pedge->v[1]],
-						pclip);
+						&r_pcurrentvertbase[r_pedge->v[1]], pclip);
 			r_pedge->cachededgeoffset = cacheoffset;

 			if (r_leftclipped)
@ -484,45 +447,36 @@ void R_RenderFace (msurface_t *fa, int clipflags)
 			if (r_rightclipped)
 				makerightedge = true;
 			r_lastvertvalid = true;
-		}
-		else
-		{
+		} else {
 			lindex = -lindex;
 			r_pedge = &pedges[lindex];
-		// if the edge is cached, we can just reuse the edge
-			if (!insubmodel)
-			{
-				if (r_pedge->cachededgeoffset & FULLY_CLIPPED_CACHED)
-				{
+			// if the edge is cached, we can just reuse the edge
+			if (!insubmodel) {
+				if (r_pedge->cachededgeoffset & FULLY_CLIPPED_CACHED) {
 					if ((r_pedge->cachededgeoffset & FRAMECOUNT_MASK) ==
-						r_framecount)
-					{
+						r_framecount) {
 						r_lastvertvalid = false;
 						continue;
 					}
-				}
-				else
-				{
-				// it's cached if the cached edge is valid and is owned
-				// by this medge_t
-					if ((((unsigned long)edge_p - (unsigned long)r_edges) >
+				} else {
+					// it's cached if the cached edge is valid and is owned
+					// by this medge_t
+					if ((((unsigned long) edge_p - (unsigned long) r_edges) >
 						 r_pedge->cachededgeoffset) &&
-						(((edge_t *)((unsigned long)r_edges +
-						 r_pedge->cachededgeoffset))->owner == r_pedge))
-					{
+						(((edge_t *) ((unsigned long) r_edges +
+									  r_pedge->cachededgeoffset))->owner ==
+						 r_pedge)) {
 						R_EmitCachedEdge ();
 						r_lastvertvalid = false;
 						continue;
 					}
 				}
 			}
-
-		// assume it's cacheable
-			cacheoffset = (byte *)edge_p - (byte *)r_edges;
+			// assume it's cacheable
+			cacheoffset = (byte *) edge_p - (byte *) r_edges;
 			r_leftclipped = r_rightclipped = false;
 			R_ClipEdge (&r_pcurrentvertbase[r_pedge->v[1]],
-						&r_pcurrentvertbase[r_pedge->v[0]],
-						pclip);
+						&r_pcurrentvertbase[r_pedge->v[0]], pclip);
 			r_pedge->cachededgeoffset = cacheoffset;

 			if (r_leftclipped)
@ -536,29 +490,25 @@ void R_RenderFace (msurface_t *fa, int clipflags)
 // if there was a clip off the left edge, add that edge too
 // FIXME: faster to do in screen space?
 // FIXME: share clipped edges?
-	if (makeleftedge)
-	{
+	if (makeleftedge) {
 		r_pedge = &tedge;
 		r_lastvertvalid = false;
 		R_ClipEdge (&r_leftexit, &r_leftenter, pclip->next);
 	}
-
 // if there was a clip off the right edge, get the right r_nearzi
-	if (makerightedge)
-	{
+	if (makerightedge) {
 		r_pedge = &tedge;
 		r_lastvertvalid = false;
 		r_nearzionly = true;
 		R_ClipEdge (&r_rightexit, &r_rightenter, view_clipplanes[1].next);
 	}
-
 // if no edges made it out, return without posting the surface
 	if (!r_emitted)
 		return;

 	r_polycount++;

-	surface_p->data = (void *)fa;
+	surface_p->data = (void *) fa;
 	surface_p->nearzi = r_nearzi;
 	surface_p->flags = fa->flags;
 	surface_p->insubmodel = insubmodel;
@ -576,10 +526,9 @@ void R_RenderFace (msurface_t *fa, int clipflags)
 	surface_p->d_zistepu = p_normal[0] * xscaleinv * distinv;
 	surface_p->d_zistepv = -p_normal[1] * yscaleinv * distinv;
 	surface_p->d_ziorigin = p_normal[2] * distinv -
-			xcenter * surface_p->d_zistepu -
-			ycenter * surface_p->d_zistepv;
+		xcenter * surface_p->d_zistepu - ycenter * surface_p->d_zistepv;

-//JDC	VectorCopy (r_worldmodelorg, surface_p->modelorg);
+//JDC   VectorCopy (r_worldmodelorg, surface_p->modelorg);
 	surface_p++;
 }

@ -589,26 +538,24 @@ void R_RenderFace (msurface_t *fa, int clipflags)
 R_RenderBmodelFace
 ================
 */
-void R_RenderBmodelFace (bedge_t *pedges, msurface_t *psurf)
+void
+R_RenderBmodelFace (bedge_t *pedges, msurface_t *psurf)
 {
-	int			i;
-	unsigned int	mask;
-	mplane_t	*pplane;
-	float		distinv;
-	vec3_t		p_normal;
-	medge_t		tedge;
-	clipplane_t	*pclip;
+	int         i;
+	unsigned int mask;
+	mplane_t   *pplane;
+	float       distinv;
+	vec3_t      p_normal;
+	medge_t     tedge;
+	clipplane_t *pclip;

 // skip out if no more surfs
-	if (surface_p >= surf_max)
-	{
+	if (surface_p >= surf_max) {
 		r_outofsurfaces++;
 		return;
 	}
-
 // ditto if not enough edges left, or switch to auxedges if possible
-	if ((edge_p + psurf->numedges + 4) >= edge_max)
-	{
+	if ((edge_p + psurf->numedges + 4) >= edge_max) {
 		r_outofedges += psurf->numedges;
 		return;
 	}
@ -621,10 +568,8 @@ void R_RenderBmodelFace (bedge_t *pedges, msurface_t *psurf)
 // set up clip planes
 	pclip = NULL;

-	for (i=3, mask = 0x08 ; i>=0 ; i--, mask >>= 1)
-	{
-		if (r_clipflags & mask)
-		{
+	for (i = 3, mask = 0x08; i >= 0; i--, mask >>= 1) {
+		if (r_clipflags & mask) {
 			view_clipplanes[i].next = pclip;
 			pclip = &view_clipplanes[i];
 		}
@ -639,8 +584,7 @@ void R_RenderBmodelFace (bedge_t *pedges, msurface_t *psurf)
 // can be used?
 	r_lastvertvalid = false;

-	for ( ; pedges ; pedges = pedges->pnext)
-	{
+	for (; pedges; pedges = pedges->pnext) {
 		r_leftclipped = r_rightclipped = false;
 		R_ClipEdge (pedges->v[0], pedges->v[1], pclip);

@ -653,27 +597,23 @@ void R_RenderBmodelFace (bedge_t *pedges, msurface_t *psurf)
 // if there was a clip off the left edge, add that edge too
 // FIXME: faster to do in screen space?
 // FIXME: share clipped edges?
-	if (makeleftedge)
-	{
+	if (makeleftedge) {
 		r_pedge = &tedge;
 		R_ClipEdge (&r_leftexit, &r_leftenter, pclip->next);
 	}
-
 // if there was a clip off the right edge, get the right r_nearzi
-	if (makerightedge)
-	{
+	if (makerightedge) {
 		r_pedge = &tedge;
 		r_nearzionly = true;
 		R_ClipEdge (&r_rightexit, &r_rightenter, view_clipplanes[1].next);
 	}
-
 // if no edges made it out, return without posting the surface
 	if (!r_emitted)
 		return;

 	r_polycount++;

-	surface_p->data = (void *)psurf;
+	surface_p->data = (void *) psurf;
 	surface_p->nearzi = r_nearzi;
 	surface_p->flags = psurf->flags;
 	surface_p->insubmodel = true;
@ -691,10 +631,9 @@ void R_RenderBmodelFace (bedge_t *pedges, msurface_t *psurf)
 	surface_p->d_zistepu = p_normal[0] * xscaleinv * distinv;
 	surface_p->d_zistepv = -p_normal[1] * yscaleinv * distinv;
 	surface_p->d_ziorigin = p_normal[2] * distinv -
-			xcenter * surface_p->d_zistepu -
-			ycenter * surface_p->d_zistepv;
+		xcenter * surface_p->d_zistepu - ycenter * surface_p->d_zistepv;

-//JDC	VectorCopy (r_worldmodelorg, surface_p->modelorg);
+//JDC   VectorCopy (r_worldmodelorg, surface_p->modelorg);
 	surface_p++;
 }

@ -704,32 +643,31 @@ void R_RenderBmodelFace (bedge_t *pedges, msurface_t *psurf)
 R_RenderPoly
 ================
 */
-void R_RenderPoly (msurface_t *fa, int clipflags)
+void
+R_RenderPoly (msurface_t *fa, int clipflags)
 {
-	int			i, lindex, lnumverts, s_axis, t_axis;
-	float		dist, lastdist, lzi, scale, u, v, frac;
-	unsigned int	mask;
-	vec3_t		local, transformed;
-	clipplane_t	*pclip;
-	medge_t		*pedges;
-	mplane_t	*pplane;
-	mvertex_t	verts[2][100];	//FIXME: do real number
-	polyvert_t	pverts[100];	//FIXME: do real number, safely
-	int			vertpage, newverts, newpage, lastvert;
-	qboolean	visible;
+	int         i, lindex, lnumverts, s_axis, t_axis;
+	float       dist, lastdist, lzi, scale, u, v, frac;
+	unsigned int mask;
+	vec3_t      local, transformed;
+	clipplane_t *pclip;
+	medge_t    *pedges;
+	mplane_t   *pplane;
+	mvertex_t   verts[2][100];			// FIXME: do real number
+	polyvert_t  pverts[100];			// FIXME: do real number, safely
+	int         vertpage, newverts, newpage, lastvert;
+	qboolean    visible;

 // FIXME: clean this up and make it faster
 // FIXME: guard against running out of vertices

-	s_axis = t_axis = 0;	// keep compiler happy
+	s_axis = t_axis = 0;				// keep compiler happy

 // set up clip planes
 	pclip = NULL;

-	for (i=3, mask = 0x08 ; i>=0 ; i--, mask >>= 1)
-	{
-		if (clipflags & mask)
-		{
+	for (i = 3, mask = 0x08; i >= 0; i--, mask >>= 1) {
+		if (clipflags & mask) {
 			view_clipplanes[i].next = pclip;
 			pclip = &view_clipplanes[i];
 		}
@ -741,25 +679,20 @@ void R_RenderPoly (msurface_t *fa, int clipflags)
 	lnumverts = fa->numedges;
 	vertpage = 0;

-	for (i=0 ; i<lnumverts ; i++)
-	{
+	for (i = 0; i < lnumverts; i++) {
 		lindex = currententity->model->surfedges[fa->firstedge + i];

-		if (lindex > 0)
-		{
+		if (lindex > 0) {
 			r_pedge = &pedges[lindex];
 			verts[0][i] = r_pcurrentvertbase[r_pedge->v[0]];
-		}
-		else
-		{
+		} else {
 			r_pedge = &pedges[-lindex];
 			verts[0][i] = r_pcurrentvertbase[r_pedge->v[1]];
 		}
 	}

 // clip the polygon, done if not visible
-	while (pclip)
-	{
+	while (pclip) {
 		lastvert = lnumverts - 1;
 		lastdist = DotProduct (verts[vertpage][lastvert].position,
 							   pclip->normal) - pclip->dist;
@ -768,31 +701,28 @@ void R_RenderPoly (msurface_t *fa, int clipflags)
 		newverts = 0;
 		newpage = vertpage ^ 1;

-		for (i=0 ; i<lnumverts ; i++)
-		{
+		for (i = 0; i < lnumverts; i++) {
 			dist = DotProduct (verts[vertpage][i].position, pclip->normal) -
-					pclip->dist;
+				pclip->dist;

-			if ((lastdist > 0) != (dist > 0))
-			{
+			if ((lastdist > 0) != (dist > 0)) {
 				frac = dist / (dist - lastdist);
 				verts[newpage][newverts].position[0] =
-						verts[vertpage][i].position[0] +
-						((verts[vertpage][lastvert].position[0] -
-						  verts[vertpage][i].position[0]) * frac);
+					verts[vertpage][i].position[0] +
+					((verts[vertpage][lastvert].position[0] -
+					  verts[vertpage][i].position[0]) * frac);
 				verts[newpage][newverts].position[1] =
-						verts[vertpage][i].position[1] +
-						((verts[vertpage][lastvert].position[1] -
-						  verts[vertpage][i].position[1]) * frac);
+					verts[vertpage][i].position[1] +
+					((verts[vertpage][lastvert].position[1] -
+					  verts[vertpage][i].position[1]) * frac);
 				verts[newpage][newverts].position[2] =
-						verts[vertpage][i].position[2] +
-						((verts[vertpage][lastvert].position[2] -
-						  verts[vertpage][i].position[2]) * frac);
+					verts[vertpage][i].position[2] +
+					((verts[vertpage][lastvert].position[2] -
+					  verts[vertpage][i].position[2]) * frac);
 				newverts++;
 			}

-			if (dist >= 0)
-			{
+			if (dist >= 0) {
 				verts[newpage][newverts] = verts[vertpage][i];
 				newverts++;
 				visible = true;
@ -813,30 +743,28 @@ void R_RenderPoly (msurface_t *fa, int clipflags)
 // transform and project, remembering the z values at the vertices and
 // r_nearzi, and extract the s and t coordinates at the vertices
 	pplane = fa->plane;
-	switch (pplane->type)
-	{
-	case PLANE_X:
-	case PLANE_ANYX:
-		s_axis = 1;
-		t_axis = 2;
-		break;
-	case PLANE_Y:
-	case PLANE_ANYY:
-		s_axis = 0;
-		t_axis = 2;
-		break;
-	case PLANE_Z:
-	case PLANE_ANYZ:
-		s_axis = 0;
-		t_axis = 1;
-		break;
+	switch (pplane->type) {
+		case PLANE_X:
+		case PLANE_ANYX:
+			s_axis = 1;
+			t_axis = 2;
+			break;
+		case PLANE_Y:
+		case PLANE_ANYY:
+			s_axis = 0;
+			t_axis = 2;
+			break;
+		case PLANE_Z:
+		case PLANE_ANYZ:
+			s_axis = 0;
+			t_axis = 1;
+			break;
 	}

 	r_nearzi = 0;

-	for (i=0 ; i<lnumverts ; i++)
-	{
-	// transform and project
+	for (i = 0; i < lnumverts; i++) {
+		// transform and project
 		VectorSubtract (verts[vertpage][i].position, modelorg, local);
 		TransformVector (local, transformed);

@ -845,19 +773,19 @@ void R_RenderPoly (msurface_t *fa, int clipflags)

 		lzi = 1.0 / transformed[2];

-		if (lzi > r_nearzi)	// for mipmap finding
+		if (lzi > r_nearzi)				// for mipmap finding
 			r_nearzi = lzi;

-	// FIXME: build x/yscale into transform?
+		// FIXME: build x/yscale into transform?
 		scale = xscale * lzi;
-		u = (xcenter + scale*transformed[0]);
+		u = (xcenter + scale * transformed[0]);
 		if (u < r_refdef.fvrectx_adj)
 			u = r_refdef.fvrectx_adj;
 		if (u > r_refdef.fvrectright_adj)
 			u = r_refdef.fvrectright_adj;

 		scale = yscale * lzi;
-		v = (ycenter - scale*transformed[1]);
+		v = (ycenter - scale * transformed[1]);
 		if (v < r_refdef.fvrecty_adj)
 			v = r_refdef.fvrecty_adj;
 		if (v > r_refdef.fvrectbottom_adj)
@ -887,30 +815,28 @@ void R_RenderPoly (msurface_t *fa, int clipflags)
 R_ZDrawSubmodelPolys
 ================
 */
-void R_ZDrawSubmodelPolys (model_t *pmodel)
+void
+R_ZDrawSubmodelPolys (model_t *pmodel)
 {
-	int			i, numsurfaces;
-	msurface_t	*psurf;
-	float		dot;
-	mplane_t	*pplane;
+	int         i, numsurfaces;
+	msurface_t *psurf;
+	float       dot;
+	mplane_t   *pplane;

 	psurf = &pmodel->surfaces[pmodel->firstmodelsurface];
 	numsurfaces = pmodel->nummodelsurfaces;

-	for (i=0 ; i<numsurfaces ; i++, psurf++)
-	{
-	// find which side of the node we are on
+	for (i = 0; i < numsurfaces; i++, psurf++) {
+		// find which side of the node we are on
 		pplane = psurf->plane;

 		dot = DotProduct (modelorg, pplane->normal) - pplane->dist;

-	// draw the polygon
+		// draw the polygon
 		if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
-			(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON)))
-		{
-		// FIXME: use bounding-box-based frustum clipping info?
+			(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
+			// FIXME: use bounding-box-based frustum clipping info?
 			R_RenderPoly (psurf, 15);
 		}
 	}
 }
-