diff options
Diffstat (limited to 'engines/kyra/seqplayer.cpp')
-rw-r--r-- | engines/kyra/seqplayer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp index 214acb6240..c31cb9a35a 100644 --- a/engines/kyra/seqplayer.cpp +++ b/engines/kyra/seqplayer.cpp @@ -92,7 +92,7 @@ uint8 *SeqPlayer::setPanPages(int pageNum, int shape) { } void SeqPlayer::makeHandShapes() { - _screen->loadBitmap("WRITING.CPS", 3, 3, _screen->getPalette(0)); + _screen->loadBitmap("WRITING.CPS", 3, 3, _screen->getPalette(0).getData()); if (_vm->gameFlags().platform == Common::kPlatformMacintosh || _vm->gameFlags().platform == Common::kPlatformAmiga) { freeHandShapes(); @@ -241,25 +241,25 @@ void SeqPlayer::s1_loadPalette() { if (_vm->gameFlags().platform == Common::kPlatformAmiga) { if (!colNum) - memcpy(_screen->getPalette(0), _screen->getPalette(0) + 576, 3*32); + _screen->getPalette(0).copy(_screen->getPalette(6)); else if (colNum == 3) - memcpy(_screen->getPalette(0), _screen->getPalette(0) + 672, 3*32); + _screen->getPalette(0).copy(_screen->getPalette(7)); else if (colNum == 4) - memcpy(_screen->getPalette(0), _screen->getPalette(0) + 288, 3*32); + _screen->getPalette(0).copy(_screen->getPalette(3)); - _screen->setScreenPalette(_screen->getPalette(0)); + _screen->setScreenPalette(_screen->getPalette(0).getData()); } else { uint32 fileSize; uint8 *srcData; srcData = _res->fileData(_vm->seqCOLTable()[colNum], &fileSize); - memcpy(_screen->getPalette(0), srcData, fileSize); + memcpy(_screen->getPalette(0).getData(), srcData, fileSize); delete[] srcData; } } void SeqPlayer::s1_loadBitmap() { uint8 cpsNum = *_seqData++; - _screen->loadBitmap(_vm->seqCPSTable()[cpsNum], 3, 3, _screen->getPalette(0)); + _screen->loadBitmap(_vm->seqCPSTable()[cpsNum], 3, 3, _screen->getPalette(0).getData()); } void SeqPlayer::s1_fadeToBlack() { |