X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fcommon%2Faselib.c;h=bb3be0ea50b1ce99bda7178dc50e3c0b6d9a993d;hb=d3bcf2f5482f883da28116cf87abc30b94064ee4;hp=b60758b85eb1e49f633f277b788fdf789da0ad15;hpb=b9ba9a7bd4ddc4463c94b1c74236920b354e243f;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/common/aselib.c b/tools/quake3/common/aselib.c
index b60758b8..bb3be0ea 100644
--- a/tools/quake3/common/aselib.c
+++ b/tools/quake3/common/aselib.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+   Copyright (C) 1999-2007 id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -19,8 +19,8 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "aselib.h"
+#include "globaldefs.h"
 #include "inout.h"
 
 #include <assert.h>
@@ -114,7 +114,7 @@ static char gl_filename[1024];
 static void ASE_Process( void );
 static void ASE_FreeGeomObject( int ndx );
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if GDEF_OS_LINUX || GDEF_OS_MACOS
 
 static char* strlwr( char* string ){
 	char *cp;
@@ -217,7 +217,7 @@ polyset_t *ASE_GetSurfaceAnimation( int which, int *pNumFrames, int skipFrameSta
 	{
 		numFramesInAnimation = pObject->anim.numFrames;
 		if ( maxFrames != -1 ) {
-			Sys_Printf( "WARNING: ASE_GetSurfaceAnimation maxFrames > numFramesInAnimation\n" );
+			Sys_FPrintf( SYS_WRN, "WARNING: ASE_GetSurfaceAnimation maxFrames > numFramesInAnimation\n" );
 		}
 	}
 
@@ -472,7 +472,7 @@ static void ASE_KeyMAP_DIFFUSE( const char *token ){
 		else
 		{
 			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
@@ -882,7 +882,7 @@ static void ASE_Process( void ){
 			}
 		}
 		else if ( s_token[0] ) {
-			Sys_Printf( "Unknown token '%s'\n", s_token );
+			Error( "Unknown token '%s'\n", s_token );
 		}
 	}