thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for bug [761637] FOA: Music problems in endgame/credits.

Browse source 
Revision to the handle_maker() fix for bug #733401, since that
didn't seem to take care of the problem. This fix chomps marker
queue entries if it finds a matching marker not at the head of
the queue. This might cause inappropriate behavior elsewhere;
regression testing is advised.

svn-id: r8831
This commit is contained in:
Jamieson Christian 2003-07-07 05:45:55 +00:00
parent 2a334f176c
commit 0fefe4602c
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scumm/imuse.cpp
View file

@ -285,8 +285,8 @@ void IMuseInternal::init_players() {
int i; int i;
for (i = ARRAYSIZE(_players); i != 0; i--, player++) { for (i = ARRAYSIZE(_players); i != 0; i--, player++) {
player->clear(); // Used to just set _active to false
player->_se = this; player->_se = this;
player->clear(); // Used to just set _active to false
} }
} }
@ -348,25 +348,28 @@ void IMuseInternal::handle_marker(uint id, byte data) {
if (_queue_adding && _queue_sound == id && data == _queue_marker) if (_queue_adding && _queue_sound == id && data == _queue_marker)
return; return;
// Fix for bug #733401: It would seem that sometimes the // Fix for bug #733401, revised for bug #761637:
// queue read position gets out of sync (possibly just // It would seem that sometimes a marker is in the queue
// reset to zero). Therefore, the read position should // but not at the head position. In the case of our bug,
// skip over any empty (i.e. all zeros) queue entries // this seems to be the result of commands in the queue
// until it finds a legit entry to review. // for songs that are no longer playing. So we skip
// ahead to the appropriate marker, effectively chomping
// anything in the queue before it. This fixes the FOA
// end credits music, but needs to be tested for inappopriate
// behavior elsewhere.
pos = _queue_end; pos = _queue_end;
while (pos != _queue_pos) { while (pos != _queue_pos) {
p = _cmd_queue[pos].array; p = _cmd_queue[pos].array;
if ((p[0] | p[1] | p[2] | p[3] | p[4] | p[5] | p[6] | p[7]) != 0) if (p[0] == TRIGGER_ID && p[1] == id && p[2] == data)
break; break;
warning ("Skipping empty command queue entry at position %d", pos);
pos = (pos + 1) & (ARRAYSIZE(_cmd_queue) - 1); pos = (pos + 1) & (ARRAYSIZE(_cmd_queue) - 1);
} }
if (pos == _queue_pos) if (pos == _queue_pos)
return; return;
if (p[0] != TRIGGER_ID || p[1] != id || p[2] != data) if (pos != _queue_end)
return; warning ("Skipping entries in iMuse command queue to reach marker");
_trigger_count--; _trigger_count--;
_queue_cleared = false; _queue_cleared = false;