diff options
| author | Johannes Schickel | 2009-06-22 02:36:54 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-22 02:36:54 +0000 |
| commit | 73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1 (patch) | |
| tree | 6d00cd2c533aeefb72d874f59aa01b9d0e918db5 /engines/kyra/screen_v2.cpp | |
| parent | 4bb392b593c492299dd916784548dc56bc0b25cb (diff) | |
| download | scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.tar.gz scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.tar.bz2 scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.zip | |
- Changed the following Screen functions to take a reference to a Palette object:
-> setScreenPalette
-> fadePalette
-> getFadeParams
-> fadePalStep
- Fixed initialization of 256 color palettes
svn-id: r41743
Diffstat (limited to 'engines/kyra/screen_v2.cpp')
| -rw-r--r-- | engines/kyra/screen_v2.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp index 9f72725d2d..1446315be5 100644 --- a/engines/kyra/screen_v2.cpp +++ b/engines/kyra/screen_v2.cpp @@ -114,12 +114,11 @@ int Screen_v2::findLeastDifferentColor(const uint8 *paletteEntry, const uint8 *p return r; } -void Screen_v2::getFadeParams(const uint8 *palette, int delay, int &delayInc, int &diff) { +void Screen_v2::getFadeParams(const Palette &pal, int delay, int &delayInc, int &diff) { int maxDiff = 0; diff = 0; - int len = _use16ColorMode ? 48 : 768; - for (int i = 0; i < len; ++i) { - diff = ABS(palette[i] - (*_screenPalette)[i]); + for (int i = 0; i < pal.getNumColors() * 3; ++i) { + diff = ABS(pal[i] - (*_screenPalette)[i]); maxDiff = MAX(maxDiff, diff); } |