aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/palette.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-03-16 00:00:18 -0400
committerPaul Gilbert2014-03-16 00:00:18 -0400
commitdfcef632eacc27b4e035e3796550dced425e836d (patch)
treedd523d7354885e38348441c97465cfc0663d9183 /engines/mads/palette.cpp
parent2fb9edc4ee80c99b5a56a66cf52c614939748bd9 (diff)
downloadscummvm-rg350-dfcef632eacc27b4e035e3796550dced425e836d.tar.gz
scummvm-rg350-dfcef632eacc27b4e035e3796550dced425e836d.tar.bz2
scummvm-rg350-dfcef632eacc27b4e035e3796550dced425e836d.zip
MADS: Hooked up the in-progress scene 103
Diffstat (limited to 'engines/mads/palette.cpp')
-rw-r--r--engines/mads/palette.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index d7301bb369..ba63dd3145 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -237,7 +237,8 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
int PaletteUsage::rgbMerge(RGB6 &palEntry) {
- return palEntry.r * 38 + palEntry.g * 76 + palEntry.b * 14;
+ return ((palEntry.r + 1) / 4 - 1) * 38 + ((palEntry.g + 1) / 4 - 1) * 76 +
+ ((palEntry.b + 1) / 4 - 1) * 14;
}
void PaletteUsage::prioritizeFromList(int lst[3]) {