Merge pull request #386 from illwieckz/sysfprintf

More: Using Sys_FPrintf with SYS_WRN and SYS_ERR
This commit is contained in:
Timothee "TTimo" Besset 2016-10-15 18:08:15 -05:00 committed by GitHub
commit 95d4d9c114
7 changed files with 10 additions and 10 deletions

View file

@ -1293,7 +1293,7 @@ tree_t *BrushBSP( bspbrush_t *brushlist, vec3_t mins, vec3_t maxs ){
volume = BrushVolume( b ); volume = BrushVolume( b );
if ( volume < microvolume ) { if ( volume < microvolume ) {
Sys_Printf( "WARNING: entity %i, brush %i: microbrush\n", Sys_FPrintf( SYS_WRN, "WARNING: entity %i, brush %i: microbrush\n",
b->original->entitynum, b->original->brushnum ); b->original->entitynum, b->original->brushnum );
} }

View file

@ -653,7 +653,7 @@ int GetEdge2( int v1, int v2, face_t *f ){
} }
#if 0 #if 0
if ( v1 == edge->v[0] && v2 == edge->v[1] ) { if ( v1 == edge->v[0] && v2 == edge->v[1] ) {
Sys_Printf( "WARNING: multiple forward edge\n" ); Sys_FPrintf( SYS_WRN, "WARNING: multiple forward edge\n" );
return i; return i;
} }
#endif #endif

View file

@ -874,7 +874,7 @@ void CreateDirectLights( void ){
if ( target[0] ) { // point towards target if ( target[0] ) { // point towards target
e2 = FindTargetEntity( target ); e2 = FindTargetEntity( target );
if ( !e2 ) { if ( !e2 ) {
Sys_Printf( "WARNING: light at (%i %i %i) has missing target\n", Sys_FPrintf( SYS_WRN, "WARNING: light at (%i %i %i) has missing target\n",
(int)dl->origin[0], (int)dl->origin[1], (int)dl->origin[2] ); (int)dl->origin[0], (int)dl->origin[1], (int)dl->origin[2] );
} }
else else

View file

@ -649,7 +649,7 @@ int main( int argc, char **argv ){
Sys_Printf( "Game: %s\n", game ); Sys_Printf( "Game: %s\n", game );
if ( !do_info && !do_bsp && !do_vis && !do_rad ) { if ( !do_info && !do_bsp && !do_vis && !do_rad ) {
Sys_Printf( "ERROR: -bsp, -vis, -light, nor -info specified.\nWhat to you want me to do?\n\n" ); Sys_FPrintf( SYS_ERR, "ERROR: -bsp, -vis, -light, nor -info specified.\nWhat to you want me to do?\n\n" );
} }
else else
{ {

View file

@ -554,13 +554,13 @@ void MakeTreePortals_r( node_t *node ){
CalcNodeBounds( node ); CalcNodeBounds( node );
if ( node->mins[0] >= node->maxs[0] ) { if ( node->mins[0] >= node->maxs[0] ) {
Sys_Printf( "WARNING: node without a volume\n" ); Sys_FPrintf( SYS_WRN, "WARNING: node without a volume\n" );
} }
for ( i = 0 ; i < 3 ; i++ ) for ( i = 0 ; i < 3 ; i++ )
{ {
if ( node->mins[i] < -8000 || node->maxs[i] > 8000 ) { if ( node->mins[i] < -8000 || node->maxs[i] > 8000 ) {
Sys_Printf( "WARNING: node with unbounded volume\n" ); Sys_FPrintf( SYS_WRN, "WARNING: node with unbounded volume\n" );
break; break;
} }
} }
@ -756,7 +756,7 @@ void FloodAreas_r( node_t *node ){
// note the current area as bounding the portal // note the current area as bounding the portal
if ( e->portalareas[1] ) { if ( e->portalareas[1] ) {
Sys_Printf( "WARNING: areaportal entity %i touches > 2 areas\n", b->original->entitynum ); Sys_FPrintf( SYS_WRN, "WARNING: areaportal entity %i touches > 2 areas\n", b->original->entitynum );
return; return;
} }
if ( e->portalareas[0] ) { if ( e->portalareas[0] ) {
@ -854,7 +854,7 @@ void SetAreaPortalAreas_r( node_t *node ){
e = &entities[b->original->entitynum]; e = &entities[b->original->entitynum];
node->area = e->portalareas[0]; node->area = e->portalareas[0];
if ( !e->portalareas[1] ) { if ( !e->portalareas[1] ) {
Sys_Printf( "WARNING: areaportal entity %i doesn't touch two areas\n", b->original->entitynum ); Sys_FPrintf( SYS_WRN, "WARNING: areaportal entity %i doesn't touch two areas\n", b->original->entitynum );
return; return;
} }
} }

View file

@ -209,7 +209,7 @@ void ClusterMerge( int leafnum ){
numvis = LeafVectorFromPortalVector( portalvector, uncompressed ); numvis = LeafVectorFromPortalVector( portalvector, uncompressed );
if ( uncompressed[leafnum >> 3] & ( 1 << ( leafnum & 7 ) ) ) { if ( uncompressed[leafnum >> 3] & ( 1 << ( leafnum & 7 ) ) ) {
Sys_Printf( "WARNING: Leaf portals saw into leaf\n" ); Sys_FPrintf( SYS_WRN, "WARNING: Leaf portals saw into leaf\n" );
} }
uncompressed[leafnum >> 3] |= ( 1 << ( leafnum & 7 ) ); uncompressed[leafnum >> 3] |= ( 1 << ( leafnum & 7 ) );

View file

@ -472,7 +472,7 @@ static void ASE_KeyMAP_DIFFUSE( const char *token ){
else else
{ {
sprintf( ase.materials[ase.numMaterials].name, "(not converted: '%s')", bitmap ); sprintf( ase.materials[ase.numMaterials].name, "(not converted: '%s')", bitmap );
Sys_Printf( "WARNING: illegal material name '%s'\n", bitmap ); Sys_FPrintf( SYS_WRN, "WARNING: illegal material name '%s'\n", bitmap );
} }
} }
else else