From 123f3fd9626db9c1f6e84b1a72e73abfa8019a85 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen Date: Sat, 3 Mar 2012 12:51:20 +0200 Subject: [PATCH] q3map2: Small cleanups 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 --- tools/quake3/q3map2/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c index 005456ef..2e6eb40b 100644 --- a/tools/quake3/q3map2/surface.c +++ b/tools/quake3/q3map2/surface.c @@ -2027,7 +2027,7 @@ int FilterWindingIntoTree_r( winding_t *w, mapDrawSurface_t *ds, node_t *node ) { int i, refs = 0; plane_t *p1, *p2; - vec4_t plane1, plane2, reverse; + vec4_t plane1, plane2; winding_t *fat, *front, *back; shaderInfo_t *si; @@ -2092,6 +2092,7 @@ int FilterWindingIntoTree_r( winding_t *w, mapDrawSurface_t *ds, node_t *node ) #if 0 /* div0: this is the plague (inaccurate) */ + vec4_t reverse; /* invert surface plane */ VectorSubtract( vec3_origin, plane2, reverse ); @@ -3531,7 +3532,7 @@ void FilterDrawsurfsIntoTree( entity_t *e, tree_t *tree ) AddSurfaceFlare( ds, e->origin ); /* 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; /* ydnar: bias the surface textures */ -- 2.39.2