From f04ac2efcf51db26d00eee7cb32ac5f3b8a2e9c8 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Fri, 29 Aug 2025 16:05:09 -0400 Subject: [PATCH 1/2] Fix Addon Options being unavailable as a netgame client --- src/menus/transient/pause-game.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/menus/transient/pause-game.c b/src/menus/transient/pause-game.c index c94be64a1..4d85b0eb7 100644 --- a/src/menus/transient/pause-game.c +++ b/src/menus/transient/pause-game.c @@ -159,6 +159,13 @@ void M_OpenPauseMenu(void) { PAUSE_Main[mpause_psetup].status = IT_STRING | IT_CALL; + if (M_SecretUnlocked(SECRET_ADDONS, true)) + { + PAUSE_Main[mpause_addons].status = IT_STRING | IT_ARROWS; + if (client) + menuaddonoptions = 0; + } + if (server || IsPlayerAdmin(consoleplayer)) { PAUSE_Main[mpause_changegametype].status = IT_STRING | IT_ARROWS; @@ -167,11 +174,6 @@ void M_OpenPauseMenu(void) PAUSE_Main[mpause_switchmap].status = IT_STRING | IT_CALL; PAUSE_Main[mpause_restartmap].status = IT_STRING | IT_CALL; - if (M_SecretUnlocked(SECRET_ADDONS, true)) - { - PAUSE_Main[mpause_addons].status = IT_STRING | IT_ARROWS; - } - if (netgame) { PAUSE_Main[mpause_admin].status = IT_STRING | IT_CALL; @@ -333,6 +335,10 @@ void M_HandlePauseMenuAddons(INT32 choice) } menuaddonoptions = menuaddonoptions ? 0 : 1; + + if (client) + menuaddonoptions = 0; + S_StartSound(NULL, sfx_s3k5b); } @@ -470,7 +476,7 @@ void M_GiveUp(INT32 choice) // Pause spectate / join functions void M_HandleSpectateToggle(INT32 choice) -{ +{ if (choice == 2) { if (!(G_GametypeHasSpectators() && pausemenu.splitscreenfocusid <= splitscreen)) From 4eaf58cec4020a7c2a8cc512fb3981f9f19b1125 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Fri, 29 Aug 2025 16:07:45 -0400 Subject: [PATCH 2/2] Also allow Addon Options Load... when client+admin --- src/menus/transient/pause-game.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/menus/transient/pause-game.c b/src/menus/transient/pause-game.c index 4d85b0eb7..5f2f9a006 100644 --- a/src/menus/transient/pause-game.c +++ b/src/menus/transient/pause-game.c @@ -162,7 +162,7 @@ void M_OpenPauseMenu(void) if (M_SecretUnlocked(SECRET_ADDONS, true)) { PAUSE_Main[mpause_addons].status = IT_STRING | IT_ARROWS; - if (client) + if (client && !IsPlayerAdmin(consoleplayer)) menuaddonoptions = 0; } @@ -336,7 +336,7 @@ void M_HandlePauseMenuAddons(INT32 choice) menuaddonoptions = menuaddonoptions ? 0 : 1; - if (client) + if (client && !IsPlayerAdmin(consoleplayer)) menuaddonoptions = 0; S_StartSound(NULL, sfx_s3k5b);