libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-30 15:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a slight logic error in the music fading. At this point the code

Browse Source 
should only check if the music is fading, not in which direction. (Also
made a minor cleanup.)

svn-id: r13235
This commit is contained in:
Torbjörn Andersson 2004-03-13 12:05:01 +00:00
parent 1f5d4dcd23
commit 0fc86ef674
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sword2/driver/d_sound.cpp
View File

@ -469,14 +469,14 @@ int32 Sound::streamCompMusic(const char *filename, uint32 musicId, bool looping)
// If both music streams are playing, one of them will have to go.
if (_music[0]._streaming && _music[1]._streaming) {
if (_music[0]._fading == 0 && _music[1]._fading == 0) {
if (!_music[0]._fading && !_music[1]._fading) {
// None of them are fading. This shouldn't happen, so
// just pick one and be done with it.
primaryStream = 0;
} else if (_music[0]._fading != 0 && _music[1]._fading == 0) {
} else if (_music[0]._fading && !_music[1]._fading) {
// Stream 0 is fading, so pick that one.
primaryStream = 0;
} else if (_music[0]._fading == 0 && _music[1]._fading > 0) {
} else if (!_music[0]._fading && _music[1]._fading) {
// Stream 1 is fading, so pick that one.
primaryStream = 1;
} else {