fix missing sound effects during introduction with non French versions.

svn-id: r48801
This commit is contained in:
Gregory Montoir 2010-04-25 21:53:27 +00:00
parent 8260919bad
commit 4decff1a92
2 changed files with 8 additions and 2 deletions

View File

@ -535,6 +535,12 @@ void AnimationSequencePlayer::mainLoop() {
if (_seqNum == 1) {
break;
}
// budttle2.flc is shorter in french version ; start the background music
// earlier and skip any sounds effects
if (_seqNum == 19 && _flicPlayer[0].getFrameCount() == 126) {
_soundSeqDataIndex = 6;
_frameCounter = 80;
}
}
(this->*(_updateFunc[_updateFuncIndex].play))();
if (_changeToNextSequence) {
@ -765,8 +771,8 @@ bool AnimationSequencePlayer::decodeNextAnimationFrame(int index) {
_flicPlayer[index].copyFrameToBuffer(_offscreenBuffer, 0, 0, kScreenWidth);
} else {
_flicPlayer[index].copyDirtyRectsToBuffer(_offscreenBuffer, kScreenWidth);
++_frameCounter;
}
++_frameCounter;
if (index == 0) {
if (_flicPlayer[index].paletteChanged()) {
getRGBPalette(index);

View File

@ -340,7 +340,7 @@ const SoundSequenceDataList AnimationSequencePlayer::_soundSeqDataList[] = {
{ 1, 80, 13, 9, 43, _soundDataSeq15_16 },
{ 1, 80, 11, 0, 11, _soundDataSeq27_28 },
{ 104, 100, 0, 0, 0, 0 },
{ 0, 100, 4, 0, 7, _soundDataSeq19_20 }
{ 0, 0, 4, 0, 7, _soundDataSeq19_20 }
};
const char *AnimationSequencePlayer::_audioFileNamesTable[] = {