[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.42,1.43 scummvm.cpp,1.63,1.64

[Pawe? Ko?odziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv2420

Modified Files:
	gfx.cpp scummvm.cpp 
Log Message:
corrections to initscreens for scummV7+

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- gfx.cpp	27 Oct 2002 09:41:33 -0000	1.42
+++ gfx.cpp	27 Oct 2002 10:31:07 -0000	1.43
@@ -50,7 +50,7 @@
 	if (!(_features & GF_SMALL_HEADER))	// Variable is reserved for game scripts in earlier games
 		_vars[VAR_PERFORMANCE_2] = 0;
 
-	if (_gameId == GID_DIG)
+	if (_features & GF_AFTER_V7)
 		initScreens(0, 0, _realWidth, _realHeight);
 	else
 		initScreens(0, 16, _realWidth, 144);
@@ -88,7 +88,7 @@
 	assert(height >= 0);
 	assert(slot >= 0 && slot < 4);
 
-	if (_gameId == GID_DIG) {
+	if (_features & GF_AFTER_V7) {
 		if ((!slot) && (_scrHeight != 0))
 			height = _scrHeight;
 	}
@@ -105,8 +105,11 @@
 	vs->size = size;
 	vs->backBuf = NULL;
 
-	if (vs->scrollable)
+	if ((vs->scrollable) && (_features & GF_AFTER_V7)) {
 		size += _realWidth * 8;
+	} else {
+		size += _realWidth * 4;
+	}
 
 	createResource(rtBuffer, slot + 1, size);
 	vs->screenPtr = getResourceAddress(rtBuffer, slot + 1);
@@ -1224,7 +1227,9 @@
 	int height = _numLinesToProcess;
 	byte b, c;
 	
-	height--;		// FIXME: This seems to fix The Dig nexus wrapping corrupting memory..
+	if (_vm->_gameId == GID_DIG)
+		height--;
+				// FIXME: This seems to fix The Dig nexus wrapping corrupting memory..
 				//	  and doesn't break any other games.. but is it correct? If so,
 				//	  do we need to mirror this change anywhere else?
 	while (1) {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- scummvm.cpp	27 Oct 2002 10:02:11 -0000	1.63
+++ scummvm.cpp	27 Oct 2002 10:31:07 -0000	1.64
@@ -206,7 +206,11 @@
 	if (!(_features & GF_SMALL_NAMES))
 		loadCharset(1);
 
-	initScreens(0, 16, _realWidth, 144);
+	if (_features & GF_AFTER_V7) {
+		initScreens(0, 0, _realWidth, _realHeight);
+	} else {
+		initScreens(0, 16, _realWidth, 144);
+	}
 
 	setShake(0);
 	setupCursor();