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

Patch #607175 correction to fix regression Bug #622606

Browse Source 
svn-id: r5207
This commit is contained in:
Jamieson Christian 2002-10-21 08:17:18 +00:00
parent 8a0d3438fc
commit 5862695bfd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scumm/imuse.cpp
View File

@ -895,14 +895,17 @@ bool IMuseInternal::start_sound(int sound)
}
}
// Make sure the requested sound is not already playing.
// FIXME: This should NEVER happen, but until we get all of the
// Sam & Max iMuse issues resolved, it does happen occasionally.
// This hack is just to make playtesting tolerable.
// If the requested sound is already playing, start it over
// from scratch. This was originally a hack to prevent Sam & Max
// iMuse messiness while upgrading the iMuse engine, but it
// is apparently necessary to deal with fade-and-restart
// race conditions that were observed in MI2. Reference
// Bug #590511 and Patch #607175 (which was reversed to fix
// an FOA regression: Bug #622606).
int i;
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == sound)
return true; // break;
break;
}
if (!i)
@ -1220,17 +1223,14 @@ int IMuseInternal::get_sound_status(int sound)
{
int i;
Player *player;
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == (uint16)sound) {
// Assume that anyone asking for the sound status is
// really asking "is it ok if I start playing this
// sound now?" So if the sound is about to fade out,
// shut it down and pretend it wasn't playing.
if (player->is_fading_out()) {
player->clear();
// pretend it's not playing.
if (player->is_fading_out())
continue;
}
return 1;
}
}