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 <curaga@operamail.com>

diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c
index 005456ef78b86c958ed325c40edde1d650177f54..2e6eb40b9553bb98ec3c3f4e738d6da02ed512b8 100644 (file)
--- 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 */