]> de.git.xonotic.org Git - xonotic/netradiant.git/blobdiff - tools/quake3/q3map2/model.c
make whitespace match master better
[xonotic/netradiant.git] / tools / quake3 / q3map2 / model.c
index 7489bcf07a8b882423f4628ae97b5c9b0b5d175e..32f65d0891774ebd07e702505bab98e1a33e909b 100644 (file)
@@ -38,7 +38,7 @@
 
 
 
-/* 
+/*
    PicoPrintFunc()
    callback for picomodel.lib
  */
@@ -49,31 +49,31 @@ void PicoPrintFunc( int level, const char *str ){
        }
        switch ( level )
        {
-               case PICO_NORMAL:
-                       Sys_Printf( "%s\n", str );
-                       break;
-               
-               case PICO_VERBOSE:
-                       Sys_FPrintf( SYS_VRB, "%s\n", str );
-                       break;
-               
-               case PICO_WARNING:
-                       Sys_Printf( "WARNING: %s\n", str );
-                       break;
-               
-               case PICO_ERROR:
-                       Sys_Printf( "ERROR: %s\n", str );
-                       break;
-               
-               case PICO_FATAL:
-                       Error( "ERROR: %s\n", str );
-                       break;
+       case PICO_NORMAL:
+               Sys_Printf( "%s\n", str );
+               break;
+
+       case PICO_VERBOSE:
+               Sys_FPrintf( SYS_VRB, "%s\n", str );
+               break;
+
+       case PICO_WARNING:
+               Sys_Printf( "WARNING: %s\n", str );
+               break;
+
+       case PICO_ERROR:
+               Sys_Printf( "ERROR: %s\n", str );
+               break;
+
+       case PICO_FATAL:
+               Error( "ERROR: %s\n", str );
+               break;
        }
 }
 
 
 
-/* 
+/*
    PicoLoadFileFunc()
    callback for picomodel.lib
  */
@@ -90,29 +90,29 @@ void PicoLoadFileFunc( const char *name, byte **buffer, int *bufSize ){
  */
 
 picoModel_t *FindModel( const char *name, int frame ){
-       int                     i;
-       
-       
+       int i;
+
+
        /* init */
        if ( numPicoModels <= 0 ) {
                memset( picoModels, 0, sizeof( picoModels ) );
        }
-       
+
        /* dummy check */
        if ( name == NULL || name[ 0 ] == '\0' ) {
                return NULL;
        }
-       
+
        /* search list */
        for ( i = 0; i < MAX_MODELS; i++ )
        {
                if ( picoModels[ i ] != NULL &&
-                       !strcmp( PicoGetModelName( picoModels[ i ] ), name ) &&
+                        !strcmp( PicoGetModelName( picoModels[ i ] ), name ) &&
                         PicoGetModelFrameNum( picoModels[ i ] ) == frame ) {
                        return picoModels[ i ];
+               }
        }
-       }
-       
+
        /* no matching picoModel found */
        return NULL;
 }
