From 06267e67cb0090aa5201303ac9f38b60465361de Mon Sep 17 00:00:00 2001 From: Garux Date: Tue, 24 Nov 2020 19:59:51 +0300 Subject: [PATCH] repacker: fix odd WARNING3: %s : about to include shader for excluded texture when repack.exclude has texture = shader from game.exclude --- tools/quake3/q3map2/autopk3.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/quake3/q3map2/autopk3.c b/tools/quake3/q3map2/autopk3.c index f2921900..21936920 100644 --- a/tools/quake3/q3map2/autopk3.c +++ b/tools/quake3/q3map2/autopk3.c @@ -1220,9 +1220,6 @@ int repackBSPMain( int argc, char **argv ){ if( ( found = StrList_find( pk3Shaders, token ) ) ){ shader = found - 1; wantShader = true; - if( StrList_find( rExTextures, token ) ) - Sys_FPrintf( SYS_WRN, "WARNING3: %s : about to include shader for excluded texture\n", token ); - } /* handle { } section */ @@ -1408,6 +1405,8 @@ int repackBSPMain( int argc, char **argv ){ wantShader = false; strClear( pk3Shaders->s[shader] ); } + if( wantShader && StrList_find( rExTextures, pk3Shaders->s[shader] ) ) + Sys_FPrintf( SYS_WRN, "WARNING3: %s : about to include shader for excluded texture\n", pk3Shaders->s[shader] ); if ( wantShader && !hasmap ){ Sys_FPrintf( SYS_WRN, "WARNING8: %s : shader has no known maps\n", pk3Shaders->s[shader] ); wantShader = false;