diff options
| author | Torbjörn Andersson | 2006-12-18 07:24:36 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-12-18 07:24:36 +0000 |
| commit | 0d65cb426074581986526c44b74e0d5ed02b6216 (patch) | |
| tree | 4b93d2f3b326a51ecf9fed61c125369419b17495 /graphics | |
| parent | 17700e2b52df347cb5a8d12b01f380846c872a87 (diff) | |
| download | scummvm-rg350-0d65cb426074581986526c44b74e0d5ed02b6216.tar.gz scummvm-rg350-0d65cb426074581986526c44b74e0d5ed02b6216.tar.bz2 scummvm-rg350-0d65cb426074581986526c44b74e0d5ed02b6216.zip | |
Check _scaleMode when decoding a NULL frame. Otherwise we will draw the
unscaled frame when playing a scaled movie. (The Broken Sword 1 intro is a
good example of this since it is scaled and uses NULL frames early on.)
svn-id: r24870
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/dxa_player.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/graphics/dxa_player.cpp b/graphics/dxa_player.cpp index 580f95e686..e55c54fe3c 100644 --- a/graphics/dxa_player.cpp +++ b/graphics/dxa_player.cpp @@ -535,8 +535,12 @@ void DXAPlayer::decodeNextFrame() { } } - if (tag == MKID_BE('NULL')) - _drawBuffer = _frameBuffer1; + if (tag == MKID_BE('NULL')) { + if (_scaleMode == S_NONE) + _drawBuffer = _frameBuffer1; + else + _drawBuffer = _scaledBuffer; + } } } // End of namespace Graphics |