From 6c6ed6a34948925c845cef0b078ab898a452202f Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 10 Jun 2019 15:43:47 -0400 Subject: [PATCH] Fix Titlemap with mazmazz's fancy menu stuff Handled by changing some defaults. Untested, experimenting with Gitlab Web IDE as reconfiguring my build environment is likely to be a pain and I'd like to put that off as long as possible please --- src/f_finale.c | 2 +- src/m_menu.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index df8d7b683..a0fa3658a 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1421,7 +1421,7 @@ void F_InitMenuPresValues(void) curbgcolor = -1; curbgxspeed = titlescrollxspeed; curbgyspeed = titlescrollyspeed; - curbghide = false; + curbghide = true; // Find current presentation values M_SetMenuCurBackground((gamestate == GS_TIMEATTACK) ? "SRB2BACK" : "TITLESKY"); diff --git a/src/m_menu.c b/src/m_menu.c index 4f78d0adc..6b247c6c3 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2196,6 +2196,7 @@ void M_InitMenuPresTables(void) menupres[i].bgcolor = -1; menupres[i].titlescrollxspeed = INT32_MAX; menupres[i].titlescrollyspeed = INT32_MAX; + menupres[i].bghide = true; // default true menupres[i].enterbubble = true; menupres[i].exitbubble = true; @@ -2464,7 +2465,7 @@ static void M_HandleMenuPresState(menu_t *newMenu) curbgcolor = -1; curbgxspeed = titlescrollxspeed; curbgyspeed = titlescrollyspeed; - curbghide = false; + curbghide = true; // don't do the below during the in-game menus if (gamestate != GS_TITLESCREEN && gamestate != GS_TIMEATTACK)