@@ -125,44 +125,44 @@ picoModel_t *FindModel( const char *name, int frame ){
  */
 
 picoModel_t *LoadModel( const char *name, int frame ){
-       int                             i;
-       picoModel_t             *model, **pm;
-       
-       
+       int i;
+       picoModel_t     *model, **pm;
+
+
        /* init */
        if ( numPicoModels <= 0 ) {
                memset( picoModels, 0, sizeof( picoModels ) );
        }
-       
+
        /* dummy check */
        if ( name == NULL || name[ 0 ] == '\0' ) {
                return NULL;
        }
-       
+
        /* try to find existing picoModel */
        model = FindModel( name, frame );
        if ( model != NULL ) {
                return model;
        }
-       
+
        /* none found, so find first non-null picoModel */
        pm = NULL;
        for ( i = 0; i < MAX_MODELS; i++ )
-               {
+       {
                if ( picoModels[ i ] == NULL ) {
                        pm = &picoModels[ i ];
                        break;
                }
        }
-       
+
        /* too many picoModels? */
        if ( pm == NULL ) {
                Error( "MAX_MODELS (%d) exceeded, there are too many model files referenced by the map.", MAX_MODELS );
        }
-       
+
        /* attempt to parse model */
        *pm = PicoLoadModel( name, frame );
-       
+
        /* if loading failed, make a bogus model to silence the rest of the warnings */
        if ( *pm == NULL ) {
                /* allocate a new model */
@@ -170,19 +170,19 @@ picoModel_t *LoadModel( const char *name, int frame ){
                if ( *pm == NULL ) {
                        return NULL;
                }
-               
+
                /* set data */
                PicoSetModelName( *pm, name );
                PicoSetModelFrameNum( *pm, frame );
        }
-       
+
        /* debug code */
        #if 0
        {
-               int                             numSurfaces, numVertexes;
-               picoSurface_t   *ps;
-               
-               
+               int numSurfaces, numVertexes;
+               picoSurface_t   *ps;
+
+
                Sys_Printf( "Model %s\n", name );
                numSurfaces = PicoGetModelNumSurfaces( *pm );
                for ( i = 0; i < numSurfaces; i++ )
@@ -193,12 +193,12 @@ picoModel_t *LoadModel( const char *name, int frame ){
                }
        }
        #endif
-       
+
        /* set count */
        if ( *pm != NULL ) {
                numPicoModels++;
        }
-       
+
        /* return the picoModel */
        return *pm;
 }
@@ -211,29 +211,29 @@ picoModel_t *LoadModel( const char *name, int frame ){
  */
 
 void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap_t *remap, shaderInfo_t *celShader, int eNum, int castShadows, int recvShadows, int spawnFlags, float lightmapScale, int lightmapSampleSize, float shadeAngle, vec3_t colormod ){
-       int                                     i, j, s, numSurfaces;
-       m4x4_t                          identity, nTransform;
-       picoModel_t                     *model;
-       picoShader_t            *shader;
-       picoSurface_t           *surface;
-       shaderInfo_t            *si;
-       mapDrawSurface_t        *ds;
-       bspDrawVert_t           *dv;
-       char                            *picoShaderName;
-       char                            shaderName[ MAX_QPATH ];
-       picoVec_t                       *xyz, *normal, *st;
-       byte                            *color;
-       picoIndex_t                     *indexes;
-       remap_t                         *rm, *glob;
-       skinfile_t                      *sf, *sf2;
-       double                          normalEpsilon_save;
-       double                          distanceEpsilon_save;
-       char                            skinfilename[ MAX_QPATH ];
-       char                            *skinfilecontent;
-       int                                     skinfilesize;
-       char                            *skinfileptr, *skinfilenextptr;
-       
-       
+       int i, j, s, numSurfaces;
+       m4x4_t identity, nTransform;
+       picoModel_t         *model;
+       picoShader_t        *shader;
+       picoSurface_t       *surface;
+       shaderInfo_t        *si;
+       mapDrawSurface_t    *ds;
+       bspDrawVert_t       *dv;
+       char                *picoShaderName;
+       char shaderName[ MAX_QPATH ];
+       picoVec_t           *xyz, *normal, *st;
+       byte                *color;
+       picoIndex_t         *indexes;
+       remap_t             *rm, *glob;
+       skinfile_t          *sf, *sf2;
+       double normalEpsilon_save;
+       double distanceEpsilon_save;
+       char skinfilename[ MAX_QPATH ];
+       char                *skinfilecontent;
+       int skinfilesize;
+       char                *skinfileptr, *skinfilenextptr;
+
+
        /* get model */
        model = LoadModel( name, frame );
        if ( model == NULL ) {
@@ -251,7 +251,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                skinfilesize = vfsLoadFile( skinfilename, (void**) &skinfilecontent, 0 );
                if ( skinfilesize >= 0 ) {
                        Sys_Printf( "Skin %d of %s does not exist, using 0 instead\n", skin, name );
-       }
+               }
        }
        sf = NULL;
        if ( skinfilesize >= 0 ) {
@@ -298,25 +298,25 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                }
                free( skinfilecontent );
        }
-       
+
        /* handle null matrix */
        if ( transform == NULL ) {
                m4x4_identity( identity );
                transform = identity;
        }
-       
+
        /* hack: Stable-1_2 and trunk have differing row/column major matrix order
           this transpose is necessary with Stable-1_2
           uncomment the following line with old m4x4_t (non 1.3/spog_branch) code */
        //%     m4x4_transpose( transform );
-       
+
        /* create transform matrix for normals */
        memcpy( nTransform, transform, sizeof( m4x4_t ) );
        if ( m4x4_invert( nTransform ) ) {
                Sys_FPrintf( SYS_VRB, "WARNING: Can't invert model transform matrix, using transpose instead\n" );
        }
        m4x4_transpose( nTransform );
-       
+
        /* fix bogus lightmap scale */
        if ( lightmapScale <= 0.0f ) {
                lightmapScale = 1.0f;
@@ -326,7 +326,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
        if ( shadeAngle <= 0.0f ) {
                shadeAngle = 0.0f;
        }
-       
+
        /* each surface on the model will become a new map drawsurface */
        numSurfaces = PicoGetModelNumSurfaces( model );
        //%     Sys_FPrintf( SYS_VRB, "Model %s has %d surfaces\n", name, numSurfaces );
@@ -337,14 +337,14 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                if ( surface == NULL ) {
                        continue;
                }
-               
+
                /* only handle triangle surfaces initially (fixme: support patches) */
                if ( PicoGetSurfaceType( surface ) != PICO_TRIANGLES ) {
                        continue;
                }
-               
+
                /* get shader name */
-        shader = PicoGetSurfaceShader( surface );
+               shader = PicoGetSurfaceShader( surface );
                if ( shader == NULL ) {
                        picoShaderName = "";
                }
@@ -356,7 +356,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                if ( sf ) {
                        picoShaderName = NULL;
                        for ( sf2 = sf; sf2 != NULL; sf2 = sf2->next )
-                               {
+                       {
                                if ( !Q_stricmp( surface->name, sf2->name ) ) {
                                        Sys_FPrintf( SYS_VRB, "Skin file: mapping %s to %s\n", surface->name, sf2->to );
                                        picoShaderName = sf2->to;
@@ -383,12 +383,12 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                                break;
                        }
                }
-               
+
                if ( glob != NULL ) {
                        Sys_FPrintf( SYS_VRB, "Globbing %s to %s\n", picoShaderName, glob->to );
                        picoShaderName = glob->to;
                }
-               
+
                /* shader renaming for sof2 */
                if ( renameModelShaders ) {
                        strcpy( shaderName, picoShaderName );
@@ -404,7 +404,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                else{
                        si = ShaderInfoForShader( picoShaderName );
                }
-               
+
                /* allocate a surface (ydnar: gs mods) */
                ds = AllocDrawSurface( SURFACE_TRIANGLES );
                ds->entityNum = eNum;
@@ -428,7 +428,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                if ( lightmapSampleSize > 0.0f ) {
                        ds->sampleSize = lightmapSampleSize;
                }
-               
+
                /* set lightmap scale */
                if ( lightmapScale > 0.0f ) {
                        ds->lightmapScale = lightmapScale;
@@ -441,27 +441,27 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                if ( shadeAngle > 0.0f ) {
                        ds->shadeAngleDegrees = shadeAngle;
                }
-               
+
                /* set particulars */
                ds->numVerts = PicoGetSurfaceNumVertexes( surface );
                ds->verts = safe_malloc( ds->numVerts * sizeof( ds->verts[ 0 ] ) );
                memset( ds->verts, 0, ds->numVerts * sizeof( ds->verts[ 0 ] ) );
-               
+
                ds->numIndexes = PicoGetSurfaceNumIndexes( surface );
                ds->indexes = safe_malloc( ds->numIndexes * sizeof( ds->indexes[ 0 ] ) );
                memset( ds->indexes, 0, ds->numIndexes * sizeof( ds->indexes[ 0 ] ) );
-               
+
                /* copy vertexes */
                for ( i = 0; i < ds->numVerts; i++ )
                {
                        /* get vertex */
                        dv = &ds->verts[ i ];
-                       
+
                        /* xyz and normal */
                        xyz = PicoGetSurfaceXYZ( surface, i );
                        VectorCopy( xyz, dv->xyz );
                        m4x4_transform_point( transform, dv->xyz );
-                       
+
                        normal = PicoGetSurfaceNormal( surface, i );
                        VectorCopy( normal, dv->normal );
                        m4x4_transform_normal( nTransform, dv->normal );
@@ -472,14 +472,14 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                                dv->st[ 0 ] = si->stFlat[ 0 ];
                                dv->st[ 1 ] = si->stFlat[ 1 ];
                        }
-                       
+
                        /* ydnar: gs mods: added support for explicit shader texcoord generation */
                        else if ( si->tcGen ) {
                                /* project the texture */
                                dv->st[ 0 ] = DotProduct( si->vecs[ 0 ], dv->xyz );
                                dv->st[ 1 ] = DotProduct( si->vecs[ 1 ], dv->xyz );
                        }
-                       
+
                        /* normal texture coordinates */
                        else
                        {
@@ -487,7 +487,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                                dv->st[ 0 ] = st[ 0 ];
                                dv->st[ 1 ] = st[ 1 ];
                        }
-                       
+
                        /* set lightmap/color bits */
                        color = PicoGetSurfaceColor( surface, 0, i );
                        for ( j = 0; j < MAX_LIGHTMAPS; j++ )
@@ -509,44 +509,44 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                                }
                        }
                }
-               
+
                /* copy indexes */
                indexes = PicoGetSurfaceIndexes( surface, 0 );
                for ( i = 0; i < ds->numIndexes; i++ )
                        ds->indexes[ i ] = indexes[ i ];
-               
+
                /* set cel shader */
                ds->celShader = celShader;
-               
+
                /* ydnar: giant hack land: generate clipping brushes for model triangles */
                if ( si->clipModel || ( spawnFlags & 2 ) ) { /* 2nd bit */
-                       vec3_t          points[ 4 ], backs[ 3 ];
-                       vec4_t          plane, reverse, pa, pb, pc;
-                       
-                       
+                       vec3_t points[ 4 ], backs[ 3 ];
+                       vec4_t plane, reverse, pa, pb, pc;
+
+
                        /* temp hack */
                        if ( !si->clipModel && !( si->compileFlags & C_SOLID ) ) {
                                continue;
                        }
-                       
+
                        /* walk triangle list */
                        for ( i = 0; i < ds->numIndexes; i += 3 )
                        {
                                /* overflow hack */
                                AUTOEXPAND_BY_REALLOC( mapplanes, ( nummapplanes + 64 ) << 1, allocatedmapplanes, 1024 );
-                               
+
                                /* make points and back points */
                                for ( j = 0; j < 3; j++ )
                                {
                                        /* get vertex */
                                        dv = &ds->verts[ ds->indexes[ i + j ] ];
-                                       
+
                                        /* copy xyz */
                                        VectorCopy( dv->xyz, points[ j ] );
                                }
 
                                VectorCopy( points[0], points[3] ); // for cyclic usage
-                               
+
                                /* make plane for triangle */
                                // div0: add some extra spawnflags:
                                //   0: snap normals to axial planes for extrusion
@@ -617,7 +617,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                                                }
                                                if ( distanceEpsilon > 0 ) {
                                                        distanceEpsilon = 0;
-                                       }
+                                               }
                                        }
                                        else{
                                                buildBrush->detail = qtrue;
@@ -642,13 +642,13 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                                        // that's at least sqrt(1/3) backPlaneDistance, unless in DOWN mode; in DOWN mode, we are screwed anyway if we encounter a plane that's perpendicular to the xy plane)
 
                                        if ( PlaneFromPoints( pa, points[ 2 ], points[ 1 ], backs[ 1 ] ) &&
-                                                       PlaneFromPoints( pb, points[ 1 ], points[ 0 ], backs[ 0 ] ) &&
+                                                PlaneFromPoints( pb, points[ 1 ], points[ 0 ], backs[ 0 ] ) &&
                                                 PlaneFromPoints( pc, points[ 0 ], points[ 2 ], backs[ 2 ] ) ) {
                                                /* set up brush sides */
                                                buildBrush->numsides = 5;
                                                buildBrush->sides[ 0 ].shaderInfo = si;
                                                for ( j = 1; j < buildBrush->numsides; j++ )
-                                                       buildBrush->sides[ j ].shaderInfo = NULL; // don't emit these faces as draw surfaces, should make smaller BSPs; hope this works
+                                                       buildBrush->sides[ j ].shaderInfo = NULL;  // don't emit these faces as draw surfaces, should make smaller BSPs; hope this works
 
                                                buildBrush->sides[ 0 ].planenum = FindFloatPlane( plane, plane[ 3 ], 3, points );
                                                buildBrush->sides[ 1 ].planenum = FindFloatPlane( pa, pa[ 3 ], 2, &points[ 1 ] ); // pa contains points[1] and points[2]
@@ -675,11 +675,11 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
                                        }
                                        else{
                                                free( buildBrush );
+                                       }
                                }
                        }
                }
        }
