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/screen.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/screen.cpp')
| -rw-r--r-- | engines/kyra/screen.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 8cf48c5ae4..e12ff98d70 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -2767,7 +2767,7 @@ void Screen::shakeScreen(int times) { } } -void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, uint8 *palData, bool skip) { +void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, Palette *pal, bool skip) { uint32 fileSize; uint8 *srcData = _vm->resource()->fileData(filename, &fileSize); @@ -2784,9 +2784,8 @@ void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, uint8 * uint32 imgSize = scumm_stricmp(ext, "CMP") ? READ_LE_UINT32(srcData + 4) : READ_LE_UINT16(srcData); uint16 palSize = READ_LE_UINT16(srcData + 8); - if (palData && palSize) { - loadPalette(srcData + 10, palData, palSize); - } + if (pal && palSize) + loadPalette(srcData + 10, pal->getData(), palSize); uint8 *srcPtr = srcData + 10 + palSize; uint8 *dstData = getPagePtr(dstPage); |