diff options
| author | Johannes Schickel | 2009-06-25 19:59:06 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-25 19:59:06 +0000 |
| commit | 5d4e7b540cd5180e7190b80f2245c744797b20b8 (patch) | |
| tree | 4b40a89784414605f52cc5d104221eee6e20cd65 /engines/kyra/screen_lol.cpp | |
| parent | 2b87ffc31ebb81954f36769333e2754e5062655d (diff) | |
| download | scummvm-rg350-5d4e7b540cd5180e7190b80f2245c744797b20b8.tar.gz scummvm-rg350-5d4e7b540cd5180e7190b80f2245c744797b20b8.tar.bz2 scummvm-rg350-5d4e7b540cd5180e7190b80f2245c744797b20b8.zip | |
Change Screen_LoL genereta overlay functionallity to accept a Palette object as source.
svn-id: r41884
Diffstat (limited to 'engines/kyra/screen_lol.cpp')
| -rw-r--r-- | engines/kyra/screen_lol.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index e75745d51c..a717a10931 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -144,7 +144,7 @@ void Screen_LoL::fprintStringIntro(const char *format, int x, int y, uint8 c1, u printText(buffer, x, y, c1, c2); } -void Screen_LoL::generateGrayOverlay(const uint8 *srcPal, uint8 *grayOverlay, int factor, int addR, int addG, int addB, int lastColor, bool skipSpecialColors) { +void Screen_LoL::generateGrayOverlay(const Palette &srcPal, uint8 *grayOverlay, int factor, int addR, int addG, int addB, int lastColor, bool skipSpecialColors) { Palette tmpPal(lastColor); for (int i = 0; i != lastColor; i++) { @@ -157,11 +157,11 @@ void Screen_LoL::generateGrayOverlay(const uint8 *srcPal, uint8 *grayOverlay, in } for (int i = 0; i < lastColor; i++) - grayOverlay[i] = findLeastDifferentColor(tmpPal.getData() + 3 * i, srcPal, lastColor, skipSpecialColors); + grayOverlay[i] = findLeastDifferentColor(tmpPal.getData() + 3 * i, srcPal.getData(), lastColor, skipSpecialColors); } -uint8 *Screen_LoL::generateLevelOverlay(const uint8 *srcPal, uint8 *ovl, int opColor, int weight) { - if (!srcPal || !ovl) +uint8 *Screen_LoL::generateLevelOverlay(const Palette &srcPal, uint8 *ovl, int opColor, int weight) { + if (!ovl) return ovl; if (weight > 255) @@ -186,7 +186,7 @@ uint8 *Screen_LoL::generateLevelOverlay(const uint8 *srcPal, uint8 *ovl, int opC int m = 0x7fff; int ii = 127; int x = 1; - const uint8 *s = srcPal + 3; + const uint8 *s = srcPal.getData() + 3; do { if (i == x) { |