-       }
 }
 
 
@@ -690,25 +690,25 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
  */
 
 void AddTriangleModels( entity_t *e ){
-       int                             num, frame, skin, castShadows, recvShadows, spawnFlags;
-       entity_t                *e2;
-       const char              *targetName;
-       const char              *target, *model, *value;
-       char                    shader[ MAX_QPATH ];
-       shaderInfo_t    *celShader;
-       float                   temp, baseLightmapScale, lightmapScale;
-       float                   shadeAngle;
-       int                             lightmapSampleSize;
-       vec3_t                  origin, scale, angles;
-       m4x4_t                  transform;
-       epair_t                 *ep;
-       remap_t                 *remap, *remap2;
-       char                    *split;
-       
-       
+       int num, frame, skin, castShadows, recvShadows, spawnFlags;
+       entity_t        *e2;
+       const char      *targetName;
+       const char      *target, *model, *value;
+       char shader[ MAX_QPATH ];
+       shaderInfo_t    *celShader;
+       float temp, baseLightmapScale, lightmapScale;
+       float shadeAngle;
+       int lightmapSampleSize;
+       vec3_t origin, scale, angles;
+       m4x4_t transform;
+       epair_t         *ep;
+       remap_t         *remap, *remap2;
+       char            *split;
+
+
        /* note it */
        Sys_FPrintf( SYS_VRB, "--- AddTriangleModels ---\n" );
-       
+
        /* get current brush entity targetname */
        if ( e == entities ) {
                targetName = "";
@@ -716,18 +716,18 @@ void AddTriangleModels( entity_t *e ){
        else
        {
                targetName = ValueForKey( e, "targetname" );
-       
+
                /* misc_model entities target non-worldspawn brush model entities */
                if ( targetName[ 0 ] == '\0' ) {
                        return;
+               }
        }
-       }
-       
+
        /* get lightmap scale */
        /* vortex: added _ls key (short name of lightmapscale) */
        baseLightmapScale = 0.0f;
        if ( strcmp( "", ValueForKey( e, "lightmapscale" ) ) ||
-               strcmp( "", ValueForKey( e, "_lightmapscale" ) ) || 
+                strcmp( "", ValueForKey( e, "_lightmapscale" ) ) ||
                 strcmp( "", ValueForKey( e, "_ls" ) ) ) {
                baseLightmapScale = FloatForKey( e, "lightmapscale" );
                if ( baseLightmapScale <= 0.0f ) {
@@ -741,16 +741,16 @@ void AddTriangleModels( entity_t *e ){
                }
                if ( baseLightmapScale > 0.0f ) {
                        Sys_Printf( "World Entity has lightmap scale of %.4f\n", baseLightmapScale );
+               }
        }
-       }
-       
-       
+
+
        /* walk the entity list */
        for ( num = 1; num < numEntities; num++ )
        {
                /* get e2 */
                e2 = &entities[ num ];
-               
+
                /* convert misc_models into raw geometry */
                if ( Q_stricmp( "misc_model", ValueForKey( e2, "classname" ) ) ) {
                        continue;
@@ -761,15 +761,15 @@ void AddTriangleModels( entity_t *e ){
                if ( strcmp( target, targetName ) ) {
                        continue;
                }
-               
+
                /* get model name */
                model = ValueForKey( e2, "model" );
                if ( model[ 0 ] == '\0' ) {
                        Sys_Printf( "WARNING: misc_model at %i %i %i without a model key\n",
-                               (int) origin[ 0 ], (int) origin[ 1 ], (int) origin[ 2 ] );
+                                               (int) origin[ 0 ], (int) origin[ 1 ], (int) origin[ 2 ] );
                        continue;
                }
-               
+
                /* get model frame */
                frame = 0;
                if ( strcmp( "", ValueForKey( e2, "_frame" ) ) ) {
@@ -778,30 +778,30 @@ void AddTriangleModels( entity_t *e ){
                else if ( strcmp( "", ValueForKey( e2, "frame" ) ) ) {
                        frame = IntForKey( e2, "frame" );
                }
-               
+
                /* worldspawn (and func_groups) default to cast/recv shadows in worldspawn group */
                if ( e == entities ) {
                        castShadows = WORLDSPAWN_CAST_SHADOWS;
                        recvShadows = WORLDSPAWN_RECV_SHADOWS;
                }
-               
+
                /* other entities don't cast any shadows, but recv worldspawn shadows */
                else
                {
                        castShadows = ENTITY_CAST_SHADOWS;
                        recvShadows = ENTITY_RECV_SHADOWS;
                }
-               
+
                /* get explicit shadow flags */
                GetEntityShadowFlags( e2, e, &castShadows, &recvShadows );
-               
+
                /* get spawnflags */
                spawnFlags = IntForKey( e2, "spawnflags" );
-               
+
                /* get origin */
                GetVectorForKey( e2, "origin", origin );
-               VectorSubtract( origin, e->origin, origin );    /* offset by parent */
-               
+               VectorSubtract( origin, e->origin, origin );    /* offset by parent */
+
                /* get scale */
                scale[ 0 ] = scale[ 1 ] = scale[ 2 ] = 1.0f;
                temp = FloatForKey( e2, "modelscale" );
@@ -812,7 +812,7 @@ void AddTriangleModels( entity_t *e ){
                if ( value[ 0 ] != '\0' ) {
                        sscanf( value, "%f %f %f", &scale[ 0 ], &scale[ 1 ], &scale[ 2 ] );
                }
-               
+
                /* get "angle" (yaw) or "angles" (pitch yaw roll) */
                angles[ 0 ] = angles[ 1 ] = angles[ 2 ] = 0.0f;
                angles[ 2 ] = FloatForKey( e2, "angle" );
@@ -820,25 +820,25 @@ void AddTriangleModels( entity_t *e ){
                if ( value[ 0 ] != '\0' ) {
                        sscanf( value, "%f %f %f", &angles[ 1 ], &angles[ 2 ], &angles[ 0 ] );
                }
-               
+
                /* set transform matrix (thanks spog) */
                m4x4_identity( transform );
                m4x4_pivoted_transform_by_vec3( transform, origin, angles, eXYZ, scale, vec3_origin );
-               
+
                /* get shader remappings */
                remap = NULL;
                for ( ep = e2->epairs; ep != NULL; ep = ep->next )
                {
                        /* look for keys prefixed with "_remap" */
                        if ( ep->key != NULL && ep->value != NULL &&
-                               ep->key[ 0 ] != '\0' && ep->value[ 0 ] != '\0' &&
+                                ep->key[ 0 ] != '\0' && ep->value[ 0 ] != '\0' &&
                                 !Q_strncasecmp( ep->key, "_remap", 6 ) ) {
                                /* create new remapping */
                                remap2 = remap;
                                remap = safe_malloc( sizeof( *remap ) );
                                remap->next = remap2;
                                strcpy( remap->from, ep->value );
-                               
+
                                /* split the string */
                                split = strchr( remap->from, ';' );
                                if ( split == NULL ) {
@@ -847,16 +847,16 @@ void AddTriangleModels( entity_t *e ){
                                        remap = remap2;
                                        continue;
                                }
-                               
+
                                /* store the split */
                                *split = '\0';
                                strcpy( remap->to, ( split + 1 ) );
-                               
+
                                /* note it */
                                //%     Sys_FPrintf( SYS_VRB, "Remapping %s to %s\n", remap->from, remap->to );
                        }
                }
-               
+
                /* ydnar: cel shader support */
                value = ValueForKey( e2, "_celshader" );
                if ( value[ 0 ] == '\0' ) {
@@ -891,7 +891,7 @@ void AddTriangleModels( entity_t *e ){
                /* vortex: added _ls key (short name of lightmapscale) */
                lightmapScale = 0.0f;
                if ( strcmp( "", ValueForKey( e2, "lightmapscale" ) ) ||
-                       strcmp( "", ValueForKey( e2, "_lightmapscale" ) ) || 
+                        strcmp( "", ValueForKey( e2, "_lightmapscale" ) ) ||
                         strcmp( "", ValueForKey( e2, "_ls" ) ) ) {
                        lightmapScale = FloatForKey( e2, "lightmapscale" );
                        if ( lightmapScale <= 0.0f ) {
@@ -905,7 +905,7 @@ void AddTriangleModels( entity_t *e ){
                        }
                        if ( lightmapScale > 0.0f ) {
                                Sys_Printf( "misc_model has lightmap scale of %.4f\n", lightmapScale );
-               }
+                       }
                }
 
                /* jal : entity based _shadeangle */
@@ -942,7 +942,7 @@ void AddTriangleModels( entity_t *e ){
 
                /* insert the model */
                InsertModel( model, skin, frame, transform, remap, celShader, mapEntityNum, castShadows, recvShadows, spawnFlags, lightmapScale, lightmapSampleSize, shadeAngle, colormod );
-               
+
                /* free shader remappings */
                while ( remap != NULL )
                {