aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2010-08-08 00:51:33 +0000
committerSven Hesse2010-08-08 00:51:33 +0000
commit66aeee8ddc3affec0708e51c2ab78cad2f6b7440 (patch)
treefce9dd0f1e0d3d284965e16d41ae1b7ee3ef2386
parent285ba14e233c20ad5753f779f6717f591ea0a83a (diff)
downloadscummvm-rg350-66aeee8ddc3affec0708e51c2ab78cad2f6b7440.tar.gz
scummvm-rg350-66aeee8ddc3affec0708e51c2ab78cad2f6b7440.tar.bz2
scummvm-rg350-66aeee8ddc3affec0708e51c2ab78cad2f6b7440.zip
VIDEO: Don't crash when sound is disabled :P
svn-id: r51886
-rw-r--r--graphics/video/coktel_decoder.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/graphics/video/coktel_decoder.cpp b/graphics/video/coktel_decoder.cpp
index ca72f87808..15899fb13d 100644
--- a/graphics/video/coktel_decoder.cpp
+++ b/graphics/video/coktel_decoder.cpp
@@ -1057,20 +1057,18 @@ void IMDDecoder::processFrame() {
}
// Audio
- if (_soundStage != kSoundNone) {
- if (cmd == kCommandNextSound) {
+ if (cmd == kCommandNextSound) {
- nextSoundSlice(hasNextCmd);
- cmd = _stream->readUint16LE();
+ nextSoundSlice(hasNextCmd);
+ cmd = _stream->readUint16LE();
- } else if (cmd == kCommandStartSound) {
+ } else if (cmd == kCommandStartSound) {
- startSound = initialSoundSlice(hasNextCmd);
- cmd = _stream->readUint16LE();
+ startSound = initialSoundSlice(hasNextCmd);
+ cmd = _stream->readUint16LE();
- } else
- emptySoundSlice(hasNextCmd);
- }
+ } else
+ emptySoundSlice(hasNextCmd);
// Set palette
if (cmd == kCommandPalette) {