diff options
Diffstat (limited to 'src/mame/drivers/cyclemb.cpp')
-rw-r--r-- | src/mame/drivers/cyclemb.cpp | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp index 95721e1cab7..a41c93dca08 100644 --- a/src/mame/drivers/cyclemb.cpp +++ b/src/mame/drivers/cyclemb.cpp @@ -84,8 +84,8 @@ Dumped by Chack'n class cyclemb_state : public driver_device { public: - cyclemb_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + cyclemb_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -140,7 +140,7 @@ public: void init_cyclemb(); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_PALETTE_INIT(cyclemb); + void cyclemb_palette(palette_device &palette) const; uint32_t screen_update_cyclemb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_skydest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -160,28 +160,29 @@ public: -PALETTE_INIT_MEMBER(cyclemb_state, cyclemb) +void cyclemb_state::cyclemb_palette(palette_device &palette) const { - const uint8_t *color_prom = memregion("proms")->base(); - int i,r,g,b,val; - int bit0,bit1,bit2; + uint8_t const *const color_prom = memregion("proms")->base(); - for (i = 0; i < 256; i++) + for (int i = 0; i < 256; i++) { - val = (color_prom[i+0x100]) | (color_prom[i+0x000]<<4); + int const val = color_prom[i | 0x100] | (color_prom[i | 0x000] << 4); + int bit0, bit1, bit2; bit0 = 0; - bit1 = (val >> 6) & 0x01; - bit2 = (val >> 7) & 0x01; - b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - bit0 = (val >> 3) & 0x01; - bit1 = (val >> 4) & 0x01; - bit2 = (val >> 5) & 0x01; - g = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - bit0 = (val >> 0) & 0x01; - bit1 = (val >> 1) & 0x01; - bit2 = (val >> 2) & 0x01; - r = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; + bit1 = BIT(val, 6); + bit2 = BIT(val, 7); + int const b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; + + bit0 = BIT(val, 3); + bit1 = BIT(val, 4); + bit2 = BIT(val, 5); + int const g = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; + + bit0 = BIT(val, 0); + bit1 = BIT(val, 1); + bit2 = BIT(val, 2); + int const r = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; palette.set_pen_color(i, rgb_t(r, g, b)); } @@ -994,12 +995,10 @@ MACHINE_CONFIG_START(cyclemb_state::cyclemb) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(cyclemb_state, screen_update_cyclemb) - MCFG_SCREEN_PALETTE("palette") - - MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cyclemb) - MCFG_PALETTE_ADD("palette", 256) - MCFG_PALETTE_INIT_OWNER(cyclemb_state, cyclemb) + MCFG_SCREEN_PALETTE(m_palette) + GFXDECODE(config, m_gfxdecode, m_palette, gfx_cyclemb); + PALETTE(config, m_palette, FUNC(cyclemb_state::cyclemb_palette), 256); /* sound hardware */ SPEAKER(config, "mono").front_center(); |