changed Sys_Error to not put up a messagebox if in dedicated mode, and cleaned it...

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index d5298cc2c6638f71da1d1497c43299acf4686e4f..c2892da98a24ef55e0994f3197728190ac781840 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -64,22 +64,26 @@ void Sys_Error (const char *error, ...)
        static int      in_sys_error0 = 0;
        static int      in_sys_error1 = 0;
        static int      in_sys_error2 = 0;
+       static int      in_sys_error3 = 0;
 
        va_start (argptr, error);
        vsnprintf (text, sizeof (text), error, argptr);
        va_end (argptr);
 
+       Con_Printf ("Quake Error: %s\n", text);
+
        // close video so the message box is visible, unless we already tried that
        if (!in_sys_error0 && cls.state != ca_dedicated)
        {
                in_sys_error0 = 1;
-               VID_Shutdown();     
+               VID_Shutdown();
        }
-       MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 
-       Con_Print ("Quake Error: ");
-       Con_Print (text);
-       Con_Print ("\n");
+       if (!in_sys_error3 && cls.state != ca_dedicated)
+       {
+               in_sys_error3 = true;
+               MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+       }
 
        if (!in_sys_error1)
        {
@@ -91,7 +95,7 @@ void Sys_Error (const char *error, ...)
        if (!in_sys_error2)
        {
                in_sys_error2 = 1;
-               DeinitConProc ();
+               Sys_Shutdown ();
        }
 
        exit (1);
@@ -404,21 +408,18 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
        // give QHOST a chance to hook into the console
-// COMMANDLINEOPTION: -HFILE is used by QHOST to hook into the windows dedicated server console window
                if ((t = COM_CheckParm ("-HFILE")) > 0)
                {
                        if (t < com_argc)
                                hFile = (HANDLE)atoi (com_argv[t+1]);
                }
 
-// COMMANDLINEOPTION: -HPARENT is used by QHOST to hook into the windows dedicated server console window
                if ((t = COM_CheckParm ("-HPARENT")) > 0)
                {
                        if (t < com_argc)
                                heventParent = (HANDLE)atoi (com_argv[t+1]);
                }
 
-// COMMANDLINEOPTION: -HCHILD is used by QHOST to hook into the windows dedicated server console window
                if ((t = COM_CheckParm ("-HCHILD")) > 0)
                {
                        if (t < com_argc)