[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.94,1.95
Travis Howell
kirben at users.sourceforge.net
Wed Jul 21 05:06:02 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9680/scumm
Modified Files:
scumm.cpp
Log Message:
Confirmed extra timers are in all PC version of indy3 too.
VAR_DEBUGMODE isn't used in SCUMM3 and below.
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- scumm.cpp 21 Jul 2004 11:37:41 -0000 1.94
+++ scumm.cpp 21 Jul 2004 12:05:00 -0000 1.95
@@ -1069,7 +1069,7 @@
else if (_heversion >= 70)
VAR(VAR_VERSION) = 22;
- if (!((_features & GF_MACINTOSH) && (_version == 3)) && !(_features & GF_FMTOWNS)) {
+ if (_version > 3) {
// This is NOT for the Mac version of Indy3/Loom
VAR(VAR_DEBUGMODE) = _debugMode;
}
@@ -1436,9 +1436,9 @@
VAR(VAR_TMR_1) += delta;
VAR(VAR_TMR_2) += delta;
VAR(VAR_TMR_3) += delta;
- if ((_gameId == GID_ZAK256) || (_gameId == GID_INDY3 && (_features & GF_FMTOWNS || _features & GF_AMIGA))) {
- // Amiga and FM Towns version of Indy3 set three extra timers
- // FM Towns version of Zak set three extra timers
+ if (_gameId == GID_ZAK256 || _gameId == GID_INDY3) {
+ // All versions of Indy3 set three extra timers
+ // FM Towns version of Zak sets three extra timers
VAR(39) += delta;
VAR(40) += delta;
VAR(41) += delta;
@@ -1489,7 +1489,7 @@
VAR(VAR_VIRT_MOUSE_Y) = _virtualMouse.y;
VAR(VAR_MOUSE_X) = _mouse.x;
VAR(VAR_MOUSE_Y) = _mouse.y;
- if (!((_features & GF_MACINTOSH) && (_version == 3)) && !(_features & GF_FMTOWNS)) {
+ if (_version > 3) {
// This is NOT for the Mac version of Indy3/Loom
VAR(VAR_DEBUGMODE) = _debugMode;
}
More information about the Scummvm-git-logs
mailing list