removed winsock ipx support

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 52a28285a16dc86924b02d8a5468bf9c4e9f5534..f6f6804f6a158f624902f6ab34fdcf9bd13f4a98 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -1,6 +1,10 @@
 
 #include "quakedef.h"
 #include <time.h>
+#ifndef WIN32
+#include <unistd.h>
+#include <fcntl.h>
+#endif
 
 extern cvar_t  timestamps;
 extern cvar_t  timeformat;
@@ -39,7 +43,7 @@ static char qfont_table[256] = {
        'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
        'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
        '`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
-       'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o', 
+       'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
        'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
        'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
@@ -49,7 +53,7 @@ extern HANDLE hinput, houtput;
 #endif
 
 #define MAX_PRINT_MSG  16384
-void Sys_Printf (char *fmt, ...)
+void Sys_Printf (const char *fmt, ...)
 {
        va_list         argptr;
        char            start[MAX_PRINT_MSG];   // String we started with
@@ -65,55 +69,63 @@ void Sys_Printf (char *fmt, ...)
 #endif
 
        va_start (argptr, fmt);
-#ifdef HAVE_VSNPRINTF
        vsnprintf (start, sizeof(start), fmt, argptr);
-#else
-       vsprintf (start, fmt, argptr);
-#endif
        va_end (argptr);
 
        if (sys_nostdout)
                return;
 
-       if (timestamps.value)
+       if (timestamps.integer)
        {
                mytime = time (NULL);
                local = localtime (&mytime);
                strftime (stamp, sizeof (stamp), timeformat.string, local);
-               
+
                snprintf (final, sizeof (final), "%s%s", stamp, start);
        }
        else
                snprintf (final, sizeof (final), "%s", start);
 
-       for (p = (unsigned char *) final; *p; p++)
+       // LordHavoc: make sure the string is terminated
+       final[MAX_PRINT_MSG - 1] = 0;
+       for (p = (unsigned char *) final;*p; p++)
                *p = qfont_table[*p];
 #ifdef WIN32
        if (cls.state == ca_dedicated)
-               WriteFile(houtput, final, strlen (final), &dummy, NULL);        
+               WriteFile(houtput, final, strlen (final), &dummy, NULL);
 #else
-       puts(final);
-#endif
-//     for (p = (unsigned char *) final; *p; p++)
-//             putc (qfont_table[*p], stdout);
-#ifndef WIN32
-       fflush (stdout);
+       printf("%s", final);
 #endif
 }
 
-void Sys_Shared_Init(void)
+
+char engineversion[128];
+
+void Sys_Shared_EarlyInit(void)
 {
-       if (COM_CheckParm("-nostdout"))
-               sys_nostdout = 1;
-       else
-       {
+       const char* os;
+
+       Memory_Init ();
+
+       COM_InitArgv();
+       COM_InitGameType();
+
 #if defined(__linux__)
-               fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
-               printf ("DarkPlaces Linux   GL %.2f build %3i", (float) VERSION, buildnumber);
+       os = "Linux";
 #elif defined(WIN32)
-               printf ("DarkPlaces Windows GL %.2f build %3i", (float) VERSION, buildnumber);
+       os = "Windows";
 #else
-               printf ("DarkPlaces Unknown GL %.2f build %3i", (float) VERSION, buildnumber);
+       os = "Unknown";
 #endif
-       }
+       snprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
+
+       if (COM_CheckParm("-nostdout"))
+               sys_nostdout = 1;
+       else
+               Con_Printf("%s\n", engineversion);
+}
+
+void Sys_Shared_LateInit(void)
+{
 }
+