[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.168,1.169

Travis Howell kirben at users.sourceforge.net
Mon Sep 13 05:25:04 CEST 2004


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

Modified Files:
	akos.cpp 
Log Message:

A few corrections


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- akos.cpp	12 Sep 2004 10:47:02 -0000	1.168
+++ akos.cpp	13 Sep 2004 12:24:33 -0000	1.169
@@ -1223,8 +1223,6 @@
 	Common::Rect clip, src, dst;
 
 	debug(0, "codec32(%d, %d)", xmoveCur, ymoveCur);
-	// Disable for now, crashes too much.
-	return 0;
 
 	if (!_mirror) {
 		dst.left = (_actorX - xmoveCur - _width) + 1;
@@ -1249,9 +1247,12 @@
 
 	_vm->markRectAsDirty(kMainVirtScreen, dst, _actorID);
 
-	byte *dstptr = _outptr + dst.left + dst.top * _outwidth;
+	if (_draw_top > dst.top)
+		_draw_top = dst.top;
+	if (_draw_bottom < dst.bottom)
+		_draw_bottom = dst.bottom;
 
-	_vm->gdi.decompressImageHE(dstptr, _outwidth, &dst, _srcptr, &src);
+	_vm->gdi.decompressImageHE(_outptr, _outwidth, &dst, _srcptr, &src);
 	return 0;
 }
 





More information about the Scummvm-git-logs mailing list