make csqc entity sounds follow their entity

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index f86b03e054f1315cdbcd8611a1c0580d9ed41f0a..928d842266dbc2f7a4fa13e381418f53c835d10a 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -22,7 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include <windows.h>
 #include <mmsystem.h>
+#ifdef SUPPORTDIRECTX
 #include <dsound.h>
+#endif
 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
@@ -32,10 +34,12 @@ cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows
 
 HANDLE                         hinput, houtput;
 
+#ifdef QHOST
 static HANDLE  tevent;
 static HANDLE  hFile;
 static HANDLE  heventParent;
 static HANDLE  heventChild;
+#endif
 
 
 /*
@@ -92,14 +96,18 @@ void Sys_Error (const char *error, ...)
 
 void Sys_Shutdown (void)
 {
+#ifdef QHOST
        if (tevent)
                CloseHandle (tevent);
+#endif
 
        if (cls.state == ca_dedicated)
                FreeConsole ();
 
+#ifdef QHOST
 // shut down QHOST hooks if necessary
        DeinitConProc ();
+#endif
 }
 
 void Sys_PrintToTerminal(const char *text)
@@ -186,6 +194,10 @@ double Sys_DoubleTime (void)
                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 if (newtime > oldtime + 1800)
+       {
+               Con_Printf("Sys_DoubleTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
+       }
        else
                curtime += newtime - oldtime;
        oldtime = newtime;
@@ -205,20 +217,28 @@ char *Sys_ConsoleInput (void)
        if (cls.state != ca_dedicated)
                return NULL;
 
-
        for ( ;; )
        {
                if (!GetNumberOfConsoleInputEvents (hinput, &numevents))
-                       Sys_Error ("Error getting # of console events");
+               {
+                       cls.state = ca_disconnected;
+                       Sys_Error ("Error getting # of console events (error code %x)", (unsigned int)GetLastError());
+               }
 
                if (numevents <= 0)
                        break;
 
                if (!ReadConsoleInput(hinput, recs, 1, &numread))
-                       Sys_Error ("Error reading console input");
+               {
+                       cls.state = ca_disconnected;
+                       Sys_Error ("Error reading console input (error code %x)", (unsigned int)GetLastError());
+               }
 
                if (numread != 1)
-                       Sys_Error ("Couldn't read console input");
+               {
+                       cls.state = ca_disconnected;
+                       Sys_Error ("Couldn't read console input (error code %x)", (unsigned int)GetLastError());
+               }
 
                if (recs[0].EventType == KEY_EVENT)
                {
@@ -249,7 +269,7 @@ char *Sys_ConsoleInput (void)
                                                break;
 
                                        default:
-                                               if (ch >= ' ')
+                                               if (ch >= (int) (unsigned char) ' ')
                                                {
                                                        WriteFile(houtput, &ch, 1, &dummy, NULL);
                                                        text[len] = ch;
@@ -268,8 +288,6 @@ char *Sys_ConsoleInput (void)
 
 void Sys_Sleep(int microseconds)
 {
-       if (microseconds < 1000)
-               microseconds = 1000;
        Sleep(microseconds / 1000);
 }
 
@@ -300,6 +318,7 @@ char *Sys_GetClipboardData (void)
 
 void Sys_InitConsole (void)
 {
+#ifdef QHOST
        int t;
 
        // initialize the windows dedicated server console if needed
@@ -307,6 +326,7 @@ void Sys_InitConsole (void)
 
        if (!tevent)
                Sys_Error ("Couldn't create event");
+#endif
 
        houtput = GetStdHandle (STD_OUTPUT_HANDLE);
        hinput = GetStdHandle (STD_INPUT_HANDLE);
@@ -315,16 +335,18 @@ void Sys_InitConsole (void)
        // if (cls.state == ca_dedicated)
        if (COM_CheckParm("-dedicated"))
        {
-               if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE))
+               //if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) // LordHavoc: on Windows XP this is never 0 or invalid, but hinput is invalid
                {
-                   AllocConsole ();
-                   houtput = GetStdHandle (STD_OUTPUT_HANDLE);
-                   hinput = GetStdHandle (STD_INPUT_HANDLE);
+                       if (!AllocConsole ())
+                               Sys_Error ("Couldn't create dedicated server console (error code %x)", (unsigned int)GetLastError());
+                       houtput = GetStdHandle (STD_OUTPUT_HANDLE);
+                       hinput = GetStdHandle (STD_INPUT_HANDLE);
                }
                if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE))
                        Sys_Error ("Couldn't create dedicated server console");
 
 
+#ifdef QHOST
 #ifdef _WIN64
 #define atoi _atoi64
 #endif
@@ -348,6 +370,7 @@ void Sys_InitConsole (void)
                }
 
                InitConProc (hFile, heventParent, heventChild);
+#endif
        }
 
 // because sound is off until we become active
@@ -400,7 +423,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        // FIXME: this tokenizer is rather redundent, call a more general one
        while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
        {
-               while (*lpCmdLine && *lpCmdLine <= ' ')
+               while (*lpCmdLine && ISWHITESPACE(*lpCmdLine))
                        lpCmdLine++;
 
                if (!*lpCmdLine)
@@ -420,7 +443,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                        // unquoted word
                        argv[com_argc] = lpCmdLine;
                        com_argc++;
-                       while (*lpCmdLine && *lpCmdLine > ' ')
+                       while (*lpCmdLine && !ISWHITESPACE(*lpCmdLine))
                                lpCmdLine++;
                }