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

q3map2: * fix map region -light compilation: load lights from .reg, not .map

Browse Source
This commit is contained in:
Garux
2018-12-21 14:45:12 +03:00
parent 45a0c71543
commit 674eacf842
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/quake3/q3map2/light.c
View File

@@ -2109,7 +2109,6 @@ void LightWorld( qboolean fastAllocate ){
int LightMain( int argc, char **argv ){
int i;
float f;
char mapSource[ 1024 ];
const char *value;
int lightmapMergeSize = 0;
qboolean lightSamplesInsist = qfalse;
@@ -2996,9 +2995,12 @@ int LightMain( int argc, char **argv ){
strcpy( source, ExpandArg( argv[ i ] ) );
StripExtension( source );
DefaultExtension( source, ".bsp" );
strcpy( mapSource, ExpandArg( argv[ i ] ) );
StripExtension( mapSource );
DefaultExtension( mapSource, ".map" );
strcpy( name, ExpandArg( argv[ i ] ) );
if ( strcmp( name + strlen( name ) - 4, ".reg" ) ) { /* not .reg */
StripExtension( name );
DefaultExtension( name, ".map" );
}
/* ydnar: set default sample size */
SetDefaultSampleSize( sampleSize );
@@ -3025,7 +3027,7 @@ int LightMain( int argc, char **argv ){
/* load map file */
value = ValueForKey( &entities[ 0 ], "_keepLights" );
if ( value[ 0 ] != '1' ) {
LoadMapFile( mapSource, qtrue, qfalse );
LoadMapFile( name, qtrue, qfalse );
}
/* set the entity/model origins and init yDrawVerts */