Skip to content
Snippets Groups Projects
Commit c00d1e54 authored by LJ Sonic's avatar LJ Sonic
Browse files

Merge branch 'no-dedi-sighandle-window' into 'next'

Disable SDL error message on dedicated servers

See merge request !1735
parents 81b0eb1c c49dd5f5
No related branches found
No related tags found
No related merge requests found
...@@ -358,6 +358,7 @@ static void I_ReportSignal(int num, int coredumped) ...@@ -358,6 +358,7 @@ static void I_ReportSignal(int num, int coredumped)
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg); I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
if (!M_CheckParm("-dedicated"))
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Process killed by signal", "Process killed by signal",
sigmsg, NULL); sigmsg, NULL);
...@@ -2202,6 +2203,7 @@ static void newsignalhandler_Warn(const char *pr) ...@@ -2202,6 +2203,7 @@ static void newsignalhandler_Warn(const char *pr)
I_OutputMsg("%s\n", text); I_OutputMsg("%s\n", text);
if (!M_CheckParm("-dedicated"))
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Startup error", "Startup error",
text, NULL); text, NULL);
...@@ -2405,6 +2407,7 @@ void I_Error(const char *error, ...) ...@@ -2405,6 +2407,7 @@ void I_Error(const char *error, ...)
// Implement message box with SDL_ShowSimpleMessageBox, // Implement message box with SDL_ShowSimpleMessageBox,
// which should fail gracefully if it can't put a message box up // which should fail gracefully if it can't put a message box up
// on the target system // on the target system
if (!M_CheckParm("-dedicated"))
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"SRB2 "VERSIONSTRING" Recursive Error", "SRB2 "VERSIONSTRING" Recursive Error",
buffer, NULL); buffer, NULL);
...@@ -2449,6 +2452,7 @@ void I_Error(const char *error, ...) ...@@ -2449,6 +2452,7 @@ void I_Error(const char *error, ...)
// Implement message box with SDL_ShowSimpleMessageBox, // Implement message box with SDL_ShowSimpleMessageBox,
// which should fail gracefully if it can't put a message box up // which should fail gracefully if it can't put a message box up
// on the target system // on the target system
if (!M_CheckParm("-dedicated"))
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"SRB2 "VERSIONSTRING" Error", "SRB2 "VERSIONSTRING" Error",
buffer, NULL); buffer, NULL);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment