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

Merge branch 'fix-vote-hum' into 'master'

Browse source 
Fix vote screen stacking sound effects + one convenience feature

Closes #1140

See merge request KartKrew/Kart!2089
This commit is contained in:
AJ Martinez 2024-03-12 00:08:03 +00:00
commit 900ff050d7
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_vote.c
View file

@ -1731,6 +1731,10 @@ void Y_StartVote(void)
memset(&vote, 0, sizeof(vote)); memset(&vote, 0, sizeof(vote));
memset(&vote_draw, 0, sizeof(vote_draw)); 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; vote.tic = vote.endtic = -1;
#ifdef VOTE_TIME_WAIT_FOR_VOTE #ifdef VOTE_TIME_WAIT_FOR_VOTE

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

@ -315,7 +315,6 @@ void M_HandlePauseMenuGametype(INT32 choice)
if (choice == 2) if (choice == 2)
{ {
if (menugametype != gametype)
{ {
M_ClearMenus(true); M_ClearMenus(true);
if (server || IsPlayerAdmin(consoleplayer)) if (server || IsPlayerAdmin(consoleplayer))
@ -331,10 +330,6 @@ void M_HandlePauseMenuGametype(INT32 choice)
} }
return; return;
} }
S_StartSound(NULL, sfx_s3k7b);
return;
} }
if (choice == -1) if (choice == -1)