more warning fixes

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index 02be56b4393be41479467a02d3c7910a99f982f2..c0ae22af3006c3230409385a0cc0dbb763e418b1 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -108,7 +108,7 @@ void Sys_PrintToTerminal(const char *text)
        DWORD dummy;
        extern HANDLE houtput;
        if (cls.state == ca_dedicated)
-               WriteFile(houtput, text, strlen (text), &dummy, NULL);
+               WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL);
 }
 
 /*
@@ -157,7 +157,12 @@ double Sys_DoubleTime (void)
                LARGE_INTEGER PerformanceCount;
 
                if (!QueryPerformanceFrequency (&PerformanceFreq))
-                       Sys_Error ("No hardware timer available");
+               {
+                       Con_Printf ("No hardware timer available");
+                       // fall back to timeGetTime
+                       Cvar_SetValueQuick(&sys_usetimegettime, true);
+                       return Sys_DoubleTime();
+               }
                QueryPerformanceCounter (&PerformanceCount);
 
                #ifdef __BORLANDC__
@@ -293,6 +298,8 @@ char *Sys_GetClipboardData (void)
 
 void Sys_InitConsole (void)
 {
+       int t;
+
        // initialize the windows dedicated server console if needed
        tevent = CreateEvent(NULL, false, false, NULL);
 
@@ -309,6 +316,9 @@ void Sys_InitConsole (void)
                hinput = GetStdHandle (STD_INPUT_HANDLE);
                houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
+#ifdef WIN64
+#define atoi _atoi64
+#endif
        // give QHOST a chance to hook into the console
                if ((t = COM_CheckParm ("-HFILE")) > 0)
                {
@@ -362,7 +372,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 {
        double frameoldtime, framenewtime;
        MEMORYSTATUS lpBuffer;
-       int t;
 
        /* previous instances do not exist in Win32 */
        if (hPrevInstance)