diff options
| author | Johannes Schickel | 2009-06-22 02:35:45 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-22 02:35:45 +0000 |
| commit | 882662977f2cdf574e5aab041ceaaf626386d0f2 (patch) | |
| tree | 5c1bddf867152fe6d7c274416e8ddc2c4ea66e53 /engines/kyra/vqa.cpp | |
| parent | 9da52cb28280e0164db7073b0d3ea5abb4d20934 (diff) | |
| download | scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.tar.gz scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.tar.bz2 scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.zip | |
Changed Screen::getPalette to return a reference to a Palette object.
svn-id: r41741
Diffstat (limited to 'engines/kyra/vqa.cpp')
| -rw-r--r-- | engines/kyra/vqa.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 5e0b22a715..0d5df03474 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -474,13 +474,13 @@ void VQAMovie::displayFrame(uint frameNum) { case MKID_BE('CPL0'): // Palette assert(size <= 3 * 256); - _file->read(_vm->screen()->getPalette(0), size); + _file->read(_vm->screen()->getPalette(0).getData(), size); break; case MKID_BE('CPLZ'): // Palette inbuf = (byte *)allocBuffer(0, size); _file->read(inbuf, size); - Screen::decodeFrame4(inbuf, _vm->screen()->getPalette(0), 768); + Screen::decodeFrame4(inbuf, _vm->screen()->getPalette(0).getData(), 768); break; case MKID_BE('VPT0'): // Frame data @@ -521,7 +521,7 @@ void VQAMovie::displayFrame(uint frameNum) { // The frame has been decoded if (_frameInfo[frameNum] & 0x80000000) { - _vm->screen()->setScreenPalette(_vm->screen()->getPalette(0)); + _vm->screen()->setScreenPalette(_vm->screen()->getPalette(0).getData()); } int blockPitch = _header.width / _header.blockW; |