diff options
author | Johannes Schickel | 2009-06-22 02:36:54 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-06-22 02:36:54 +0000 |
commit | 73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1 (patch) | |
tree | 6d00cd2c533aeefb72d874f59aa01b9d0e918db5 /engines/kyra/vqa.cpp | |
parent | 4bb392b593c492299dd916784548dc56bc0b25cb (diff) | |
download | scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.tar.gz scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.tar.bz2 scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.zip |
- Changed the following Screen functions to take a reference to a Palette object:
-> setScreenPalette
-> fadePalette
-> getFadeParams
-> fadePalStep
- Fixed initialization of 256 color palettes
svn-id: r41743
Diffstat (limited to 'engines/kyra/vqa.cpp')
-rw-r--r-- | engines/kyra/vqa.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 0d5df03474..bfb27d0d16 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -520,9 +520,8 @@ void VQAMovie::displayFrame(uint frameNum) { // The frame has been decoded - if (_frameInfo[frameNum] & 0x80000000) { - _vm->screen()->setScreenPalette(_vm->screen()->getPalette(0).getData()); - } + if (_frameInfo[frameNum] & 0x80000000) + _vm->screen()->setScreenPalette(_vm->screen()->getPalette(0)); int blockPitch = _header.width / _header.blockW; |