actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent sound fade in/out from hitting assertion in fapproach

Browse Source
This commit is contained in:
Gareth Francis
2024-04-11 10:59:03 -07:00
committed by teejusb
parent 5bea3b97f2
commit 85bac5506e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameSoundManager.cpp
+12 -2
View File
@@ -554,7 +554,12 @@ void GameSoundManager::Update( float fDeltaTime )
{
case FADE_NONE: break;
case FADE_OUT:
fapproach( fVolume, g_fDimVolume, fDeltaTime/fFadeOutSpeed );
if( fFadeOutSpeed > 0.0 ) {
fapproach( fVolume, g_fDimVolume, fDeltaTime/fFadeOutSpeed );
} else {
// Treat an invalid fade speed as instant
fVolume = g_fDimVolume;
}
if( std::abs(fVolume-g_fDimVolume) < 0.001f )
g_FadeState = FADE_WAIT;
break;
@@ -564,7 +569,12 @@ void GameSoundManager::Update( float fDeltaTime )
g_FadeState = FADE_IN;
break;
case FADE_IN:
fapproach( fVolume, g_fOriginalVolume, fDeltaTime/fFadeInSpeed );
if( fFadeInSpeed > 0.0 ) {
fapproach( fVolume, g_fOriginalVolume, fDeltaTime/fFadeInSpeed );
} else {
// Treat an invalid fade speed as instant
fVolume = g_fOriginalVolume;
}
if( std::abs(fVolume-g_fOriginalVolume) < 0.001f )
g_FadeState = FADE_NONE;
break;