renamed MATERIALFLAG_WATER to MATERIALFLAG_WATERSCROLL

[xonotic/darkplaces.git] / sys_linux.c

diff --git a/sys_linux.c b/sys_linux.c
index 1edb74ddcf42ed8421f6eb18dfda882372626fab..6a876d1b029086fce435cb5e0d1c6027c1ff6833 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,3 +1,4 @@
+#include "quakedef.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -10,8 +11,6 @@
 
 #include <signal.h>
 
-#include "quakedef.h"
-
 
 #ifdef WIN32
 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)"};
@@ -76,6 +75,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)
        {
@@ -213,14 +213,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
 }
 
@@ -239,8 +241,6 @@ void Sys_Init_Commands (void)
 
 int main (int argc, char **argv)
 {
-       double frameoldtime, framenewtime;
-
        signal(SIGFPE, SIG_IGN);
 
        com_argc = argc;
@@ -250,17 +250,7 @@ int main (int argc, char **argv)
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-       Host_Init();
+       Host_Main();
 
-       frameoldtime = Sys_DoubleTime () - 0.1;
-       while (1)
-       {
-               // find time spent rendering last frame
-               framenewtime = Sys_DoubleTime ();
-
-               Host_Frame (framenewtime - frameoldtime);
-
-               frameoldtime = framenewtime;
-       }
        return 0;
 }