[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.245,1.246 scumm.cpp,1.716,1.717

kirben kirben at users.sourceforge.net
Sat Feb 4 13:56:04 CET 2006


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4243/scumm

Modified Files:
	script.cpp scumm.cpp 
Log Message:

Fix DISABLE_SCUMM_7_8 compile.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- script.cpp	28 Jan 2006 16:30:34 -0000	1.245
+++ script.cpp	4 Feb 2006 21:55:37 -0000	1.246
@@ -465,9 +465,11 @@
 			printf("\n");
 		}
 
+#ifndef DISABLE_SCUMM_7_8
 		if (_imuseDigital) {
 			_imuseDigital->callback();
 		}
+#endif
 
 		executeOpcode(_opcode);
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.716
retrieving revision 1.717
diff -u -d -r1.716 -r1.717
--- scumm.cpp	4 Feb 2006 12:11:09 -0000	1.716
+++ scumm.cpp	4 Feb 2006 21:55:37 -0000	1.717
@@ -2339,9 +2339,11 @@
 	start_time = _system->getMillis();
 
 	while (!_quit) {
+#ifndef DISABLE_SCUMM_7_8
 		if (_imuseDigital) {
 			_imuseDigital->callback();
 		}
+#endif
 		_sound->updateCD(); // Loop CD Audio if needed
 		parseEvents();
 		if (_system->getMillis() >= start_time + msec_delay)





More information about the Scummvm-git-logs mailing list