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

.ase also works from .map!

Browse Source
This commit is contained in:
Rudolf Polzer
2010-10-09 19:37:43 +02:00
parent 1b73f1f78b
commit 8442ecbb14
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/quake3/q3map2/convert_map.c
View File

@@ -493,7 +493,10 @@ static void ConvertBrush( FILE *f, int num, bspBrush_t *brush, vec3_t origin, qb
if(strncmp(buildSide->shaderInfo->shader, "textures/common/", 16))
if(strcmp(buildSide->shaderInfo->shader, "noshader"))
if(strcmp(buildSide->shaderInfo->shader, "default"))
{
fprintf(stderr, "no matching triangle for brushside using %s (hopefully nobody can see this side anyway)\n", buildSide->shaderInfo->shader);
texture = "common/WTF";
}
MakeNormalVectors( buildPlane->normal, vecs[ 0 ], vecs[ 1 ] );
VectorMA( vec3_origin, buildPlane->dist, buildPlane->normal, pts[ 0 ] );

6
tools/quake3/q3map2/main.c
View File

@@ -1508,14 +1508,14 @@ int ConvertBSPMain( int argc, char **argv )
int i;
int (*convertFunc)( char * );
game_t *convertGame;
qboolean map_allowed;
char ext[1024];
qboolean map_allowed;
/* set default */
convertFunc = ConvertBSPToASE;
convertGame = NULL;
map_allowed = qfalse;
map_allowed = qtrue;
/* arg checking */
if( argc < 1 )
@@ -1534,6 +1534,7 @@ int ConvertBSPMain( int argc, char **argv )
if( !Q_stricmp( argv[ i ], "ase" ) )
{
convertFunc = ConvertBSPToASE;
map_allowed = qtrue;
}
else if( !Q_stricmp( argv[ i ], "map_bp" ) )
{
@@ -1548,6 +1549,7 @@ int ConvertBSPMain( int argc, char **argv )
else
{
convertGame = GetGame( argv[ i ] );
map_allowed = qfalse;
if( convertGame == NULL )
Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
}