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

don't write the bsp twice when pseudo compiling

Browse Source
This commit is contained in:
Rudolf Polzer 2010-10-09 21:29:15 +02:00
parent 6980df0b21
commit cf1b60d899
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/quake3/q3map2/bsp.c
View File

@ -978,7 +978,7 @@ int BSPMain( int argc, char **argv )
ProcessAdvertisements(); ProcessAdvertisements();
/* finish and write bsp */ /* finish and write bsp */
EndBSPFile(); EndBSPFile(qtrue);
/* remove temp map source file if appropriate */ /* remove temp map source file if appropriate */
if( strlen( tempSource ) > 0) if( strlen( tempSource ) > 0)

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

@ -1511,7 +1511,7 @@ void PseudoCompileBSP(qboolean need_tree)
EmitBrushes(entity->brushes, &entity->firstBrush, &entity->numBrushes ); EmitBrushes(entity->brushes, &entity->firstBrush, &entity->numBrushes );
EndModel(entity, node); EndModel(entity, node);
} }
EndBSPFile(); EndBSPFile(qfalse);
} }
/* /*

2
tools/quake3/q3map2/q3map2.h
View File

@ -1615,7 +1615,7 @@ void SetLightStyles( void );
int EmitShader( const char *shader, int *contentFlags, int *surfaceFlags ); int EmitShader( const char *shader, int *contentFlags, int *surfaceFlags );
void BeginBSPFile( void ); void BeginBSPFile( void );
void EndBSPFile( void ); void EndBSPFile( qboolean do_write );
void EmitBrushes( brush_t *brushes, int *firstBrush, int *numBrushes ); void EmitBrushes( brush_t *brushes, int *firstBrush, int *numBrushes );
void EmitFogs( void ); void EmitFogs( void );

19
tools/quake3/q3map2/writebsp.c
View File

@ -399,7 +399,7 @@ EndBSPFile()
finishes a new bsp and writes to disk finishes a new bsp and writes to disk
*/ */
void EndBSPFile( void ) void EndBSPFile(qboolean do_write)
{ {
char path[ 1024 ]; char path[ 1024 ];
@ -411,13 +411,16 @@ void EndBSPFile( void )
numBSPEntities = numEntities; numBSPEntities = numEntities;
UnparseEntities(); UnparseEntities();
/* write the surface extra file */ if(do_write)
WriteSurfaceExtraFile( source ); {
/* write the surface extra file */
/* write the bsp */ WriteSurfaceExtraFile( source );
sprintf( path, "%s.bsp", source );
Sys_Printf( "Writing %s\n", path ); /* write the bsp */
WriteBSPFile( path ); sprintf( path, "%s.bsp", source );
Sys_Printf( "Writing %s\n", path );
WriteBSPFile( path );
}
} }