From 661e8b00de91fdaed6691b544a0b7f698075e787 Mon Sep 17 00:00:00 2001 From: Garux Date: Wed, 4 Dec 2019 22:18:44 +0300 Subject: [PATCH] use EXTERNAL_LIGHTMAP macro, shorten code --- tools/quake3/q3map2/convert_ase.c | 9 +++------ tools/quake3/q3map2/convert_obj.c | 11 ++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/tools/quake3/q3map2/convert_ase.c b/tools/quake3/q3map2/convert_ase.c index 87e159e8..ade2403b 100644 --- a/tools/quake3/q3map2/convert_ase.c +++ b/tools/quake3/q3map2/convert_ase.c @@ -315,7 +315,7 @@ static void ConvertLightmap( FILE *f, const char *base, int lightmapNum ){ 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\t\"%s\\" EXTERNAL_LIGHTMAP "\"\r\n", base, lightmapNum ); fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" ); fprintf( f, "\t\t}\r\n" ); } @@ -382,14 +382,11 @@ int ConvertBSPToASE( char *bspName ){ for ( ; ; lightmapCount++ ) { char buf[1024]; - FILE *tmp; - snprintf( buf, sizeof( buf ), "%s/lm_%04d.tga", dirname, lightmapCount ); + snprintf( buf, sizeof( buf ), "%s/" EXTERNAL_LIGHTMAP, dirname, lightmapCount ); buf[sizeof( buf ) - 1] = 0; - tmp = fopen( buf, "rb" ); - if ( !tmp ) { + if ( !FileExists( buf ) ) { break; } - fclose( tmp ); } fprintf( f, "\t*MATERIAL_COUNT\t%d\r\n", lightmapCount ); for ( i = 0; i < lightmapCount; i++ ) diff --git a/tools/quake3/q3map2/convert_obj.c b/tools/quake3/q3map2/convert_obj.c index cf8d4c1e..212b750b 100644 --- a/tools/quake3/q3map2/convert_obj.c +++ b/tools/quake3/q3map2/convert_obj.c @@ -198,9 +198,9 @@ static void ConvertLightmapToMTL( FILE *f, const char *base, int lightmapNum ){ fprintf( f, "newmtl lm_%04d\r\n", lightmapNum ); if ( lightmapNum >= 0 ) { /* blender hates this, so let's not do it - fprintf( f, "map_Kd %s\\lm_%04d.tga\r\n", base, lightmapNum ); + fprintf( f, "map_Kd %s\\" EXTERNAL_LIGHTMAP "\r\n", base, lightmapNum ); */ - fprintf( f, "map_Kd %s/lm_%04d.tga\r\n", base, lightmapNum ); + fprintf( f, "map_Kd %s/" EXTERNAL_LIGHTMAP "\r\n", base, lightmapNum ); } } @@ -263,14 +263,11 @@ int ConvertBSPToOBJ( char *bspName ){ for ( ; ; lightmapCount++ ) { char buf[1024]; - FILE *tmp; - snprintf( buf, sizeof( buf ), "%s/lm_%04d.tga", dirname, lightmapCount ); + snprintf( buf, sizeof( buf ), "%s/" EXTERNAL_LIGHTMAP, dirname, lightmapCount ); buf[sizeof( buf ) - 1] = 0; - tmp = fopen( buf, "rb" ); - if ( !tmp ) { + if ( !FileExists( buf ) ) { break; } - fclose( tmp ); } lastLightmap = lightmapCount - 1; }