[Scummvm-cvs-logs] SF.net SVN: scummvm: [20812] scummvm/trunk/engines/scumm/smush/smush_player.cpp
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Feb 22 05:27:04 CET 2006
Revision: 20812
Author: sev
Date: 2006-02-22 05:26:13 -0800 (Wed, 22 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20812&view=rev
Log Message:
-----------
Fix bug #1386333: "FT DEMO: assertion triggered when playing movie".
Modified Paths:
--------------
scummvm/trunk/engines/scumm/smush/smush_player.cpp
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2006-02-22 12:15:37 UTC (rev 20811)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2006-02-22 13:26:13 UTC (rev 20812)
@@ -1329,9 +1329,19 @@
}
if (_updateNeeded) {
uint32 end_time, start_time;
+ int w = _width, h = _height;
start_time = _vm->_system->getMillis();
- _vm->_system->copyRectToScreen(_dst, _width, 0, 0, _width, _height);
+
+ // Workaround for bug #1386333: "FT DEMO: assertion triggered
+ // when playing movie". Some frames there are 384 x 224
+ if (w > _vm->_screenWidth)
+ w = _vm->_screenWidth;
+
+ if (h > _vm->_screenHeight)
+ h = _vm->_screenHeight;
+
+ _vm->_system->copyRectToScreen(_dst, _width, 0, 0, w, h);
_vm->_system->updateScreen();
_updateNeeded = false;
#ifdef _WIN32_WCE
More information about the Scummvm-git-logs
mailing list