summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/zaxxon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/zaxxon.cpp')
-rw-r--r--src/mame/video/zaxxon.cpp46
1 files changed, 22 insertions, 24 deletions
diff --git a/src/mame/video/zaxxon.cpp b/src/mame/video/zaxxon.cpp
index 04323f11742..76b11ba6a98 100644
--- a/src/mame/video/zaxxon.cpp
+++ b/src/mame/video/zaxxon.cpp
@@ -17,46 +17,44 @@
*
*************************************/
-PALETTE_INIT_MEMBER(zaxxon_state, zaxxon)
+void zaxxon_state::zaxxon_palette(palette_device &palette)
{
- const uint8_t *color_prom = memregion("proms")->base();
- static const int resistances[3] = { 1000, 470, 220 };
- double rweights[3], gweights[3], bweights[2];
- int i;
+ uint8_t const *const color_prom = memregion("proms")->base();
+ static constexpr int resistances[3] = { 1000, 470, 220 };
- /* compute the color output resistor weights */
+ // compute the color output resistor weights
+ double rweights[3], gweights[3], bweights[2];
compute_resistor_weights(0, 255, -1.0,
3, &resistances[0], rweights, 470, 0,
3, &resistances[0], gweights, 470, 0,
2, &resistances[1], bweights, 470, 0);
- /* initialize the palette with these colors */
- for (i = 0; i < palette.entries(); i++)
+ // initialize the palette with these colors
+ for (int i = 0; i < palette.entries(); i++)
{
int bit0, bit1, bit2;
- int r, g, b;
- /* red component */
- bit0 = (color_prom[i] >> 0) & 0x01;
- bit1 = (color_prom[i] >> 1) & 0x01;
- bit2 = (color_prom[i] >> 2) & 0x01;
- r = combine_3_weights(rweights, 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 = combine_3_weights(rweights, bit0, bit1, bit2);
- /* green component */
- bit0 = (color_prom[i] >> 3) & 0x01;
- bit1 = (color_prom[i] >> 4) & 0x01;
- bit2 = (color_prom[i] >> 5) & 0x01;
- g = combine_3_weights(gweights, 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_3_weights(gweights, bit0, bit1, bit2);
- /* blue component */
- bit0 = (color_prom[i] >> 6) & 0x01;
- bit1 = (color_prom[i] >> 7) & 0x01;
- b = combine_2_weights(bweights, bit0, bit1);
+ // blue component
+ bit0 = BIT(color_prom[i], 6);
+ bit1 = BIT(color_prom[i], 7);
+ int const b = combine_2_weights(bweights, bit0, bit1);
palette.set_pen_color(i, rgb_t(r, g, b));
}
- /* color_prom now points to the beginning of the character color codes */
+ // color_prom now points to the beginning of the character color codes
m_color_codes = &color_prom[256];
}