[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.180,1.181

Gregory Montoir cyx at users.sourceforge.net
Tue Dec 13 19:31:01 CET 2005


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

Modified Files:
	smush_player.cpp 
Log Message:
Don't update screen when _width or _height is 0, otherwise the copyRectToScreen assert gets triggered. This happens at the beginning of vision.san in FT, where the first frame doesn't contain any FOBJ chunks.

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- smush_player.cpp	18 Oct 2005 01:30:22 -0000	1.180
+++ smush_player.cpp	14 Dec 2005 03:29:53 -0000	1.181
@@ -996,14 +996,16 @@
 
 	end_time = _vm->_system->getMillis();
 
+	if (_width != 0 && _height != 0) {
 #ifdef _WIN32_WCE
-	if (!_inTimer || _inTimerCount == _inTimerCountRedraw) {
-		updateScreen();
-		_inTimerCount = 0;
-	}
+		if (!_inTimer || _inTimerCount == _inTimerCountRedraw) {
+			updateScreen();
+			_inTimerCount = 0;
+		}
 #else
-	updateScreen();
+		updateScreen();
 #endif
+	}
 	_smixer->handleFrame();
 
 	debugC(DEBUG_SMUSH, "Smush stats: FRME( %03d ), Limit(%d)", end_time - start_time, _speed);





More information about the Scummvm-git-logs mailing list