Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks
This commit is contained in:
parent
a1e6f5bdb3
commit
d44a8ab78e
12
src/m_menu.c
12
src/m_menu.c
|
@ -2295,18 +2295,18 @@ static boolean MIT_SetCurBackground(UINT32 menutype, INT32 level, INT32 *retval,
|
||||||
curbgcolor = menupres[menutype].bgcolor;
|
curbgcolor = menupres[menutype].bgcolor;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (menupres[menutype].bgname[0] && (!menupres[menutype].bghide || !titlemapinaction))
|
else if (menupres[menutype].bghide && titlemapinaction) // hide the background
|
||||||
|
{
|
||||||
|
curbghide = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (menupres[menutype].bgname[0])
|
||||||
{
|
{
|
||||||
strncpy(curbgname, menupres[menutype].bgname, 8);
|
strncpy(curbgname, menupres[menutype].bgname, 8);
|
||||||
curbgxspeed = menupres[menutype].titlescrollxspeed != INT32_MAX ? menupres[menutype].titlescrollxspeed : titlescrollxspeed;
|
curbgxspeed = menupres[menutype].titlescrollxspeed != INT32_MAX ? menupres[menutype].titlescrollxspeed : titlescrollxspeed;
|
||||||
curbgyspeed = menupres[menutype].titlescrollyspeed != INT32_MAX ? menupres[menutype].titlescrollyspeed : titlescrollyspeed;
|
curbgyspeed = menupres[menutype].titlescrollyspeed != INT32_MAX ? menupres[menutype].titlescrollyspeed : titlescrollyspeed;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (menupres[menutype].bghide && titlemapinaction) // hide the background
|
|
||||||
{
|
|
||||||
curbghide = true;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else if (!level)
|
else if (!level)
|
||||||
{
|
{
|
||||||
if (M_GetYoungestChildMenu() == MN_SP_PLAYER || !defaultname || !defaultname[0])
|
if (M_GetYoungestChildMenu() == MN_SP_PLAYER || !defaultname || !defaultname[0])
|
||||||
|
|
Loading…
Reference in a new issue