diff options
| author | Johannes Schickel | 2009-06-22 02:37:20 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-22 02:37:20 +0000 |
| commit | d2e5166dae41d8972151ba3d1471ceace4323478 (patch) | |
| tree | 44ade291f259c93fe7d818a28efd4bece4ff2dc3 /engines/kyra/seqplayer.cpp | |
| parent | 73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1 (diff) | |
| download | scummvm-rg350-d2e5166dae41d8972151ba3d1471ceace4323478.tar.gz scummvm-rg350-d2e5166dae41d8972151ba3d1471ceace4323478.tar.bz2 scummvm-rg350-d2e5166dae41d8972151ba3d1471ceace4323478.zip | |
Changed Screen::loadBitmap and Movie::open to take an optional Palette pointer instead of an optional array pointer.
svn-id: r41744
Diffstat (limited to 'engines/kyra/seqplayer.cpp')
| -rw-r--r-- | engines/kyra/seqplayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp index bde0cae303..a027444630 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).getData()); + _screen->loadBitmap("WRITING.CPS", 3, 3, &_screen->getPalette(0)); if (_vm->gameFlags().platform == Common::kPlatformMacintosh || _vm->gameFlags().platform == Common::kPlatformAmiga) { freeHandShapes(); @@ -259,7 +259,7 @@ void SeqPlayer::s1_loadPalette() { void SeqPlayer::s1_loadBitmap() { uint8 cpsNum = *_seqData++; - _screen->loadBitmap(_vm->seqCPSTable()[cpsNum], 3, 3, _screen->getPalette(0).getData()); + _screen->loadBitmap(_vm->seqCPSTable()[cpsNum], 3, 3, &_screen->getPalette(0)); } void SeqPlayer::s1_fadeToBlack() { |