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/script_lol.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/script_lol.cpp')
| -rw-r--r-- | engines/kyra/script_lol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index c97e452a88..2f26c14d43 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -609,7 +609,7 @@ int LoLEngine::olol_fadePalette(EMCState *script) { int LoLEngine::olol_loadBitmap(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_clearDialogueField(%p) (%s, %d)", (const void *)script, stackPosString(0), stackPos(1)); - _screen->loadBitmap(stackPosString(0), 3, 3, _screen->getPalette(3).getData()); + _screen->loadBitmap(stackPosString(0), 3, 3, &_screen->getPalette(3)); if (stackPos(1) != 2) _screen->copyPage(3, stackPos(1)); return 1; @@ -2525,7 +2525,7 @@ int LoLEngine::tlol_fadeInScene(const TIM *tim, const uint16 *param) { strcpy(filename, sceneFile); strcat(filename, ".CPS"); - _screen->loadBitmap(filename, 7, 5, _screen->getPalette(0).getData()); + _screen->loadBitmap(filename, 7, 5, &_screen->getPalette(0)); filename[0] = 0; @@ -2563,7 +2563,7 @@ int LoLEngine::tlol_fadeInPalette(const TIM *tim, const uint16 *param) { const char *bitmap = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[0]<<1))); Palette pal(_screen->getPalette(0).getNumColors()); - _screen->loadBitmap(bitmap, 3, 3, pal.getData()); + _screen->loadBitmap(bitmap, 3, 3, &pal); _screen->fadePalette(pal, param[1]); return 1; |