[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.34,1.35
Travis Howell
kirben at users.sourceforge.net
Mon Sep 23 21:30:03 CEST 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv25258/scumm
Modified Files:
scummvm.cpp
Log Message:
Add emergency patch for 'RFC: Timer-based CD audio sync' patch so monkeyvga works again.
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- scummvm.cpp 22 Sep 2002 04:03:45 -0000 1.34
+++ scummvm.cpp 24 Sep 2002 04:29:54 -0000 1.35
@@ -340,6 +340,8 @@
int Scumm::scummLoop(int delta)
{
+ static int counter = 0;
+
#ifndef _WIN32_WCE
if (_debugger)
_debugger->on_frame();
@@ -378,7 +380,17 @@
_vars[VAR_MOUSE_Y] = mouse.y;
_vars[VAR_DEBUGMODE] = _debugMode;
- if (_features & GF_AUDIOTRACKS) {
+ if (_gameId == GID_MONKEY_VGA) {
+ // FIXME: Is all this really necessary now?
+ if (delta == 1)
+ _vars[VAR_MI1_TIMER]++;
+ else if (++counter != 2)
+ _vars[VAR_MI1_TIMER] += 5;
+ else {
+ counter = 0;
+ _vars[VAR_MI1_TIMER] += 6;
+ }
+ } else if (_features & GF_AUDIOTRACKS) {
_vars[VAR_MI1_TIMER] = _sound->readCDTimer();
} else if (_features & GF_OLD256) {
More information about the Scummvm-git-logs
mailing list