cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-02-23 04:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

throwing a fatal error when com_soundMegs is too low for a map load

Browse source
This commit is contained in:
myT 2020-10-15 05:04:01 +02:00
parent a4397252c3
commit bb9e814837
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.txt
View file

@ -21,6 +21,8 @@ chg: with r_backend GL3, depth fade with MSAA now requires GLSL 4.00 at a minimu
chg: with r_backend GL3, alpha to coverage now requires GLSL 4.00 at a minimum chg: with r_backend GL3, alpha to coverage now requires GLSL 4.00 at a minimum
fix: throwing a fatal error when com_soundMegs is too low to load a map instead of freezing
fix: /video produced .avi files that started with silence when they were not first in the sequence fix: /video produced .avi files that started with silence when they were not first in the sequence
fix: with r_backend D3D11, some device reset scenarios caused fatal errors instead of video restarts fix: with r_backend D3D11, some device reset scenarios caused fatal errors instead of video restarts

7
code/client/snd_dma.cpp
View file

@ -1054,7 +1054,7 @@ static void S_UpdateBackgroundTrack()
} }
void S_FreeOldestSound() qbool S_FreeOldestSound()
{ {
sfx_t* sfx; sfx_t* sfx;
int oldest = Com_Milliseconds(); int oldest = Com_Milliseconds();
@ -1068,6 +1068,9 @@ void S_FreeOldestSound()
} }
} }
if (slot == 0)
return qfalse;
sfx = &s_knownSfx[slot]; sfx = &s_knownSfx[slot];
Com_DPrintf( "S_FreeOldestSound: freeing sound %s\n", sfx->soundName ); Com_DPrintf( "S_FreeOldestSound: freeing sound %s\n", sfx->soundName );
@ -1081,6 +1084,8 @@ void S_FreeOldestSound()
sfx->inMemory = qfalse; sfx->inMemory = qfalse;
sfx->soundData = NULL; sfx->soundData = NULL;
return qtrue;
} }

2
code/client/snd_local.h
View file

@ -162,6 +162,6 @@ void SND_setup();
void S_PaintChannels(int endtime); void S_PaintChannels(int endtime);
void S_FreeOldestSound(); qbool S_FreeOldestSound();
qbool S_Base_Init( soundInterface_t *si ); qbool S_Base_Init( soundInterface_t *si );

9
code/client/snd_mem.cpp
View file

@ -43,7 +43,14 @@ void SND_free( sndBuffer* v )
sndBuffer* SND_malloc() sndBuffer* SND_malloc()
{ {
while (!freelist) { while (!freelist) {
S_FreeOldestSound(); if (!S_FreeOldestSound()) {
// Throw an error instead of running an infinite loop.
// It would be nicer to have a disconnect/drop type of error here,
// but sadly that would leave the hunk allocator in a bad state.
Com_Error (ERR_FATAL,
"Not enough memory for audio.\n"
"Please increase com_soundMegs accordingly.\n");
}
} }
sndmem_avail -= sizeof(sndBuffer); sndmem_avail -= sizeof(sndBuffer);