From 4eaa7e969f0f1abe52a6d09d17cf3b26ee153af3 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 28 Aug 2020 17:11:38 -0400 Subject: [PATCH] Add new `STARTUP` lump, for the splash screen --- src/console.c | 8 ++++++-- src/d_main.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/console.c b/src/console.c index 0235b9bd4..21f660a56 100644 --- a/src/console.c +++ b/src/console.c @@ -1677,8 +1677,12 @@ static void CON_DrawBackpic(void) lumpnum_t piclump; int x, w, h; - // Get the lumpnum for CONSBACK, or fallback into MISSING. - piclump = W_CheckNumForName("CONSBACK"); + // Get the lumpnum for CONSBACK, STARTUP (Only during game startup) or fallback into MISSING. + if (con_startup) + piclump = W_CheckNumForName("STARTUP"); + else + piclump = W_CheckNumForName("CONSBACK"); + if (piclump == LUMPERROR) piclump = W_GetNumForName("MISSING"); diff --git a/src/d_main.c b/src/d_main.c index 25209de68..77c33e7ba 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -768,7 +768,7 @@ void D_SRB2Loop(void) */ /* Smells like a hack... Don't fade Sonic's ass into the title screen. */ if (gamestate != GS_TITLESCREEN) - V_DrawScaledPatch(0, 0, 0, W_CachePatchNum(W_GetNumForName("CONSBACK"), PU_PATCH)); + V_DrawScaledPatch(0, 0, 0, W_CachePatchNum(W_GetNumForName("STARTUP"), PU_PATCH)); for (;;) {