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 a0597957e062a24611b78503dd09735c2911a9a0..f16a9d08478e65703834d7a663cb6b07abe220a7 100644 (file)
--- a/tools/quake3/q3map2/convert_ase.c
+++ b/tools/quake3/q3map2/convert_ase.c
@@ -43,6 +43,7 @@ ConvertSurface()
 converts a bsp drawsurface to an ase chunk
 */
 
+int numLightmapsASE = 0;
 static void ConvertSurface( FILE *f, bspModel_t *model, int modelNum, bspDrawSurface_t *ds, int surfaceNum, vec3_t origin )
 {
        int                             i, v, face, a, b, c;
@@ -162,7 +163,15 @@ static void ConvertSurface( FILE *f, bspModel_t *model, int modelNum, bspDrawSur
        fprintf( f, "\t*PROP_MOTIONBLUR\t0\r\n" );
        fprintf( f, "\t*PROP_CASTSHADOW\t1\r\n" );
        fprintf( f, "\t*PROP_RECVSHADOW\t1\r\n" );
-       fprintf( f, "\t*MATERIAL_REF\t%d\r\n", lightmapsAsTexcoord ? ds->lightmapNum : ds->shaderNum );
+       if(lightmapsAsTexcoord)
+       {
+               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[0] + deluxemap );
+       }
+       else
+               fprintf( f, "\t*MATERIAL_REF\t%d\r\n", ds->shaderNum );
        fprintf( f, "}\r\n" );
 }
 
@@ -282,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 );
@@ -293,15 +299,18 @@ static void ConvertLightmap( FILE *f, const char *base, int lightmapNum )
        fprintf( f, "\t\t*MATERIAL_SHADING Phong\r\n" );
        
        /* print map info */
-       fprintf( f, "\t\t*MAP_DIFFUSE\t{\r\n" );
-       fprintf( f, "\t\t\t*MAP_NAME\t\"lm_%04d\"\r\n", lightmapNum );
-       fprintf( f, "\t\t\t*MAP_CLASS\t\"Bitmap\"\r\n");
-       fprintf( f, "\t\t\t*MAP_SUBNO\t1\r\n" );
-       fprintf( f, "\t\t\t*MAP_AMOUNT\t1.0\r\n" );
-       fprintf( f, "\t\t\t*MAP_TYPE\tScreen\r\n" );
-       fprintf( f, "\t\t\t*BITMAP\t\"%s\\lm_%04d.tga\"\r\n", base, lightmapNum );
-       fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" );
-       fprintf( f, "\t\t}\r\n" );
+       if(lightmapNum >= 0)
+       {
+               fprintf( f, "\t\t*MAP_DIFFUSE\t{\r\n" );
+               fprintf( f, "\t\t\t*MAP_NAME\t\"lm_%04d\"\r\n", lightmapNum );
+               fprintf( f, "\t\t\t*MAP_CLASS\t\"Bitmap\"\r\n");
+               fprintf( f, "\t\t\t*MAP_SUBNO\t1\r\n" );
+               fprintf( f, "\t\t\t*MAP_AMOUNT\t1.0\r\n" );
+               fprintf( f, "\t\t\t*MAP_TYPE\tScreen\r\n" );
+               fprintf( f, "\t\t\t*BITMAP\t\"%s\\lm_%04d.tga\"\r\n", base, lightmapNum );
+               fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" );
+               fprintf( f, "\t\t}\r\n" );
+       }
        
        fprintf( f, "\t}\r\n" );
 }
@@ -377,6 +386,7 @@ int ConvertBSPToASE( char *bspName )
                fprintf( f, "\t*MATERIAL_COUNT\t%d\r\n", lightmapCount );
                for( i = 0; i < lightmapCount; i++ )
                        ConvertLightmap( f, base, i );
+               numLightmapsASE = lightmapCount;
        }
        else
        {