various printf/fprintf calls are now Con_Printf, and some other minor cleanups

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5246 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/sys_linux.c b/sys_linux.c
index 3f67c89a6c36d049a02f54f35db23783e14bfd10..f3db25efac8a6dc642ec3f6ffb1b6246a351c4bd 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -42,11 +42,8 @@ void Sys_Error (const char *error, ...)
        va_start (argptr,error);
        dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
-       fprintf(stderr, "Error: %s\n", string);
 
-       Con_Print ("Quake Error: ");
-       Con_Print (string);
-       Con_Print ("\n");
+       Con_Printf ("Quake Error: %s\n", string);
 
        Host_Shutdown ();
        exit (1);
@@ -54,7 +51,7 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-       printf("%s", text);
+       fprintf(stdout, "%s", text);
 }
 
 double Sys_DoubleTime (void)

diff --git a/sys_sdl.c b/sys_sdl.c
index bdefa12255a10eb0e7698774f034dffd80f527cb..39c57df999a2159099295a4015f7d8cfe4f5df47 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -40,11 +40,8 @@ void Sys_Error (const char *error, ...)
        va_start (argptr,error);
        dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
-       fprintf(stderr, "Error: %s\n", string);
 
-       Con_Print ("Quake Error: ");
-       Con_Print (string);
-       Con_Print ("\n");
+       Con_Printf ("Quake Error: %s\n", string);
 
        Host_Shutdown ();
        exit (1);
@@ -52,7 +49,7 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-       printf("%s", text);
+       fprintf(stdout, "%s", text);
 }
 
 double Sys_DoubleTime (void)

diff --git a/vid_glx.c b/vid_glx.c
index efad71fdd0a5b781fb0899252c689ee5cc624c26..fbbb5b08eb063b9cab095b1d200280620cae42e6 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -618,7 +618,7 @@ void VID_Shutdown(void)
 
 void signal_handler(int sig)
 {
-       printf("Received signal %d, exiting...\n", sig);
+       Con_Printf("Received signal %d, exiting...\n", sig);
        VID_RestoreSystemGamma();
        Sys_Quit();
        exit(0);

diff --git a/vid_null.c b/vid_null.c
index 19af599e4ec84bc71fdf902893140bc269b7821d..0b3f0c27b8de7f21cdb43f3b11047df1a4b26545 100644 (file)
--- a/vid_null.c
+++ b/vid_null.c
@@ -28,7 +28,7 @@ void VID_Shutdown(void)
 
 void signal_handler(int sig)
 {
-       printf("Received signal %d, exiting...\n", sig);
+       Con_Printf("Received signal %d, exiting...\n", sig);
        Sys_Quit();
        exit(0);
 }