[Scummvm-cvs-logs] CVS: scummvm costume.cpp,1.29,1.30

Lionel Ulmer bbrox at users.sourceforge.net
Wed May 1 02:38:03 CEST 2002


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

Modified Files:
	costume.cpp 
Log Message:
Fix some bad memory accesses in LoomCD. The masking is still bad but
at least Valgrind is not accusing ScummVM to be too buggy anymore :-)



Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** costume.cpp	21 Apr 2002 13:13:26 -0000	1.29
--- costume.cpp	1 May 2002 09:37:03 -0000	1.30
***************
*** 283,291 ****
  	masking = 0;
  
! 	if (_zbuf) {
  		masking = _vm->isMaskActiveAt(_left, _top, _right, _bottom,_vm->getResourceAddress(rtBuffer,9) +
! 																	_vm->gdi._imgBufOffs[_zbuf] +
! 																	_vm->_screenStartStrip);
! 	}
  
  	if (_zbuf || charsetmask) {
--- 283,291 ----
  	masking = 0;
  
! 	if (_vm->_features & GF_SMALL_HEADER)
! 		masking = _zbuf;
! 	else
  		masking = _vm->isMaskActiveAt(_left, _top, _right, _bottom,_vm->getResourceAddress(rtBuffer,9) +
! 		                              _vm->gdi._imgBufOffs[_zbuf] + _vm->_screenStartStrip);
  
  	if (_zbuf || charsetmask) {
***************
*** 1046,1050 ****
  				i++;
  		}
- 
  		nc = lc->_dataptr[i];
  
--- 1046,1049 ----





More information about the Scummvm-git-logs mailing list