libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-12 06:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: if game starts fading, stops music and later starts music again don't resume fading - fixes lsl6 music when going in from swimming pool

Browse Source 
svn-id: r50995
This commit is contained in:
Martin Kiewitz 2010-07-18 16:22:16 +00:00
parent 46b27926b2
commit aa5a1ddb47
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/sci/sound/music.cpp
View File

@ -388,6 +388,7 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
}
}
pSnd->fadeStep = 0; // just make sure that previous fading isn't continued
pSnd->status = kSoundPlaying;
}

2
engines/sci/sound/soundcmd.cpp
View File

@ -300,7 +300,7 @@ reg_t SoundCommandParser::kDoSoundFade(int argc, reg_t *argv, reg_t acc) {
// If sound is not playing currently, set signal directly
if (musicSlot->status != kSoundPlaying) {
debugC(2, kDebugLevelSound, "kDoSound(fade): fading requested, but sound is currently not playing");
debugC(2, kDebugLevelSound, "kDoSound(fade): %04x:%04x fading requested, but sound is currently not playing", PRINT_REG(obj));
writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
return acc;
}