X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_linux.c;h=725eecace8dc1b10d9205ef7ab488fa0e24f0b6c;hb=4915376d9debe00084f449c65dced6cc3d937617;hp=13bc04f4ecee5a0fbbdead531fb518c15c1c08da;hpb=267196599b7ec2c80c47f1514b4f2f594fabe4af;p=xonotic%2Fdarkplaces.git

diff --git a/sys_linux.c b/sys_linux.c
index 13bc04f4..725eecac 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>
@@ -58,7 +59,7 @@ void Sys_PrintToTerminal(const char *text)
 #endif
 	while(*text)
 	{
-		ssize_t written = write(1, text, strlen(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;
@@ -75,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)
 	{
@@ -212,14 +214,16 @@ char *Sys_ConsoleInput(void)
 	return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
+void Sys_Sleep(int microseconds)
 {
-	if (milliseconds < 1)
-		milliseconds = 1;
 #ifdef WIN32
-	Sleep(milliseconds);
+	if (microseconds < 1000)
+		microseconds = 1000;
+	Sleep(microseconds / 1000);
 #else
-	usleep(milliseconds * 1000);
+	if (microseconds < 1)
+		microseconds = 1;
+	usleep(microseconds);
 #endif
 }
 
@@ -238,8 +242,6 @@ void Sys_Init_Commands (void)
 
 int main (int argc, char **argv)
 {
-	double frameoldtime, framenewtime;
-
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
@@ -249,17 +251,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;
 }