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

uh

Browse source
This commit is contained in:
Jaime Passos 2019-08-19 14:43:48 -03:00
parent 85499040d3
commit 29dc1119e5
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -358,7 +358,7 @@ static void D_Display(void)
// clean up border stuff // clean up border stuff
// see if the border needs to be initially drawn // see if the border needs to be initially drawn
if (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction && curbghide)) if (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction && curbghide && (!hidetitlemap)))
{ {
// draw the view directly // draw the view directly

1
src/f_finale.c
View file

@ -75,6 +75,7 @@ INT32 curbgcolor;
INT32 curbgxspeed; INT32 curbgxspeed;
INT32 curbgyspeed; INT32 curbgyspeed;
boolean curbghide; boolean curbghide;
boolean hidetitlemap; // WARNING: set to false by M_SetupNextMenu and M_ClearMenus
static UINT8 curDemo = 0; static UINT8 curDemo = 0;
static UINT32 demoDelayLeft; static UINT32 demoDelayLeft;

1
src/f_finale.h
View file

@ -94,6 +94,7 @@ extern INT32 curbgcolor;
extern INT32 curbgxspeed; extern INT32 curbgxspeed;
extern INT32 curbgyspeed; extern INT32 curbgyspeed;
extern boolean curbghide; extern boolean curbghide;
extern boolean hidetitlemap;
#define TITLEBACKGROUNDACTIVE (curfadevalue >= 0 || curbgname[0]) #define TITLEBACKGROUNDACTIVE (curfadevalue >= 0 || curbgname[0])

26
src/m_menu.c
View file

@ -3418,6 +3418,7 @@ void M_ClearMenus(boolean callexitmenufunc)
if (currentMenu == &MessageDef) // Oh sod off! if (currentMenu == &MessageDef) // Oh sod off!
currentMenu = &MainDef; // Not like it matters currentMenu = &MainDef; // Not like it matters
menuactive = false; menuactive = false;
hidetitlemap = false;
} }
// //
@ -3456,6 +3457,8 @@ void M_SetupNextMenu(menu_t *menudef)
} }
} }
} }
hidetitlemap = false;
} }
// //
@ -7714,10 +7717,6 @@ static void M_SetupChoosePlayer(INT32 choice)
if (Playing() == false) if (Playing() == false)
M_ChangeMenuMusic("_chsel", true); M_ChangeMenuMusic("_chsel", true);
charseltimer = 0;
charselscrollx = charselfadescrollamt;
//wipegamestate = -1;
SP_PlayerDef.prevMenu = currentMenu; SP_PlayerDef.prevMenu = currentMenu;
M_SetupNextMenu(&SP_PlayerDef); M_SetupNextMenu(&SP_PlayerDef);
if (!allowed) if (!allowed)
@ -7730,7 +7729,12 @@ static void M_SetupChoosePlayer(INT32 choice)
char_on = description[char_on].next; char_on = description[char_on].next;
} }
} }
char_scroll = 0; // finish scrolling the menu
// finish scrolling the menu
char_scroll = 0;
charseltimer = 0;
charselscrollx = charselfadescrollamt;
Z_Free(char_notes); Z_Free(char_notes);
char_notes = V_WordWrap(0, 21*8, V_ALLOWLOWERCASE, description[char_on].notes); char_notes = V_WordWrap(0, 21*8, V_ALLOWLOWERCASE, description[char_on].notes);
} }
@ -7880,7 +7884,17 @@ static void M_DrawSetupChoosePlayerMenu(void)
// Yes. // Yes.
if (thismenu) if (thismenu)
{ {
M_DrawLoadGameData(); if (charselscrollx)
{
// Don't hide the title map yet
hidetitlemap = false;
M_DrawLoadGameData();
}
else
{
// Okay, fine, now you can
hidetitlemap = true;
}
charseltimer++; charseltimer++;
} }
else if (charseltimer > 0) else if (charseltimer > 0)