Skip to content

[MP] Fix ambient sounds not playing after snd_restart #1311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dpiers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MP] Fix ambient sounds not playing after snd_restart #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions codemp/client/cl_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,9 @@ void CL_Snd_Restart_f( void ) {

extern void S_RestartMusic( void );
S_RestartMusic();

extern void AS_ParseSets( void );
AS_ParseSets();
}


Expand Down
13 changes: 10 additions & 3 deletions codemp/client/snd_ambient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,13 +758,21 @@ Loads the ambient sound sets and prepares to play them when needed
-------------------------
*/

static namePrecache_m *TheNamePrecache( void )
{
// Use a static singleton so pMap persists across sound restarts.
// This fixes ambient sounds not playing after snd_restart.
static namePrecache_m singleton;
return &singleton;
}

void AS_Init( void )
{
if (!aSets)
{
numSets = 0;

pMap = new namePrecache_m;
pMap = TheNamePrecache();

//Setup the structure
aSets = new CSetGroup();
Expand Down Expand Up @@ -882,8 +890,7 @@ void AS_FreePartial(void)

numSets = 0;

delete pMap;
pMap = new namePrecache_m;
// pMap is now a static singleton, just clear it instead of delete/new
pMap->clear();
}
}
Expand Down