[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.74,2.75 scummvm.cpp,2.128,2.129

[Max Horn]

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

Modified Files:
	gfx.cpp scummvm.cpp 
Log Message:
more v2 var access fixes

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.74
retrieving revision 2.75
diff -u -d -r2.74 -r2.75
--- gfx.cpp	8 May 2003 15:58:29 -0000	2.74
+++ gfx.cpp	8 May 2003 20:37:06 -0000	2.75
@@ -2759,9 +2759,14 @@
 	byte *start, *end;
 	byte tmp[3];
 
-	valueToAdd = VAR(VAR_TIMER);
-	if (valueToAdd < VAR(VAR_TIMER_NEXT))
+	if (_features & GF_AFTER_V2) {
+		// FIXME - no idea if this is right :-/
 		valueToAdd = VAR(VAR_TIMER_NEXT);
+	} else {
+		valueToAdd = VAR(VAR_TIMER);
+		if (valueToAdd < VAR(VAR_TIMER_NEXT))
+			valueToAdd = VAR(VAR_TIMER_NEXT);
+	}
 
 	if (!_colorCycle)							// FIXME
 		return;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.128
retrieving revision 2.129
diff -u -d -r2.128 -r2.129
--- scummvm.cpp	8 May 2003 15:58:30 -0000	2.128
+++ scummvm.cpp	8 May 2003 20:37:06 -0000	2.129
@@ -878,9 +878,11 @@
 	VAR(VAR_HAVE_MSG) = (_haveMsg == 0xFE) ? 0xFF : _haveMsg;
 	VAR(VAR_VIRT_MOUSE_X) = _virtual_mouse_x;
 	VAR(VAR_VIRT_MOUSE_Y) = _virtual_mouse_y;
-	VAR(VAR_MOUSE_X) = mouse.x;
-	VAR(VAR_MOUSE_Y) = mouse.y;
-	VAR(VAR_DEBUGMODE) = _debugMode;
+	if (!(_features & GF_AFTER_V2)) {
+		VAR(VAR_MOUSE_X) = mouse.x;
+		VAR(VAR_MOUSE_Y) = mouse.y;
+		VAR(VAR_DEBUGMODE) = _debugMode;
+	}
 
 	if (_features & GF_AUDIOTRACKS) {
 		// Covered automatically by the Sound class