Revert renamings from 591877ee0c64958303dcbb4f2af3d343a420cf6a

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index fa733ebf843790abc82ca03f78ca479232a0c718..646fd9a27323c19642244e4474b0057f48b5b1f7 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -382,7 +382,7 @@ double Sys_DirtyTime(void)
                double old_benchmark_time = benchmark_time;
                benchmark_time += 1;
                if(benchmark_time == old_benchmark_time)
-                       Sys_Abort("sys_usenoclockbutbenchmark cannot run any longer, sorry");
+                       Sys_Error("sys_usenoclockbutbenchmark cannot run any longer, sorry");
                return benchmark_time * 0.000001;
        }
 #if HAVE_QUERYPERFORMANCECOUNTER
@@ -463,7 +463,7 @@ double Sys_DirtyTime(void)
        }
 #else
        // fallback for using the SDL timer if no other timer is available
-       // this calls Sys_Abort() if not linking against SDL
+       // this calls Sys_Error() if not linking against SDL
        return (double) Sys_SDL_GetTicks() / 1000.0;
 #endif
 }
@@ -492,7 +492,7 @@ double Sys_Sleep(double time)
                double old_benchmark_time = benchmark_time;
                benchmark_time += microseconds;
                if(benchmark_time == old_benchmark_time)
-                       Sys_Abort("sys_usenoclockbutbenchmark cannot run any longer, sorry");
+                       Sys_Error("sys_usenoclockbutbenchmark cannot run any longer, sorry");
                return 0;
        }
 
@@ -674,7 +674,7 @@ Startup and Shutdown
 ===============================================================================
 */
 
-void Sys_Abort (const char *error, ...)
+void Sys_Error (const char *error, ...)
 {
        va_list argptr;
        char string[MAX_INPUTLINE];
@@ -693,7 +693,7 @@ void Sys_Abort (const char *error, ...)
        dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
 
-       Con_Printf(CON_ERROR "Engine Abort: %s\n^9%s\n", string, engineversion);
+       Con_Printf(CON_ERROR "Engine Error - %s\n^9%s\n", string, engineversion);
 
        dp_strlcat(string, "\n\n", sizeof(string));
        dp_strlcat(string, engineversion, sizeof(string));
@@ -716,7 +716,7 @@ void Sys_Abort (const char *error, ...)
        S_StopAllSounds();
 
        host.state = host_failed; // make Sys_HandleSignal() call _Exit()
-       Sys_SDL_Dialog("Engine Abort", string);
+       Sys_SDL_Dialog("Engine Error", string);
 
        fflush(stderr);
        exit (1);
@@ -985,7 +985,7 @@ static void Sys_HandleCrash(int sig)
        Sys_Print("\n", 1);
 #endif
 
-       // DP8 TODO: send a disconnect message indicating we crashed, see Sys_Abort() and Host_Error()
+       // DP8 TODO: send a disconnect message indicating we crashed, see Sys_Error() and Host_Error()
 
        // don't want a dead window left blocking the OS UI or the crash dialog
        VID_Shutdown();