conback lives... again!

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index b9b4cd387de985b9a3359ca78bc23ed6d1b31068..27041f6d6a5d712080557fa0a711df6ff789e8c6 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 #include "errno.h"
 #include "resource.h"
@@ -29,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern void S_BlockSound (void);
 
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+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)"};
 
 HANDLE                         hinput, houtput;
 
@@ -286,7 +287,7 @@ char *Sys_GetClipboardData (void)
                {
                        if ((cliptext = GlobalLock (hClipboardData)) != 0)
                        {
-                               data = malloc (GlobalSize(hClipboardData)+1);
+                               data = Z_Malloc (GlobalSize(hClipboardData)+1);
                                strcpy (data, cliptext);
                                GlobalUnlock (hClipboardData);
                        }
@@ -316,7 +317,7 @@ void Sys_InitConsole (void)
                hinput = GetStdHandle (STD_INPUT_HANDLE);
                houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
-#ifdef WIN64
+#ifdef _WIN64
 #define atoi _atoi64
 #endif
        // give QHOST a chance to hook into the console
@@ -370,7 +371,6 @@ char                program_name[MAX_OSPATH];
 
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-       double frameoldtime, framenewtime;
        MEMORYSTATUS lpBuffer;
 
        /* previous instances do not exist in Win32 */
@@ -423,17 +423,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                }
        }
 
-       Host_Init ();
-
-       frameoldtime = Sys_DoubleTime ();
-
-       /* main window message loop */
-       while (1)
-       {
-               framenewtime = Sys_DoubleTime ();
-               Host_Frame (framenewtime - frameoldtime);
-               frameoldtime = framenewtime;
-       }
+       Host_Main();
 
        /* return success of application */
        return true;