some warning fixes

[xonotic/netradiant.git] / tools / quake3 / q3map2 / convert_ase.c

diff --git a/tools/quake3/q3map2/convert_ase.c b/tools/quake3/q3map2/convert_ase.c
index 304b1b7c0c804dba93714d01c176d774b90a6684..f16a9d08478e65703834d7a663cb6b07abe220a7 100644 (file)
--- a/tools/quake3/q3map2/convert_ase.c
+++ b/tools/quake3/q3map2/convert_ase.c
@@ -165,10 +165,10 @@ static void ConvertSurface( FILE *f, bspModel_t *model, int modelNum, bspDrawSur
        fprintf( f, "\t*PROP_RECVSHADOW\t1\r\n" );
        if(lightmapsAsTexcoord)
        {
-               if(ds->lightmapNum >= 0 && ds->lightmapNum < numLightmapsASE)
-                       fprintf( f, "\t*MATERIAL_REF\t%d\r\n", ds->lightmapNum );
+               if(ds->lightmapNum[0] >= 0 && ds->lightmapNum[0] + (int)deluxemap < numLightmapsASE)
+                       fprintf( f, "\t*MATERIAL_REF\t%d\r\n", ds->lightmapNum[0] + deluxemap );
                else
-                       Sys_Printf( "WARNING: lightmap %d out of range, not exporting\n", ds->lightmapNum );
+                       Sys_Printf( "WARNING: lightmap %d out of range, not exporting\n", ds->lightmapNum[0] + deluxemap );
        }
        else
                fprintf( f, "\t*MATERIAL_REF\t%d\r\n", ds->shaderNum );
@@ -291,9 +291,6 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum )
 }
 static void ConvertLightmap( FILE *f, const char *base, int lightmapNum )
 {
-       shaderInfo_t    *si;
-       char                    *c, filename[ 1024 ];
-       
        /* print shader info */
        fprintf( f, "\t*MATERIAL\t%d\t{\r\n", lightmapNum );
        fprintf( f, "\t\t*MATERIAL_NAME\t\"lm_%04d\"\r\n", lightmapNum );