diff options
author | Johannes Schickel | 2009-06-22 02:35:45 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-06-22 02:35:45 +0000 |
commit | 882662977f2cdf574e5aab041ceaaf626386d0f2 (patch) | |
tree | 5c1bddf867152fe6d7c274416e8ddc2c4ea66e53 /engines/kyra/screen_lok.cpp | |
parent | 9da52cb28280e0164db7073b0d3ea5abb4d20934 (diff) | |
download | scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.tar.gz scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.tar.bz2 scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.zip |
Changed Screen::getPalette to return a reference to a Palette object.
svn-id: r41741
Diffstat (limited to 'engines/kyra/screen_lok.cpp')
-rw-r--r-- | engines/kyra/screen_lok.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp index 7796b5d27c..a7cad28aa8 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -80,13 +80,15 @@ const ScreenDim *Screen_LoK::getScreenDim(int dim) { void Screen_LoK::fadeSpecialPalette(int palIndex, int startIndex, int size, int fadeTime) { assert(_vm->palTable1()[palIndex]); - assert(getPalette(0)); + uint8 tempPal[768]; - memcpy(tempPal, getPalette(0), 768); + memcpy(tempPal, getPalette(0).getData(), 768); memcpy(&tempPal[startIndex*3], _vm->palTable1()[palIndex], size*3); + fadePalette(tempPal, fadeTime*18); - memcpy(&getPalette(0)[startIndex*3], &tempPal[startIndex*3], size*3); - setScreenPalette(getPalette(0)); + + getPalette(0).copy(tempPal, startIndex, size); + setScreenPalette(getPalette(0).getData()); _system->updateScreen(); } |