[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.281,2.282 sound.cpp,1.163,1.164

Travis Howell kirben at users.sourceforge.net
Mon Jul 14 01:43:01 CEST 2003


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

Modified Files:
	scummvm.cpp sound.cpp 
Log Message:

zak v1 uses same sound resources as zak v2


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.281
retrieving revision 2.282
diff -u -d -r2.281 -r2.282
--- scummvm.cpp	14 Jul 2003 06:44:47 -0000	2.281
+++ scummvm.cpp	14 Jul 2003 08:42:02 -0000	2.282
@@ -629,8 +629,9 @@
 		_imuse = NULL;
 		_playerV2 = NULL;
 	} else if (_features & GF_OLD_BUNDLE) {
-		_playerV2 = NULL;
-		if (!(_features & GF_AMIGA) && _version != 1)
+		if ((_features & GF_AMIGA) || ((_version == 1) && (_gameId == GID_MANIAC)))
+			_playerV2 = NULL;
+		else
 			_playerV2 = new Player_V2(this);
 		_imuse = NULL;
 		_imuseDigital = NULL;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- sound.cpp	12 Jul 2003 15:38:27 -0000	1.163
+++ sound.cpp	14 Jul 2003 08:42:02 -0000	1.164
@@ -487,7 +487,10 @@
 		return;
 	}
 	
-	if (_scumm->_features & GF_OLD_BUNDLE && _scumm->_version != 1) {
+	if (_scumm->_features & GF_OLD_BUNDLE) {
+		//TODO: support maniac v1 sounds
+		if ((_scumm->_version == 1) && (_scumm->_gameId == GID_MANIAC)) 
+			return;
 		// other versions seem to be 0000 at this point...
 		// hopefully this test is correct
 		// 0xfe7f seems to be sound and 0x764a music





More information about the Scummvm-git-logs mailing list