aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/lol.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-29 16:08:16 +0000
committerJohannes Schickel2009-06-29 16:08:16 +0000
commitc09985db2c8222feb2ab0aaa1aa2e562ce423141 (patch)
tree26e43408d41eda8c7ba3275848b9868c14831fc6 /engines/kyra/lol.cpp
parent3bde2647b6ebc4c596c98f8550b3b432441235da (diff)
downloadscummvm-rg350-c09985db2c8222feb2ab0aaa1aa2e562ce423141.tar.gz
scummvm-rg350-c09985db2c8222feb2ab0aaa1aa2e562ce423141.tar.bz2
scummvm-rg350-c09985db2c8222feb2ab0aaa1aa2e562ce423141.zip
Change Screen_LoL::loadSpecialColors to take an Palette object as parameter.
svn-id: r41947
Diffstat (limited to 'engines/kyra/lol.cpp')
-rw-r--r--engines/kyra/lol.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 312234905b..f9b0d03644 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -1680,7 +1680,7 @@ void LoLEngine::setPaletteBrightness(const Palette &srcPal, int brightness, int
void LoLEngine::generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int modifier) {
dst.copy(src);
- _screen->loadSpecialColors(dst.getData());
+ _screen->loadSpecialColors(dst);
brightness = (8 - brightness) << 5;
if (modifier >= 0 && modifier < 8 && (_flagsTable[31] & 0x08)) {
@@ -3663,8 +3663,8 @@ void LoLEngine::restoreSwampPalette() {
SWAP(s[i], d[i]);
generateBrightnessPalette(_screen->getPalette(0), _screen->getPalette(1), _brightness, _lampEffect);
- _screen->loadSpecialColors(s);
- _screen->loadSpecialColors(d2);
+ _screen->loadSpecialColors(_screen->getPalette(2));
+ _screen->loadSpecialColors(_screen->getPalette(1));
playSpellAnimation(0, 0, 0, 2, 0, 0, 0, s, d2, 40, 0);
}