diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 129fb440e..337e1c942 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D1X-Rebirth Changelog 20081110 -------- main/credits.c, main/inferno.c, main/menu.c, main/newmenu.c: Small Cleanup: Using timer_delay for credits timer as timer_delay2 would respect VSync and change speed of the Credits scrolling; Cleaned that Start/Join Netgame cases up a bit; Removed the excessive use of atexit in newmenu... more to come +misc/error.c: When Error() is called, set Function_mode to FMODE_EXIT... basically to prevent the messagebox would try to render the game in background if the Error would happen while mission loading 20081109 -------- diff --git a/misc/error.c b/misc/error.c index 32d9153ce..5691b7623 100644 --- a/misc/error.c +++ b/misc/error.c @@ -28,6 +28,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "console.h" #include "error.h" +#include "inferno.h" #define MAX_MSG_LEN 256 @@ -96,6 +97,7 @@ void Error(char *fmt,...) { va_list arglist; + Function_mode = FMODE_EXIT; strcpy(exit_message,"Error: "); // don't put the new line in for dialog output va_start(arglist,fmt); vsprintf(exit_message+strlen(exit_message),fmt,arglist);