[Scummvm-cvs-logs] scummvm master -> 892ca3a9c57a948254a2779821a24576f82a77d6

DrMcCoy drmccoy at drmccoy.de
Mon Jun 18 17:16:21 CEST 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
892ca3a9c5 GOB: Don't loop /all/ sounds in Little Red


Commit: 892ca3a9c57a948254a2779821a24576f82a77d6
    https://github.com/scummvm/scummvm/commit/892ca3a9c57a948254a2779821a24576f82a77d6
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-06-18T08:14:04-07:00

Commit Message:
GOB: Don't loop /all/ sounds in Little Red

Just the title music... *cough*

Changed paths:
    engines/gob/inter_littlered.cpp
    engines/gob/sound/soundblaster.cpp



diff --git a/engines/gob/inter_littlered.cpp b/engines/gob/inter_littlered.cpp
index 729d9f5..01aa4c2 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 915d744..19c2346 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() {






More information about the Scummvm-git-logs mailing list