X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_shared.c;h=f6f6804f6a158f624902f6ab34fdcf9bd13f4a98;hb=d4ffce6349c1960f435b8877832d88c7c54e17ba;hp=e7b4a810c86b3d35dcd652a9e82ae03393293d7c;hpb=ff5947f97081e10c4ce112d4d51c2d1fa14ebba8;p=xonotic%2Fdarkplaces.git

diff --git a/sys_shared.c b/sys_shared.c
index e7b4a810..f6f6804f 100644
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -43,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',  '{',  '|',  '}',  '~',  '<'
 };
@@ -53,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
@@ -69,11 +69,7 @@ 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)
@@ -100,31 +96,36 @@ void Sys_Printf (char *fmt, ...)
 #else
 	printf("%s", final);
 #endif
-//	for (p = (unsigned char *) final; *p; p++)
-//		putc (qfont_table[*p], stdout);
-//#ifndef WIN32
-//	fflush (stdout);
-//#endif
 }
 
-char engineversion[40];
+
+char engineversion[128];
 
 void Sys_Shared_EarlyInit(void)
 {
+	const char* os;
+
+	Memory_Init ();
+
+	COM_InitArgv();
+	COM_InitGameType();
+
 #if defined(__linux__)
-	sprintf (engineversion, "%s Linux GL build %s", gamename, buildstring);
+	os = "Linux";
 #elif defined(WIN32)
-	sprintf (engineversion, "%s Windows GL build %s", gamename, buildstring);
+	os = "Windows";
 #else
-	sprintf (engineversion, "%s Unknown GL build %s", gamename, buildstring);
+	os = "Unknown";
 #endif
+	snprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
 
 	if (COM_CheckParm("-nostdout"))
 		sys_nostdout = 1;
 	else
-		printf("%s\n", engineversion);
+		Con_Printf("%s\n", engineversion);
 }
 
 void Sys_Shared_LateInit(void)
 {
 }
+