[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.477,2.478

Max Horn fingolfin at users.sourceforge.net
Sat Nov 19 15:54:02 CET 2005


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

Modified Files:
	gfx.cpp 
Log Message:
Fix for crash caused by very rapid camera movement in V7/V8 games

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.477
retrieving revision 2.478
diff -u -d -r2.477 -r2.478
--- gfx.cpp	18 Nov 2005 00:01:46 -0000	2.477
+++ gfx.cpp	19 Nov 2005 23:53:02 -0000	2.478
@@ -802,11 +802,10 @@
 
 	if (_features & GF_NEW_CAMERA) {
 		diff = camera._cur.x / 8 - camera._last.x / 8;
-		if (_fullRedraw) {
+		if (_fullRedraw || ABS(diff) >= gdi._numStrips) {
 			_bgNeedsRedraw = false;
 			redrawBGStrip(0, gdi._numStrips);
 		} else if (diff > 0) {
-			assert(gdi._numStrips > diff);
 			val = -diff;
 			redrawBGStrip(gdi._numStrips - diff, diff);
 		} else if (diff < 0) {





More information about the Scummvm-git-logs mailing list