[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.90,1.91

Jamieson Christian jamieson630 at users.sourceforge.net
Sun Aug 10 20:53:02 CEST 2003


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

Modified Files:
	costume.cpp 
Log Message:
Fix for Bug [770364] MI2: Amiga - Segfault when entering bar
Possible fix for Bug [770085] MI2: Amiga version always crashes after a few minutes

Corrected OOB graphics writes in proc3_ami() by fixing the
mask to properly detect negative Y values. Don't know if
this is the right way to fix this -- there are enough GFX
bugs in the Amiga code as to make assessment difficult --
but at least it averts crashes.

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- costume.cpp	11 Aug 2003 03:45:12 -0000	1.90
+++ costume.cpp	11 Aug 2003 03:52:34 -0000	1.91
@@ -496,7 +496,7 @@
 			len = *src++;
 		do {
 			if (_scaleY == 255 || cost_scaleTable[_scaleIndexY] < _scaleY) {
-				masked = (y < _outheight) && v1.mask_ptr && ((mask[0] | mask[v1.imgbufoffs]) & maskbit);
+				masked = (y >= _outheight) || v1.mask_ptr && ((mask[0] | mask[v1.imgbufoffs]) & maskbit);
 				
 				if (color && v1.x >= 0 && v1.x < _vm->_screenWidth && !masked) {
 					*dst = _palette[color];





More information about the Scummvm-git-logs mailing list