Allow both CALL VOTE and ADMIN TOOLS in pause menu

Also slight re-ordering
This commit is contained in:
toaster 2023-06-28 00:37:30 +01:00
parent 97dd516568
commit cc73279756
2 changed files with 5 additions and 5 deletions

View file

@ -452,8 +452,8 @@ typedef enum
#ifdef HAVE_DISCORDRPC
mpause_discordrequests,
#endif
mpause_callvote,
mpause_admin,
mpause_callvote,
mpause_continue,
mpause_spectate,

View file

@ -40,12 +40,12 @@ menuitem_t PAUSE_Main[] =
NULL, {.routine = M_DiscordRequests}, 0, 0},
#endif
{IT_STRING | IT_ARROWS, "CALL VOTE", "M_ICOVOT",
NULL, {.routine = M_HandlePauseMenuCallVote}, 0, 0},
{IT_STRING | IT_ARROWS, "ADMIN TOOLS", "M_ICOADM",
NULL, {.routine = M_KickHandler}, 0, 0},
{IT_STRING | IT_ARROWS, "CALL VOTE", "M_ICOVOT",
NULL, {.routine = M_HandlePauseMenuCallVote}, 0, 0},
{IT_STRING | IT_CALL, "RESUME GAME", "M_ICOUNP",
NULL, {.routine = M_QuitPauseMenu}, 0, 0},
@ -196,7 +196,7 @@ void M_OpenPauseMenu(void)
}
}
if (netgame && (PAUSE_Main[mpause_admin].status == IT_DISABLED))
if (netgame) // && (PAUSE_Main[mpause_admin].status == IT_DISABLED))
{
menucallvote = K_GetNextAllowedMidVote(menucallvote, true);