[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.148,2.149 object.cpp,1.117,1.118 verbs.cpp,1.51,1.52

[Jonathan Gray]

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

Modified Files:
	gfx.cpp object.cpp verbs.cpp 
Log Message:
v1 object drawing updates from aquadran

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.148
retrieving revision 2.149
diff -u -d -r2.148 -r2.149
--- gfx.cpp	6 Jun 2003 05:27:44 -0000	2.148
+++ gfx.cpp	6 Jun 2003 07:35:18 -0000	2.149
@@ -1354,7 +1354,7 @@
 	height >>= 3;
 	width >>= 3;
 	for (y = 0; y < height; y++) {
-		_C64Colors[3] = (_C64ObjectMap[y * width + stripnr] & 7);
+		_C64Colors[3] = (_C64ObjectMap[y * width + stripnr + (width * height)] & 7);
 		for (i = 0; i < 8; i++) {
 			for (j = 7; j >= 0; j--) {
 				byte c = _C64CharMap[_C64ObjectMap[y * width + stripnr] * 8 + i] >> (j & 6);

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- object.cpp	6 Jun 2003 05:27:45 -0000	1.117
+++ object.cpp	6 Jun 2003 07:35:19 -0000	1.118
@@ -442,12 +442,12 @@
 
 	if (numstrip != 0) {
 		byte flags = Gdi::dbAllowMaskOr;
-		// Sam & Max needs this to fix object-layering problems with
-		// the inventory and conversation icons.
 		if (_features & GF_AFTER_V1) {
 			gdi._C64ObjectMode = true;
-			gdi.decodeC64Gfx(ptr, gdi._C64ObjectMap, width * (height >> 3));
+			gdi.decodeC64Gfx(ptr, gdi._C64ObjectMap, width * (height >> 3) * 3);
 		}
+		// Sam & Max needs this to fix object-layering problems with
+		// the inventory and conversation icons.
 		if ((_features & GF_AFTER_V7 || _gameId == GID_SAMNMAX) && getClass(od->obj_nr, kObjectClassIgnoreBoxes))
 			flags |= Gdi::dbDrawMaskOnAll;
 		gdi.drawBitmap(ptr, &virtscr[0], x, ypos, width << 3, height, x - xpos, numstrip, flags);

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- verbs.cpp	6 Jun 2003 05:27:45 -0000	1.51
+++ verbs.cpp	6 Jun 2003 07:35:19 -0000	1.52
@@ -455,6 +455,7 @@
 	assert(imptr);
 	if (_features & GF_AFTER_V1) {
 		gdi._C64ObjectMode = true;
+		gdi.decodeC64Gfx(imptr, gdi._C64ObjectMap, imgw * imgh * 3);
 	}
 	for (i = 0; i < imgw; i++) {
 		tmp = xstrip + i;