From fd063e8ad03d3be3a88fe616a86251c6fe1bedaa Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 7 Dec 2025 19:03:26 +0100 Subject: [PATCH] g_demo: screw you LF2_EXISTSHACK --- src/g_demo.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/g_demo.c b/src/g_demo.c index ff7939c77..7b80f6702 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -2786,7 +2786,7 @@ void G_DoPlayDemo(char *defdemoname) demobuf.p += 4; // Extrainfo location // ...*map* not loaded? - if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK)) + if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1]) { snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); @@ -2827,6 +2827,16 @@ void G_DoPlayDemo(char *defdemoname) return; } + // ...*map* not loaded? + if (!(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK)) + { + snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname); + CONS_Alert(CONS_ERROR, "%s", msg); + M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER); + G_ResetDemoPlayback(); + return; + } + // Set color for (i = 0; i < MAXSKINCOLORS; i++) {