[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.86,1.87

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15334

Modified Files:
	sound.cpp 
Log Message:
add bundle file names for comi demo, and only add .IMX when playing the full version

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- sound.cpp	1 Mar 2003 13:32:45 -0000	1.86
+++ sound.cpp	4 Mar 2003 06:10:07 -0000	1.87
@@ -996,8 +996,10 @@
 				_scumm->_bundle->_musicFile.close();	
 
 			if (_scumm->_bundle->openMusicFile(bunfile, _scumm->getGameDataPath()) == false) {
-				_outputMixerSize = 0;
-				return;
+				if (_scumm->_bundle->openMusicFile("music.bun", _scumm->getGameDataPath()) == false) {
+					_outputMixerSize = 0;
+					return;
+				}
 			}
 
 			_musicDisk = (byte)_scumm->_vars[_scumm->VAR_CURRENTDISK];
@@ -1179,6 +1181,8 @@
 
 		result = _scumm->_bundle->openVoiceFile(voxfile, _scumm->getGameDataPath());
 
+		if (result == false) 
+			result = _scumm->_bundle->openVoiceFile("voice.bun", _scumm->getGameDataPath());
 		_voiceDisk = (byte)_scumm->_vars[_scumm->VAR_CURRENTDISK];
 	} else if (_scumm->_gameId == GID_DIG)
 		result = _scumm->_bundle->openVoiceFile("digvoice.bun", _scumm->getGameDataPath());
@@ -1195,7 +1199,8 @@
 	if (_scumm->_gameId == GID_CMI) {
 		char name[20];
 		strcpy(name, sound);
-		strcat(name, ".IMX");
+		if (_scumm->_maxRooms != 6) // CMI demo does not have .IMX for voice but does for music...
+			strcat(name, ".IMX");
 		ptr = (byte *)malloc(1000000);
 		output_size = _scumm->_bundle->decompressVoiceSampleByName(name, ptr);
 		if (output_size == 0) {