]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
Merge commit 'ed4c8c204443726e852a4c8927b3f8d2571cc522' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 26 May 2020 15:37:18 +0000 (17:37 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 26 May 2020 15:37:18 +0000 (17:37 +0200)
1  2 
tools/quake3/q3map2/bspfile_abstract.c
tools/quake3/q3map2/exportents.c
tools/quake3/q3map2/light_bounce.c
tools/quake3/q3map2/main.c
tools/quake3/q3map2/path_init.c
tools/quake3/q3map2/q3map2.h

index a751f83a5fd2e538ca2c6797ae800544ad3c7e5a,8aad909195fc824496867552aa7341c243b854e1..2941fa74e5da99146a811bc9eb5960b8b9549cdd
@@@ -109,7 -109,7 +109,7 @@@ void SetDrawSurfacesBuffer()
  
        bspDrawSurfaces = safe_malloc_info( sizeof( bspDrawSurface_t ) * numBSPDrawSurfacesBuffer, "IncDrawSurfaces" );
  
 -      memset( bspDrawSurfaces, 0, MAX_MAP_DRAW_SURFS * sizeof( bspDrawVert_t ) );
 +      memset( bspDrawSurfaces, 0, MAX_MAP_DRAW_SURFS * sizeof( bspDrawSurface_t ) );
  }
  
  void SetDrawSurfaces( int n ){
  
        bspDrawSurfaces = safe_malloc_info( sizeof( bspDrawSurface_t ) * numBSPDrawSurfacesBuffer, "IncDrawSurfaces" );
  
 -      memset( bspDrawSurfaces, 0, n * sizeof( bspDrawVert_t ) );
 +      memset( bspDrawSurfaces, 0, n * sizeof( bspDrawSurface_t ) );
  }
  
  void BSPFilesCleanup(){
@@@ -277,7 -277,7 +277,7 @@@ int GetLumpElements( bspHeader_t *heade
        /* check for odd size */
        if ( header->lumps[ lump ].length % size ) {
                if ( force ) {
 -                      Sys_Printf( "WARNING: GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump );
 +                      Sys_FPrintf( SYS_WRN, "WARNING: GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump );
                        return 0;
                }
                else{
@@@ -321,7 -321,7 +321,7 @@@ int CopyLump( bspHeader_t *header, int 
        }
        if ( length % size ) {
                if ( force ) {
 -                      Sys_Printf( "WARNING: CopyLump: odd lump size (%d) in lump %d\n", length, lump );
 +                      Sys_FPrintf( SYS_WRN, "WARNING: CopyLump: odd lump size (%d) in lump %d\n", length, lump );
                        return 0;
                }
                else{
@@@ -450,7 -450,12 +450,12 @@@ void PrintBSPFileSizes( void )
        if ( numEntities <= 0 ) {
                ParseEntities();
        }
+       int patchCount = 0;
+       bspDrawSurface_t *s;
+       for ( s = bspDrawSurfaces; s != bspDrawSurfaces + numBSPDrawSurfaces; ++s ){
+               if ( s->surfaceType == MST_PATCH )
+                       ++patchCount;
+       }
        /* note that this is abstracted */
        Sys_Printf( "Abstracted BSP file components (*actual sizes may differ)\n" );
  
  
        Sys_Printf( "%9d drawsurfaces  %9d *\n",
                                numBSPDrawSurfaces, (int) ( numBSPDrawSurfaces * sizeof( *bspDrawSurfaces ) ) );
+       Sys_Printf( "%9d patchsurfaces       \n",
+                               patchCount );
        Sys_Printf( "%9d drawverts     %9d *\n",
                                numBSPDrawVerts, (int) ( numBSPDrawVerts * sizeof( *bspDrawVerts ) ) );
        Sys_Printf( "%9d drawindexes   %9d\n",
@@@ -619,8 -626,6 +626,8 @@@ void ParseEntities( void )
        numBSPEntities = numEntities;
  }
  
 +
 +
  /*
   * must be called before UnparseEntities
   */
@@@ -665,8 -670,6 +672,8 @@@ void InjectCommandLine( char **argv, in
        SetKeyValue( &entities[0], "_q3map2_version", Q3MAP_VERSION );
  }
  
 +
 +
  /*
     UnparseEntities()
     generates the dentdata string from all the entities.
@@@ -793,8 -796,6 +800,8 @@@ void SetKeyValue( entity_t *ent, const 
        ep->value = copystring( value );
  }
  
 +
 +
  /*
     KeyExists()
     returns true if entity has this key
@@@ -815,8 -816,6 +822,8 @@@ qboolean KeyExists( const entity_t *ent
        return qfalse;
  }
  
 +
 +
  /*
     ValueForKey()
     gets the value for an entity key
@@@ -880,7 -879,7 +887,7 @@@ vec_t FloatForKey( const entity_t *ent
     gets a 3-element vector value for an entity key
   */
  
 -void GetVectorForKey( const entity_t *ent, const char *key, vec3_t vec ){
 +qboolean GetVectorForKey( const entity_t *ent, const char *key, vec3_t vec ){
        const char  *k;
        double v1, v2, v3;
  
        vec[ 0 ] = v1;
        vec[ 1 ] = v2;
        vec[ 2 ] = v3;
 +
 +      /* true if the key is found, false otherwise */
 +      return strlen( k );
  }
  
  
index b123660843acfc4cdfc7a962bf5d96c6bdae2cbc,578f9e42fbcdf5caf2f35e8ac5400c1797cc5a95..a0e5d6b6c11d5e036add41268cd962935f3707c6
@@@ -64,7 -64,7 +64,7 @@@ void ExportEntities( void )
                
          /* sanity check */
          if ( bspEntData == NULL || bspEntDataSize == 0 ) {
 -                Sys_Printf( "WARNING: No BSP entity data. aborting...\n" );
 +                Sys_FPrintf( SYS_WRN, "WARNING: No BSP entity data. aborting...\n" );
                  return;
          }
                
@@@ -109,4 -109,4 +109,4 @@@ int ExportEntitiesMain( int argc, char 
                
          /* return to sender */
          return 0;
--}
++}
index acf2eacd3ce4af54d09239f04ee93cf19b1ebce8,bddbe6749da2af8b795c9725f129b8f95d6f55e7..c818121215d6f3a87bf1b728b73ee550a80a13bf
@@@ -428,13 -428,15 +428,15 @@@ static void RadSample( int lightmapNum
  #define RADIOSITY_MIN               0.0001f
  #define RADIOSITY_CLIP_EPSILON      0.125f
  
  static void RadSubdivideDiffuseLight( int lightmapNum, bspDrawSurface_t *ds, rawLightmap_t *lm, shaderInfo_t *si,
-                                                                         float scale, float subdivide, qboolean original, radWinding_t *rw, clipWork_t *cw ){
+                                                                         float scale, float subdivide, radWinding_t *rw, clipWork_t *cw ){
        int i, style = 0;
        float dist, area, value;
        vec3_t mins, maxs, normal, d1, d2, cross, color, gradient;
        light_t         *light, *splash;
-       winding_t       *w;
+       winding_t       *w, *splash_w;
  
  
        /* dummy check */
                        RadClipWindingEpsilon( rw, normal, dist, RADIOSITY_CLIP_EPSILON, &front, &back, cw );
  
                        /* recurse */
-                       RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, qfalse, &front, cw );
-                       RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, qfalse, &back, cw );
+                       RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, &front, cw );
+                       RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, &back, cw );
                        return;
                }
        }
                /* if color gradient is too high, subdivide again */
                if ( subdivide > minDiffuseSubdivide &&
                         ( gradient[ 0 ] > RADIOSITY_MAX_GRADIENT || gradient[ 1 ] > RADIOSITY_MAX_GRADIENT || gradient[ 2 ] > RADIOSITY_MAX_GRADIENT ) ) {
-                       RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, ( subdivide / 2.0f ), qfalse, rw, cw );
+                       RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, ( subdivide / 2.0f ), rw, cw );
                        return;
                }
        }
        light->falloffTolerance = falloffTolerance;
  
        /* bouncing light? */
 -      if ( !bouncing ) {
 +      if ( bouncing == qfalse ) {
                /* This is weird. This actually handles surfacelight and not
                 * bounces. */
  
                VectorMA( light->origin, 1.0f, light->normal, light->origin );
                light->dist = DotProduct( light->origin, normal );
  
-               /* optionally create a point backsplash light for first pass */
-               if ( original && si->backsplashFraction > 0 ) {
+ #if 0
+               /* optionally create a point backsplash light */
+               if ( si->backsplashFraction > 0 ) {
                        /* allocate a new point light */
                        splash = safe_malloc( sizeof( *splash ) );
                        memset( splash, 0, sizeof( *splash ) );
                        splash->next = lights;
                        lights = splash;
  
                        /* set it up */
                        splash->flags = LIGHT_Q3A_DEFAULT;
                        splash->type = EMIT_POINT;
                        splash->photons = light->photons * si->backsplashFraction;
                        splash->fade = 1.0f;
                        splash->si = si;
                        VectorMA( light->origin, si->backsplashDistance, normal, splash->origin );
                        VectorCopy( si->color, splash->color );
                        splash->falloffTolerance = falloffTolerance;
                        splash->style = noStyles ? LS_NORMAL : light->style;
  
                        /* add to counts */
                        numPointLights++;
                }
+ #endif
+ #if 1
+               /* optionally create area backsplash light */
+               //if ( original && si->backsplashFraction > 0 ) {
+               if ( si->backsplashFraction > 0 && !( si->compileFlags & C_SKY ) ) {
+                       /* allocate a new area light */
+                       splash = safe_malloc( sizeof( *splash ) );
+                       memset( splash, 0, sizeof( *splash ) );
+                       ThreadLock();
+                       splash->next = lights;
+                       lights = splash;
+                       ThreadUnlock();
+                       /* set it up */
+                       splash->flags = LIGHT_AREA_DEFAULT;
+                       splash->type = EMIT_AREA;
+                       splash->photons = light->photons * 7.0f * si->backsplashFraction;
+                       splash->add = light->add * 7.0f * si->backsplashFraction;
+                       splash->fade = 1.0f;
+                       splash->si = si;
+                       VectorCopy( si->color, splash->color );
+                       VectorScale( splash->color, splash->add, splash->emitColor );
+                       splash->falloffTolerance = falloffTolerance;
+                       splash->style = noStyles ? LS_NORMAL : si->lightStyle;
+                       if ( splash->style < LS_NORMAL || splash->style >= LS_NONE ) {
+                               splash->style = LS_NORMAL;
+                       }
+                       /* create a regular winding */
+                       splash_w = AllocWinding( rw->numVerts );
+                       splash_w->numpoints = rw->numVerts;
+                       for ( i = 0; i < rw->numVerts; i++ )
+                               VectorMA( rw->verts[rw->numVerts - 1 - i].xyz, si->backsplashDistance, normal, splash_w->p[ i ] );
+                       splash->w = splash_w;
+                       VectorMA( light->origin, si->backsplashDistance, normal, splash->origin );
+                       VectorNegate( normal, splash->normal );
+             splash->dist = DotProduct( splash->origin, splash->normal );
+ //                    splash->flags |= LIGHT_TWOSIDED;
+               }
+ #endif
        }
        else
        {
  }
  
  
  /*
     RadLightForTriangles()
     creates unbounced diffuse lights for triangle soup (misc_models, etc)
@@@ -679,7 -730,7 +730,7 @@@ void RadLightForTriangles( int num, in
                }
  
                /* subdivide into area lights */
-               RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, qtrue, &rw, cw );
+               RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, &rw, cw );
        }
  }
  
@@@ -788,7 -839,7 +839,7 @@@ void RadLightForPatch( int num, int lig
                                }
  
                                /* subdivide into area lights */
-                               RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, qtrue, &rw, cw );
+                               RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, &rw, cw );
                        }
  
                        /* generate 2 tris */
                                        }
  
                                        /* subdivide into area lights */
