[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.22,2.23

[Jonathan Gray]

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

Modified Files:
	charset.cpp 
Log Message:
patch #730034 from erik, EGA LOOM: Small text shadow update

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.22
retrieving revision 2.23
diff -u -d -r2.22 -r2.23
--- charset.cpp	29 Apr 2003 10:29:00 -0000	2.22
+++ charset.cpp	30 Apr 2003 10:27:06 -0000	2.23
@@ -225,23 +225,24 @@
 				bit = 0x80;
 			}
 			if (buffer & bit) {
-				byte *dst = dest_ptr + y * _vm->_realWidth + x;
-
-				if (_dropShadow)
-					*(dst + _vm->_realWidth + 1) = 0;
-				*dst = _color;
+				if (_dropShadow) {
+					*(dest_ptr + x + 1) = 0;
+					*(dest_ptr + x + _vm->_realWidth) = 0;
+					*(dest_ptr + x + _vm->_realWidth + 1) = 0;
+				}					
+				*(dest_ptr + x) = _color;
 
 				if (useMask) {
 					mask_ptr[maskpos] |= maskmask;
 					if (_dropShadow) {
-						int spos = maskpos + _vm->gdi._numStrips;
-						byte sbit = maskmask >> 1;
-
-						if (sbit == 0) {
-							sbit = 0x80;
-							spos++;
+						mask_ptr[maskpos + _vm->gdi._numStrips] |= maskmask;
+						if (maskmask == 1) {
+							mask_ptr[maskpos + 1] |= 0x80;
+							mask_ptr[maskpos + _vm->gdi._numStrips + 1] |= 0x80;
+						} else {
+							mask_ptr[maskpos] |= (maskmask >> 1);
+							mask_ptr[maskpos + _vm->gdi._numStrips] |= (maskmask >> 1);
 						}
-						mask_ptr[spos] |= sbit;
 					}
 				}
 			}
@@ -251,6 +252,7 @@
 				maskpos++;
 			}
 		}
+		dest_ptr += _vm->_realWidth;
 		mask_ptr += _vm->gdi._numStrips;
 	}