X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_linux.c;h=637cf29e245ae2447641096ed976c2559b4bf379;hp=9b6aa09e0c5b58fe594992581dda07ff944a0032;hb=a563a5248b0ec2278c6ffd1d7f6d39d4c6b7a15c;hpb=7403ba135fe27515470bfc6a7f8980869ccfee76

diff --git a/sys_linux.c b/sys_linux.c
index 9b6aa09e..637cf29e 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,5 +1,6 @@
 
 #ifdef WIN32
+#include <io.h>
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -13,7 +14,7 @@
 
 
 #ifdef WIN32
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"};
 #endif
 
 
@@ -51,7 +52,22 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-	fprintf(stdout, "%s", text);
+#ifndef WIN32
+	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
+	int origflags = fcntl (1, F_GETFL, 0);
+	fcntl (1, F_SETFL, origflags & ~FNDELAY);
+#endif
+	while(*text)
+	{
+		int written = (int)write(1, text, (int)strlen(text));
+		if(written <= 0)
+			break; // sorry, I cannot do anything about this error - without an output
+		text += written;
+	}
+#ifndef WIN32
+	fcntl (1, F_SETFL, origflags);
+#endif
+	//fprintf(stdout, "%s", text);
 }
 
 double Sys_DoubleTime (void)
@@ -60,6 +76,7 @@ double Sys_DoubleTime (void)
 	static double oldtime = 0.0, curtime = 0.0;
 	double newtime;
 #ifdef WIN32
+#include <mmsystem.h>
 	// LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
 	if (sys_usetimegettime.integer)
 	{
@@ -223,8 +240,6 @@ void Sys_Init_Commands (void)
 
 int main (int argc, char **argv)
 {
-	double frameoldtime, framenewtime;
-
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
@@ -234,17 +249,7 @@ int main (int argc, char **argv)
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-	Host_Init();
-
-	frameoldtime = Sys_DoubleTime () - 0.1;
-	while (1)
-	{
-		// find time spent rendering last frame
-		framenewtime = Sys_DoubleTime ();
+	Host_Main();
 
-		Host_Frame (framenewtime - frameoldtime);
-
-		frameoldtime = framenewtime;
-	}
 	return 0;
 }