thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow both CALL VOTE and ADMIN TOOLS in pause menu

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_menu.h
View file

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

8
src/menus/transient/pause-game.c
View file

@ -40,12 +40,12 @@ menuitem_t PAUSE_Main[] =
NULL, {.routine = M_DiscordRequests}, 0, 0}, NULL, {.routine = M_DiscordRequests}, 0, 0},
#endif #endif
{IT_STRING | IT_ARROWS, "CALL VOTE", "M_ICOVOT",
NULL, {.routine = M_HandlePauseMenuCallVote}, 0, 0},
{IT_STRING | IT_ARROWS, "ADMIN TOOLS", "M_ICOADM", {IT_STRING | IT_ARROWS, "ADMIN TOOLS", "M_ICOADM",
NULL, {.routine = M_KickHandler}, 0, 0}, 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", {IT_STRING | IT_CALL, "RESUME GAME", "M_ICOUNP",
NULL, {.routine = M_QuitPauseMenu}, 0, 0}, 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); menucallvote = K_GetNextAllowedMidVote(menucallvote, true);