quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

q3map2: Small cleanups

Browse Source 
Move one variable to the section it is used in, and remove one unnecessary
NULL check.

If si were NULL at that point, we would have segfaulted ages ago.

Signed-off-by: Lauri Kasanen <curaga@operamail.com>
This commit is contained in:
Lauri Kasanen 2012-03-03 12:51:20 +02:00 committed by Rudolf Polzer
parent 053ca4041b
commit 123f3fd962
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/quake3/q3map2/surface.c
View File

@ -2027,7 +2027,7 @@ int FilterWindingIntoTree_r( winding_t *w, mapDrawSurface_t *ds, node_t *node )
{ {
int i, refs = 0; int i, refs = 0;
plane_t *p1, *p2; plane_t *p1, *p2;
vec4_t plane1, plane2, reverse; vec4_t plane1, plane2;
winding_t *fat, *front, *back; winding_t *fat, *front, *back;
shaderInfo_t *si; shaderInfo_t *si;
@ -2092,6 +2092,7 @@ int FilterWindingIntoTree_r( winding_t *w, mapDrawSurface_t *ds, node_t *node )
#if 0 #if 0
/* div0: this is the plague (inaccurate) */ /* div0: this is the plague (inaccurate) */
vec4_t reverse;
/* invert surface plane */ /* invert surface plane */
VectorSubtract( vec3_origin, plane2, reverse ); VectorSubtract( vec3_origin, plane2, reverse );
@ -3531,7 +3532,7 @@ void FilterDrawsurfsIntoTree( entity_t *e, tree_t *tree )
AddSurfaceFlare( ds, e->origin ); AddSurfaceFlare( ds, e->origin );
/* ydnar: don't emit nodraw surfaces (like nodraw fog) */ /* ydnar: don't emit nodraw surfaces (like nodraw fog) */
if( si != NULL && (si->compileFlags & C_NODRAW) && ds->type != SURFACE_PATCH ) if( (si->compileFlags & C_NODRAW) && ds->type != SURFACE_PATCH )
continue; continue;
/* ydnar: bias the surface textures */ /* ydnar: bias the surface textures */