summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/looping.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/looping.cpp')
-rw-r--r--src/mame/drivers/looping.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp
index 3e9066dcf68..ff23f1f710b 100644
--- a/src/mame/drivers/looping.cpp
+++ b/src/mame/drivers/looping.cpp
@@ -127,6 +127,11 @@ public:
void init_looping();
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
private:
DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w);
DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w);
@@ -152,14 +157,11 @@ private:
DECLARE_WRITE_LINE_MEMBER(ay_enable_w);
DECLARE_WRITE_LINE_MEMBER(speech_enable_w);
TILE_GET_INFO_MEMBER(get_tile_info);
- DECLARE_PALETTE_INIT(looping);
+ void looping_palette(palette_device &palette) const;
uint32_t screen_update_looping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(looping_interrupt);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
void looping_io_map(address_map &map);
void looping_map(address_map &map);
void looping_sound_io_map(address_map &map);
@@ -193,40 +195,39 @@ private:
*
*************************************/
-PALETTE_INIT_MEMBER(looping_state, looping)
+void looping_state::looping_palette(palette_device &palette) const
{
- 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 < 32; i++)
+ // initialize the palette with these colors
+ for (int i = 0; i < 32; i++)
{
- int bit0, bit1, bit2, r, g, b;
+ int bit0, bit1, bit2;
- /* red component */
- bit0 = (color_prom[i] >> 0) & 1;
- bit1 = (color_prom[i] >> 1) & 1;
- bit2 = (color_prom[i] >> 2) & 1;
- 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) & 1;
- bit1 = (color_prom[i] >> 4) & 1;
- bit2 = (color_prom[i] >> 5) & 1;
- 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) & 1;
- bit1 = (color_prom[i] >> 7) & 1;
- 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));
}
@@ -661,8 +662,7 @@ void looping_state::looping(machine_config &config)
screen.set_palette(m_palette);
GFXDECODE(config, m_gfxdecode, m_palette, gfx_looping);
-
- PALETTE(config, m_palette, 32).set_init(FUNC(looping_state::palette_init_looping));
+ PALETTE(config, m_palette, FUNC(looping_state::looping_palette), 32);
ls259_device &videolatch(LS259(config, "videolatch")); // E2 on video board
videolatch.q_out_cb<1>().set(FUNC(looping_state::level2_irq_set));