aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorGregory Montoir2005-12-14 03:29:53 +0000
committerGregory Montoir2005-12-14 03:29:53 +0000
commit25024e6943454e04aaedd4c8dd14b61a5cffba3c (patch)
tree82eedfff00de0ff82f5360c5869919a5e8585f53 /scumm
parent7cb66e3cf751d9750e5d5479cd8d280971d9ef23 (diff)
downloadscummvm-rg350-25024e6943454e04aaedd4c8dd14b61a5cffba3c.tar.gz
scummvm-rg350-25024e6943454e04aaedd4c8dd14b61a5cffba3c.tar.bz2
scummvm-rg350-25024e6943454e04aaedd4c8dd14b61a5cffba3c.zip
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.
svn-id: r19797
Diffstat (limited to 'scumm')
-rw-r--r--scumm/smush/smush_player.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 9bc8b823c0..58973fbd09 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -996,14 +996,16 @@ void SmushPlayer::handleFrame(Chunk &b) {
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);