From 62195e3165352f858a5d334d33957ded829dd563 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 11 Mar 2024 03:10:55 -0700 Subject: [PATCH 1/2] Vote: fix sounds stacking when restarting vote screen --- src/k_vote.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/k_vote.c b/src/k_vote.c index 57e014464..ac53bfb57 100644 --- a/src/k_vote.c +++ b/src/k_vote.c @@ -1731,6 +1731,10 @@ void Y_StartVote(void) memset(&vote, 0, sizeof(vote)); memset(&vote_draw, 0, sizeof(vote_draw)); + // Restarting vote from the menu: stop any long sounds + // that were playing (kc37). + S_StopSounds(); + vote.tic = vote.endtic = -1; #ifdef VOTE_TIME_WAIT_FOR_VOTE From 2f3bc714a80cf976fafb2f3fc5f1a8632bfb53bd Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 11 Mar 2024 03:15:07 -0700 Subject: [PATCH 2/2] Menus/Pause: A button on gametype always goes to vote - Instead of playing a bumper noise if you selected the same gametype as the current one --- src/menus/transient/pause-game.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/menus/transient/pause-game.c b/src/menus/transient/pause-game.c index 48c999736..16f5478f8 100644 --- a/src/menus/transient/pause-game.c +++ b/src/menus/transient/pause-game.c @@ -315,7 +315,6 @@ void M_HandlePauseMenuGametype(INT32 choice) if (choice == 2) { - if (menugametype != gametype) { M_ClearMenus(true); if (server || IsPlayerAdmin(consoleplayer)) @@ -331,10 +330,6 @@ void M_HandlePauseMenuGametype(INT32 choice) } return; } - - S_StartSound(NULL, sfx_s3k7b); - - return; } if (choice == -1)