[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.246,1.247 scumm.cpp,1.720,1.721
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Feb 5 05:47:07 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 gob.vcproj,1.6,1.7 scumm.vcproj,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.136,1.137 dimuse.h,1.82,1.83 dimuse_script.cpp,1.41,1.42 dimuse_track.cpp,1.58,1.59
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13894/scumm
Modified Files:
script.cpp scumm.cpp
Log Message:
revert experimental imuse changes
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- script.cpp 4 Feb 2006 21:55:37 -0000 1.246
+++ script.cpp 5 Feb 2006 13:46:38 -0000 1.247
@@ -465,12 +465,6 @@
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.720
retrieving revision 1.721
diff -u -d -r1.720 -r1.721
--- scumm.cpp 5 Feb 2006 02:14:20 -0000 1.720
+++ scumm.cpp 5 Feb 2006 13:46:38 -0000 1.721
@@ -2339,11 +2339,6 @@
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)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 gob.vcproj,1.6,1.7 scumm.vcproj,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.136,1.137 dimuse.h,1.82,1.83 dimuse_script.cpp,1.41,1.42 dimuse_track.cpp,1.58,1.59
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list