aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorGregory Montoir2010-04-25 21:53:27 +0000
committerGregory Montoir2010-04-25 21:53:27 +0000
commit4decff1a9291e0733812bca290ed5ecab5792003 (patch)
tree3ab49062672db0772fe4bb0e2ea192dc137f229a /engines
parent8260919bad48eb35ed0634df0d21d5d63d5c09b6 (diff)
downloadscummvm-rg350-4decff1a9291e0733812bca290ed5ecab5792003.tar.gz
scummvm-rg350-4decff1a9291e0733812bca290ed5ecab5792003.tar.bz2
scummvm-rg350-4decff1a9291e0733812bca290ed5ecab5792003.zip
fix missing sound effects during introduction with non French versions.
svn-id: r48801
Diffstat (limited to 'engines')
-rw-r--r--engines/tucker/sequences.cpp8
-rw-r--r--engines/tucker/staticres.cpp2
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index 9689ad75d2..02cc695e7c 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -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);
diff --git a/engines/tucker/staticres.cpp b/engines/tucker/staticres.cpp
index b663fb38da..aec0c999b4 100644
--- a/engines/tucker/staticres.cpp
+++ b/engines/tucker/staticres.cpp
@@ -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[] = {