quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consider "textures/system/" jka common folder during map decompilation

Browse Source
This commit is contained in:
Garux 2021-03-09 20:13:42 +03:00
parent 0737e962de
commit 0cff77e30d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/quake3/q3map2/convert_map.cpp
View File

@ -684,14 +684,13 @@ static void ConvertBrush( FILE *f, int num, bspBrush_t *brush, const Vector3& or
} }
else else
{ {
if ( !striEqualPrefix( buildSide->shaderInfo->shader, "textures/common/" ) ) { if ( !striEqualPrefix( buildSide->shaderInfo->shader, "textures/common/" )
if ( !strEqual( buildSide->shaderInfo->shader, "noshader" ) ) { && !striEqualPrefix( buildSide->shaderInfo->shader, "textures/system/" )
if ( !strEqual( buildSide->shaderInfo->shader, "default" ) ) { && !strEqual( buildSide->shaderInfo->shader, "noshader" )
&& !strEqual( buildSide->shaderInfo->shader, "default" ) ) {
//fprintf( stderr, "no matching triangle for brushside using %s (hopefully nobody can see this side anyway)\n", buildSide->shaderInfo->shader ); //fprintf( stderr, "no matching triangle for brushside using %s (hopefully nobody can see this side anyway)\n", buildSide->shaderInfo->shader );
texture = "common/WTF"; texture = "common/WTF";
} }
}
}
if ( brushPrimitives ) { if ( brushPrimitives ) {
fprintf( f, "\t\t( %.3f %.3f %.3f ) ( %.3f %.3f %.3f ) ( %.3f %.3f %.3f ) ( ( %.8f %.8f %.8f ) ( %.8f %.8f %.8f ) ) %s %d 0 0\n", fprintf( f, "\t\t( %.3f %.3f %.3f ) ( %.3f %.3f %.3f ) ( %.3f %.3f %.3f ) ( ( %.8f %.8f %.8f ) ( %.8f %.8f %.8f ) ) %s %d 0 0\n",