From 00a3ea58ee2db2193fcfd96bad5473c37525f5bb Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Thu, 2 May 2019 12:03:50 -0400 Subject: [PATCH] Add message boxes for file add errors --- src/g_game.c | 13 +++++++++---- src/m_menu.c | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 7d673f66d..d29da5ba0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6570,16 +6570,21 @@ static void G_LoadDemoExtraFiles(UINT8 **pp) if (toomany) { - CONS_Printf("Too many files loaded\n"); + CONS_Alert(CONS_WARNING, M_GetText("Too many files loaded to add anymore for demo playback\n")); + if (!CON_Ready()) + M_StartMessage(M_GetText("There are too many files loaded to add this demo's add-ons.\n\nDemo playback may desync.\n\nPress ESC\n"), NULL, MM_NOTHING); } else if (ncs != FS_FOUND) { if (ncs == FS_NOTFOUND) - CONS_Printf("You do not have a copy of %s\n", filename); + CONS_Alert(CONS_NOTICE, M_GetText("You do not have a copy of %s\n"), filename); else if (ncs == FS_MD5SUMBAD) - CONS_Printf("Checksum mismatch on %s\n", filename); + CONS_Alert(CONS_NOTICE, M_GetText("Checksum mismatch on %s\n"), filename); else - CONS_Printf("Unknown error finding file (%s)\n", filename); + CONS_Alert(CONS_NOTICE, M_GetText("Unknown error finding file %s\n"), filename); + + if (!CON_Ready()) + M_StartMessage(M_GetText("There were errors trying to add this demo's add-ons. Check the console for more information.\n\nDemo playback may desync.\n\nPress ESC\n"), NULL, MM_NOTHING); } else { diff --git a/src/m_menu.c b/src/m_menu.c index 144b671eb..ed034f93c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -4368,6 +4368,7 @@ void M_StartMessage(const char *string, void *routine, M_StartControlPanel(); // can't put menuactive to true if (currentMenu == &MessageDef) // Prevent recursion + MessageDef.prevMenu = ((demo.playback) ? &PlaybackMenuDef : &MainDef); else MessageDef.prevMenu = currentMenu;