Draw connection screen correctly; make scroll speed inherit global setting
This commit is contained in:
parent
094ec7ce3c
commit
5870d145b2
|
@ -1127,7 +1127,7 @@ static inline void CL_DrawConnectionStatus(void)
|
||||||
|
|
||||||
// Draw background fade
|
// Draw background fade
|
||||||
if (!menuactive) // menu already draws its own fade
|
if (!menuactive) // menu already draws its own fade
|
||||||
V_DrawFadeScreen(0xFF00, curfadevalue);
|
V_DrawFadeScreen(0xFF00, 16); // force default
|
||||||
|
|
||||||
// Draw the bottom box.
|
// Draw the bottom box.
|
||||||
M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
|
M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
|
||||||
|
|
|
@ -1465,7 +1465,7 @@ void F_TitleScreenDrawer(void)
|
||||||
// Draw that sky!
|
// Draw that sky!
|
||||||
if (curbgcolor >= 0)
|
if (curbgcolor >= 0)
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
|
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
|
||||||
else if (!curbghide || !titlemapinaction)
|
else if (!curbghide || !titlemapinaction || gamestate == GS_WAITINGPLAYERS)
|
||||||
M_SkyScroll(curbgxspeed, curbgyspeed, curbgname);
|
M_SkyScroll(curbgxspeed, curbgyspeed, curbgname);
|
||||||
|
|
||||||
// Don't draw outside of the title screewn, or if the patch isn't there.
|
// Don't draw outside of the title screewn, or if the patch isn't there.
|
||||||
|
|
|
@ -2230,6 +2230,8 @@ void MN_InitInfoTables(void)
|
||||||
menumeta[i].enterwipe = -1;
|
menumeta[i].enterwipe = -1;
|
||||||
menumeta[i].exitwipe = -1;
|
menumeta[i].exitwipe = -1;
|
||||||
menumeta[i].bgcolor = -1;
|
menumeta[i].bgcolor = -1;
|
||||||
|
menumeta[i].titlescrollxspeed = INT32_MAX;
|
||||||
|
menumeta[i].titlescrollyspeed = INT32_MAX;
|
||||||
// default true
|
// default true
|
||||||
menumeta[i].enterbubble = true;
|
menumeta[i].enterbubble = true;
|
||||||
menumeta[i].exitbubble = true;
|
menumeta[i].exitbubble = true;
|
||||||
|
@ -2359,8 +2361,8 @@ static boolean MIT_SetCurBackground(UINT32 menutype, INT32 level, INT32 *retval,
|
||||||
else if (menumeta[menutype].bgname[0] && (!menumeta[menutype].bghide || !titlemapinaction))
|
else if (menumeta[menutype].bgname[0] && (!menumeta[menutype].bghide || !titlemapinaction))
|
||||||
{
|
{
|
||||||
strncpy(curbgname, menumeta[menutype].bgname, 8);
|
strncpy(curbgname, menumeta[menutype].bgname, 8);
|
||||||
curbgxspeed = menumeta[menutype].titlescrollxspeed;
|
curbgxspeed = menumeta[menutype].titlescrollxspeed != INT32_MAX ? menumeta[menutype].titlescrollxspeed : titlescrollxspeed;
|
||||||
curbgyspeed = menumeta[menutype].titlescrollyspeed;
|
curbgyspeed = menumeta[menutype].titlescrollyspeed != INT32_MAX ? menumeta[menutype].titlescrollyspeed : titlescrollyspeed;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (menumeta[menutype].bghide && titlemapinaction) // hide the background
|
else if (menumeta[menutype].bghide && titlemapinaction) // hide the background
|
||||||
|
|
Loading…
Reference in a new issue