[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.15,1.16

Travis Howell kirben at users.sourceforge.net
Fri Jan 9 07:14:03 CET 2004


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

Modified Files:
	dimuse_sndmgr.cpp 
Log Message:

Regression fix from aquadran


Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dimuse_sndmgr.cpp	9 Jan 2004 13:16:06 -0000	1.15
+++ dimuse_sndmgr.cpp	9 Jan 2004 15:13:56 -0000	1.16
@@ -219,7 +219,7 @@
 			_sounds[slot].resPtr = ptr;
 			result = true;
 		} else if (soundType == IMUSE_BUNDLE) {
-			bool header_outside = _vm->_gameId != GID_DIG;
+			bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO));
 			if (soundGroup == IMUSE_VOICE)
 				result = openVoiceBundle(slot);
 			else if (soundGroup == IMUSE_MUSIC)
@@ -234,7 +234,7 @@
 		}
 	} else if (soundName != NULL) {
 		if (soundType == IMUSE_BUNDLE) {
-			bool header_outside = _vm->_gameId != GID_DIG;
+			bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO));
 			if (soundGroup == IMUSE_VOICE)
 				result = openVoiceBundle(slot);
 			else if (soundGroup == IMUSE_MUSIC)
@@ -396,7 +396,7 @@
 	}
 
 	int header_size = soundHandle->offsetData;
-	bool header_outside = _vm->_gameId != GID_DIG;
+	bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO));
 	if (soundHandle->_bundle) {
 		size = soundHandle->_bundle->decompressSampleByCurIndex(start + offset, size, buf, header_size, header_outside);
 	} else if (soundHandle->resPtr) {





More information about the Scummvm-git-logs mailing list