another WIN32_LEAN_AND_MEAN patch from Willis, this one for non-SDL client and dedica...

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index c0ae22af3006c3230409385a0cc0dbb763e418b1..c5fdb0c35581bb9dfcb381ad0e66180b27e7b7a8 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;
 
@@ -50,7 +51,7 @@ SYSTEM IO
 void Sys_Error (const char *error, ...)
 {
        va_list         argptr;
-       char            text[1024];
+       char            text[MAX_INPUTLINE];
        static int      in_sys_error0 = 0;
        static int      in_sys_error1 = 0;
        static int      in_sys_error2 = 0;
@@ -158,7 +159,7 @@ double Sys_DoubleTime (void)
 
                if (!QueryPerformanceFrequency (&PerformanceFreq))
                {
-                       Con_Printf ("No hardware timer available");
+                       Con_Printf ("No hardware timer available\n");
                        // fall back to timeGetTime
                        Cvar_SetValueQuick(&sys_usetimegettime, true);
                        return Sys_DoubleTime();
@@ -196,7 +197,7 @@ double Sys_DoubleTime (void)
 
 char *Sys_ConsoleInput (void)
 {
-       static char text[256];
+       static char text[MAX_INPUTLINE];
        static int len;
        INPUT_RECORD recs[1024];
        int ch;
@@ -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