Merge intoverflow.h into qdefs.h

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index 12b4174a2ea653f7fd15bc86f8528aa79e7d314b..8ae3bbe9d239a791189e0a74d078917c33941b09 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -83,7 +83,7 @@ void Sys_Error (const char *error, ...)
        if (!in_sys_error1)
        {
                in_sys_error1 = 1;
-               Host_Shutdown ();
+               //Host_Shutdown ();
        }
 
 // shut down QHOST hooks if necessary
@@ -135,25 +135,16 @@ char *Sys_ConsoleInput (void)
        for ( ;; )
        {
                if (!GetNumberOfConsoleInputEvents (hinput, &numevents))
-               {
-                       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))
-               {
-                       cls.state = ca_disconnected;
                        Sys_Error ("Error reading console input (error code %x)", (unsigned int)GetLastError());
-               }
 
                if (numread != 1)
-               {
-                       cls.state = ca_disconnected;
                        Sys_Error ("Couldn't read console input (error code %x)", (unsigned int)GetLastError());
-               }
 
                if (recs[0].EventType == KEY_EVENT)
                {
@@ -243,7 +234,7 @@ void Sys_InitConsole (void)
 
        // LadyHavoc: can't check cls.state because it hasn't been initialized yet
        // if (cls.state == ca_dedicated)
-       if (COM_CheckParm("-dedicated"))
+       if (Sys_CheckParm("-dedicated"))
        {
                //if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) // LadyHavoc: on Windows XP this is never 0 or invalid, but hinput is invalid
                {
@@ -261,19 +252,19 @@ void Sys_InitConsole (void)
 #define atoi _atoi64
 #endif
        // give QHOST a chance to hook into the console
-               if ((t = COM_CheckParm ("-HFILE")) > 0)
+               if ((t = Sys_CheckParm ("-HFILE")) > 0)
                {
                        if (t < sys.argc)
                                hFile = (HANDLE)atoi (sys.argv[t+1]);
                }
 
-               if ((t = COM_CheckParm ("-HPARENT")) > 0)
+               if ((t = Sys_CheckParm ("-HPARENT")) > 0)
                {
                        if (t < sys.argc)
                                heventParent = (HANDLE)atoi (sys.argv[t+1]);
                }
 
-               if ((t = COM_CheckParm ("-HCHILD")) > 0)
+               if ((t = Sys_CheckParm ("-HCHILD")) > 0)
                {
                        if (t < sys.argc)
                                heventChild = (HANDLE)atoi (sys.argv[t+1]);
@@ -361,6 +352,9 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 
        Sys_ProvideSelfFD();
 
+       // used by everything
+       Memory_Init();
+
        Host_Main();
 
        Sys_Quit(0);
@@ -392,7 +386,7 @@ int main (int argc, const char* argv[])
 }
 #endif
 
-qboolean sys_supportsdlgetticks = false;
+qbool sys_supportsdlgetticks = false;
 unsigned int Sys_SDL_GetTicks (void)
 {
        Sys_Error("Called Sys_SDL_GetTicks on non-SDL target");