-                                       RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, qtrue, &rw, cw );
+                                       RadSubdivideDiffuseLight( lightmapNum, ds, lm, si, scale, subdivide, &rw, cw );
                                }
                        }
                }
index 4e1cd3e88f25708409a09d1a7666516eed1acc5f,1b8275dfe090287969b0c4bb9ccf2850cc2ca1d2..c592a1daf5a734860675d0570658432af4c43286
@@@ -1,4 -1,4 +1,4 @@@
 -/* -------------------------------------------------------------------------------;
 +/* -------------------------------------------------------------------------------
  
     Copyright (C) 1999-2007 id Software, Inc. and contributors.
     For a list of contributors, see the accompanying CONTRIBUTORS file.
  
  /* dependencies */
  #include "q3map2.h"
 -
 -
 -
 -/*
 -   Random()
 -   returns a pseudorandom number between 0 and 1
 - */
 -
 -vec_t Random( void ){
 -      return (vec_t) rand() / RAND_MAX;
 -}
 -
 -
 -char *Q_strncpyz( char *dst, const char *src, size_t len ) {
 -      if ( len == 0 ) {
 -              abort();
 -      }
 -
 -      strncpy( dst, src, len );
 -      dst[ len - 1 ] = '\0';
 -      return dst;
 -}
 -
 -
 -char *Q_strcat( char *dst, size_t dlen, const char *src ) {
 -      size_t n = strlen( dst );
 -
 -      if ( n > dlen ) {
 -              abort(); /* buffer overflow */
 -      }
 -
 -      return Q_strncpyz( dst + n, src, dlen - n );
 -}
 -
 -
 -char *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen ) {
 -      size_t n = strlen( dst );
 -
 -      if ( n > dlen ) {
 -              abort(); /* buffer overflow */
 -      }
 -
 -      return Q_strncpyz( dst + n, src, MIN( slen, dlen - n ) );
 -}
 -
 -
 -/*
 -   ExitQ3Map()
 -   cleanup routine
 - */
 -
 -static void ExitQ3Map( void ){
 -      BSPFilesCleanup();
 -      if ( mapDrawSurfs != NULL ) {
 -              free( mapDrawSurfs );
 -      }
 -}
 -
 -
 -
 -/* minimap stuff */
 -
 -typedef struct minimap_s
 -{
 -      bspModel_t *model;
 -      int width;
 -      int height;
 -      int samples;
 -      float *sample_offsets;
 -      float sharpen_boxmult;
 -      float sharpen_centermult;
 -      float boost, brightness, contrast;
 -      float *data1f;
 -      float *sharpendata1f;
 -      vec3_t mins, size;
 -}
 -minimap_t;
 -static minimap_t minimap;
 -
 -qboolean BrushIntersectionWithLine( bspBrush_t *brush, vec3_t start, vec3_t dir, float *t_in, float *t_out ){
 -      int i;
 -      qboolean in = qfalse, out = qfalse;
 -      bspBrushSide_t *sides = &bspBrushSides[brush->firstSide];
 -
 -      for ( i = 0; i < brush->numSides; ++i )
 -      {
 -              bspPlane_t *p = &bspPlanes[sides[i].planeNum];
 -              float sn = DotProduct( start, p->normal );
 -              float dn = DotProduct( dir, p->normal );
 -              if ( dn == 0 ) {
 -                      if ( sn > p->dist ) {
 -                              return qfalse; // outside!
 -                      }
 -              }
 -              else
 -              {
 -                      float t = ( p->dist - sn ) / dn;
 -                      if ( dn < 0 ) {
 -                              if ( !in || t > *t_in ) {
 -                                      *t_in = t;
 -                                      in = qtrue;
 -                                      // as t_in can only increase, and t_out can only decrease, early out
 -                                      if ( out && *t_in >= *t_out ) {
 -                                              return qfalse;
 -                                      }
 -                              }
 -                      }
 -                      else
 -                      {
 -                              if ( !out || t < *t_out ) {
 -                                      *t_out = t;
 -                                      out = qtrue;
 -                                      // as t_in can only increase, and t_out can only decrease, early out
 -                                      if ( in && *t_in >= *t_out ) {
 -                                              return qfalse;
 -                                      }
 -                              }
 -                      }
 -              }
 -      }
 -      return in && out;
 -}
 -
 -static float MiniMapSample( float x, float y ){
 -      vec3_t org, dir;
 -      int i, bi;
 -      float t0, t1;
 -      float samp;
 -      bspBrush_t *b;
 -      bspBrushSide_t *s;
 -      int cnt;
 -
 -      org[0] = x;
 -      org[1] = y;
 -      org[2] = 0;
 -      dir[0] = 0;
 -      dir[1] = 0;
 -      dir[2] = 1;
 -
 -      cnt = 0;
 -      samp = 0;
 -      for ( i = 0; i < minimap.model->numBSPBrushes; ++i )
 -      {
 -              bi = minimap.model->firstBSPBrush + i;
 -              if ( opaqueBrushes[bi >> 3] & ( 1 << ( bi & 7 ) ) ) {
 -                      b = &bspBrushes[bi];
 -
 -                      // sort out mins/maxs of the brush
 -                      s = &bspBrushSides[b->firstSide];
 -                      if ( x < -bspPlanes[s[0].planeNum].dist ) {
 -                              continue;
 -                      }
 -                      if ( x > +bspPlanes[s[1].planeNum].dist ) {
 -                              continue;
 -                      }
 -                      if ( y < -bspPlanes[s[2].planeNum].dist ) {
 -                              continue;
 -                      }
 -                      if ( y > +bspPlanes[s[3].planeNum].dist ) {
 -                              continue;
 -                      }
 -
 -                      if ( BrushIntersectionWithLine( b, org, dir, &t0, &t1 ) ) {
 -                              samp += t1 - t0;
 -                              ++cnt;
 -                      }
 -              }
 -      }
 -
 -      return samp;
 -}
 -
 -void RandomVector2f( float v[2] ){
 -      do
 -      {
 -              v[0] = 2 * Random() - 1;
 -              v[1] = 2 * Random() - 1;
 -      }
 -      while ( v[0] * v[0] + v[1] * v[1] > 1 );
 -}
 -
 -static void MiniMapRandomlySupersampled( int y ){
 -      int x, i;
 -      float *p = &minimap.data1f[y * minimap.width];
 -      float ymin = minimap.mins[1] + minimap.size[1] * ( y / (float) minimap.height );
 -      float dx   =                   minimap.size[0]      / (float) minimap.width;
 -      float dy   =                   minimap.size[1]      / (float) minimap.height;
 -      float uv[2];
 -      float thisval;
 -
 -      for ( x = 0; x < minimap.width; ++x )
 -      {
 -              float xmin = minimap.mins[0] + minimap.size[0] * ( x / (float) minimap.width );
 -              float val = 0;
 -
 -              for ( i = 0; i < minimap.samples; ++i )
 -              {
 -                      RandomVector2f( uv );
 -                      thisval = MiniMapSample(
 -                              xmin + ( uv[0] + 0.5 ) * dx, /* exaggerated random pattern for better results */
 -                              ymin + ( uv[1] + 0.5 ) * dy  /* exaggerated random pattern for better results */
 -                              );
 -                      val += thisval;
 -              }
 -              val /= minimap.samples * minimap.size[2];
 -              *p++ = val;
 -      }
 -}
 -
 -static void MiniMapSupersampled( int y ){
 -      int x, i;
 -      float *p = &minimap.data1f[y * minimap.width];
 -      float ymin = minimap.mins[1] + minimap.size[1] * ( y / (float) minimap.height );
 -      float dx   =                   minimap.size[0]      / (float) minimap.width;
 -      float dy   =                   minimap.size[1]      / (float) minimap.height;
 -
 -      for ( x = 0; x < minimap.width; ++x )
 -      {
 -              float xmin = minimap.mins[0] + minimap.size[0] * ( x / (float) minimap.width );
 -              float val = 0;
 -
 -              for ( i = 0; i < minimap.samples; ++i )
 -              {
 -                      float thisval = MiniMapSample(
 -                              xmin + minimap.sample_offsets[2 * i + 0] * dx,
 -                              ymin + minimap.sample_offsets[2 * i + 1] * dy
 -                              );
 -                      val += thisval;
 -              }
 -              val /= minimap.samples * minimap.size[2];
 -              *p++ = val;
 -      }
 -}
 -
 -static void MiniMapNoSupersampling( int y ){
 -      int x;
 -      float *p = &minimap.data1f[y * minimap.width];
 -      float ymin = minimap.mins[1] + minimap.size[1] * ( ( y + 0.5 ) / (float) minimap.height );
 -
 -      for ( x = 0; x < minimap.width; ++x )
 -      {
 -              float xmin = minimap.mins[0] + minimap.size[0] * ( ( x + 0.5 ) / (float) minimap.width );
 -              *p++ = MiniMapSample( xmin, ymin ) / minimap.size[2];
 -      }
 -}
 -
 -static void MiniMapSharpen( int y ){
 -      int x;
 -      qboolean up = ( y > 0 );
 -      qboolean down = ( y < minimap.height - 1 );
 -      float *p = &minimap.data1f[y * minimap.width];
 -      float *q = &minimap.sharpendata1f[y * minimap.width];
 -
 -      for ( x = 0; x < minimap.width; ++x )
 -      {
 -              qboolean left = ( x > 0 );
 -              qboolean right = ( x < minimap.width - 1 );
 -              float val = p[0] * minimap.sharpen_centermult;
 -
 -              if ( left && up ) {
 -                      val += p[-1 - minimap.width] * minimap.sharpen_boxmult;
 -              }
 -              if ( left && down ) {
 -                      val += p[-1 + minimap.width] * minimap.sharpen_boxmult;
 -              }
 -              if ( right && up ) {
 -                      val += p[+1 - minimap.width] * minimap.sharpen_boxmult;
 -              }
 -              if ( right && down ) {
 -                      val += p[+1 + minimap.width] * minimap.sharpen_boxmult;
 -              }
 -
 -              if ( left ) {
 -                      val += p[-1] * minimap.sharpen_boxmult;
 -              }
 -              if ( right ) {
 -                      val += p[+1] * minimap.sharpen_boxmult;
 -              }
 -              if ( up ) {
 -                      val += p[-minimap.width] * minimap.sharpen_boxmult;
 -              }
 -              if ( down ) {
 -                      val += p[+minimap.width] * minimap.sharpen_boxmult;
 -              }
 -
 -              ++p;
 -              *q++ = val;
 -      }
 -}
 -
 -static void MiniMapContrastBoost( int y ){
 -      int x;
 -      float *q = &minimap.data1f[y * minimap.width];
 -      for ( x = 0; x < minimap.width; ++x )
 -      {
 -              *q = *q * minimap.boost / ( ( minimap.boost - 1 ) * *q + 1 );
 -              ++q;
 -      }
 -}
 -
 -static void MiniMapBrightnessContrast( int y ){
 -      int x;
 -      float *q = &minimap.data1f[y * minimap.width];
 -      for ( x = 0; x < minimap.width; ++x )
 -      {
 -              *q = *q * minimap.contrast + minimap.brightness;
 -              ++q;
 -      }
 -}
 -
 -void MiniMapMakeMinsMaxs( vec3_t mins_in, vec3_t maxs_in, float border, qboolean keepaspect ){
 -      vec3_t mins, maxs, extend;
 -      VectorCopy( mins_in, mins );
 -      VectorCopy( maxs_in, maxs );
 -
 -      // line compatible to nexuiz mapinfo
 -      Sys_Printf( "size %f %f %f %f %f %f\n", mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2] );
 -
 -      if ( keepaspect ) {
 -              VectorSubtract( maxs, mins, extend );
 -              if ( extend[1] > extend[0] ) {
 -                      mins[0] -= ( extend[1] - extend[0] ) * 0.5;
 -                      maxs[0] += ( extend[1] - extend[0] ) * 0.5;
 -              }
 -              else
 -              {
 -                      mins[1] -= ( extend[0] - extend[1] ) * 0.5;
 -                      maxs[1] += ( extend[0] - extend[1] ) * 0.5;
 -              }
 -      }
 -
 -      /* border: amount of black area around the image */
 -      /* input: border, 1-2*border, border but we need border/(1-2*border) */
 -
 -      VectorSubtract( maxs, mins, extend );
 -      VectorScale( extend, border / ( 1 - 2 * border ), extend );
 -
 -      VectorSubtract( mins, extend, mins );
 -      VectorAdd( maxs, extend, maxs );
 -
 -      VectorCopy( mins, minimap.mins );
 -      VectorSubtract( maxs, mins, minimap.size );
 -
 -      // line compatible to nexuiz mapinfo
 -      Sys_Printf( "size_texcoords %f %f %f %f %f %f\n", mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2] );
 -}
 -
 -/*
 -   MiniMapSetupBrushes()
 -   determines solid non-sky brushes in the world
 - */
 -
 -void MiniMapSetupBrushes( void ){
 -      SetupBrushesFlags( C_SOLID | C_SKY, C_SOLID, 0, 0 );
 -      // at least one must be solid
 -      // none may be sky
 -      // not all may be nodraw
 -}
 -
 -qboolean MiniMapEvaluateSampleOffsets( int *bestj, int *bestk, float *bestval ){
 -      float val, dx, dy;
 -      int j, k;
 -
 -      *bestj = *bestk = -1;
 -      *bestval = 3; /* max possible val is 2 */
 -
 -      for ( j = 0; j < minimap.samples; ++j )
 -              for ( k = j + 1; k < minimap.samples; ++k )
 -              {
 -                      dx = minimap.sample_offsets[2 * j + 0] - minimap.sample_offsets[2 * k + 0];
 -                      dy = minimap.sample_offsets[2 * j + 1] - minimap.sample_offsets[2 * k + 1];
 -                      if ( dx > +0.5 ) {
 -                              dx -= 1;
 -                      }
 -                      if ( dx < -0.5 ) {
 -                              dx += 1;
 -                      }
 -                      if ( dy > +0.5 ) {
 -                              dy -= 1;
 -                      }
 -                      if ( dy < -0.5 ) {
 -                              dy += 1;
 -                      }
 -                      val = dx * dx + dy * dy;
 -                      if ( val < *bestval ) {
 -                              *bestj = j;
 -                              *bestk = k;
 -                              *bestval = val;
 -                      }
 -              }
 -
 -      return *bestval < 3;
 -}
 -
 -void MiniMapMakeSampleOffsets(){
 -      int i, j, k, jj, kk;
 -      float val, valj, valk, sx, sy, rx, ry;
 -
 -      Sys_Printf( "Generating good sample offsets (this may take a while)...\n" );
 -
 -      /* start with entirely random samples */
 -      for ( i = 0; i < minimap.samples; ++i )
 -      {
 -              minimap.sample_offsets[2 * i + 0] = Random();
 -              minimap.sample_offsets[2 * i + 1] = Random();
 -      }
 -
 -      for ( i = 0; i < 1000; ++i )
 -      {
 -              if ( MiniMapEvaluateSampleOffsets( &j, &k, &val ) ) {
 -                      sx = minimap.sample_offsets[2 * j + 0];
 -                      sy = minimap.sample_offsets[2 * j + 1];
 -                      minimap.sample_offsets[2 * j + 0] = rx = Random();
 -                      minimap.sample_offsets[2 * j + 1] = ry = Random();
 -                      if ( !MiniMapEvaluateSampleOffsets( &jj, &kk, &valj ) ) {
 -                              valj = -1;
 -                      }
 -                      minimap.sample_offsets[2 * j + 0] = sx;
 -                      minimap.sample_offsets[2 * j + 1] = sy;
 -
 -                      sx = minimap.sample_offsets[2 * k + 0];
 -                      sy = minimap.sample_offsets[2 * k + 1];
 -                      minimap.sample_offsets[2 * k + 0] = rx;
 -                      minimap.sample_offsets[2 * k + 1] = ry;
 -                      if ( !MiniMapEvaluateSampleOffsets( &jj, &kk, &valk ) ) {
 -                              valk = -1;
 -                      }
 -                      minimap.sample_offsets[2 * k + 0] = sx;
 -                      minimap.sample_offsets[2 * k + 1] = sy;
 -
 -                      if ( valj > valk ) {
 -                              if ( valj > val ) {
 -                                      /* valj is the greatest */
 -                                      minimap.sample_offsets[2 * j + 0] = rx;
 -                                      minimap.sample_offsets[2 * j + 1] = ry;
 -                                      i = -1;
 -                              }
 -                              else
 -                              {
 -                                      /* valj is the greater and it is useless - forget it */
 -                              }
 -                      }
 -                      else
 -                      {
 -                              if ( valk > val ) {
 -                                      /* valk is the greatest */
 -                                      minimap.sample_offsets[2 * k + 0] = rx;
 -                                      minimap.sample_offsets[2 * k + 1] = ry;
 -                                      i = -1;
 -                              }
 -                              else
 -                              {
 -                                      /* valk is the greater and it is useless - forget it */
 -                              }
 -                      }
 -              }
 -              else{
 -                      break;
 -              }
 -      }
 -}
 -
 -void MergeRelativePath( char *out, const char *absolute, const char *relative ){
 -      const char *endpos = absolute + strlen( absolute );
 -      while ( endpos != absolute && ( endpos[-1] == '/' || endpos[-1] == '\\' ) )
 -              --endpos;
 -      while ( relative[0] == '.' && relative[1] == '.' && ( relative[2] == '/' || relative[2] == '\\' ) )
 -      {
 -              relative += 3;
 -              while ( endpos != absolute )
 -              {
 -                      --endpos;
 -                      if ( *endpos == '/' || *endpos == '\\' ) {
 -                              break;
 -                      }
 -              }
 -              while ( endpos != absolute && ( endpos[-1] == '/' || endpos[-1] == '\\' ) )
 -                      --endpos;
 -      }
 -      memcpy( out, absolute, endpos - absolute );
 -      out[endpos - absolute] = '/';
 -      strcpy( out + ( endpos - absolute + 1 ), relative );
 -}
 -
 -int MiniMapBSPMain( int argc, char **argv ){
 -      char minimapFilename[1024];
 -      char basename[1024];
 -      char path[1024];
 -      char relativeMinimapFilename[1024];
 -      qboolean autolevel;
 -      float minimapSharpen;
 -      float border;
 -      byte *data4b, *p;
 -      float *q;
 -      int x, y;
 -      int i;
 -      miniMapMode_t mode;
 -      vec3_t mins, maxs;
 -      qboolean keepaspect;
 -
 -      /* arg checking */
 -      if ( argc < 2 ) {
 -              Sys_Printf( "Usage: q3map [-v] -minimap [-size n] [-sharpen f] [-samples n | -random n] [-o filename.tga] [-minmax Xmin Ymin Zmin Xmax Ymax Zmax] <mapname>\n" );
 -              return 0;
 -      }
 -
 -      /* load the BSP first */
 -      strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
 -      StripExtension( source );
 -      DefaultExtension( source, ".bsp" );
 -      Sys_Printf( "Loading %s\n", source );
 -      //BeginMapShaderFile( source ); //do not delete q3map2_*.shader on minimap generation
 -      LoadShaderInfo();
 -      LoadBSPFile( source );
 -
 -      minimap.model = &bspModels[0];
 -      VectorCopy( minimap.model->mins, mins );
 -      VectorCopy( minimap.model->maxs, maxs );
 -
 -      *minimapFilename = 0;
 -      minimapSharpen = game->miniMapSharpen;
 -      minimap.width = minimap.height = game->miniMapSize;
 -      border = game->miniMapBorder;
 -      keepaspect = game->miniMapKeepAspect;
 -      mode = game->miniMapMode;
 -
 -      autolevel = qfalse;
 -      minimap.samples = 1;
 -      minimap.sample_offsets = NULL;
 -      minimap.boost = 1.0;
 -      minimap.brightness = 0.0;
 -      minimap.contrast = 1.0;
 -
 -      /* process arguments */
 -      for ( i = 1; i < ( argc - 1 ); i++ )
 -      {
 -              if ( !strcmp( argv[ i ],  "-size" ) ) {
 -                      minimap.width = minimap.height = atoi( argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Image size set to %i\n", minimap.width );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-sharpen" ) ) {
 -                      minimapSharpen = atof( argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Sharpening coefficient set to %f\n", minimapSharpen );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-samples" ) ) {
 -                      minimap.samples = atoi( argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Samples set to %i\n", minimap.samples );
 -                      if ( minimap.sample_offsets ) {
 -                              free( minimap.sample_offsets );
 -                      }
 -                      minimap.sample_offsets = malloc( 2 * sizeof( *minimap.sample_offsets ) * minimap.samples );
 -                      MiniMapMakeSampleOffsets();
 -              }
 -              else if ( !strcmp( argv[ i ],  "-random" ) ) {
 -                      minimap.samples = atoi( argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Random samples set to %i\n", minimap.samples );
 -                      if ( minimap.sample_offsets ) {
 -                              free( minimap.sample_offsets );
 -                      }
 -                      minimap.sample_offsets = NULL;
 -              }
 -              else if ( !strcmp( argv[ i ],  "-border" ) ) {
 -                      border = atof( argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Border set to %f\n", border );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-keepaspect" ) ) {
 -                      keepaspect = qtrue;
 -                      Sys_Printf( "Keeping aspect ratio by letterboxing\n", border );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-nokeepaspect" ) ) {
 -                      keepaspect = qfalse;
 -                      Sys_Printf( "Not keeping aspect ratio\n", border );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-o" ) ) {
 -                      strcpy( minimapFilename, argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Output file name set to %s\n", minimapFilename );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-minmax" ) && i < ( argc - 7 ) ) {
 -                      mins[0] = atof( argv[i + 1] );
 -                      mins[1] = atof( argv[i + 2] );
 -                      mins[2] = atof( argv[i + 3] );
 -                      maxs[0] = atof( argv[i + 4] );
 -                      maxs[1] = atof( argv[i + 5] );
 -                      maxs[2] = atof( argv[i + 6] );
 -                      i += 6;
 -                      Sys_Printf( "Map mins/maxs overridden\n" );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-gray" ) ) {
 -                      mode = MINIMAP_MODE_GRAY;
 -                      Sys_Printf( "Writing as white-on-black image\n" );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-black" ) ) {
 -                      mode = MINIMAP_MODE_BLACK;
 -                      Sys_Printf( "Writing as black alpha image\n" );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-white" ) ) {
 -                      mode = MINIMAP_MODE_WHITE;
 -                      Sys_Printf( "Writing as white alpha image\n" );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-boost" ) && i < ( argc - 2 ) ) {
 -                      minimap.boost = atof( argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Contrast boost set to %f\n", minimap.boost );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-brightness" ) && i < ( argc - 2 ) ) {
 -                      minimap.brightness = atof( argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Brightness set to %f\n", minimap.brightness );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-contrast" ) && i < ( argc - 2 ) ) {
 -                      minimap.contrast = atof( argv[i + 1] );
 -                      i++;
 -                      Sys_Printf( "Contrast set to %f\n", minimap.contrast );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-autolevel" ) ) {
 -                      autolevel = qtrue;
 -                      Sys_Printf( "Auto level enabled\n", border );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-noautolevel" ) ) {
 -                      autolevel = qfalse;
 -                      Sys_Printf( "Auto level disabled\n", border );
 -              }
 -      }
 -
 -      MiniMapMakeMinsMaxs( mins, maxs, border, keepaspect );
 -
 -      if ( !*minimapFilename ) {
 -              ExtractFileBase( source, basename );
 -              ExtractFilePath( source, path );
 -              sprintf( relativeMinimapFilename, game->miniMapNameFormat, basename );
 -              MergeRelativePath( minimapFilename, path, relativeMinimapFilename );
 -              Sys_Printf( "Output file name automatically set to %s\n", minimapFilename );
 -      }
 -      ExtractFilePath( minimapFilename, path );
 -      Q_mkdir( path );
 -
 -      if ( minimapSharpen >= 0 ) {
 -              minimap.sharpen_centermult = 8 * minimapSharpen + 1;
 -              minimap.sharpen_boxmult    =    -minimapSharpen;
 -      }
 -
 -      minimap.data1f = safe_malloc( minimap.width * minimap.height * sizeof( *minimap.data1f ) );
 -      data4b = safe_malloc( minimap.width * minimap.height * 4 );
 -      if ( minimapSharpen >= 0 ) {
 -              minimap.sharpendata1f = safe_malloc( minimap.width * minimap.height * sizeof( *minimap.data1f ) );
 -      }
 -
 -      MiniMapSetupBrushes();
 -
 -      if ( minimap.samples <= 1 ) {
 -              Sys_Printf( "\n--- MiniMapNoSupersampling (%d) ---\n", minimap.height );
 -              RunThreadsOnIndividual( minimap.height, qtrue, MiniMapNoSupersampling );
 -      }
 -      else
 -      {
 -              if ( minimap.sample_offsets ) {
 -                      Sys_Printf( "\n--- MiniMapSupersampled (%d) ---\n", minimap.height );
 -                      RunThreadsOnIndividual( minimap.height, qtrue, MiniMapSupersampled );
 -              }
 -              else
 -              {
 -                      Sys_Printf( "\n--- MiniMapRandomlySupersampled (%d) ---\n", minimap.height );
 -                      RunThreadsOnIndividual( minimap.height, qtrue, MiniMapRandomlySupersampled );
 -              }
 -      }
 -
 -      if ( minimap.boost != 1.0 ) {
 -              Sys_Printf( "\n--- MiniMapContrastBoost (%d) ---\n", minimap.height );
 -              RunThreadsOnIndividual( minimap.height, qtrue, MiniMapContrastBoost );
 -      }
 -
 -      if ( autolevel ) {
 -              Sys_Printf( "\n--- MiniMapAutoLevel (%d) ---\n", minimap.height );
 -              float mi = 1, ma = 0;
 -              float s, o;
 -
 -              // TODO threads!
 -              q = minimap.data1f;
 -              for ( y = 0; y < minimap.height; ++y )
 -                      for ( x = 0; x < minimap.width; ++x )
 -                      {
 -                              float v = *q++;
 -                              if ( v < mi ) {
 -                                      mi = v;
 -                              }
 -                              if ( v > ma ) {
 -                                      ma = v;
 -                              }
 -                      }
 -              if ( ma > mi ) {
 -                      s = 1 / ( ma - mi );
 -                      o = mi / ( ma - mi );
 -
 -                      // equations:
 -                      //   brightness + contrast * v
 -                      // after autolevel:
 -                      //   brightness + contrast * (v * s - o)
 -                      // =
 -                      //   (brightness - contrast * o) + (contrast * s) * v
 -                      minimap.brightness = minimap.brightness - minimap.contrast * o;
 -                      minimap.contrast *= s;
 -
 -                      Sys_Printf( "Auto level: Brightness changed to %f\n", minimap.brightness );
 -                      Sys_Printf( "Auto level: Contrast changed to %f\n", minimap.contrast );
 -              }
 -              else{
 -                      Sys_Printf( "Auto level: failed because all pixels are the same value\n" );
 -              }
 -      }
 -
 -      if ( minimap.brightness != 0 || minimap.contrast != 1 ) {
 -              Sys_Printf( "\n--- MiniMapBrightnessContrast (%d) ---\n", minimap.height );
 -              RunThreadsOnIndividual( minimap.height, qtrue, MiniMapBrightnessContrast );
 -      }
 -
 -      if ( minimap.sharpendata1f ) {
 -              Sys_Printf( "\n--- MiniMapSharpen (%d) ---\n", minimap.height );
 -              RunThreadsOnIndividual( minimap.height, qtrue, MiniMapSharpen );
 -              q = minimap.sharpendata1f;
 -      }
 -      else
 -      {
 -              q = minimap.data1f;
 -      }
 -
 -      Sys_Printf( "\nConverting..." );
 -
 -      switch ( mode )
 -      {
 -      case MINIMAP_MODE_GRAY:
 -              p = data4b;
 -              for ( y = 0; y < minimap.height; ++y )
 -                      for ( x = 0; x < minimap.width; ++x )
 -                      {
 -                              byte b;
 -                              float v = *q++;
 -                              if ( v < 0 ) {
 -                                      v = 0;
 -                              }
 -                              if ( v > 255.0 / 256.0 ) {
 -                                      v = 255.0 / 256.0;
 -                              }
 -                              b = v * 256;
 -                              *p++ = b;
 -                      }
 -              Sys_Printf( " writing to %s...", minimapFilename );
 -              WriteTGAGray( minimapFilename, data4b, minimap.width, minimap.height );
 -              break;
 -      case MINIMAP_MODE_BLACK:
 -              p = data4b;
 -              for ( y = 0; y < minimap.height; ++y )
 -                      for ( x = 0; x < minimap.width; ++x )
 -                      {
 -                              byte b;
 -                              float v = *q++;
 -                              if ( v < 0 ) {
 -                                      v = 0;
 -                              }
 -                              if ( v > 255.0 / 256.0 ) {
 -                                      v = 255.0 / 256.0;
 -                              }
 -                              b = v * 256;
 -                              *p++ = 0;
 -                              *p++ = 0;
 -                              *p++ = 0;
 -                              *p++ = b;
 -                      }
 -              Sys_Printf( " writing to %s...", minimapFilename );
 -              WriteTGA( minimapFilename, data4b, minimap.width, minimap.height );
 -              break;
 -      case MINIMAP_MODE_WHITE:
 -              p = data4b;
 -              for ( y = 0; y < minimap.height; ++y )
 -                      for ( x = 0; x < minimap.width; ++x )
 -                      {
 -                              byte b;
 -                              float v = *q++;
 -                              if ( v < 0 ) {
 -                                      v = 0;
 -                              }
 -                              if ( v > 255.0 / 256.0 ) {
 -                                      v = 255.0 / 256.0;
 -                              }
 -                              b = v * 256;
 -                              *p++ = 255;
 -                              *p++ = 255;
 -                              *p++ = 255;
 -                              *p++ = b;
 -                      }
 -              Sys_Printf( " writing to %s...", minimapFilename );
 -              WriteTGA( minimapFilename, data4b, minimap.width, minimap.height );
 -              break;
 -      }
 -
 -      Sys_Printf( " done.\n" );
 -
 -      /* return to sender */
 -      return 0;
 -}
 -
 -
 -
 -
 -
 -/*
 -   MD4BlockChecksum()
 -   calculates an md4 checksum for a block of data
 - */
 -
 -static int MD4BlockChecksum( void *buffer, int length ){
 -      return Com_BlockChecksum( buffer, length );
 -}
 -
 -/*
 -   FixAAS()
 -   resets an aas checksum to match the given BSP
 - */
 -
 -int FixAAS( int argc, char **argv ){
 -      int length, checksum;
 -      void        *buffer;
 -      FILE        *file;
 -      char aas[ 1024 ], **ext;
 -      char        *exts[] =
 -      {
 -              ".aas",
 -              "_b0.aas",
 -              "_b1.aas",
 -              NULL
 -      };
 -
 -
 -      /* arg checking */
 -      if ( argc < 2 ) {
 -              Sys_Printf( "Usage: q3map -fixaas [-v] <mapname>\n" );
 -              return 0;
 -      }
 -
 -      /* do some path mangling */
 -      strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
 -      StripExtension( source );
 -      DefaultExtension( source, ".bsp" );
 -
 -      /* note it */
 -      Sys_Printf( "--- FixAAS ---\n" );
 -
 -      /* load the bsp */
 -      Sys_Printf( "Loading %s\n", source );
 -      length = LoadFile( source, &buffer );
 -
 -      /* create bsp checksum */
 -      Sys_Printf( "Creating checksum...\n" );
 -      checksum = LittleLong( MD4BlockChecksum( buffer, length ) );
 -
 -      /* write checksum to aas */
 -      ext = exts;
 -      while ( *ext )
 -      {
 -              /* mangle name */
 -              strcpy( aas, source );
 -              StripExtension( aas );
 -              strcat( aas, *ext );
 -              Sys_Printf( "Trying %s\n", aas );
 -              ext++;
 -
 -              /* fix it */
 -              file = fopen( aas, "r+b" );
 -              if ( !file ) {
 -                      continue;
 -              }
 -              if ( fwrite( &checksum, 4, 1, file ) != 1 ) {
 -                      Error( "Error writing checksum to %s", aas );
 -              }
 -              fclose( file );
 -      }
 -
 -      /* return to sender */
 -      return 0;
 -}
 -
 -
 -
 -/*
 -   AnalyzeBSP() - ydnar
 -   analyzes a Quake engine BSP file
 - */
 -
 -typedef struct abspHeader_s
 -{
 -      char ident[ 4 ];
 -      int version;
 -
 -      bspLump_t lumps[ 1 ];       /* unknown size */
 -}
 -abspHeader_t;
 -
 -typedef struct abspLumpTest_s
 -{
 -      int radix, minCount;
 -      char            *name;
 -}
 -abspLumpTest_t;
 -
 -int AnalyzeBSP( int argc, char **argv ){
 -      abspHeader_t            *header;
 -      int size, i, version, offset, length, lumpInt, count;
 -      char ident[ 5 ];
 -      void                    *lump;
 -      float lumpFloat;
 -      char lumpString[ 1024 ], source[ 1024 ];
 -      qboolean lumpSwap = qfalse;
 -      abspLumpTest_t          *lumpTest;
 -      static abspLumpTest_t lumpTests[] =
 -      {
 -              { sizeof( bspPlane_t ),         6,      "IBSP LUMP_PLANES" },
 -              { sizeof( bspBrush_t ),         1,      "IBSP LUMP_BRUSHES" },
 -              { 8,                            6,      "IBSP LUMP_BRUSHSIDES" },
 -              { sizeof( bspBrushSide_t ),     6,      "RBSP LUMP_BRUSHSIDES" },
 -              { sizeof( bspModel_t ),         1,      "IBSP LUMP_MODELS" },
 -              { sizeof( bspNode_t ),          2,      "IBSP LUMP_NODES" },
 -              { sizeof( bspLeaf_t ),          1,      "IBSP LUMP_LEAFS" },
 -              { 104,                          3,      "IBSP LUMP_DRAWSURFS" },
 -              { 44,                           3,      "IBSP LUMP_DRAWVERTS" },
 -              { 4,                            6,      "IBSP LUMP_DRAWINDEXES" },
 -              { 128 * 128 * 3,                1,      "IBSP LUMP_LIGHTMAPS" },
 -              { 256 * 256 * 3,                1,      "IBSP LUMP_LIGHTMAPS (256 x 256)" },
 -              { 512 * 512 * 3,                1,      "IBSP LUMP_LIGHTMAPS (512 x 512)" },
 -              { 0, 0, NULL }
 -      };
 -
 -
 -      /* arg checking */
 -      if ( argc < 1 ) {
 -              Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
 -              return 0;
 -      }
 -
 -      /* process arguments */
 -      for ( i = 1; i < ( argc - 1 ); i++ )
 -      {
 -              /* -format map|ase|... */
 -              if ( !strcmp( argv[ i ],  "-lumpswap" ) ) {
 -                      Sys_Printf( "Swapped lump structs enabled\n" );
 -                      lumpSwap = qtrue;
 -              }
 -      }
 -
 -      /* clean up map name */
 -      strcpy( source, ExpandArg( argv[ i ] ) );
 -      Sys_Printf( "Loading %s\n", source );
 -
 -      /* load the file */
 -      size = LoadFile( source, (void**) &header );
 -      if ( size == 0 || header == NULL ) {
 -              Sys_Printf( "Unable to load %s.\n", source );
 -              return -1;
 -      }
 -
 -      /* analyze ident/version */
 -      memcpy( ident, header->ident, 4 );
 -      ident[ 4 ] = '\0';
 -      version = LittleLong( header->version );
 -
 -      Sys_Printf( "Identity:      %s\n", ident );
 -      Sys_Printf( "Version:       %d\n", version );
 -      Sys_Printf( "---------------------------------------\n" );
 -
 -      /* analyze each lump */
 -      for ( i = 0; i < 100; i++ )
 -      {
 -              /* call of duty swapped lump pairs */
 -              if ( lumpSwap ) {
 -                      offset = LittleLong( header->lumps[ i ].length );
 -                      length = LittleLong( header->lumps[ i ].offset );
 -              }
 -
 -              /* standard lump pairs */
 -              else
 -              {
 -                      offset = LittleLong( header->lumps[ i ].offset );
 -                      length = LittleLong( header->lumps[ i ].length );
 -              }
 -
 -              /* extract data */
 -              lump = (byte*) header + offset;
 -              lumpInt = LittleLong( (int) *( (int*) lump ) );
 -              lumpFloat = LittleFloat( (float) *( (float*) lump ) );
 -              memcpy( lumpString, (char*) lump, ( (size_t)length < sizeof( lumpString ) ? (size_t)length : sizeof( lumpString ) - 1 ) );
 -              lumpString[ sizeof( lumpString ) - 1 ] = '\0';
 -
 -              /* print basic lump info */
 -              Sys_Printf( "Lump:          %d\n", i );
 -              Sys_Printf( "Offset:        %d bytes\n", offset );
 -              Sys_Printf( "Length:        %d bytes\n", length );
 -
 -              /* only operate on valid lumps */
 -              if ( length > 0 ) {
 -                      /* print data in 4 formats */
 -                      Sys_Printf( "As hex:        %08X\n", lumpInt );
 -                      Sys_Printf( "As int:        %d\n", lumpInt );
 -                      Sys_Printf( "As float:      %f\n", lumpFloat );
 -                      Sys_Printf( "As string:     %s\n", lumpString );
 -
 -                      /* guess lump type */
 -                      if ( lumpString[ 0 ] == '{' && lumpString[ 2 ] == '"' ) {
 -                              Sys_Printf( "Type guess:    IBSP LUMP_ENTITIES\n" );
 -                      }
 -                      else if ( strstr( lumpString, "textures/" ) ) {
 -                              Sys_Printf( "Type guess:    IBSP LUMP_SHADERS\n" );
 -                      }
 -                      else
 -                      {
 -                              /* guess based on size/count */
 -                              for ( lumpTest = lumpTests; lumpTest->radix > 0; lumpTest++ )
 -                              {
 -                                      if ( ( length % lumpTest->radix ) != 0 ) {
 -                                              continue;
 -                                      }
 -                                      count = length / lumpTest->radix;
 -                                      if ( count < lumpTest->minCount ) {
 -                                              continue;
 -                                      }
 -                                      Sys_Printf( "Type guess:    %s (%d x %d)\n", lumpTest->name, count, lumpTest->radix );
 -                              }
 -                      }
 -              }
 -
 -              Sys_Printf( "---------------------------------------\n" );
 -
 -              /* end of file */
 -              if ( offset + length >= size ) {
 -                      break;
 -              }
 -      }
 -
 -      /* last stats */
 -      Sys_Printf( "Lump count:    %d\n", i + 1 );
 -      Sys_Printf( "File size:     %d bytes\n", size );
 -
 -      /* return to caller */
 -      return 0;
 -}
 -
 -
 -
 -/*
 -   BSPInfo()
 -   emits statistics about the bsp file
 - */
 -
 -int BSPInfo( int count, char **fileNames ){
 -      int i;
 -      char source[ 1024 ], ext[ 64 ];
 -      int size;
 -      FILE        *f;
 -
 -
 -      /* dummy check */
 -      if ( count < 1 ) {
 -              Sys_Printf( "No files to dump info for.\n" );
 -              return -1;
 -      }
 -
 -      /* enable info mode */
 -      infoMode = qtrue;
 -
 -      /* walk file list */
 -      for ( i = 0; i < count; i++ )
 -      {
 -              Sys_Printf( "---------------------------------\n" );
 -
 -              /* mangle filename and get size */
 -              strcpy( source, fileNames[ i ] );
 -              ExtractFileExtension( source, ext );
 -              if ( !Q_stricmp( ext, "map" ) ) {
 -                      StripExtension( source );
 -              }
 -              DefaultExtension( source, ".bsp" );
 -              f = fopen( source, "rb" );
 -              if ( f ) {
 -                      size = Q_filelength( f );
 -                      fclose( f );
 -              }
 -              else{
 -                      size = 0;
 -              }
 -
 -              /* load the bsp file and print lump sizes */
 -              Sys_Printf( "%s\n", source );
 -              LoadBSPFile( source );
 -              PrintBSPFileSizes();
 -
 -              /* print sizes */
 -              Sys_Printf( "\n" );
 -              Sys_Printf( "          total         %9d\n", size );
 -              Sys_Printf( "                        %9d KB\n", size / 1024 );
 -              Sys_Printf( "                        %9d MB\n", size / ( 1024 * 1024 ) );
 -
 -              Sys_Printf( "---------------------------------\n" );
 -      }
 -
 -      /* return count */
 -      return i;
 -}
 -
 -
 -static void ExtrapolateTexcoords( const float *axyz, const float *ast, const float *bxyz, const float *bst, const float *cxyz, const float *cst, const float *axyz_new, float *ast_out, const float *bxyz_new, float *bst_out, const float *cxyz_new, float *cst_out ){
 -      vec4_t scoeffs, tcoeffs;
 -      float md;
 -      m4x4_t solvematrix;
 -
 -      vec3_t norm;
 -      vec3_t dab, dac;
 -      VectorSubtract( bxyz, axyz, dab );
 -      VectorSubtract( cxyz, axyz, dac );
 -      CrossProduct( dab, dac, norm );
 -
 -      // assume:
 -      //   s = f(x, y, z)
 -      //   s(v + norm) = s(v) when n ortho xyz
 -
 -      // s(v) = DotProduct(v, scoeffs) + scoeffs[3]
 -
 -      // solve:
 -      //   scoeffs * (axyz, 1) == ast[0]
 -      //   scoeffs * (bxyz, 1) == bst[0]
 -      //   scoeffs * (cxyz, 1) == cst[0]
 -      //   scoeffs * (norm, 0) == 0
 -      // scoeffs * [axyz, 1 | bxyz, 1 | cxyz, 1 | norm, 0] = [ast[0], bst[0], cst[0], 0]
 -      solvematrix[0] = axyz[0];
 -      solvematrix[4] = axyz[1];
 -      solvematrix[8] = axyz[2];
 -      solvematrix[12] = 1;
 -      solvematrix[1] = bxyz[0];
 -      solvematrix[5] = bxyz[1];
 -      solvematrix[9] = bxyz[2];
 -      solvematrix[13] = 1;
 -      solvematrix[2] = cxyz[0];
 -      solvematrix[6] = cxyz[1];
 -      solvematrix[10] = cxyz[2];
 -      solvematrix[14] = 1;
 -      solvematrix[3] = norm[0];
 -      solvematrix[7] = norm[1];
 -      solvematrix[11] = norm[2];
 -      solvematrix[15] = 0;
 -
 -      md = m4_det( solvematrix );
 -      if ( md * md < 1e-10 ) {
 -              Sys_Printf( "Cannot invert some matrix, some texcoords aren't extrapolated!" );
 -              return;
 -      }
 -
 -      m4x4_invert( solvematrix );
 -
 -      scoeffs[0] = ast[0];
 -      scoeffs[1] = bst[0];
 -      scoeffs[2] = cst[0];
 -      scoeffs[3] = 0;
 -      m4x4_transform_vec4( solvematrix, scoeffs );
 -      tcoeffs[0] = ast[1];
 -      tcoeffs[1] = bst[1];
 -      tcoeffs[2] = cst[1];
 -      tcoeffs[3] = 0;
 -      m4x4_transform_vec4( solvematrix, tcoeffs );
 -
 -      ast_out[0] = scoeffs[0] * axyz_new[0] + scoeffs[1] * axyz_new[1] + scoeffs[2] * axyz_new[2] + scoeffs[3];
 -      ast_out[1] = tcoeffs[0] * axyz_new[0] + tcoeffs[1] * axyz_new[1] + tcoeffs[2] * axyz_new[2] + tcoeffs[3];
 -      bst_out[0] = scoeffs[0] * bxyz_new[0] + scoeffs[1] * bxyz_new[1] + scoeffs[2] * bxyz_new[2] + scoeffs[3];
 -      bst_out[1] = tcoeffs[0] * bxyz_new[0] + tcoeffs[1] * bxyz_new[1] + tcoeffs[2] * bxyz_new[2] + tcoeffs[3];
 -      cst_out[0] = scoeffs[0] * cxyz_new[0] + scoeffs[1] * cxyz_new[1] + scoeffs[2] * cxyz_new[2] + scoeffs[3];
 -      cst_out[1] = tcoeffs[0] * cxyz_new[0] + tcoeffs[1] * cxyz_new[1] + tcoeffs[2] * cxyz_new[2] + tcoeffs[3];
 -}
 +#include <glib.h>
  
  /*
 -   ScaleBSPMain()
 -   amaze and confuse your enemies with wierd scaled maps!
 +   Random()
 +   returns a pseudorandom number between 0 and 1
   */
  
 -int ScaleBSPMain( int argc, char **argv ){
 -      int i, j;
 -      float f, a;
 -      vec3_t scale;
 -      vec3_t vec;
 -      char str[ 1024 ];
 -      int uniform, axis;
 -      qboolean texscale;
 -      float *old_xyzst = NULL;
 -      float spawn_ref = 0;
 +vec_t Random( void ){
 +      return (vec_t) rand() / RAND_MAX;
 +}
  
  
 -      /* arg checking */
 -      if ( argc < 3 ) {
 -              Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
 -              return 0;
 +char *Q_strncpyz( char *dst, const char *src, size_t len ) {
 +      if ( len == 0 ) {
 +              abort();
        }
  
 -      texscale = qfalse;
 -      for ( i = 1; i < argc - 2; ++i )
 -      {
 -              if ( !strcmp( argv[i], "-tex" ) ) {
 -                      texscale = qtrue;
 -              }
 -              else if ( !strcmp( argv[i], "-spawn_ref" ) ) {
 -                      spawn_ref = atof( argv[i + 1] );
 -                      ++i;
 -              }
 -              else{
 -                      break;
 -              }
 -      }
 +      strncpy( dst, src, len );
 +      dst[ len - 1 ] = '\0';
 +      return dst;
 +}
  
 -      /* get scale */
 -      // if(argc-2 >= i) // always true
 -      scale[2] = scale[1] = scale[0] = atof( argv[ argc - 2 ] );
 -      if ( argc - 3 >= i ) {
 -              scale[1] = scale[0] = atof( argv[ argc - 3 ] );
 -      }
 -      if ( argc - 4 >= i ) {
 -              scale[0] = atof( argv[ argc - 4 ] );
 -      }
  
 -      uniform = ( ( scale[0] == scale[1] ) && ( scale[1] == scale[2] ) );
 +char *Q_strcat( char *dst, size_t dlen, const char *src ) {
 +      size_t n = strlen( dst );
  
 -      if ( scale[0] == 0.0f || scale[1] == 0.0f || scale[2] == 0.0f ) {
 -              Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
 -              Sys_Printf( "Non-zero scale value required.\n" );
 -              return 0;
 +      if ( n > dlen ) {
 +              abort(); /* buffer overflow */
        }
  
 -      /* do some path mangling */
 -      strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
 -      StripExtension( source );
 -      DefaultExtension( source, ".bsp" );
 -
 -      /* load the bsp */
 -      Sys_Printf( "Loading %s\n", source );
 -      LoadBSPFile( source );
 -      ParseEntities();
 -
 -      /* note it */
 -      Sys_Printf( "--- ScaleBSP ---\n" );
 -      Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities );
 -
 -      /* scale entity keys */
 -      for ( i = 0; i < numBSPEntities && i < numEntities; i++ )
 -      {
 -              /* scale origin */
 -              GetVectorForKey( &entities[ i ], "origin", vec );
 -              if ( ( vec[ 0 ] || vec[ 1 ] || vec[ 2 ] ) ) {
 -                      if ( !strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
 -                              vec[2] += spawn_ref;
 -                      }
 -                      vec[0] *= scale[0];
 -                      vec[1] *= scale[1];
 -                      vec[2] *= scale[2];
 -                      if ( !strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
 -                              vec[2] -= spawn_ref;
 -                      }
 -                      sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
 -                      SetKeyValue( &entities[ i ], "origin", str );
 -              }
 -
 -              a = FloatForKey( &entities[ i ], "angle" );
 -              if ( a == -1 || a == -2 ) { // z scale
 -                      axis = 2;
 -              }
 -              else if ( fabs( sin( DEG2RAD( a ) ) ) < 0.707 ) {
 -                      axis = 0;
 -              }
 -              else{
 -                      axis = 1;
 -              }
 -
 -              /* scale door lip */
 -              f = FloatForKey( &entities[ i ], "lip" );
 -              if ( f ) {
 -                      f *= scale[axis];
 -                      sprintf( str, "%f", f );
 -                      SetKeyValue( &entities[ i ], "lip", str );
 -              }
 -
 -              /* scale plat height */
 -              f = FloatForKey( &entities[ i ], "height" );
 -              if ( f ) {
 -                      f *= scale[2];
 -                      sprintf( str, "%f", f );
 -                      SetKeyValue( &entities[ i ], "height", str );
 -              }
 -
 -              // TODO maybe allow a definition file for entities to specify which values are scaled how?
 -      }
 +      return Q_strncpyz( dst + n, src, dlen - n );
 +}
  
 -      /* scale models */
 -      for ( i = 0; i < numBSPModels; i++ )
 -      {
 -              bspModels[ i ].mins[0] *= scale[0];
 -              bspModels[ i ].mins[1] *= scale[1];
 -              bspModels[ i ].mins[2] *= scale[2];
 -              bspModels[ i ].maxs[0] *= scale[0];
 -              bspModels[ i ].maxs[1] *= scale[1];
 -              bspModels[ i ].maxs[2] *= scale[2];
 -      }
  
 -      /* scale nodes */
 -      for ( i = 0; i < numBSPNodes; i++ )
 -      {
 -              bspNodes[ i ].mins[0] *= scale[0];
 -              bspNodes[ i ].mins[1] *= scale[1];
 -              bspNodes[ i ].mins[2] *= scale[2];
 -              bspNodes[ i ].maxs[0] *= scale[0];
 -              bspNodes[ i ].maxs[1] *= scale[1];
 -              bspNodes[ i ].maxs[2] *= scale[2];
 -      }
 +char *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen ) {
 +      size_t n = strlen( dst );
  
 -      /* scale leafs */
 -      for ( i = 0; i < numBSPLeafs; i++ )
 -      {
 -              bspLeafs[ i ].mins[0] *= scale[0];
 -              bspLeafs[ i ].mins[1] *= scale[1];
 -              bspLeafs[ i ].mins[2] *= scale[2];
 -              bspLeafs[ i ].maxs[0] *= scale[0];
 -              bspLeafs[ i ].maxs[1] *= scale[1];
 -              bspLeafs[ i ].maxs[2] *= scale[2];
 -      }
 -
 -      if ( texscale ) {
 -              Sys_Printf( "Using texture unlocking (and probably breaking texture alignment a lot)\n" );
 -              old_xyzst = safe_malloc( sizeof( *old_xyzst ) * numBSPDrawVerts * 5 );
 -              for ( i = 0; i < numBSPDrawVerts; i++ )
 -              {
 -                      old_xyzst[5 * i + 0] = bspDrawVerts[i].xyz[0];
 -                      old_xyzst[5 * i + 1] = bspDrawVerts[i].xyz[1];
 -                      old_xyzst[5 * i + 2] = bspDrawVerts[i].xyz[2];
 -                      old_xyzst[5 * i + 3] = bspDrawVerts[i].st[0];
 -                      old_xyzst[5 * i + 4] = bspDrawVerts[i].st[1];
 -              }
 +      if ( n > dlen ) {
 +              abort(); /* buffer overflow */
        }
  
 -      /* scale drawverts */
 -      for ( i = 0; i < numBSPDrawVerts; i++ )
 -      {
 -              bspDrawVerts[i].xyz[0] *= scale[0];
 -              bspDrawVerts[i].xyz[1] *= scale[1];
 -              bspDrawVerts[i].xyz[2] *= scale[2];
 -              bspDrawVerts[i].normal[0] /= scale[0];
 -              bspDrawVerts[i].normal[1] /= scale[1];
 -              bspDrawVerts[i].normal[2] /= scale[2];
 -              VectorNormalize( bspDrawVerts[i].normal, bspDrawVerts[i].normal );
 -      }
 +      return Q_strncpyz( dst + n, src, MIN( slen, dlen - n ) );
 +}
  
 -      if ( texscale ) {
 -              for ( i = 0; i < numBSPDrawSurfaces; i++ )
 -              {
 -                      switch ( bspDrawSurfaces[i].surfaceType )
 -                      {
 -                      case SURFACE_FACE:
 -                      case SURFACE_META:
 -                              if ( bspDrawSurfaces[i].numIndexes % 3 ) {
 -                                      Error( "Not a triangulation!" );
 -                              }
 -                              for ( j = bspDrawSurfaces[i].firstIndex; j < bspDrawSurfaces[i].firstIndex + bspDrawSurfaces[i].numIndexes; j += 3 )
 -                              {
 -                                      int ia = bspDrawIndexes[j] + bspDrawSurfaces[i].firstVert, ib = bspDrawIndexes[j + 1] + bspDrawSurfaces[i].firstVert, ic = bspDrawIndexes[j + 2] + bspDrawSurfaces[i].firstVert;
 -                                      bspDrawVert_t *a = &bspDrawVerts[ia], *b = &bspDrawVerts[ib], *c = &bspDrawVerts[ic];
 -                                      float *oa = &old_xyzst[ia * 5], *ob = &old_xyzst[ib * 5], *oc = &old_xyzst[ic * 5];
 -                                      // extrapolate:
 -                                      //   a->xyz -> oa
 -                                      //   b->xyz -> ob
 -                                      //   c->xyz -> oc
 -                                      ExtrapolateTexcoords(
 -                                              &oa[0], &oa[3],
 -                                              &ob[0], &ob[3],
 -                                              &oc[0], &oc[3],
 -                                              a->xyz, a->st,
 -                                              b->xyz, b->st,
 -                                              c->xyz, c->st );
 -                              }
 -                              break;
 -                      }
 -              }
 -      }
  
 -      /* scale planes */
 -      if ( uniform ) {
 -              for ( i = 0; i < numBSPPlanes; i++ )
 -              {
 -                      bspPlanes[ i ].dist *= scale[0];
 -              }
 -      }
 -      else
 -      {
 -              for ( i = 0; i < numBSPPlanes; i++ )
 -              {
 -                      bspPlanes[ i ].normal[0] /= scale[0];
 -                      bspPlanes[ i ].normal[1] /= scale[1];
 -                      bspPlanes[ i ].normal[2] /= scale[2];
 -                      f = 1 / VectorLength( bspPlanes[i].normal );
 -                      VectorScale( bspPlanes[i].normal, f, bspPlanes[i].normal );
 -                      bspPlanes[ i ].dist *= f;
 -              }
 -      }
 +/*
 +   ExitQ3Map()
 +   cleanup routine
 + */
  
 -      /* scale gridsize */
 -      GetVectorForKey( &entities[ 0 ], "gridsize", vec );
 -      if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) == 0.0f ) {
 -              VectorCopy( gridSize, vec );
 +static void ExitQ3Map( void ){
 +      BSPFilesCleanup();
 +      if ( mapDrawSurfs != NULL ) {
 +              free( mapDrawSurfs );
        }
 -      vec[0] *= scale[0];
 -      vec[1] *= scale[1];
 -      vec[2] *= scale[2];
 -      sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
 -      SetKeyValue( &entities[ 0 ], "gridsize", str );
 -
 -      /* inject command line parameters */
 -      InjectCommandLine( argv, 0, argc - 1 );
 -
 -      /* write the bsp */
 -      UnparseEntities();
 -      StripExtension( source );
 -      DefaultExtension( source, "_s.bsp" );
 -      Sys_Printf( "Writing %s\n", source );
 -      WriteBSPFile( source );
 -
 -      /* return to sender */
 -      return 0;
  }
  
  
@@@ -156,13 -1532,13 +156,13 @@@ int ShiftBSPMain( int argc, char **arg
                /* shift origin */
                GetVectorForKey( &entities[ i ], "origin", vec );
                if ( ( vec[ 0 ] || vec[ 1 ] || vec[ 2 ] ) ) {
 -                      if ( !strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
 +                      if ( !!strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
                                vec[2] += spawn_ref;
                        }
                        vec[0] += scale[0];
                        vec[1] += scale[1];
                        vec[2] += scale[2];
 -                      if ( !strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
 +                      if ( !!strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
                                vec[2] -= spawn_ref;
                        }
                        sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
@@@ -2074,6 -3450,246 +2074,6 @@@ skipEXrefile
  
  
  
 -/*
 -   PseudoCompileBSP()
 -   a stripped down ProcessModels
 - */
 -void PseudoCompileBSP( qboolean need_tree ){
 -      int models;
 -      char modelValue[10];
 -      entity_t *entity;
 -      face_t *faces;
 -      tree_t *tree;
 -      node_t *node;
 -      brush_t *brush;
 -      side_t *side;
 -      int i;
 -
 -      SetDrawSurfacesBuffer();
 -      mapDrawSurfs = safe_malloc( sizeof( mapDrawSurface_t ) * MAX_MAP_DRAW_SURFS );
 -      memset( mapDrawSurfs, 0, sizeof( mapDrawSurface_t ) * MAX_MAP_DRAW_SURFS );
 -      numMapDrawSurfs = 0;
 -
 -      BeginBSPFile();
 -      models = 1;
 -      for ( mapEntityNum = 0; mapEntityNum < numEntities; mapEntityNum++ )
 -      {
 -              /* get entity */
 -              entity = &entities[ mapEntityNum ];
 -              if ( entity->brushes == NULL && entity->patches == NULL ) {
 -                      continue;
 -              }
 -
 -              if ( mapEntityNum != 0 ) {
 -                      sprintf( modelValue, "*%d", models++ );
 -                      SetKeyValue( entity, "model", modelValue );
 -              }
 -
 -              /* process the model */
 -              Sys_FPrintf( SYS_VRB, "############### model %i ###############\n", numBSPModels );
 -              BeginModel();
 -
 -              entity->firstDrawSurf = numMapDrawSurfs;
 -
 -              ClearMetaTriangles();
 -              PatchMapDrawSurfs( entity );
 -
 -              if ( mapEntityNum == 0 && need_tree ) {
 -                      faces = MakeStructuralBSPFaceList( entities[0].brushes );
 -                      tree = FaceBSP( faces );
 -                      node = tree->headnode;
 -              }
 -              else
 -              {
 -                      node = AllocNode();
 -                      node->planenum = PLANENUM_LEAF;
 -                      tree = AllocTree();
 -                      tree->headnode = node;
 -              }
 -
 -              /* a minimized ClipSidesIntoTree */
 -              for ( brush = entity->brushes; brush; brush = brush->next )
 -              {
 -                      /* walk the brush sides */
 -                      for ( i = 0; i < brush->numsides; i++ )
 -                      {
 -                              /* get side */
 -                              side = &brush->sides[ i ];
 -                              if ( side->winding == NULL ) {
 -                                      continue;
 -                              }
 -                              /* shader? */
 -                              if ( side->shaderInfo == NULL ) {
 -                                      continue;
 -                              }
 -                              /* save this winding as a visible surface */
 -                              DrawSurfaceForSide( entity, brush, side, side->winding );
 -                      }
 -              }
 -
 -              if ( meta ) {
 -                      ClassifyEntitySurfaces( entity );
 -                      MakeEntityDecals( entity );
 -                      MakeEntityMetaTriangles( entity );
 -                      SmoothMetaTriangles();
 -                      MergeMetaTriangles();
 -              }
 -              FilterDrawsurfsIntoTree( entity, tree );
 -
 -              FilterStructuralBrushesIntoTree( entity, tree );
 -              FilterDetailBrushesIntoTree( entity, tree );
 -
 -              EmitBrushes( entity->brushes, &entity->firstBrush, &entity->numBrushes );
 -              EndModel( entity, node );
 -      }
 -      EndBSPFile( qfalse );
 -}
 -
 -/*
 -   ConvertBSPMain()
 -   main argument processing function for bsp conversion
 - */
 -
 -int ConvertBSPMain( int argc, char **argv ){
 -      int i;
 -      int ( *convertFunc )( char * );
 -      game_t  *convertGame;
 -      char ext[1024];
 -      qboolean map_allowed, force_bsp, force_map;
 -
 -
 -      /* set default */
 -      convertFunc = ConvertBSPToASE;
 -      convertGame = NULL;
 -      map_allowed = qfalse;
 -      force_bsp = qfalse;
 -      force_map = qfalse;
 -
 -      /* arg checking */
 -      if ( argc < 1 ) {
 -              Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
 -              return 0;
 -      }
 -
 -      /* process arguments */
 -      for ( i = 1; i < ( argc - 1 ); i++ )
 -      {
 -              /* -format map|ase|... */
 -              if ( !strcmp( argv[ i ],  "-format" ) ) {
 -                      i++;
 -                      if ( !Q_stricmp( argv[ i ], "ase" ) ) {
 -                              convertFunc = ConvertBSPToASE;
 -                              map_allowed = qfalse;
 -                      }
 -                      else if ( !Q_stricmp( argv[ i ], "obj" ) ) {
 -                              convertFunc = ConvertBSPToOBJ;
 -                              map_allowed = qfalse;
 -                      }
 -                      else if ( !Q_stricmp( argv[ i ], "map_bp" ) ) {
 -                              convertFunc = ConvertBSPToMap_BP;
 -                              map_allowed = qtrue;
 -                      }
 -                      else if ( !Q_stricmp( argv[ i ], "map" ) ) {
 -                              convertFunc = ConvertBSPToMap;
 -                              map_allowed = qtrue;
 -                      }
 -                      else
 -                      {
 -                              convertGame = GetGame( argv[ i ] );
 -                              map_allowed = qfalse;
 -                              if ( convertGame == NULL ) {
 -                                      Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
 -                              }
 -                      }
 -              }
 -              else if ( !strcmp( argv[ i ],  "-ne" ) ) {
 -                      normalEpsilon = atof( argv[ i + 1 ] );
 -                      i++;
 -                      Sys_Printf( "Normal epsilon set to %f\n", normalEpsilon );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-de" ) ) {
 -                      distanceEpsilon = atof( argv[ i + 1 ] );
 -                      i++;
 -                      Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon );
 -              }
 -              else if ( !strcmp( argv[ i ],  "-shaderasbitmap" ) || !strcmp( argv[ i ],  "-shadersasbitmap" ) ) {
 -                      shadersAsBitmap = qtrue;
 -              }
 -              else if ( !strcmp( argv[ i ],  "-lightmapastexcoord" ) || !strcmp( argv[ i ],  "-lightmapsastexcoord" ) ) {
 -                      lightmapsAsTexcoord = qtrue;
 -              }
 -              else if ( !strcmp( argv[ i ],  "-deluxemapastexcoord" ) || !strcmp( argv[ i ],  "-deluxemapsastexcoord" ) ) {
 -                      lightmapsAsTexcoord = qtrue;
 -                      deluxemap = qtrue;
 -              }
 -              else if ( !strcmp( argv[ i ],  "-readbsp" ) ) {
 -                      force_bsp = qtrue;
 -              }
 -              else if ( !strcmp( argv[ i ],  "-readmap" ) ) {
 -                      force_map = qtrue;
 -              }
 -              else if ( !strcmp( argv[ i ],  "-meta" ) ) {
 -                      meta = qtrue;
 -              }
 -              else if ( !strcmp( argv[ i ],  "-patchmeta" ) ) {
 -                      meta = qtrue;
 -                      patchMeta = qtrue;
 -              }
 -              else if ( !strcmp( argv[ i ],  "-fast" ) ) {
 -                      fast = qtrue;
 -              }
 -      }
 -
 -      LoadShaderInfo();
 -
 -      /* clean up map name */
 -      strcpy( source, ExpandArg( argv[i] ) );
 -      ExtractFileExtension( source, ext );
 -
 -      if ( !map_allowed && !force_map ) {
 -              force_bsp = qtrue;
 -      }
 -
 -      if ( force_map || ( !force_bsp && !Q_stricmp( ext, "map" ) && map_allowed ) ) {
 -              if ( !map_allowed ) {
 -                      Sys_Printf( "WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n" );
 -              }
 -              StripExtension( source );
 -              DefaultExtension( source, ".map" );
 -              Sys_Printf( "Loading %s\n", source );
 -              LoadMapFile( source, qfalse, convertGame == NULL );
 -              PseudoCompileBSP( convertGame != NULL );
 -      }
 -      else
 -      {
 -              StripExtension( source );
 -              DefaultExtension( source, ".bsp" );
 -              Sys_Printf( "Loading %s\n", source );
 -              LoadBSPFile( source );
 -              ParseEntities();
 -      }
 -
 -      /* bsp format convert? */
 -      if ( convertGame != NULL ) {
 -              /* set global game */
 -              game = convertGame;
 -
 -              /* write bsp */
 -              StripExtension( source );
 -              DefaultExtension( source, "_c.bsp" );
 -              Sys_Printf( "Writing %s\n", source );
 -              WriteBSPFile( source );
 -
 -              /* return to sender */
 -              return 0;
 -      }
 -
 -      /* normal convert */
 -      return convertFunc( source );
 -}
 -
 -
 -
  /*
     main()
     q3map mojo...
  int main( int argc, char **argv ){
        int i, r;
        double start, end;
 +      extern qboolean werror;
  
  #ifdef WIN32
        _setmaxstdio(2048);
                        argv[ i ] = NULL;
                }
  
 +              /* make all warnings into errors */
 +              else if ( !strcmp( argv[ i ], "-werror" ) ) {
 +                      werror = qtrue;
 +                      argv[ i ] = NULL;
 +              }
 +
                /* patch subdivisions */
                else if ( !strcmp( argv[ i ], "-subdivisions" ) ) {
                        argv[ i ] = NULL;
  
        /* check if we have enough options left to attempt something */
        if ( argc < 2 ) {
-               Error( "Usage: %s [general options] [options] mapfile", argv[ 0 ] );
+               Error( "Usage: %s [general options] [options] mapfile\n%s -help for help", argv[ 0 ] , argv[ 0 ] );
        }
  
        /* fixaas */
        if ( !strcmp( argv[ 1 ], "-fixaas" ) ) {
 -              r = FixAAS( argc - 1, argv + 1 );
 +              r = FixAASMain( argc - 1, argv + 1 );
        }
  
        /* analyze */
        else if ( !strcmp( argv[ 1 ], "-analyze" ) ) {
 -              r = AnalyzeBSP( argc - 1, argv + 1 );
 +              r = AnalyzeBSPMain( argc - 1, argv + 1 );
        }
  
        /* info */
        else if ( !strcmp( argv[ 1 ], "-info" ) ) {
 -              r = BSPInfo( argc - 2, argv + 2 );
 +              r = BSPInfoMain( argc - 2, argv + 2 );
        }
  
        /* vis */
  
        /* vlight */
        else if ( !strcmp( argv[ 1 ], "-vlight" ) ) {
 -              Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" );
 +              Sys_FPrintf( SYS_WRN, "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" );
                argv[ 1 ] = "-fast";    /* eek a hack */
                r = LightMain( argc, argv );
        }
index f8d978040ed5d6c22627ceb365dd31b81f2fc165,b953377a93234f46ab26618c2fe87a9e7b0016a1..66f256b48017a0c9033d214d7b53b59ec849c2c1
@@@ -101,7 -101,7 +101,7 @@@ char *LokiGetHomeDir( void )
   */
  
  void LokiInitPaths( char *argv0 ){
 -      char        *home;
 +      char *home;
  
        if ( !homePath ) {
                /* get home dir */
        /* this is kinda crap, but hey */
        strcpy( installPath, "../" );
        #else
 +
        char temp[ MAX_OS_PATH ];
 -      char        *path;
 -      char        *last;
 +      char *path;
 +      char *last;
        qboolean found;
  
  
                                path++;
                        }
  
                        /* concatenate */
                        if ( last > ( path + 1 ) ) {
                                // +1 hack: Q_strncat calls Q_strncpyz that expects a len including '\0'
@@@ -408,9 -408,6 +409,9 @@@ void InitPaths( int *argc, char **argv 
        int i, j, k, len, len2;
        char temp[ MAX_OS_PATH ];
  
 +      int noBasePath = 0;
 +      int noHomePath = 0;
 +      int noMagicPath = 0;
  
        /* note it */
        Sys_FPrintf( SYS_VRB, "--- InitPaths ---\n" );
                        argv[ i ] = NULL;
                }
  
 +              /* -fs_nobasepath */
 +              else if ( strcmp( argv[ i ], "-fs_nobasepath" ) == 0 ) {
 +                      noBasePath = 1;
 +                      // we don't want any basepath, neither guessed ones
 +                      noMagicPath = 1;
 +                      argv[ i ] = NULL;
 +              }               
 +
 +              /* -fs_nomagicpath */
 +              else if ( strcmp( argv[ i ], "-fs_nomagicpath") == 0) {
 +                      noMagicPath = 1;
 +                      argv[ i ] = NULL;
 +              }
 +
                /* -fs_basepath */
                else if ( strcmp( argv[ i ], "-fs_basepath" ) == 0 ) {
                        if ( ++i >= *argc ) {
                        argv[ i ] = NULL;
                }
  
 +              /* -fs_nohomepath */
 +              else if ( strcmp( argv[ i ], "-fs_nohomepath" ) == 0 ) {
 +                      noHomePath = 1;
 +                      argv[ i ] = NULL;
 +              }               
 +
                /* -fs_homebase */
                else if ( strcmp( argv[ i ], "-fs_homebase" ) == 0 ) {
                        if ( ++i >= *argc ) {
                        homeBasePath = ".";
                        argv[ i ] = NULL;
                }
--
--              /* -fs_pakpath */
--              else if ( strcmp( argv[ i ], "-fs_pakpath" ) == 0 ) {
--                      if ( ++i >= *argc ) {
--                              Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
--                      }
--                      argv[ i - 1 ] = NULL;
--                      AddPakPath( argv[ i ] );
--                      argv[ i ] = NULL;
--              }
 -
        }
  
        /* remove processed arguments */
        /* add standard game path */
        AddGamePath( game->gamePath );
  
 -      /* if there is no base path set, figure it out */
 -      if ( numBasePaths == 0 ) {
 +      /* if there is no base path set, figure it out unless fs_nomagicpath is set */
 +      if ( numBasePaths == 0 && noBasePath == 0 && noMagicPath == 0 ) {
                /* this is another crappy replacement for SetQdirFromPath() */
                len2 = strlen( game->magic );
                for ( i = 0; i < *argc && numBasePaths == 0; i++ )
                }
        }
  
 -      /* this only affects unix */
 -      if ( homeBasePath ) {
 -              AddHomeBasePath( homeBasePath );
 +      if ( noBasePath == 1 ) {
 +              numBasePaths = 0;
        }
 -      else{
 -              AddHomeBasePath( game->homeBasePath );
 +
 +      if ( noHomePath == 0 ) {
 +              /* this only affects unix */
 +              if ( homeBasePath ) {
 +                      AddHomeBasePath( homeBasePath );
 +              }
 +              else{
 +                      AddHomeBasePath( game->homeBasePath );
 +              }
        }
  
        /* initialize vfs paths */
index f6296f1b72aae3412f8dcd4c90c175d1503195a8,e6d0e1f73598189ec0e7bc498fd816cdcb27c428..a230dd002f019045f7ec6b7347f2afcf0c28b92a
@@@ -32,7 -32,7 +32,7 @@@
  #ifndef Q3MAP2_H
  #define Q3MAP2_H
  
 -
 +#include "globaldefs.h"
  
  /* version */
  #ifndef Q3MAP_VERSION
@@@ -50,7 -50,7 +50,7 @@@
     ------------------------------------------------------------------------------- */
  
  /* platform-specific */
 -#if defined( __linux__ ) || defined( __APPLE__ )
 +#if GDEF_OS_LINUX || GDEF_OS_MACOS
        #define Q_UNIX
  #endif
  
@@@ -60,7 -60,7 +60,7 @@@
        #include <limits.h>
  #endif
  
 -#ifdef WIN32
 +#if GDEF_OS_WINDOWS
        #include <windows.h>
  #endif
  
@@@ -72,9 -72,6 +72,9 @@@
  #include "mathlib.h"
  #include "md5lib.h"
  #include "ddslib.h"
 +#ifdef BUILD_CRUNCH
 +#include "crn_rgba.h"
 +#endif // BUILD_CRUNCH
  
  #include "picomodel.h"
  
     ------------------------------------------------------------------------------- */
  
  #define MAC_STATIC_HACK         0
 -#if defined( __APPLE__ ) && MAC_STATIC_HACK
 +#if GDEF_OS_MACOS && MAC_STATIC_HACK
        #define MAC_STATIC          static
  #else
        #define MAC_STATIC
  #endif
  
  #if 1
 -      #ifdef WIN32
 +      #if GDEF_OS_WINDOWS
                #define Q_stricmp           stricmp
                #define Q_strncasecmp       strnicmp
        #else
  
  /* ok to increase these at the expense of more memory */
  #define MAX_MAP_AREAS           0x100       /* MAX_MAP_AREA_BYTES in q_shared must match! */
 -#define       MAX_MAP_FOGS                    0x100                   //& 0x100       /* RBSP (32 - world fog - goggles) */
 +#define MAX_MAP_FOGS            30          //& 0x100 /* RBSP (32 - world fog - goggles) */
  #define MAX_MAP_LEAFS           0x20000
  #define MAX_MAP_PORTALS         0x20000
  #define MAX_MAP_LIGHTING        0x800000
  #define MAX_MAP_VISCLUSTERS     0x4000 // <= MAX_MAP_LEAFS
  #define MAX_MAP_VISIBILITY      ( VIS_HEADER_SIZE + MAX_MAP_VISCLUSTERS * ( ( ( MAX_MAP_VISCLUSTERS + 63 ) & ~63 ) >> 3 ) )
  
 -#define       MAX_MAP_DRAW_SURFS              0x20000
 +#define MAX_MAP_DRAW_SURFS      0x20000
  
  #define MAX_MAP_ADVERTISEMENTS  30
  
@@@ -962,9 -959,8 +962,9 @@@ typedef struct parseMesh_
        shaderInfo_t        *shaderInfo;
        shaderInfo_t        *celShader;             /* :) */
  
 +      /* jal : entity based _lightmapsamplesize */
 +      int lightmapSampleSize;
        /* ydnar: gs mods */
 -      int lightmapSampleSize;                     /* jal : entity based _lightmapsamplesize */
        float lightmapScale;
        vec3_t eMins, eMaxs;
        indexMap_t          *im;
@@@ -1520,7 -1516,10 +1520,7 @@@ vec_t                       Random( voi
  char                        *Q_strncpyz( char *dst, const char *src, size_t len );
  char                        *Q_strcat( char *dst, size_t dlen, const char *src );
  char                        *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen );
 -int                         BSPInfo( int count, char **fileNames );
 -int                         ScaleBSPMain( int argc, char **argv );
  int                         ShiftBSPMain( int argc, char **argv );
 -int                         ConvertMain( int argc, char **argv );
  
  /* help.c */
  void                        HelpMain(const char* arg);
@@@ -1530,41 -1529,22 +1530,41 @@@ game_t                      *GetGame( c
  void                        InitPaths( int *argc, char **argv );
  
  
 +/* fixaas.c */
 +int                         FixAASMain( int argc, char **argv );
 +
 +
  /* bsp.c */
  int                         BSPMain( int argc, char **argv );
  
  
 +/* bsp_analyze.c */
 +int                         AnalyzeBSPMain( int argc, char **argv );
 +
 +
 +/* bsp_info.c */
 +int                         BSPInfoMain( int count, char **fileNames );
 +
 +/* bsp_scale.c */
 +int                         ScaleBSPMain( int argc, char **argv );
 +
 +/* minimap.c */
 +int                         MiniMapBSPMain( int argc, char **argv );
 +
 +/* convert_bsp.c */
 +int                         ConvertBSPMain( int argc, char **argv );
 +
 +
  /* convert_map.c */
  int                         ConvertBSPToMap( char *bspName );
  int                         ConvertBSPToMap_BP( char *bspName );
  
 -
  /* convert_ase.c */
  int                         ConvertBSPToASE( char *bspName );
  
  /* convert_obj.c */
  int                         ConvertBSPToOBJ( char *bspName );
  
 -
  /* brush.c */
  sideRef_t                   *AllocSideRef( side_t *side, sideRef_t *next );
  int                         CountBrushList( brush_t *brushes );
@@@ -1638,12 -1618,12 +1638,12 @@@ void                        MakeTreePor
  
  
  /* leakfile.c */
 -xmlNodePtr                  LeakFile( tree_t *tree );
 +xmlNodePtr                  LeakFile( tree_t *tree, const char *lineFilePath );
  
  
  /* prtfile.c */
  void                        NumberClusters( tree_t *tree );
 -void                        WritePortalFile( tree_t *tree );
 +void                        WritePortalFile( tree_t *tree, const char *portalFilePath );
  
  
  /* writebsp.c */
@@@ -1653,7 -1633,7 +1653,7 @@@ void                        SetLightSty
  int                         EmitShader( const char *shader, int *contentFlags, int *surfaceFlags );
  
  void                        BeginBSPFile( void );
 -void                        EndBSPFile( qboolean do_write );
 +void                        EndBSPFile( qboolean do_write, const char *BSPFilePath, const char *surfaceFilePath );
  void                        EmitBrushes( brush_t *brushes, int *firstBrush, int *numBrushes );
  void                        EmitFogs( void );
  
@@@ -1765,8 -1745,8 +1765,8 @@@ int                         GetSurfaceE
  float                       GetSurfaceExtraLongestCurve( int num );
  void                        GetSurfaceExtraLightmapAxis( int num, vec3_t lightmapAxis );
  
 -void                        WriteSurfaceExtraFile( const char *path );
 -void                        LoadSurfaceExtraFile( const char *path );
 +void                        WriteSurfaceExtraFile( const char *surfaceFilePath );
 +void                        LoadSurfaceExtraFile( const char *surfaceFilePath );
  
  
  /* decals.c */
@@@ -1837,7 -1817,7 +1837,7 @@@ void                        FloodLightR
  void                        IlluminateRawLightmap( int num );
  void                        IlluminateVertexes( int num );
  
 -void                        SetupBrushesFlags( int mask_any, int test_any, int mask_all, int test_all );
 +void                        SetupBrushesFlags( unsigned int mask_any, unsigned int test_any, unsigned int mask_all, unsigned int test_all );
  void                        SetupBrushes( void );
  void                        SetupClusters( void );
  qboolean                    ClusterVisible( int a, int b );
@@@ -1860,14 -1840,14 +1860,19 @@@ int                         ImportLight
  
  void                        SetupSurfaceLightmaps( void );
  void                        StitchSurfaceLightmaps( void );
 -void                        StoreSurfaceLightmaps( void );
 +void                        StoreSurfaceLightmaps( qboolean fastAllocate );
 +
 +
 +/* exportents.c */
 +void                        ExportEntities( void );
 +int                         ExportEntitiesMain( int argc, char **argv );
  
  
+ /* exportents.c */
+ void                        ExportEntities( void );
+ int                         ExportEntitiesMain( int argc, char **argv );
  /* image.c */
  void                        ImageFree( image_t *image );
  image_t                     *ImageFind( const char *filename );
@@@ -1926,7 -1906,7 +1931,7 @@@ qboolean                    KeyExists( 
  const char                  *ValueForKey( const entity_t *ent, const char *key );
  int                         IntForKey( const entity_t *ent, const char *key );
  vec_t                       FloatForKey( const entity_t *ent, const char *key );
 -void                        GetVectorForKey( const entity_t *ent, const char *key, vec3_t vec );
 +qboolean                    GetVectorForKey( const entity_t *ent, const char *key, vec3_t vec );
  entity_t                    *FindTargetEntity( const char *target );
  void                        GetEntityShadowFlags( const entity_t *ent, const entity_t *ent2, int *castShadows, int *recvShadows );
  void InjectCommandLine( char **argv, int beginArgs, int endArgs );
@@@ -1969,21 -1949,21 +1974,21 @@@ Q_EXTERN game_t games[
        {
                                                                #include "game_quake3.h"
        ,
 -                                                              #include "game_quakelive.h" /* most be after game_quake3.h as they share defines! */
 +                                                              #include "game_quakelive.h" /* must be after game_quake3.h as they share defines! */
        ,
 -                                                              #include "game_nexuiz.h" /* most be after game_quake3.h as they share defines! */
 +                                                              #include "game_nexuiz.h" /* must be after game_quake3.h as they share defines! */
        ,
 -                                                              #include "game_xonotic.h" /* most be after game_quake3.h as they share defines! */
 +                                                              #include "game_xonotic.h" /* must be after game_quake3.h as they share defines! */
        ,
                                                                #include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
        ,
 -                                                              #include "game_unvanquished.h"
 +                                                              #include "game_unvanquished.h" /* must be after game_tremulous.h as they share defines! */
        ,
                                                                #include "game_tenebrae.h"
        ,
                                                                #include "game_wolf.h"
        ,
 -                                                              #include "game_wolfet.h" /* most be after game_wolf.h as they share defines! */
 +                                                              #include "game_wolfet.h" /* must be after game_wolf.h as they share defines! */
        ,
                                                                #include "game_etut.h"
        ,
        ,
                                                                #include "game_sof2.h"
        ,
 -                                                              #include "game_jk2.h"   /* most be after game_sof2.h as they share defines! */
 +                                                              #include "game_jk2.h"   /* must be after game_sof2.h as they share defines! */
        ,
 -                                                              #include "game_ja.h"    /* most be after game_jk2.h as they share defines! */
 +                                                              #include "game_ja.h"    /* must be after game_jk2.h as they share defines! */
        ,
                                                                #include "game_qfusion.h"   /* qfusion game */
        ,
@@@ -2261,7 -2241,7 +2266,7 @@@ Q_EXTERN qboolean keepLights Q_ASSIGN( 
  
  Q_EXTERN int sampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_SAMPLE_SIZE );
  Q_EXTERN int minSampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_MIN_SAMPLE_SIZE );
 -Q_EXTERN float noVertexLighting Q_ASSIGN( 0.0f );
 +Q_EXTERN qboolean noVertexLighting Q_ASSIGN( qfalse );
  Q_EXTERN qboolean nolm Q_ASSIGN( qfalse );
  Q_EXTERN qboolean noGridLighting Q_ASSIGN( qfalse );