merged matrix4x4 and matrix3x4 into matrixlib, updated makefiles and dsp, some cleanu...

[xonotic/darkplaces.git] / sys_linux.c

diff --git a/sys_linux.c b/sys_linux.c
index 90c959b995a34b6fa7747a44fdfd333924abed11..f006b276cd01a383f932d4686ad6202282e061f2 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -167,11 +167,10 @@ double Sys_DoubleTime (void)
        static double oldtime = 0.0, curtime = 0.0;
        double newtime;
        struct timeval tp;
-       struct timezone tzp;
 
-       gettimeofday(&tp, &tzp);
+       gettimeofday(&tp, NULL);
 
-       newtime = (double) ((unsigned long) tp.tv_sec) + tp.tv_usec/1000000.0;
+       newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
 
        if (first)
        {
@@ -180,12 +179,13 @@ double Sys_DoubleTime (void)
        }
 
        if (newtime < oldtime)
-               Con_Printf("Sys_DoubleTime: time running backwards??\n");
-       else
        {
-               curtime += newtime - oldtime;
-               oldtime = newtime;
+               if (newtime < oldtime - 0.001)
+                       Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
        }
+       else
+               curtime += newtime - oldtime;
+       oldtime = newtime;
 
        return curtime;
 }
@@ -239,7 +239,7 @@ void Sys_Sleep(void)
 
 int main (int c, char **v)
 {
-       double oldtime, newtime;
+       double frameoldtime, framenewtime;
 
        signal(SIGFPE, SIG_IGN);
 
@@ -259,15 +259,15 @@ int main (int c, char **v)
 
        Sys_Shared_LateInit();
 
-       oldtime = Sys_DoubleTime () - 0.1;
+       frameoldtime = Sys_DoubleTime () - 0.1;
        while (1)
        {
                // find time spent rendering last frame
-               newtime = Sys_DoubleTime ();
+               framenewtime = Sys_DoubleTime ();
 
-               Host_Frame (newtime - oldtime);
+               Host_Frame (framenewtime - frameoldtime);
 
-               oldtime = newtime;
+               frameoldtime = framenewtime;
        }
        return 0;
 }