aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/screen_lok.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-22 02:35:04 +0000
committerJohannes Schickel2009-06-22 02:35:04 +0000
commit9da52cb28280e0164db7073b0d3ea5abb4d20934 (patch)
treedb192ee1f4860c48bd0e597487b8a97889088643 /engines/kyra/screen_lok.cpp
parentb448d506b89209d79bc153b6b0759ad926fa8794 (diff)
downloadscummvm-rg350-9da52cb28280e0164db7073b0d3ea5abb4d20934.tar.gz
scummvm-rg350-9da52cb28280e0164db7073b0d3ea5abb4d20934.tar.bz2
scummvm-rg350-9da52cb28280e0164db7073b0d3ea5abb4d20934.zip
Got rid of Screen::_currentPalette.
svn-id: r41740
Diffstat (limited to 'engines/kyra/screen_lok.cpp')
-rw-r--r--engines/kyra/screen_lok.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp
index 6d97db2f28..7796b5d27c 100644
--- a/engines/kyra/screen_lok.cpp
+++ b/engines/kyra/screen_lok.cpp
@@ -80,13 +80,13 @@ const ScreenDim *Screen_LoK::getScreenDim(int dim) {
void Screen_LoK::fadeSpecialPalette(int palIndex, int startIndex, int size, int fadeTime) {
assert(_vm->palTable1()[palIndex]);
- assert(_currentPalette);
+ assert(getPalette(0));
uint8 tempPal[768];
- memcpy(tempPal, _currentPalette, 768);
+ memcpy(tempPal, getPalette(0), 768);
memcpy(&tempPal[startIndex*3], _vm->palTable1()[palIndex], size*3);
fadePalette(tempPal, fadeTime*18);
- memcpy(&_currentPalette[startIndex*3], &tempPal[startIndex*3], size*3);
- setScreenPalette(_currentPalette);
+ memcpy(&getPalette(0)[startIndex*3], &tempPal[startIndex*3], size*3);
+ setScreenPalette(getPalette(0));
_system->updateScreen();
}