From 5d9e813c5ef715e69ba34e40a015320958b5b5f4 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 17 Oct 2023 17:56:10 -0400 Subject: [PATCH] Fixes for titlemaps - Removed all old dev title screen remainders that were interfering with titlemaps. - F_VersionDrawer displays on all title screen types - SA2 intro sound only plays whenever there's am actual title card to show (before it checked for not GS_CEREMONY?) - Removed redundant customversionstring check in menus (F_VersionDrawer already handles customversionstring) --- src/deh_soc.c | 2 -- src/f_finale.c | 85 ++++++++++-------------------------------------- src/f_finale.h | 1 - src/g_game.c | 8 ++--- src/k_menudraw.c | 12 +------ 5 files changed, 22 insertions(+), 86 deletions(-) diff --git a/src/deh_soc.c b/src/deh_soc.c index 9e32abb83..d3a48cb6f 100644 --- a/src/deh_soc.c +++ b/src/deh_soc.c @@ -3189,8 +3189,6 @@ void readmaincfg(MYFILE *f, boolean mainfile) } else if (fastcmp(word2, "RINGRACERS")) ttmode = TTMODE_RINGRACERS; - else if (fastcmp(word2, "OLD") || fastcmp(word2, "SSNTAILS")) - ttmode = TTMODE_OLD; titlechanged = true; } else if (fastcmp(word, "TITLEPICSNAME")) diff --git a/src/f_finale.c b/src/f_finale.c index 5ded47495..95fb2a53b 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1316,7 +1316,7 @@ static void F_InitMenuPresValues(void) curbgcolor = -1; curbgxspeed = titlescrollxspeed; curbgyspeed = titlescrollyspeed; - curbghide = false; + curbghide = true; curhidepics = hidetitlepics; curttmode = ttmode; @@ -1426,15 +1426,13 @@ static void F_CacheTitleScreen(void) { UINT16 i; - switch(curttmode) + switch (curttmode) { case TTMODE_NONE: break; - case TTMODE_OLD: - break; // idk do we still want this? - case TTMODE_RINGRACERS: + { if (!M_SecretUnlocked(SECRET_ALTTITLE, true)) { CV_StealthSetValue(&cv_alttitle, 0); @@ -1452,6 +1450,7 @@ static void F_CacheTitleScreen(void) } kts_copyright = W_CachePatchName("KTSCR", PU_PATCH_LOWPRIORITY); break; + } case TTMODE_USER: { @@ -1593,36 +1592,34 @@ void F_TitleScreenDrawer(void) { boolean hidepics = false; +#if 0 if (modeattacking) return; // We likely came here from retrying. Don't do a damn thing. +#endif // Draw that sky! if (curbgcolor >= 0) V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor); else if (!curbghide || !titlemapinaction || gamestate == GS_WAITINGPLAYERS) F_SkyScroll(curbgxspeed, curbgyspeed, curbgname); - else - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // Don't draw outside of the title screen, or if the patch isn't there. if (gamestate != GS_TITLESCREEN && gamestate != GS_WAITINGPLAYERS) return; - // Don't draw if title mode is set to Old/None and the patch isn't there - /* - if (!ttwing && (curttmode == TTMODE_OLD || curttmode == TTMODE_NONE)) - return; - */ - // rei|miru: use title pics? hidepics = curhidepics; if (hidepics) + { goto luahook; + } - switch(curttmode) + switch (curttmode) { case TTMODE_NONE: + { break; + } case TTMODE_RINGRACERS: { @@ -1657,64 +1654,11 @@ void F_TitleScreenDrawer(void) V_DrawFixedPatch(0, 0, FRACUNIT, 0, kts_bumper, NULL); V_DrawFixedPatch(0, 0, FRACUNIT, 0, kts_copyright, NULL); - - F_VersionDrawer(); break; } - case TTMODE_OLD: -/* - if (finalecount < 50) - { - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); - - V_DrawSmallScaledPatch(84, 36, 0, ttbanner); - - if (finalecount >= 20) - V_DrawSmallScaledPatch(84, 87, 0, ttkart); - else if (finalecount >= 10) - V_DrawSciencePatch((84<>1; - - V_DrawSciencePatch(0, 0 - FixedMul(40< -1 && ttuser[curttloop]) @@ -1728,8 +1672,11 @@ void F_TitleScreenDrawer(void) V_DrawSciencePatch(curttx< 0) M_DrawMenuMessage(); } diff --git a/src/f_finale.h b/src/f_finale.h index 517b59ce3..b3e4b4545 100644 --- a/src/f_finale.h +++ b/src/f_finale.h @@ -81,7 +81,6 @@ typedef enum { TTMODE_NONE = 0, TTMODE_RINGRACERS, - TTMODE_OLD, TTMODE_USER } ttmode_enum; diff --git a/src/g_game.c b/src/g_game.c index 2ecb144e1..72a580b47 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1213,8 +1213,11 @@ void G_StartTitleCard(void) return; } + // start the title card + WipeStageTitle = (gamestate == GS_LEVEL); + // play the sound - if (gamestate != GS_CEREMONY) + if (WipeStageTitle) { sfxenum_t kstart = sfx_kstart; if (K_CheckBossIntro() == true) @@ -1223,9 +1226,6 @@ void G_StartTitleCard(void) kstart = sfx_ruby2; S_StartSound(NULL, kstart); } - - // start the title card - WipeStageTitle = (gamestate == GS_LEVEL); } // diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 0083ae643..a7c9117c7 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -785,17 +785,7 @@ void M_Drawer(void) // ... but only in the MAIN MENU. I'm a picky bastard. if (currentMenu == &MainDef) { - if (customversionstring[0] != '\0') - { - V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT, "Mod version:"); - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT, customversionstring); - } - else - { - F_VersionDrawer(); - } - - + F_VersionDrawer(); } // Draw message overlay when needed