[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.112,1.113

Max Horn fingolfin at users.sourceforge.net
Mon May 12 12:54:04 CEST 2003


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

Modified Files:
	sound.cpp 
Log Message:
fixed illegal var access in V7/V8 games

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- sound.cpp	8 May 2003 15:48:49 -0000	1.112
+++ sound.cpp	12 May 2003 19:53:18 -0000	1.113
@@ -101,15 +101,14 @@
 				);
 #endif
 			
-			if (!(_scumm->_features & GF_AFTER_V7)) {
-				if (_scumm->_imuse)
-					_scumm->VAR(_scumm->VAR_SOUNDRESULT) =
-						(short)_scumm->_imuse->doCommand(data[0], data[1], data[2], data[3], data[4],
+			if (_scumm->_features & GF_AFTER_V7) {
+				if (_scumm->_imuseDigital)
+					_scumm->_imuseDigital->doCommand(data[0], data[1], data[2], data[3], data[4],
 																	data[5], data[6], data[7]);
 			} else {
-				if (_scumm->_imuseDigital)
+				if (_scumm->_imuse)
 					_scumm->VAR(_scumm->VAR_SOUNDRESULT) =
-						(short)_scumm->_imuseDigital->doCommand(data[0], data[1], data[2], data[3], data[4],
+						(short)_scumm->_imuse->doCommand(data[0], data[1], data[2], data[3], data[4],
 																	data[5], data[6], data[7]);
 			}
 		}





More information about the Scummvm-git-logs mailing list