diff options
Diffstat (limited to 'src/mame/video/finalizr.cpp')
-rw-r--r-- | src/mame/video/finalizr.cpp | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/src/mame/video/finalizr.cpp b/src/mame/video/finalizr.cpp index e133389ffb3..279e77bced8 100644 --- a/src/mame/video/finalizr.cpp +++ b/src/mame/video/finalizr.cpp @@ -35,61 +35,59 @@ ***************************************************************************/ -PALETTE_INIT_MEMBER(finalizr_state, finalizr) +void finalizr_state::finalizr_palette(palette_device &palette) const { const uint8_t *color_prom = memregion("proms")->base(); - static const int resistances[4] = { 2200, 1000, 470, 220 }; - double rweights[4], gweights[4], bweights[4]; - int i; + static constexpr int resistances[4] = { 2200, 1000, 470, 220 }; - /* compute the color output resistor weights */ + // compute the color output resistor weights + double rweights[4], gweights[4], bweights[4]; compute_resistor_weights(0, 255, -1.0, 4, &resistances[0], rweights, 470, 0, 4, &resistances[0], gweights, 470, 0, 4, &resistances[0], bweights, 470, 0); - /* create a lookup table for the palette */ - for (i = 0; i < 0x20; i++) + // create a lookup table for the palette + for (int i = 0; i < 0x20; i++) { int bit0, bit1, bit2, bit3; - int r, g, b; - - /* red component */ - bit0 = (color_prom[i] >> 0) & 0x01; - bit1 = (color_prom[i] >> 1) & 0x01; - bit2 = (color_prom[i] >> 2) & 0x01; - bit3 = (color_prom[i] >> 3) & 0x01; - r = combine_4_weights(rweights, bit0, bit1, bit2, bit3); - - /* green component */ - bit0 = (color_prom[i] >> 4) & 0x01; - bit1 = (color_prom[i] >> 5) & 0x01; - bit2 = (color_prom[i] >> 6) & 0x01; - bit3 = (color_prom[i] >> 7) & 0x01; - g = combine_4_weights(gweights, bit0, bit1, bit2, bit3); - - /* blue component */ - bit0 = (color_prom[i + 0x20] >> 0) & 0x01; - bit1 = (color_prom[i + 0x20] >> 1) & 0x01; - bit2 = (color_prom[i + 0x20] >> 2) & 0x01; - bit3 = (color_prom[i + 0x20] >> 3) & 0x01; - b = combine_4_weights(bweights, bit0, bit1, bit2, bit3); + + // red component + bit0 = BIT(color_prom[i], 0); + bit1 = BIT(color_prom[i], 1); + bit2 = BIT(color_prom[i], 2); + bit3 = BIT(color_prom[i], 3); + int const r = combine_4_weights(rweights, bit0, bit1, bit2, bit3); + + // green component + bit0 = BIT(color_prom[i], 4); + bit1 = BIT(color_prom[i], 5); + bit2 = BIT(color_prom[i], 6); + bit3 = BIT(color_prom[i], 7); + int const g = combine_4_weights(gweights, bit0, bit1, bit2, bit3); + + // blue component + bit0 = BIT(color_prom[i + 0x20], 0); + bit1 = BIT(color_prom[i + 0x20], 1); + bit2 = BIT(color_prom[i + 0x20], 2); + bit3 = BIT(color_prom[i + 0x20], 3); + int const b = combine_4_weights(bweights, bit0, bit1, bit2, bit3); palette.set_indirect_color(i, rgb_t(r, g, b)); } - /* color_prom now points to the beginning of the lookup table */ + // color_prom now points to the beginning of the lookup table color_prom += 0x40; - for (i = 0; i < 0x100; i++) + for (int i = 0; i < 0x100; i++) { - uint8_t ctabentry = (color_prom[i] & 0x0f) | 0x10; + uint8_t const ctabentry = (color_prom[i] & 0x0f) | 0x10; palette.set_pen_indirect(i, ctabentry); } - for (i = 0x100; i < 0x200; i++) + for (int i = 0x100; i < 0x200; i++) { - uint8_t ctabentry = color_prom[i] & 0x0f; + uint8_t const ctabentry = color_prom[i] & 0x0f; palette.set_pen_indirect(i, ctabentry); } } |