From: bones_was_here Date: Thu, 7 Mar 2024 18:32:06 +0000 (+1000) Subject: Make the Sys_Error() message more informative X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f7732e0c54fca9ee8f9cd76558a86ef1e78c532;p=xonotic%2Fdarkplaces.git Make the Sys_Error() message more informative Re: 24550510e6ff331c1749707df7fad608f618bdd3 as discussed in chat, there was a good reason to change this word: it indicates DP deliberately stopped execution, whereas "Error" is generic (most problems that can happen on a computer are some form of error). Also "Engine Error" makes it sound like there's a bug in DP, which isn't necessarily the case: there are several scenarios where user error can trigger this. This message was already different from Quake's "Quake Error". Signed-off-by: bones_was_here --- diff --git a/sys_shared.c b/sys_shared.c index 646fd9a2..4c714cc0 100644 --- a/sys_shared.c +++ b/sys_shared.c @@ -693,7 +693,7 @@ void Sys_Error (const char *error, ...) dpvsnprintf (string, sizeof (string), error, argptr); va_end (argptr); - Con_Printf(CON_ERROR "Engine Error - %s\n^9%s\n", string, engineversion); + Con_Printf(CON_ERROR "Engine Aborted: %s\n^9%s\n", string, engineversion); dp_strlcat(string, "\n\n", sizeof(string)); dp_strlcat(string, engineversion, sizeof(string)); @@ -709,14 +709,14 @@ void Sys_Error (const char *error, ...) sv.active = false; // make SV_DropClient() skip the QC stuff to avoid recursive errors for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) if (host_client->active) - SV_DropClient(false, "Server abort!"); // closes demo file + SV_DropClient(false, "Server aborted!"); // closes demo file } // don't want a dead window left blocking the OS UI or the abort dialog VID_Shutdown(); S_StopAllSounds(); host.state = host_failed; // make Sys_HandleSignal() call _Exit() - Sys_SDL_Dialog("Engine Error", string); + Sys_SDL_Dialog("Engine Aborted", string); fflush(stderr); exit (1);