sys_usetimegettime is now initialized at a place where it shouldn't crash anymore...

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index dee6bc51c618064dde845be98bc64287948415c3..151565564a33cbcccd3ddc51cf212ee742a2199e 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sys_win.c -- Win32 system interface code
 
-#define WIN32_USETIMEGETTIME 0
-
 #include "quakedef.h"
 #include "winquake.h"
 #include "errno.h"
@@ -28,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "conproc.h"
 #include "direct.h"
 
+cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+
 // # of seconds to wait on Sys_Error running dedicated before exiting
 #define CONSOLE_ERROR_TIMEOUT  60.0
 // sleep time on pause or minimization
@@ -278,45 +278,52 @@ double Sys_DoubleTime (void)
        static double oldtime = 0.0, curtime = 0.0;
        double newtime;
        // 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 WIN32_USETIMEGETTIME
-       // timeGetTime
-       // platform:
-       // Windows 95/98/ME/NT/2000
-       // features:
-       // reasonable accuracy (millisecond)
-       // issues:
-       // wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter)
-
-       // make sure the timer is high precision, otherwise different versions of windows have varying accuracy
-       if (first)
-               timeBeginPeriod (1);
-
-       newtime = (double) timeGetTime () / 1000.0;
-#else
-       // QueryPerformanceCounter
-       // platform:
-       // Windows 95/98/ME/NT/2000
-       // features:
-       // very accurate (CPU cycles)
-       // known issues:
-       // does not necessarily match realtime too well (tends to get faster and faster in win98)
-       // wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
-       static double timescale = 0.0;
-       LARGE_INTEGER PerformanceFreq;
-       LARGE_INTEGER PerformanceCount;
-
-       if (!QueryPerformanceFrequency (&PerformanceFreq))
-               Sys_Error ("No hardware timer available");
-       QueryPerformanceCounter (&PerformanceCount);
-
-#ifdef __BORLANDC__
-       timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
-       newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
-#else
-       timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
-       newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
-#endif
-#endif
+       if (sys_usetimegettime.integer)
+       {
+               static int firsttimegettime = true;
+               // timeGetTime
+               // platform:
+               // Windows 95/98/ME/NT/2000/XP
+               // features:
+               // reasonable accuracy (millisecond)
+               // issues:
+               // wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter)
+
+               // make sure the timer is high precision, otherwise different versions of windows have varying accuracy
+               if (firsttimegettime)
+               {
+                       timeBeginPeriod (1);
+                       firsttimegettime = false;
+               }
+
+               newtime = (double) timeGetTime () / 1000.0;
+       }
+       else
+       {
+               // QueryPerformanceCounter
+               // platform:
+               // Windows 95/98/ME/NT/2000/XP
+               // features:
+               // very accurate (CPU cycles)
+               // known issues:
+               // does not necessarily match realtime too well (tends to get faster and faster in win98)
+               // wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
+               double timescale;
+               LARGE_INTEGER PerformanceFreq;
+               LARGE_INTEGER PerformanceCount;
+
+               if (!QueryPerformanceFrequency (&PerformanceFreq))
+                       Sys_Error ("No hardware timer available");
+               QueryPerformanceCounter (&PerformanceCount);
+
+               #ifdef __BORLANDC__
+               timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
+               newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
+               #else
+               timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
+               newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
+               #endif
+       }
 
        if (first)
        {
@@ -325,7 +332,11 @@ double Sys_DoubleTime (void)
        }
 
        if (newtime < oldtime)
-               Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
+       {
+               // warn if it's significant
+               if (newtime - oldtime < -0.01)
+                       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;
@@ -523,6 +534,8 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 
        Sys_Shared_EarlyInit();
 
+       Cvar_RegisterVariable(&sys_usetimegettime);
+
        tevent = CreateEvent(NULL, false, false, NULL);
 
        if (!tevent)