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_tim.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_tim.cpp')
| -rw-r--r-- | engines/kyra/script_tim.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index abd09a51ac..5c74eae25b 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -478,7 +478,7 @@ TIMInterpreter::Animation *TIMInterpreter::initAnimStruct(int index, const char anim->wsa = new WSAMovie_v2(_vm); assert(anim->wsa); - anim->wsa->open(file, wsaOpenFlags, (index == 1) ? _screen->getPalette(0).getData() : 0); + anim->wsa->open(file, wsaOpenFlags, (index == 1) ? &_screen->getPalette(0) : 0); } if (anim->wsa && anim->wsa->opened()) { @@ -515,7 +515,7 @@ TIMInterpreter::Animation *TIMInterpreter::initAnimStruct(int index, const char snprintf(file, 32, "%s.CPS", filename); if (_vm->resource()->exists(file)) { - _screen->loadBitmap(file, 3, 3, _screen->getPalette(0).getData()); + _screen->loadBitmap(file, 3, 3, &_screen->getPalette(0)); _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, _drawPage2, Screen::CR_NO_P_CHECK); if (_drawPage2) _screen->checkedPageUpdate(8, 4); @@ -539,7 +539,7 @@ TIMInterpreter::Animation *TIMInterpreter::initAnimStruct(int index, const char snprintf(file, 32, "%s.CPS", filename); if (_vm->resource()->exists(file)) { - _screen->loadBitmap(file, 3, 3, _screen->getPalette(0).getData()); + _screen->loadBitmap(file, 3, 3, &_screen->getPalette(0)); _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, _drawPage2, Screen::CR_NO_P_CHECK); if (_drawPage2) _screen->checkedPageUpdate(8, 4); @@ -947,7 +947,7 @@ TIMInterpreter::Animation *TIMInterpreter_LoL::initAnimStruct(int index, const c if (_vm->resource()->exists(file)) { anim->wsa = new WSAMovie_v2(_vm); assert(anim->wsa); - anim->wsa->open(file, wsaOpenFlags, _screen->getPalette(3).getData()); + anim->wsa->open(file, wsaOpenFlags, &_screen->getPalette(3)); } if (wsaFlags & 1) { |