diff options
| author | Eugene Sandulenko | 2006-02-22 13:26:13 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-02-22 13:26:13 +0000 |
| commit | a467247e6ed972e0a13bf26af07811dda55bd69a (patch) | |
| tree | d8f1f2cf1fb50732a31dd1b21eec174ce03b7d4f /engines | |
| parent | 56a8e34407f30cd787234688ae0ed942e9bac22c (diff) | |
| download | scummvm-rg350-a467247e6ed972e0a13bf26af07811dda55bd69a.tar.gz scummvm-rg350-a467247e6ed972e0a13bf26af07811dda55bd69a.tar.bz2 scummvm-rg350-a467247e6ed972e0a13bf26af07811dda55bd69a.zip | |
Fix bug #1386333: "FT DEMO: assertion triggered when playing movie".
svn-id: r20812
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 740aeb0239..2a3a4527aa 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -1329,9 +1329,19 @@ void SmushPlayer::play(const char *filename, int32 offset, int32 startFrame) { } 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 |