diff options
| author | Paul Gilbert | 2014-05-06 22:49:57 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-05-06 22:49:57 -0400 |
| commit | 0c079f4d6958e295a2c4d666d106c66505d55380 (patch) | |
| tree | a6bb6df27d257d5b8e0c4d9765e4989b25b03db6 /engines/mads/palette.h | |
| parent | bd136a1c87b764de58b2e60dd8f14bb3c33dda40 (diff) | |
| download | scummvm-rg350-0c079f4d6958e295a2c4d666d106c66505d55380.tar.gz scummvm-rg350-0c079f4d6958e295a2c4d666d106c66505d55380.tar.bz2 scummvm-rg350-0c079f4d6958e295a2c4d666d106c66505d55380.zip | |
MADS: Fixes for correctly setting up grey fading palette intensities
Diffstat (limited to 'engines/mads/palette.h')
| -rw-r--r-- | engines/mads/palette.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/mads/palette.h b/engines/mads/palette.h index 1beadd4c16..9bf5bfa830 100644 --- a/engines/mads/palette.h +++ b/engines/mads/palette.h @@ -220,9 +220,15 @@ public: setPalette(&palette[0], 0, PALETTE_COUNT); } - int rgbMerge(byte r, byte g, byte b); + /** + * Calculates a merge/hash for a given palette entry + */ + static int rgbMerge(byte r, byte g, byte b); - int rgbMerge(RGB6 &palEntry); + /** + * Calculates a merge/hash for a given palette entry + */ + static int rgbMerge(RGB6 &palEntry); /** * Fades the given palette to greyscale |