stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 23:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'titlemap-fix' into 'master'

Browse source 
Fix Titlemap with mazmazz's fancy menu stuff

See merge request STJr/SRB2Internal!228
This commit is contained in:
Monster Iestyn 2019-06-28 18:15:46 -04:00
commit e2859aab5d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/f_finale.c
View file

@ -1421,7 +1421,7 @@ void F_InitMenuPresValues(void)
curbgcolor = -1; curbgcolor = -1;
curbgxspeed = titlescrollxspeed; curbgxspeed = titlescrollxspeed;
curbgyspeed = titlescrollyspeed; curbgyspeed = titlescrollyspeed;
curbghide = false; curbghide = true;
// Find current presentation values // Find current presentation values
M_SetMenuCurBackground((gamestate == GS_TIMEATTACK) ? "SRB2BACK" : "TITLESKY"); M_SetMenuCurBackground((gamestate == GS_TIMEATTACK) ? "SRB2BACK" : "TITLESKY");

3
src/m_menu.c
View file

@ -2200,6 +2200,7 @@ void M_InitMenuPresTables(void)
menupres[i].bgcolor = -1; menupres[i].bgcolor = -1;
menupres[i].titlescrollxspeed = INT32_MAX; menupres[i].titlescrollxspeed = INT32_MAX;
menupres[i].titlescrollyspeed = INT32_MAX; menupres[i].titlescrollyspeed = INT32_MAX;
menupres[i].bghide = true;
// default true // default true
menupres[i].enterbubble = true; menupres[i].enterbubble = true;
menupres[i].exitbubble = true; menupres[i].exitbubble = true;
@ -2468,7 +2469,7 @@ static void M_HandleMenuPresState(menu_t *newMenu)
curbgcolor = -1; curbgcolor = -1;
curbgxspeed = titlescrollxspeed; curbgxspeed = titlescrollxspeed;
curbgyspeed = titlescrollyspeed; curbgyspeed = titlescrollyspeed;
curbghide = false; curbghide = true;
// don't do the below during the in-game menus // don't do the below during the in-game menus
if (gamestate != GS_TITLESCREEN && gamestate != GS_TIMEATTACK) if (gamestate != GS_TITLESCREEN && gamestate != GS_TIMEATTACK)