diff options
Diffstat (limited to 'src/mame/video/mappy.cpp')
-rw-r--r-- | src/mame/video/mappy.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/video/mappy.cpp b/src/mame/video/mappy.cpp index ccb2a54715c..81828b961a7 100644 --- a/src/mame/video/mappy.cpp +++ b/src/mame/video/mappy.cpp @@ -53,18 +53,18 @@ void mappy_state::superpac_palette(palette_device &palette) const bit0 = BIT(color_prom[i], 0); bit1 = BIT(color_prom[i], 1); bit2 = BIT(color_prom[i], 2); - int const r = combine_weights(rweights, bit0, bit1, bit2); + int const r = combine_3_weights(rweights, bit0, bit1, bit2); // green component bit0 = BIT(color_prom[i], 3); bit1 = BIT(color_prom[i], 4); bit2 = BIT(color_prom[i], 5); - int const g = combine_weights(gweights, bit0, bit1, bit2); + int const g = combine_3_weights(gweights, bit0, bit1, bit2); // blue component bit0 = BIT(color_prom[i], 6); bit1 = BIT(color_prom[i], 7); - int const b = combine_weights(bweights, bit0, bit1); + int const b = combine_2_weights(bweights, bit0, bit1); palette.set_indirect_color(i, rgb_t(r, g, b)); } @@ -108,18 +108,18 @@ void mappy_state::mappy_palette(palette_device &palette) const bit0 = BIT(color_prom[i], 0); bit1 = BIT(color_prom[i], 1); bit2 = BIT(color_prom[i], 2); - int const r = combine_weights(rweights, bit0, bit1, bit2); + int const r = combine_3_weights(rweights, bit0, bit1, bit2); // green component bit0 = BIT(color_prom[i], 3); bit1 = BIT(color_prom[i], 4); bit2 = BIT(color_prom[i], 5); - int const g = combine_weights(gweights, bit0, bit1, bit2); + int const g = combine_3_weights(gweights, bit0, bit1, bit2); // blue component bit0 = BIT(color_prom[i], 6); bit1 = BIT(color_prom[i], 7); - int const b = combine_weights(bweights, bit0, bit1); + int const b = combine_2_weights(bweights, bit0, bit1); palette.set_indirect_color(i, rgb_t(r, g, b)); } @@ -176,21 +176,21 @@ void mappy_state::phozon_palette(palette_device &palette) const bit1 = BIT(color_prom[i], 1); bit2 = BIT(color_prom[i], 2); bit3 = BIT(color_prom[i], 3); - int const r = combine_weights(rweights, bit0, bit1, bit2, bit3); + int const r = combine_4_weights(rweights, bit0, bit1, bit2, bit3); // green component bit0 = BIT(color_prom[i | 0x100], 0); bit1 = BIT(color_prom[i | 0x100], 1); bit2 = BIT(color_prom[i | 0x100], 2); bit3 = BIT(color_prom[i | 0x100], 3); - int const g = combine_weights(gweights, bit0, bit1, bit2, bit3); + int const g = combine_4_weights(gweights, bit0, bit1, bit2, bit3); // blue component bit0 = BIT(color_prom[i | 0x200], 0); bit1 = BIT(color_prom[i | 0x200], 1); bit2 = BIT(color_prom[i | 0x200], 2); bit3 = BIT(color_prom[i | 0x200], 3); - int const b = combine_weights(bweights, bit0, bit1, bit2, bit3); + int const b = combine_4_weights(bweights, bit0, bit1, bit2, bit3); palette.set_indirect_color(i, rgb_t(r, g, b)); } |