From 688adb205535a4d70e6a3b835ee57dbdc60bd791 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 22 Aug 2020 17:16:49 -0700 Subject: [PATCH] Make join requests options on pause menu selectable even if you're already in the menu --- src/discord.c | 1 + src/m_menu.c | 18 +++++++++++++++--- src/m_menu.h | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/discord.c b/src/discord.c index 068c2404d..e69b3abf4 100644 --- a/src/discord.c +++ b/src/discord.c @@ -276,6 +276,7 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser) else { discordRequestList = newRequest; + M_RefreshPauseMenu(); } // Made it to the end, request was valid, so play the request sound :) diff --git a/src/m_menu.c b/src/m_menu.c index 2c8f66fe9..1979e30a8 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3348,10 +3348,8 @@ void M_StartControlPanel(void) MPauseMenu[i].alphaKey -= 8; MPauseMenu[mpause_discordrequests].alphaKey = MPauseMenu[i].alphaKey; - MPauseMenu[mpause_discordrequests].status = IT_GRAYEDOUT; - if (discordRequestList != NULL) - MPauseMenu[mpause_discordrequests].status = IT_STRING | IT_SUBMENU; + M_RefreshPauseMenu(); } #endif @@ -6370,6 +6368,20 @@ static void M_SelectableClearMenus(INT32 choice) M_ClearMenus(true); } +void M_RefreshPauseMenu(void) +{ +#ifdef HAVE_DISCORDRPC + if (discordRequestList != NULL) + { + MPauseMenu[mpause_discordrequests].status = IT_STRING | IT_SUBMENU; + } + else + { + MPauseMenu[mpause_discordrequests].status = IT_GRAYEDOUT; + } +#endif +} + // ====== // CHEATS // ====== diff --git a/src/m_menu.h b/src/m_menu.h index 1ad20c777..4fc92bd55 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -267,6 +267,8 @@ void Addons_option_Onchange(void); void M_ReplayHut(INT32 choice); void M_SetPlaybackMenuPointer(void); +void M_RefreshPauseMenu(void); + INT32 HU_GetHighlightColor(void); // These defines make it a little easier to make menus