From e53ad4edf496f82949a2b1ea1e8c9c42dd73d0eb Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 25 Dec 2021 07:02:07 -0500 Subject: [PATCH] Char select fixes - Allow input for multiplayer now - Unset all devices in this menu --- src/k_menufunc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/k_menufunc.c b/src/k_menufunc.c index d46064bb9..885f4fed2 100644 --- a/src/k_menufunc.c +++ b/src/k_menufunc.c @@ -1899,7 +1899,6 @@ void M_CharacterSelectInit(INT32 choice) } memset(setup_player, 0, sizeof(setup_player)); - //setup_player[0].mdepth = CSSTEP_CHARS; setup_numplayers = 0; memset(setup_explosions, 0, sizeof(setup_explosions)); @@ -1929,6 +1928,12 @@ void M_CharacterSelectInit(INT32 choice) } } + for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) + { + // Un-set all devices upon entering this menu. + cv_usejoystick[i].value = -1; + } + PLAY_CharSelectDef.prevMenu = currentMenu; M_SetupNextMenu(&PLAY_CharSelectDef, false); } @@ -2222,9 +2227,6 @@ boolean M_CharacterSelectHandler(INT32 choice) { setup_player_t *p = &setup_player[i]; - if (i > 0) - break; // temp - if (p->delay == 0 && menucmd[i].delay == 0) { switch (p->mdepth)