stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make dedicated servers not pop up that annoying SDL error window

Browse source 
So they don't mess with shell scripts that expect SRB2 to exit when it crashes (like most other programs)
This commit is contained in:
GoldenTails 2022-02-05 18:19:00 -06:00
parent 93512ae9f9
commit c49dd5f535
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/sdl/i_system.c
View file

@ -358,9 +358,10 @@ 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);
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, if (!M_CheckParm("-dedicated"))
"Process killed by signal", SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
sigmsg, NULL); "Process killed by signal",
sigmsg, NULL);
} }
#ifndef NEWSIGNALHANDLER #ifndef NEWSIGNALHANDLER
@ -2202,9 +2203,10 @@ static void newsignalhandler_Warn(const char *pr)
I_OutputMsg("%s\n", text); I_OutputMsg("%s\n", text);
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, if (!M_CheckParm("-dedicated"))
"Startup error", SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
text, NULL); "Startup error",
text, NULL);
I_ShutdownConsole(); I_ShutdownConsole();
exit(-1); exit(-1);
@ -2405,9 +2407,10 @@ 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
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, if (!M_CheckParm("-dedicated"))
"SRB2 "VERSIONSTRING" Recursive Error", SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
buffer, NULL); "SRB2 "VERSIONSTRING" Recursive Error",
buffer, NULL);
W_Shutdown(); W_Shutdown();
exit(-1); // recursive errors detected exit(-1); // recursive errors detected
@ -2449,9 +2452,10 @@ 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
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, if (!M_CheckParm("-dedicated"))
"SRB2 "VERSIONSTRING" Error", SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
buffer, NULL); "SRB2 "VERSIONSTRING" Error",
buffer, NULL);
// Note that SDL_ShowSimpleMessageBox does *not* require SDL to be // Note that SDL_ShowSimpleMessageBox does *not* require SDL to be
// initialized at the time, so calling it after SDL_Quit() is // initialized at the time, so calling it after SDL_Quit() is
// perfectly okay! In addition, we do this on purpose so the // perfectly okay! In addition, we do this on purpose so the