[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.320,1.321 gfx.cpp,2.388,2.389

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22721/scumm

Modified Files:
	actor.cpp gfx.cpp 
Log Message:
(more) correct v2 ditherers. Still suffers from some differences and
text colors are not always match.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- actor.cpp	20 Feb 2005 00:17:21 -0000	1.320
+++ actor.cpp	20 Feb 2005 01:37:47 -0000	1.321
@@ -1402,7 +1402,7 @@
 			palette[i] = i;
 
 		// Make stuff more visible on CGA. Based on disassembly
-		if (_vm->_renderMode == Common::kRenderCGA) {
+		if (_vm->_renderMode == Common::kRenderCGA && _vm->_version > 2) {
 			palette[6] = 5;
 			palette[7] = 15;
 		}

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.388
retrieving revision 2.389
diff -u -d -r2.388 -r2.389
--- gfx.cpp	20 Feb 2005 00:17:22 -0000	2.388
+++ gfx.cpp	20 Feb 2005 01:37:47 -0000	2.389
@@ -555,6 +555,10 @@
 		ptr = dst + y1 * dstPitch;
 
 		idx1 = (y + y1) % 2;
+
+		if (_vm->_version == 2)
+			idx1 = 0;
+
 		for (int x1 = 0; x1 < width; x1++) {
 			idx2 = (x + x1) % 2;
 			*ptr++ = cgaDither[idx1][idx2][*ptr & 0xF];