Merge branch 'menu-2pcontrols-fix' into 'master'

Fix 2p control menu graying out

See merge request STJr/SRB2!407
This commit is contained in:
Digiku 2018-12-20 16:54:52 -05:00
commit 50221c47e9

View file

@ -6837,9 +6837,10 @@ static void M_Setup2PControlsMenu(INT32 choice)
OP_MPControlsMenu[0].status = IT_GRAYEDOUT2; OP_MPControlsMenu[0].status = IT_GRAYEDOUT2;
OP_MPControlsMenu[1].status = IT_GRAYEDOUT2; OP_MPControlsMenu[1].status = IT_GRAYEDOUT2;
OP_MPControlsMenu[2].status = IT_GRAYEDOUT2; OP_MPControlsMenu[2].status = IT_GRAYEDOUT2;
// Hide the pause/console controls too // Hide the pause/console and system menu controls too
OP_MiscControlsMenu[3].status = IT_GRAYEDOUT2; OP_MiscControlsMenu[3].status = IT_GRAYEDOUT2;
OP_MiscControlsMenu[4].status = IT_GRAYEDOUT2; OP_MiscControlsMenu[6].status = IT_GRAYEDOUT2;
OP_MiscControlsMenu[8].status = IT_GRAYEDOUT2;
OP_ControlListDef.prevMenu = &OP_P2ControlsDef; OP_ControlListDef.prevMenu = &OP_P2ControlsDef;
M_SetupNextMenu(&OP_ControlListDef); M_SetupNextMenu(&OP_ControlListDef);