aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2012-06-18 17:04:46 +0200
committerSven Hesse2012-06-18 17:14:04 +0200
commit892ca3a9c57a948254a2779821a24576f82a77d6 (patch)
tree123fdfbe94fb7f967a086747195b3c9576f8269a
parent065e83e44fd16571b251b227c8fb5ffaccbadbed (diff)
downloadscummvm-rg350-892ca3a9c57a948254a2779821a24576f82a77d6.tar.gz
scummvm-rg350-892ca3a9c57a948254a2779821a24576f82a77d6.tar.bz2
scummvm-rg350-892ca3a9c57a948254a2779821a24576f82a77d6.zip
GOB: Don't loop /all/ sounds in Little Red
Just the title music... *cough*
-rw-r--r--engines/gob/inter_littlered.cpp4
-rw-r--r--engines/gob/sound/soundblaster.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/engines/gob/inter_littlered.cpp b/engines/gob/inter_littlered.cpp
index 729d9f5694..01aa4c2158 100644
--- a/engines/gob/inter_littlered.cpp
+++ b/engines/gob/inter_littlered.cpp
@@ -110,9 +110,9 @@ void Inter_LittleRed::oLittleRed_keyFunc(OpFuncParams &params) {
}
void Inter_LittleRed::oLittleRed_playComposition(OpFuncParams &params) {
- _vm->_sound->blasterRepeatComposition(-1);
-
o1_playComposition(params);
+
+ _vm->_sound->blasterRepeatComposition(-1);
}
} // End of namespace Gob
diff --git a/engines/gob/sound/soundblaster.cpp b/engines/gob/sound/soundblaster.cpp
index 915d744494..19c2346448 100644
--- a/engines/gob/sound/soundblaster.cpp
+++ b/engines/gob/sound/soundblaster.cpp
@@ -49,6 +49,8 @@ void SoundBlaster::stopSound(int16 fadeLength, SoundDesc *sndDesc) {
if (sndDesc && (sndDesc != _curSoundDesc))
return;
+ _compositionRepCount = 0;
+
if (fadeLength <= 0)
_curSoundDesc = 0;
@@ -64,6 +66,7 @@ void SoundBlaster::stopComposition() {
void SoundBlaster::endComposition() {
_compositionPos = -1;
+ _compositionRepCount = 0;
}
void SoundBlaster::nextCompositionPos() {