From 043d08127ab87117ddfd16e8b439f47c6b66a87f Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Sun, 28 Jan 2018 06:46:54 +0100 Subject: [PATCH] reduce more diff noise --- tools/quake3/common/imagelib.c | 2 +- tools/quake3/q3map2/bsp.c | 6 ++++-- tools/quake3/q3map2/facebsp.c | 9 ++++----- tools/quake3/q3map2/game_unvanquished.h | 1 + tools/quake3/q3map2/lightmaps_ydnar.c | 17 ++++++++--------- tools/quake3/q3map2/q3map2.h | 12 ++++++------ 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tools/quake3/common/imagelib.c b/tools/quake3/common/imagelib.c index 73abf2de..5bc5ff71 100644 --- a/tools/quake3/common/imagelib.c +++ b/tools/quake3/common/imagelib.c @@ -1172,7 +1172,7 @@ void WriteTGA( const char *filename, byte *data, int width, int height ) { void WriteTGAGray( const char *filename, byte *data, int width, int height ) { byte buffer[18]; - FILE *f; + FILE *f; memset( buffer, 0, 18 ); buffer[2] = 3; // uncompressed type diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c index 9164c4c2..bbab3f25 100644 --- a/tools/quake3/q3map2/bsp.c +++ b/tools/quake3/q3map2/bsp.c @@ -972,11 +972,13 @@ int BSPMain( int argc, char **argv ){ colorsRGB = qfalse; Sys_Printf( "Colors are linear\n" ); } - else if ( !strcmp( argv[ i ], "-altsplit" ) ) { + else if ( !strcmp( argv[ i ], "-altsplit" ) ) + { Sys_Printf( "Alternate BSP splitting (by 27) enabled\n" ); bspAlternateSplitWeights = qtrue; } - else if ( !strcmp( argv[ i ], "-deep" ) ) { + else if ( !strcmp( argv[ i ], "-deep" ) ) + { Sys_Printf( "Deep BSP tree generation enabled\n" ); deepBSP = qtrue; } diff --git a/tools/quake3/q3map2/facebsp.c b/tools/quake3/q3map2/facebsp.c index aabc2bcc..e5390ede 100644 --- a/tools/quake3/q3map2/facebsp.c +++ b/tools/quake3/q3map2/facebsp.c @@ -77,12 +77,12 @@ void FreeBspFace( face_t *f ) { */ static void SelectSplitPlaneNum( node_t *node, face_t *list, int *splitPlaneNum, int *compileFlags ){ - face_t *split; - face_t *check; - face_t *bestSplit; + face_t *split; + face_t *check; + face_t *bestSplit; int splits, facing, front, back; int side; - plane_t *plane; + plane_t *plane; int value, bestValue; int i; vec3_t normal; @@ -90,7 +90,6 @@ static void SelectSplitPlaneNum( node_t *node, face_t *list, int *splitPlaneNum, int planenum; float sizeBias; - /* ydnar: set some defaults */ *splitPlaneNum = -1; /* leaf */ *compileFlags = 0; diff --git a/tools/quake3/q3map2/game_unvanquished.h b/tools/quake3/q3map2/game_unvanquished.h index a9e7d699..75d6804e 100644 --- a/tools/quake3/q3map2/game_unvanquished.h +++ b/tools/quake3/q3map2/game_unvanquished.h @@ -27,6 +27,7 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2." ------------------------------------------------------------------------------- */ /* Derived from Tremulous support by LinuxManMikeC */ +/* Updated to Unvanquished support by Neumond */ /* marker */ diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.c index 8b44eaf3..1b28ca06 100644 --- a/tools/quake3/q3map2/lightmaps_ydnar.c +++ b/tools/quake3/q3map2/lightmaps_ydnar.c @@ -890,7 +890,6 @@ static int CompareSurfaceInfo( const void *a, const void *b ){ return -1; } - /* then lightmap sample size */ if ( aInfo->sampleSize < bInfo->sampleSize ) { return 1; @@ -2505,7 +2504,7 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ ----------------------------------------------------------------- */ /* note it */ - Sys_Printf( "Subsampling..." ); + Sys_FPrintf( SYS_VRB, "Subsampling..." ); /* walk the list of raw lightmaps */ numUsed = 0; @@ -2973,7 +2972,7 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ if ( noCollapse == qfalse && deluxemap == qfalse ) { /* note it */ - Sys_Printf( "collapsing..." ); + Sys_FPrintf( SYS_VRB, "collapsing..." ); /* set all twin refs to null */ for ( i = 0; i < numRawLightmaps; i++ ) @@ -3042,7 +3041,7 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ ----------------------------------------------------------------- */ /* note it */ - Sys_Printf( "sorting..." ); + Sys_FPrintf( SYS_VRB, "sorting..." ); /* allocate a new sorted list */ if ( sortLightmaps == NULL ) { @@ -3059,7 +3058,7 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ ----------------------------------------------------------------- */ /* note it */ - Sys_Printf( "allocating..." ); + Sys_FPrintf( SYS_VRB, "allocating..." ); /* kill all existing output lightmaps */ if ( outLightmaps != NULL ) { @@ -3112,7 +3111,7 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ ----------------------------------------------------------------- */ /* note it */ - Sys_Printf( "storing..." ); + Sys_FPrintf( SYS_VRB, "storing..." ); /* count the bsp lightmaps and allocate space */ if ( bspLightBytes != NULL ) { @@ -3182,7 +3181,7 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ } if ( numExtLightmaps > 0 ) { - Sys_Printf( "\n" ); + Sys_FPrintf( SYS_VRB, "\n" ); } /* delete unused external lightmaps */ @@ -3203,7 +3202,7 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ ----------------------------------------------------------------- */ /* note it */ - Sys_Printf( "projecting..." ); + Sys_FPrintf( SYS_VRB, "projecting..." ); /* walk the list of surfaces */ for ( i = 0; i < numBSPDrawSurfaces; i++ ) @@ -3482,7 +3481,7 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ } /* finish */ - Sys_Printf( "done.\n" ); + Sys_FPrintf( SYS_VRB, "done.\n" ); /* calc num stored */ numStored = numBSPLightBytes / 3; diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index 7d6cb9a4..46fec5ee 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -1966,7 +1966,7 @@ Q_EXTERN game_t games[] , #include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */ , - #include "game_unvanquished.h" + #include "game_unvanquished.h" /* must be after game_tremulous.h as they share defines! */ , #include "game_tenebrae.h" , @@ -2042,8 +2042,8 @@ Q_EXTERN qboolean nofog Q_ASSIGN( qfalse ); Q_EXTERN qboolean noHint Q_ASSIGN( qfalse ); /* ydnar */ Q_EXTERN qboolean renameModelShaders Q_ASSIGN( qfalse ); /* ydnar */ Q_EXTERN qboolean skyFixHack Q_ASSIGN( qfalse ); /* ydnar */ -Q_EXTERN qboolean bspAlternateSplitWeights Q_ASSIGN( qfalse ); /* 27 */ -Q_EXTERN qboolean deepBSP Q_ASSIGN( qfalse ); /* div0 */ +Q_EXTERN qboolean bspAlternateSplitWeights Q_ASSIGN( qfalse ); /* 27 */ +Q_EXTERN qboolean deepBSP Q_ASSIGN( qfalse ); /* div0 */ Q_EXTERN qboolean maxAreaFaceSurface Q_ASSIGN( qfalse ); /* divVerent */ Q_EXTERN int patchSubdivisions Q_ASSIGN( 8 ); /* ydnar: -patchmeta subdivisions */ @@ -2527,7 +2527,7 @@ Q_EXTERN int allocatedBSPBrushSides Q_ASSIGN( 0 ); Q_EXTERN bspBrushSide_t* bspBrushSides Q_ASSIGN( NULL ); Q_EXTERN int numBSPLightBytes Q_ASSIGN( 0 ); -Q_EXTERN byte *bspLightBytes Q_ASSIGN( NULL ); +Q_EXTERN byte *bspLightBytes Q_ASSIGN( NULL ); //% Q_EXTERN int numBSPGridPoints Q_ASSIGN( 0 ); //% Q_EXTERN byte *bspGridPoints Q_ASSIGN( NULL ); @@ -2539,11 +2539,11 @@ Q_EXTERN int numBSPVisBytes Q_ASSIGN( 0 ); Q_EXTERN byte bspVisBytes[ MAX_MAP_VISIBILITY ]; Q_EXTERN int numBSPDrawVerts Q_ASSIGN( 0 ); -Q_EXTERN bspDrawVert_t *bspDrawVerts Q_ASSIGN( NULL ); +Q_EXTERN bspDrawVert_t *bspDrawVerts Q_ASSIGN( NULL ); Q_EXTERN int numBSPDrawIndexes Q_ASSIGN( 0 ); Q_EXTERN int allocatedBSPDrawIndexes Q_ASSIGN( 0 ); -Q_EXTERN int *bspDrawIndexes Q_ASSIGN( NULL ); +Q_EXTERN int *bspDrawIndexes Q_ASSIGN( NULL ); Q_EXTERN int numBSPDrawSurfaces Q_ASSIGN( 0 ); Q_EXTERN bspDrawSurface_t *bspDrawSurfaces Q_ASSIGN( NULL ); -- 2.39.2