AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-24 12:36:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

initialize I_ErrorMsg earlier (#496)

Browse Source
This commit is contained in:
Roman Fomin 2022-04-07 15:45:53 +07:00 committed by GitHub
parent cebc872986
commit ee2d4a4be0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/i_main.c
View File

@ -111,6 +111,8 @@ int main(int argc, char **argv)
I_AtExitPrio(I_QuitLast, false, "I_QuitLast", exit_priority_last); I_AtExitPrio(I_QuitLast, false, "I_QuitLast", exit_priority_last);
I_AtExitPrio(I_Quit, true, "I_Quit", exit_priority_last); I_AtExitPrio(I_Quit, true, "I_Quit", exit_priority_last);
I_AtExitPrio(I_ErrorMsg, true, "I_ErrorMsg", exit_priority_verylast);
// 2/2/98 Stan // 2/2/98 Stan
// Must call this here. It's required by both netgames and i_video.c. // Must call this here. It's required by both netgames and i_video.c.

4
Source/i_system.c
View File

@ -220,7 +220,6 @@ void I_InitKeyboard(void)
} }
extern boolean nomusicparm, nosfxparm; extern boolean nomusicparm, nosfxparm;
static void I_ErrorMsg();
void I_Init(void) void I_Init(void)
{ {
@ -260,7 +259,6 @@ void I_Init(void)
// killough 3/6/98: end of keyboard / autorun state changes // killough 3/6/98: end of keyboard / autorun state changes
I_AtExit(I_Shutdown, true); I_AtExit(I_Shutdown, true);
I_AtExitPrio(I_ErrorMsg, true, "I_ErrorMsg", exit_priority_verylast);
// killough 2/21/98: avoid sound initialization if no sound & no music // killough 2/21/98: avoid sound initialization if no sound & no music
{ {
@ -364,7 +362,7 @@ void I_Error(const char *error, ...) // killough 3/20/98: add const
I_SafeExit(-1); I_SafeExit(-1);
} }
static void I_ErrorMsg() void I_ErrorMsg()
{ {
// Pop up a GUI dialog box to show the error message, if the // Pop up a GUI dialog box to show the error message, if the
// game was not run from the console (and the user will // game was not run from the console (and the user will

1
Source/i_system.h
View File

@ -123,6 +123,7 @@ void I_AtExitPrio(atexit_func_t func, boolean run_if_error,
const char* name, exit_priority_t priority); const char* name, exit_priority_t priority);
#define I_AtExit(a,b) I_AtExitPrio(a,b,#a,exit_priority_normal) #define I_AtExit(a,b) I_AtExitPrio(a,b,#a,exit_priority_normal)
void I_SafeExit(int rc) NORETURN; void I_SafeExit(int rc) NORETURN;
void I_ErrorMsg(void);
#endif #endif