console: improve default text legibility and background alpha behaviour

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index d8d98795f6ac0a89fa80616e48569302e50c248a..7ce6406d21faeee15b6749d5b9ba9b0431b8d565 100644 (file)
--- a/host.c
+++ b/host.c
@@ -44,7 +44,6 @@ host_static_t host;
 cvar_t host_framerate = {CF_CLIENT | CF_SERVER, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"};
 // shows time used by certain subsystems
 cvar_t host_speeds = {CF_CLIENT | CF_SERVER, "host_speeds","0", "reports how much time is used in server/graphics/sound"};
-cvar_t host_maxwait = {CF_CLIENT | CF_SERVER, "host_maxwait","1000", "maximum sleep time requested from the operating system in millisecond. Larger sleeps will be done using multiple host_maxwait length sleeps. Lowering this value will increase CPU load, but may help working around problems with accuracy of sleep times."};
 
 cvar_t developer = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "developer","0", "shows debugging messages and information (recommended for all developers and level designers); the value -1 also suppresses buffering and logging these messages"};
 cvar_t developer_extra = {CF_CLIENT | CF_SERVER, "developer_extra", "0", "prints additional debugging messages, often very verbose!"};
@@ -105,12 +104,12 @@ void Host_Error (const char *error, ...)
        Con_Printf(CON_ERROR "Host_Error: %s\n", hosterrorstring1);
 
        // LadyHavoc: if crashing very early, or currently shutting down, do
-       // Sys_Abort instead
+       // Sys_Error instead
        if (host.framecount < 3 || host.state == host_shutdown)
-               Sys_Abort ("Host_Error during %s: %s", host.framecount < 3 ? "startup" : "shutdown", hosterrorstring1);
+               Sys_Error ("Host_Error during %s: %s", host.framecount < 3 ? "startup" : "shutdown", hosterrorstring1);
 
        if (hosterror)
-               Sys_Abort ("Host_Error: recursively entered (original error was: %s    new error is: %s)", hosterrorstring2, hosterrorstring1);
+               Sys_Error ("Host_Error: recursively entered (original error was: %s    new error is: %s)", hosterrorstring2, hosterrorstring1);
        hosterror = true;
 
        dp_strlcpy(hosterrorstring2, hosterrorstring1, sizeof(hosterrorstring2));
@@ -125,7 +124,7 @@ void Host_Error (const char *error, ...)
                host.hook.SV_Shutdown();
 
        if (cls.state == ca_dedicated)
-               Sys_Abort("Host_Error: %s", hosterrorstring1);        // dedicated servers exit
+               Sys_Error("Host_Error: %s", hosterrorstring1);        // dedicated servers exit
 
        // prevent an endless loop if the error was triggered by a command
        Cbuf_Clear(cmd_local->cbuf);
@@ -253,12 +252,13 @@ static void Host_LoadConfig_f(cmd_state_t *cmd)
        // Xonotic QC complains/breaks if its cvars are deleted before its m_shutdown() is called
        if(MR_Shutdown)
                MR_Shutdown();
-       // append a menu restart command to execute after the config
-       Cbuf_AddText(cmd, "\nmenu_restart\n");
 #endif
-       // reset all cvars, commands and aliases to init values
        Cmd_RestoreInitState();
-       // reset cvars to their defaults, and then exec startup scripts again
+#ifdef CONFIG_MENU
+       // Must re-add menu.c commands or load menu.dat before executing quake.rc or handling events
+       MR_Init();
+#endif
+       // exec startup scripts again
        Host_AddConfigText(cmd);
 }
 
@@ -278,7 +278,6 @@ static void Host_InitLocal (void)
        Cvar_RegisterVariable (&host_framerate);
        Cvar_RegisterCallback (&host_framerate, Host_Framerate_c);
        Cvar_RegisterVariable (&host_speeds);
-       Cvar_RegisterVariable (&host_maxwait);
        Cvar_RegisterVariable (&host_isclient);
 
        Cvar_RegisterVariable (&developer);
@@ -340,7 +339,7 @@ void Host_LockSession(void)
                        }
                        else
                        {
-                               Sys_Abort("session lock %s could not be acquired. Please run with -sessionid and an unique session name.\n", p);
+                               Sys_Error("session lock %s could not be acquired. Please run with -sessionid and an unique session name.\n", p);
                        }
                }
        }
@@ -385,7 +384,7 @@ static void Host_Init (void)
        host.state = host_init;
 
        if (setjmp(host.abortframe)) // Huh?!
-               Sys_Abort("Engine initialization failed. Check the console (if available) for additional information.\n");
+               Sys_Error("Engine initialization failed. Check the console (if available) for additional information.\n");
 
        if (Sys_CheckParm("-profilegameonly"))
                Sys_AllowProfiling(false);
@@ -683,7 +682,7 @@ void Host_Main(void)
        oldtime = Sys_DirtyTime();
 
        // Main event loop
-       while(host.state != host_shutdown)
+       while(host.state < host_shutdown) // see Sys_HandleCrash() comments
        {
                // Something bad happened, or the server disconnected
                if (setjmp(host.abortframe))