diff options
Diffstat (limited to 'src/mame/video/suprloco.cpp')
-rw-r--r-- | src/mame/video/suprloco.cpp | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/src/mame/video/suprloco.cpp b/src/mame/video/suprloco.cpp index 19401afaf4f..15608323be7 100644 --- a/src/mame/video/suprloco.cpp +++ b/src/mame/video/suprloco.cpp @@ -30,42 +30,35 @@ I'm not sure about the resistor values, I'm using the Galaxian ones. ***************************************************************************/ -PALETTE_INIT_MEMBER(suprloco_state, suprloco) +void suprloco_state::suprloco_palette(palette_device &palette) const { const uint8_t *color_prom = memregion("proms")->base(); - int i; - - for (i = 0;i < 512;i++) + for (int i = 0; i < 512; i++) { - int bit0,bit1,bit2,r,g,b; - - /* red component */ - bit0 = (color_prom[i] >> 0) & 0x01; - bit1 = (color_prom[i] >> 1) & 0x01; - bit2 = (color_prom[i] >> 2) & 0x01; - r = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - /* green component */ - bit0 = (color_prom[i] >> 3) & 0x01; - bit1 = (color_prom[i] >> 4) & 0x01; - bit2 = (color_prom[i] >> 5) & 0x01; - g = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - /* blue component */ + int bit0, bit1, bit2; + + // red component + bit0 = BIT(color_prom[i], 0); + bit1 = BIT(color_prom[i], 1); + bit2 = BIT(color_prom[i], 2); + int const r = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; + // green component + bit0 = BIT(color_prom[i], 3); + bit1 = BIT(color_prom[i], 4); + bit2 = BIT(color_prom[i], 5); + int const g = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; + // blue component bit0 = 0; - bit1 = (color_prom[i] >> 6) & 0x01; - bit2 = (color_prom[i] >> 7) & 0x01; - b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; + bit1 = BIT(color_prom[i], 6); + bit2 = BIT(color_prom[i], 7); + int const b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - palette.set_pen_color(i,rgb_t(r,g,b)); + palette.set_pen_color(i, rgb_t(r, g, b)); - /* hack: generate a second bank of sprite palette with red changed to purple */ + // hack: generate a second bank of sprite palette with red changed to purple if (i >= 256) - { - if ((i & 0x0f) == 0x09) - palette.set_pen_color(i+256,rgb_t(r,g,0xff)); - else - palette.set_pen_color(i+256,rgb_t(r,g,b)); - } + palette.set_pen_color(i + 256, rgb_t(r, g, ((i & 0x0f) == 0x09) ? 0xff : b)); } } |