[Scummvm-cvs-logs] SF.net SVN: scummvm:[51886] scummvm/trunk/graphics/video/coktel_decoder.cpp

[drmccoy at users.sourceforge.net]

Revision: 51886
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51886&view=rev
Author:   drmccoy
Date:     2010-08-08 00:51:33 +0000 (Sun, 08 Aug 2010)

Log Message:
-----------
VIDEO: Don't crash when sound is disabled :P

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktel_decoder.cpp

Modified: scummvm/trunk/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.cpp	2010-08-08 00:51:09 UTC (rev 51885)
+++ scummvm/trunk/graphics/video/coktel_decoder.cpp	2010-08-08 00:51:33 UTC (rev 51886)
@@ -1057,20 +1057,18 @@
 		}
 
 		// 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) {


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