[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.484,2.485

Eugene Sandulenko sev at users.sourceforge.net
Fri Jan 6 07:07:01 CET 2006


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

Modified Files:
	gfx.cpp 
Log Message:
Finally fix MM NES crash.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.484
retrieving revision 2.485
diff -u -d -r2.484 -r2.485
--- gfx.cpp	6 Jan 2006 13:56:46 -0000	2.484
+++ gfx.cpp	6 Jan 2006 15:02:07 -0000	2.485
@@ -577,6 +577,8 @@
 			x += 16;
 			while (x + width >= _screenWidth)
 				width -= 16;
+			if (width < 0)
+				return;
 		}
 
 		_system->copyRectToScreen(_compositeBuf + x1 + y * _screenWidth, _screenWidth, x, y, width, height);
@@ -3025,6 +3027,7 @@
 			t = tab_2[i * 4 + 1];
 			r = tab_2[i * 4 + 2];
 			b = tab_2[i * 4 + 3];
+
 			if (t == b) {
 				while (l <= r) {
 					if (l >= 0 && l < gdi._numStrips && t < bottom) {





More information about the Scummvm-git-logs mailing list