[Scummvm-cvs-logs] SF.net SVN: scummvm: [28227] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_sndmgr.cpp

[Kirben at users.sourceforge.net]

Revision: 28227
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28227&view=rev
Author:   Kirben
Date:     2007-07-26 18:33:05 -0700 (Thu, 26 Jul 2007)

Log Message:
-----------
Only set soundMode, if compressed segment exists.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2007-07-27 00:59:12 UTC (rev 28226)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2007-07-27 01:33:05 UTC (rev 28227)
@@ -615,22 +615,24 @@
 			if (!len) {
 				sprintf(fileName, "%s_reg%03d.ogg", soundDesc->name, region);
 				cmpFile = soundDesc->bundle->getFile(fileName, offs, len);
+				if (len) {
 #ifndef USE_VORBIS
-				if (len)
 					error("Vorbis library compiled support needed!");
 #endif
-				soundMode = 2;
+					soundMode = 2;
+				}
 			}
 			if (!len) {
 				sprintf(fileName, "%s_reg%03d.mp3", soundDesc->name, region);
 				cmpFile = soundDesc->bundle->getFile(fileName, offs, len);
+				if (len) {
 #ifndef USE_MAD
-				if (len)
 					error("Mad library compiled support needed!");
 #endif
-				assert(len);
-				soundMode = 1;
+					soundMode = 1;
+				}
 			}
+			assert(len);
 
 			if (!soundDesc->compressedStream) {
 				Common::MemoryReadStream *tmp = cmpFile->readStream(len);


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