[Scummvm-cvs-logs] SF.net SVN: scummvm:[48158] scummvm/trunk/engines/scumm/sound.cpp

[Kirben at users.sourceforge.net]

Revision: 48158
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48158&view=rev
Author:   Kirben
Date:     2010-03-02 00:18:00 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Fix bug #2961530 - Zak/FM-Towns: Game hangs when using monkey wrench.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/sound.cpp

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2010-02-28 20:42:07 UTC (rev 48157)
+++ scummvm/trunk/engines/scumm/sound.cpp	2010-03-02 00:18:00 UTC (rev 48158)
@@ -349,8 +349,12 @@
 				}
 				size -= waveSize;
 
-				Audio::SeekableAudioStream *s = Audio::makeRawStream(sound, waveSize, rate, Audio::FLAG_UNSIGNED);
-				stream = new Audio::SubLoopingAudioStream(s, 0, Audio::Timestamp(0, loopStart, rate), Audio::Timestamp(0, loopEnd, rate));
+				if (loopEnd > 0) {
+					Audio::SeekableAudioStream *s = Audio::makeRawStream(sound, waveSize, rate, Audio::FLAG_UNSIGNED);
+					stream = new Audio::SubLoopingAudioStream(s, 0, Audio::Timestamp(0, loopStart, rate), Audio::Timestamp(0, loopEnd, rate));
+				} else {
+					stream = Audio::makeRawStream(sound, waveSize, rate, Audio::FLAG_UNSIGNED);
+				}
 				_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0);
 			}
 			break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.