added Print versions of Printf functions and made all calls that do not need formatin...

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 881c560e9fdb7829156d1630f2d96625c7ae7f2d..d1bc7fe60c90029f8bbdcb2e35b4b644fdecdb47 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -49,42 +49,45 @@ static char qfont_table[256] = {
 };
 
 
-#define MAX_PRINT_MSG  16384
-void Sys_Printf (const char *fmt, ...)
-{
-       va_list         argptr;
-       char            start[MAX_PRINT_MSG];   // String we started with
-       char            stamp[MAX_PRINT_MSG];   // Time stamp
-       char            final[MAX_PRINT_MSG];   // String we print
-
-       time_t          mytime = 0;
-       struct tm       *local = NULL;
-
-       unsigned char           *p;
+#define MAXPRINTMSG 16384
 
-       va_start (argptr, fmt);
-       vsnprintf (start, sizeof(start), fmt, argptr);
-       va_end (argptr);
+void Sys_Print(const char *msg)
+{
+       unsigned char *p;
+       // Time stamp
+       char stamp[128];
+       // String we print
+       char final[MAXPRINTMSG];
 
        if (sys_nostdout)
                return;
 
        if (timestamps.integer)
        {
-               mytime = time (NULL);
-               local = localtime (&mytime);
-               strftime (stamp, sizeof (stamp), timeformat.string, local);
-
-               snprintf (final, sizeof (final), "%s%s", stamp, start);
+               time_t mytime = time(NULL);
+               strftime(stamp, sizeof(stamp), timeformat.string, localtime(&mytime));
+               snprintf(final, sizeof(final), "%s%s", stamp, msg);
        }
        else
-               snprintf (final, sizeof (final), "%s", start);
+               strncpy(final, msg, sizeof(final));
 
        // LordHavoc: make sure the string is terminated
-       final[MAX_PRINT_MSG - 1] = 0;
+       final[MAXPRINTMSG-1] = 0;
        for (p = (unsigned char *) final;*p; p++)
                *p = qfont_table[*p];
-       Sys_Print(final);
+       Sys_PrintToTerminal(final);
+}
+
+void Sys_Printf(const char *fmt, ...)
+{
+       va_list argptr;
+       char msg[MAXPRINTMSG];  // String we started with
+
+       va_start(argptr,fmt);
+       vsnprintf(msg,sizeof(msg),fmt,argptr);
+       va_end(argptr);
+
+       Sys_Print(msg);
 }