[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.54,1.55 gfx.h,1.7,1.8 object.cpp,1.12,1.13 saveload.cpp,1.19,1.20 scumm.h,1.59,1.60

[Pawe? Ko?odziejski]

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

Modified Files:
	gfx.cpp gfx.h object.cpp saveload.cpp scumm.h 
Log Message:
applied patch: #634326, and changed strip ranges for after and before scumm v7,
added comments to saveload

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- gfx.cpp	6 Nov 2002 15:29:48 -0000	1.54
+++ gfx.cpp	6 Nov 2002 17:55:43 -0000	1.55
@@ -430,8 +430,12 @@
 	size = itemsize * gdi._numZBuffer;
 	memset(createResource(rtBuffer, 9, size), 0, size);
 
-	for (i = 0; i < 4; i++)
-		gdi._imgBufOffs[i] = i * itemsize;
+	for (i = 0; i < (int)ARRAYSIZE(gdi._imgBufOffs); i++) {
+		if (i < gdi._numZBuffer)
+			gdi._imgBufOffs[i] = i * itemsize;
+		else
+			gdi._imgBufOffs[i] = (gdi._numZBuffer - 1) * itemsize;
+	}
 }
 
 void Scumm::setPaletteFromPtr(byte *ptr)
@@ -1854,8 +1858,13 @@
 		lp = (left >> 3) + _screenStartStrip;
 		if (lp < 0)
 			lp = 0;
-		if (rp >= 240)
-			rp = 240;
+		if (_features & GF_AFTER_V7) {
+			if (rp > 409)
+				rp = 409;
+		} else {
+			if (rp >= 200)
+				rp = 200;
+		}
 		if (lp <= rp) {
 			num = rp - lp + 1;
 			sp = &gfxUsageBits[lp];

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gfx.h	6 Nov 2002 15:29:49 -0000	1.7
+++ gfx.h	6 Nov 2002 17:55:44 -0000	1.8
@@ -116,7 +116,7 @@
 	uint _readOffs;
 
 	int _numZBuffer;
-	int _imgBufOffs[4];
+	int _imgBufOffs[5];
 	byte _disable_zbuffer;
 	int32 _numStrips;
 

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- object.cpp	6 Nov 2002 15:29:49 -0000	1.12
+++ object.cpp	6 Nov 2002 17:55:44 -0000	1.13
@@ -1433,9 +1433,13 @@
 
 	if (left_strip < 0)
 		left_strip = 0;
-	if (right_strip >= 409)
-		right_strip = 409;
-
+	if (_features & GF_AFTER_V7) {
+		if (right_strip > 409)
+			right_strip = 409;
+	} else {
+		if (right_strip >= 200)
+			right_strip = 200;
+	}
 	for (i = left_strip; i <= right_strip; i++)
 		gdi.resetBackground(top, bottom, i);
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- saveload.cpp	6 Nov 2002 15:22:10 -0000	1.19
+++ saveload.cpp	6 Nov 2002 17:55:44 -0000	1.20
@@ -410,6 +410,8 @@
 		// MKLINE(Scumm, _palManipEnd, sleByte),
 		// MKLINE(Scumm, _palManipCounter, sleUint16),
 
+		// MKARRAY(Scumm, gfxUsageBits[0], sleUint32, 410),
+		// replace below:
 		MKARRAY(Scumm, gfxUsageBits[0], sleUint32, 200),
 		MKLINE(Scumm, gdi._transparency, sleByte),
 		MKARRAY(Scumm, _currentPalette[0], sleByte, 768),
@@ -421,6 +423,7 @@
 
 		MKLINE(Scumm, _egoPositioned, sleByte),
 
+		// FIXME: Should be 5, not 4 :
 		MKARRAY(Scumm, gdi._imgBufOffs[0], sleUint16, 4),
 		MKLINE(Scumm, gdi._numZBuffer, sleByte),
 
@@ -521,6 +524,8 @@
 		// MKLINE(Scumm, _palManipEnd, sleByte),
 		// MKLINE(Scumm, _palManipCounter, sleUint16),
 
+		// MKARRAY(Scumm, gfxUsageBits[0], sleUint32, 410),
+		// replace below:
 		MKARRAY(Scumm, gfxUsageBits[0], sleUint32, 200),
 		MKLINE(Scumm, gdi._transparency, sleByte),
 		MKARRAY(Scumm, _currentPalette[0], sleByte, 768),
@@ -532,6 +537,7 @@
 
 		MKLINE(Scumm, _egoPositioned, sleByte),
 
+		// FIXME: Should be 5, not 4 :
 		MKARRAY(Scumm, gdi._imgBufOffs[0], sleUint16, 4),
 		MKLINE(Scumm, gdi._numZBuffer, sleByte),
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- scumm.h	6 Nov 2002 16:44:57 -0000	1.59
+++ scumm.h	6 Nov 2002 17:55:44 -0000	1.60
@@ -840,7 +840,7 @@
 	uint16 _palManipCounter;
 	byte *_palManipPalette;
 	byte *_palManipIntermediatePal;
-	uint32 gfxUsageBits[409];
+	uint32 gfxUsageBits[410];
 	byte *_shadowPalette;
 	int _shadowPaletteSize;
 	byte _currentPalette[3 * 256];