From 7d41a1f619f0e03eeaf7acc2edde6c2671779e03 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 23 Oct 2016 00:22:00 +0200 Subject: Improvements to rgb_t (nw) - Make most class methods constexpr - Make color constants (white, black, etc.) into constexpr factory methods, in order to fix a static initialization problem discussed on the MAMEWorld forums. (Note that while C++14 allows constexpr member variables to be initialized outside classes, current compilers' support for C++14 constexpr rules has proven to be lamentably deficient.) - Create bitmap_rgb32::erase to simplify syntax in update handlers --- src/mame/drivers/alinvade.cpp | 2 +- src/mame/drivers/alto2.cpp | 2 +- src/mame/drivers/amust.cpp | 2 +- src/mame/drivers/anzterm.cpp | 2 +- src/mame/drivers/apexc.cpp | 4 ++-- src/mame/drivers/apricot.cpp | 4 ++-- src/mame/drivers/arcadia.cpp | 4 ++-- src/mame/drivers/astinvad.cpp | 16 ++++++++-------- src/mame/drivers/attache.cpp | 2 +- src/mame/drivers/avalnche.cpp | 4 ++-- src/mame/drivers/ax20.cpp | 2 +- src/mame/drivers/beaminv.cpp | 2 +- src/mame/drivers/beehive.cpp | 2 +- src/mame/drivers/berzerk.cpp | 4 ++-- src/mame/drivers/binbug.cpp | 4 ++-- src/mame/drivers/bw12.cpp | 2 +- src/mame/drivers/c64dtv.cpp | 2 +- src/mame/drivers/cbm2.cpp | 2 +- src/mame/drivers/cgenie.cpp | 8 ++++---- src/mame/drivers/clayshoo.cpp | 2 +- src/mame/drivers/cmi.cpp | 2 +- src/mame/drivers/dai3wksi.cpp | 2 +- src/mame/drivers/decwritr.cpp | 2 +- src/mame/drivers/dvk_ksm.cpp | 2 +- src/mame/drivers/einstein.cpp | 2 +- src/mame/drivers/electron.cpp | 2 +- src/mame/drivers/embargo.cpp | 2 +- src/mame/drivers/enigma2.cpp | 2 +- src/mame/drivers/fk1.cpp | 2 +- src/mame/drivers/h19.cpp | 2 +- src/mame/drivers/homelab.cpp | 6 +++--- src/mame/drivers/hp64k.cpp | 2 +- src/mame/drivers/hp9845.cpp | 2 +- src/mame/drivers/hyperscan.cpp | 2 +- src/mame/drivers/ie15.cpp | 4 ++-- src/mame/drivers/ipds.cpp | 2 +- src/mame/drivers/iq151.cpp | 2 +- src/mame/drivers/itt3030.cpp | 6 +++--- src/mame/drivers/k8915.cpp | 2 +- src/mame/drivers/kaypro.cpp | 2 +- src/mame/drivers/laser3k.cpp | 2 +- src/mame/drivers/m10.cpp | 2 +- src/mame/drivers/m14.cpp | 2 +- src/mame/drivers/m79amb.cpp | 2 +- src/mame/drivers/mgames.cpp | 2 +- src/mame/drivers/micral.cpp | 2 +- src/mame/drivers/minivadr.cpp | 2 +- src/mame/drivers/mmagic.cpp | 20 ++++++++++---------- src/mame/drivers/modellot.cpp | 2 +- src/mame/drivers/mx2178.cpp | 2 +- src/mame/drivers/nokia_3310.cpp | 2 +- src/mame/drivers/octopus.cpp | 2 +- src/mame/drivers/osbexec.cpp | 2 +- src/mame/drivers/osborne1.cpp | 2 +- src/mame/drivers/p2000t.cpp | 8 ++++---- src/mame/drivers/pc8001.cpp | 4 ++-- src/mame/drivers/pcxt.cpp | 2 +- src/mame/drivers/peoplepc.cpp | 2 +- src/mame/drivers/pet.cpp | 6 +++--- src/mame/drivers/plan80.cpp | 2 +- src/mame/drivers/pmd85.cpp | 2 +- src/mame/drivers/pyl601.cpp | 2 +- src/mame/drivers/quizshow.cpp | 4 ++-- src/mame/drivers/rc759.cpp | 2 +- src/mame/drivers/rd100.cpp | 2 +- src/mame/drivers/rotaryf.cpp | 4 ++-- src/mame/drivers/safarir.cpp | 2 +- src/mame/drivers/sbrain.cpp | 2 +- src/mame/drivers/seabattl.cpp | 4 ++-- src/mame/drivers/skydiver.cpp | 4 ++-- src/mame/drivers/sm1800.cpp | 4 ++-- src/mame/drivers/sm7238.cpp | 2 +- src/mame/drivers/sstrangr.cpp | 4 ++-- src/mame/drivers/tandy2k.cpp | 2 +- src/mame/drivers/tdv2324.cpp | 2 +- src/mame/drivers/tek405x.cpp | 4 ++-- src/mame/drivers/ti99_2.cpp | 2 +- src/mame/drivers/toratora.cpp | 2 +- src/mame/drivers/trs80m2.cpp | 6 +++--- src/mame/drivers/ts803.cpp | 2 +- src/mame/drivers/tv990.cpp | 8 ++++---- src/mame/drivers/univac.cpp | 2 +- src/mame/drivers/vboy.cpp | 8 ++++---- src/mame/drivers/victor9k.cpp | 2 +- src/mame/drivers/vixen.cpp | 2 +- src/mame/drivers/vt100.cpp | 2 +- src/mame/drivers/vta2000.cpp | 2 +- src/mame/drivers/vtech2.cpp | 4 ++-- src/mame/drivers/warpsped.cpp | 4 ++-- src/mame/drivers/wicat.cpp | 2 +- src/mame/drivers/zac2650.cpp | 8 ++++---- src/mame/drivers/zorba.cpp | 2 +- src/mame/drivers/zrt80.cpp | 2 +- src/mame/drivers/zx.cpp | 8 ++++---- src/mame/machine/sms.cpp | 12 ++++++------ src/mame/machine/vectrex.cpp | 12 ++++++------ src/mame/video/733_asr.cpp | 4 ++-- src/mame/video/abc1600.cpp | 4 ++-- src/mame/video/abc800.cpp | 6 +++--- src/mame/video/abc802.cpp | 2 +- src/mame/video/abc806.cpp | 4 ++-- src/mame/video/apple2.cpp | 2 +- src/mame/video/capbowl.cpp | 2 +- src/mame/video/cgc7900.cpp | 4 ++-- src/mame/video/darkmist.cpp | 2 +- src/mame/video/decodmd1.cpp | 4 ++-- src/mame/video/firetrk.cpp | 8 ++++---- src/mame/video/galaxian.cpp | 12 ++++++------ src/mame/video/hyhoo.cpp | 2 +- src/mame/video/itech8.cpp | 8 ++++---- src/mame/video/jedi.cpp | 2 +- src/mame/video/kaypro.cpp | 2 +- src/mame/video/liberatr.cpp | 2 +- src/mame/video/malzak.cpp | 2 +- src/mame/video/mcr3.cpp | 2 +- src/mame/video/mw8080bw.cpp | 18 +++++++++--------- src/mame/video/newbrain.cpp | 4 ++-- src/mame/video/pc1512.cpp | 6 +++--- src/mame/video/pcd.cpp | 6 +++--- src/mame/video/quasar.cpp | 2 +- src/mame/video/special.cpp | 4 ++-- src/mame/video/v1050.cpp | 2 +- src/mame/video/vector06.cpp | 2 +- src/mame/video/vicdual.cpp | 6 +++--- src/mame/video/warpwarp.cpp | 2 +- src/mame/video/zaccaria.cpp | 2 +- src/mame/video/zodiack.cpp | 2 +- src/mame/video/zx8301.cpp | 2 +- 128 files changed, 231 insertions(+), 231 deletions(-) (limited to 'src/mame') diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp index 9743e3d69b1..f3f7b3781b6 100644 --- a/src/mame/drivers/alinvade.cpp +++ b/src/mame/drivers/alinvade.cpp @@ -180,7 +180,7 @@ uint32_t alinvade_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm for (i = 0; i < 8; i++) { - pen_t pen = (data & 0x01) ? rgb_t::white : rgb_t::black; + pen_t pen = (data & 0x01) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y, x) = pen; data = data >> 1; diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp index 291eee99351..1ed1d1109b0 100644 --- a/src/mame/drivers/alto2.cpp +++ b/src/mame/drivers/alto2.cpp @@ -281,7 +281,7 @@ static MACHINE_CONFIG_START( alto2, alto2_state ) MCFG_CPU_IO_MAP(alto2_iomem_map) // Video hardware - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white()) MCFG_SCREEN_RAW_PARAMS(XTAL_20_16MHz, A2_DISP_TOTAL_WIDTH, 0, A2_DISP_WIDTH, A2_DISP_TOTAL_HEIGHT, 0, A2_DISP_HEIGHT) diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index 555813dba3b..5c2aea97faf 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -397,7 +397,7 @@ static MACHINE_CONFIG_START( amust, amust_state ) MCFG_MACHINE_RESET_OVERRIDE(amust_state, amust) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(640, 480) diff --git a/src/mame/drivers/anzterm.cpp b/src/mame/drivers/anzterm.cpp index eb9a00a7a60..ff5ba0a8f23 100644 --- a/src/mame/drivers/anzterm.cpp +++ b/src/mame/drivers/anzterm.cpp @@ -417,7 +417,7 @@ MACHINE_CONFIG_START( anzterm, anzterm_state ) MCFG_DEVICE_ADD("acia.ic17", ACIA6850, 0) MCFG_DEVICE_ADD("acia.ic18", ACIA6850, 0) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(anzterm_state, screen_update) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_RAW_PARAMS(15974400/4, 1024, 0, 104*8, 260, 0, 24*10) // this is totally wrong, it just stops a validation error diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp index 6d338a6839e..8dcb2dcd67b 100644 --- a/src/mame/drivers/apexc.cpp +++ b/src/mame/drivers/apexc.cpp @@ -504,8 +504,8 @@ INTERRUPT_GEN_MEMBER(apexc_state::apexc_interrupt) static const rgb_t apexc_palette[] = { - rgb_t::white, - rgb_t::black, + rgb_t::white(), + rgb_t::black(), rgb_t(255, 0, 0), rgb_t(50, 0, 0) }; diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index 3c6e2ef0266..4925a63778c 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -284,7 +284,7 @@ uint32_t apricot_state::screen_update_apricot(screen_device &screen, bitmap_rgb3 if (!m_display_on) m_crtc->screen_update(screen, bitmap, cliprect); else - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); return 0; } @@ -392,7 +392,7 @@ static MACHINE_CONFIG_START( apricot, apricot_state ) MCFG_RAM_DEFAULT_SIZE("256k") // video hardware - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_SIZE(800, 400) MCFG_SCREEN_VISIBLE_AREA(0, 800-1, 0, 400-1) MCFG_SCREEN_REFRESH_RATE(72) diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp index c1386db9654..0b0b4f5dc6e 100644 --- a/src/mame/drivers/arcadia.cpp +++ b/src/mame/drivers/arcadia.cpp @@ -416,14 +416,14 @@ GFXDECODE_END static const rgb_t arcadia_colors[] = { - rgb_t::white, /* white */ + rgb_t::white(), /* white */ rgb_t(0xff, 0xff, 0x00), /* yellow */ rgb_t(0x00, 0xff, 0xff), /* cyan */ rgb_t(0x00, 0xff, 0x00), /* green */ rgb_t(0xff, 0x00, 0xff), /* magenta */ rgb_t(0xff, 0x00, 0x00), /* red */ rgb_t(0x00, 0x00, 0xff), /* blue */ - rgb_t::black /* black */ + rgb_t::black() /* black */ }; static const unsigned short arcadia_palette[128+8] = /* bgnd, fgnd */ diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index 8a15e952351..5fcc2838eeb 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -148,14 +148,14 @@ void astinvad_state::plot_byte( bitmap_rgb32 &bitmap, uint8_t y, uint8_t x, uint { uint8_t flip_xor = m_screen_flip & 7; - bitmap.pix32(y, x + (0 ^ flip_xor)) = (data & 0x01) ? m_palette->pen_color(color) : rgb_t::black; - bitmap.pix32(y, x + (1 ^ flip_xor)) = (data & 0x02) ? m_palette->pen_color(color) : rgb_t::black; - bitmap.pix32(y, x + (2 ^ flip_xor)) = (data & 0x04) ? m_palette->pen_color(color) : rgb_t::black; - bitmap.pix32(y, x + (3 ^ flip_xor)) = (data & 0x08) ? m_palette->pen_color(color) : rgb_t::black; - bitmap.pix32(y, x + (4 ^ flip_xor)) = (data & 0x10) ? m_palette->pen_color(color) : rgb_t::black; - bitmap.pix32(y, x + (5 ^ flip_xor)) = (data & 0x20) ? m_palette->pen_color(color) : rgb_t::black; - bitmap.pix32(y, x + (6 ^ flip_xor)) = (data & 0x40) ? m_palette->pen_color(color) : rgb_t::black; - bitmap.pix32(y, x + (7 ^ flip_xor)) = (data & 0x80) ? m_palette->pen_color(color) : rgb_t::black; + bitmap.pix32(y, x + (0 ^ flip_xor)) = (data & 0x01) ? m_palette->pen_color(color) : rgb_t::black(); + bitmap.pix32(y, x + (1 ^ flip_xor)) = (data & 0x02) ? m_palette->pen_color(color) : rgb_t::black(); + bitmap.pix32(y, x + (2 ^ flip_xor)) = (data & 0x04) ? m_palette->pen_color(color) : rgb_t::black(); + bitmap.pix32(y, x + (3 ^ flip_xor)) = (data & 0x08) ? m_palette->pen_color(color) : rgb_t::black(); + bitmap.pix32(y, x + (4 ^ flip_xor)) = (data & 0x10) ? m_palette->pen_color(color) : rgb_t::black(); + bitmap.pix32(y, x + (5 ^ flip_xor)) = (data & 0x20) ? m_palette->pen_color(color) : rgb_t::black(); + bitmap.pix32(y, x + (6 ^ flip_xor)) = (data & 0x40) ? m_palette->pen_color(color) : rgb_t::black(); + bitmap.pix32(y, x + (7 ^ flip_xor)) = (data & 0x80) ? m_palette->pen_color(color) : rgb_t::black(); } diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 0f43caf48ff..b1958f25904 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -916,7 +916,7 @@ static MACHINE_CONFIG_START( attache, attache_state ) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(64)) /* not accurate */ MCFG_SCREEN_SIZE(640,240) diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp index 0c051f25638..6efd0fed41d 100644 --- a/src/mame/drivers/avalnche.cpp +++ b/src/mame/drivers/avalnche.cpp @@ -64,9 +64,9 @@ uint32_t avalnche_state::screen_update_avalnche(screen_device &screen, bitmap_rg pen_t pen; if (m_avalance_video_inverted) - pen = (data & 0x80) ? rgb_t::white : rgb_t::black; + pen = (data & 0x80) ? rgb_t::white() : rgb_t::black(); else - pen = (data & 0x80) ? rgb_t::black : rgb_t::white; + pen = (data & 0x80) ? rgb_t::black() : rgb_t::white(); bitmap.pix32(y, x) = pen; diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp index 7d81ff8479c..6851d677fce 100644 --- a/src/mame/drivers/ax20.cpp +++ b/src/mame/drivers/ax20.cpp @@ -128,7 +128,7 @@ static MACHINE_CONFIG_START( ax20, ax20_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_COLOR(rgb_t::green) + MCFG_SCREEN_COLOR(rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(ax20_state, screen_update) diff --git a/src/mame/drivers/beaminv.cpp b/src/mame/drivers/beaminv.cpp index 168f90d9dcd..5d2cf1a7561 100644 --- a/src/mame/drivers/beaminv.cpp +++ b/src/mame/drivers/beaminv.cpp @@ -187,7 +187,7 @@ uint32_t beaminv_state::screen_update_beaminv(screen_device &screen, bitmap_rgb3 for (i = 0; i < 8; i++) { - pen_t pen = (data & 0x01) ? rgb_t::white : rgb_t::black; + pen_t pen = (data & 0x01) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y, x) = pen; data = data >> 1; diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp index 26215237621..6919a0d34e0 100644 --- a/src/mame/drivers/beehive.cpp +++ b/src/mame/drivers/beehive.cpp @@ -293,7 +293,7 @@ static MACHINE_CONFIG_START( beehive, beehive_state ) MCFG_CPU_IO_MAP(beehive_io) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(beehive_state, screen_update) diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp index e8b277064d3..4efbd6fba8a 100644 --- a/src/mame/drivers/berzerk.cpp +++ b/src/mame/drivers/berzerk.cpp @@ -485,7 +485,7 @@ uint32_t berzerk_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma for (i = 0; i < 4; i++) { - rgb_t pen = (data & 0x80) ? pens[color >> 4] : rgb_t::black; + rgb_t pen = (data & 0x80) ? pens[color >> 4] : rgb_t::black(); bitmap.pix32(y, x) = pen; x = x + 1; @@ -494,7 +494,7 @@ uint32_t berzerk_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma for (; i < 8; i++) { - rgb_t pen = (data & 0x80) ? pens[color & 0x0f] : rgb_t::black; + rgb_t pen = (data & 0x80) ? pens[color & 0x0f] : rgb_t::black(); bitmap.pix32(y, x) = pen; x = x + 1; diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index 7db5c0e76c6..c03e8b7cba8 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -297,7 +297,7 @@ static MACHINE_CONFIG_START( binbug, binbug_state ) MCFG_S2650_FLAG_HANDLER(WRITELINE(binbug_state, binbug_serial_w)) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(binbug_state, screen_update) @@ -534,7 +534,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state ) MCFG_Z80_DAISY_CHAIN(dg680_daisy_chain) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(binbug_state, screen_update) diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp index c61ce09e17a..c8043423661 100644 --- a/src/mame/drivers/bw12.cpp +++ b/src/mame/drivers/bw12.cpp @@ -547,7 +547,7 @@ static MACHINE_CONFIG_START( common, bw12_state ) MCFG_CPU_IO_MAP(bw12_io) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) diff --git a/src/mame/drivers/c64dtv.cpp b/src/mame/drivers/c64dtv.cpp index 9a8c2f6d1ed..2b39febdeb8 100644 --- a/src/mame/drivers/c64dtv.cpp +++ b/src/mame/drivers/c64dtv.cpp @@ -16,7 +16,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - bitmap.fill(rgb_t::black); + bitmap.erase(cliprect); return 0; } }; diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index 416891f59e6..6899d9e5b77 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -2517,7 +2517,7 @@ static MACHINE_CONFIG_START( cbm2lp_ntsc, cbm2_state ) MCFG_QUANTUM_PERFECT_CPU(M6509_TAG) // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(MC68B45_TAG, mc6845_device, screen_update) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp index 3423ce62cdb..95b8b661f65 100644 --- a/src/mame/drivers/cgenie.cpp +++ b/src/mame/drivers/cgenie.cpp @@ -376,7 +376,7 @@ MC6845_UPDATE_ROW( cgenie_state::crtc_update_row ) // how accurate are these colors? const rgb_t cgenie_state::m_palette_bg[] = { - rgb_t::black, + rgb_t::black(), rgb_t(0x70, 0x28, 0x20), // dark orange rgb_t(0x28, 0x70, 0x20), // dark green rgb_t(0x48, 0x48, 0x48), // dark gray @@ -401,13 +401,13 @@ const rgb_t cgenie_state::m_palette_eu[] = rgb_t(0x8c, 0x8c, 0x8c), // light gray rgb_t(0x00, 0xfb, 0x8c), // turquoise rgb_t(0xd2, 0x00, 0xff), // magenta - rgb_t::white // bright white + rgb_t::white() // bright white }; // new zealand palette const rgb_t cgenie_state::m_palette_nz[] = { - rgb_t::white, + rgb_t::white(), rgb_t(0x12, 0xff, 0xff), rgb_t(0xff, 0x6f, 0xff), rgb_t(0x31, 0x77, 0xff), @@ -422,7 +422,7 @@ const rgb_t cgenie_state::m_palette_nz[] = rgb_t(0xff, 0xf9, 0x00), rgb_t(0x00, 0xda, 0x00), rgb_t(0xff, 0x22, 0x00), - rgb_t::black + rgb_t::black() }; diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp index 7b8f3124536..8af858dfcf7 100644 --- a/src/mame/drivers/clayshoo.cpp +++ b/src/mame/drivers/clayshoo.cpp @@ -184,7 +184,7 @@ uint32_t clayshoo_state::screen_update_clayshoo(screen_device &screen, bitmap_rg for (i = 0; i < 8; i++) { - pen_t pen = (data & 0x80) ? rgb_t::white : rgb_t::black; + pen_t pen = (data & 0x80) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y, x) = pen; data = data << 1; diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index 9cfbea08cea..314fa7f94ed 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -2771,7 +2771,7 @@ static MACHINE_CONFIG_START( cmi2x, cmi_state ) MCFG_DL1416_UPDATE_HANDLER(WRITE16(cmi_state, cmi_iix_update_dp3)) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBLANK_END, HBLANK_START, VTOTAL, VBLANK_END, VBLANK_START) MCFG_SCREEN_UPDATE_DRIVER(cmi_state, screen_update_cmi2x) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp index a068d5722c9..f92884ea9ae 100644 --- a/src/mame/drivers/dai3wksi.cpp +++ b/src/mame/drivers/dai3wksi.cpp @@ -166,7 +166,7 @@ uint32_t dai3wksi_state::screen_update_dai3wksi(screen_device &screen, bitmap_rg for (int i = 0; i <= 3; i++) { - rgb_t pen = (data & (1 << i)) ? m_palette->pen_color(color) : rgb_t::black; + rgb_t pen = (data & (1 << i)) ? m_palette->pen_color(color) : rgb_t::black(); if (m_dai3wksi_flipscreen) bitmap.pix32(255-y, 255-x) = pen; diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp index 04091b850e8..57069404404 100644 --- a/src/mame/drivers/decwritr.cpp +++ b/src/mame/drivers/decwritr.cpp @@ -40,7 +40,7 @@ public: //required_device m_terminal; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - bitmap.fill(rgb_t::black); + bitmap.erase(cliprect); return 0; } DECLARE_READ8_MEMBER(la120_KBD_r); diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp index a8a3cda8170..9266dbf0da7 100644 --- a/src/mame/drivers/dvk_ksm.cpp +++ b/src/mame/drivers/dvk_ksm.cpp @@ -342,7 +342,7 @@ static MACHINE_CONFIG_START( ksm, ksm_state ) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ksm_state, scanline_callback, "screen", 0, 1) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(ksm_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_15_4MHz, KSM_TOTAL_HORZ, KSM_HORZ_START, KSM_HORZ_START+KSM_DISP_HORZ, KSM_TOTAL_VERT, KSM_VERT_START, diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index 59b2c1b4824..bc6e026aa62 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -431,7 +431,7 @@ MACHINE_RESET_MEMBER(einstein_state,einstein2) einstein_state::machine_reset(); /* 80 column card palette */ - m_palette->set_pen_color(TMS9928A_PALETTE_SIZE, rgb_t::black); + m_palette->set_pen_color(TMS9928A_PALETTE_SIZE, rgb_t::black()); m_palette->set_pen_color(TMS9928A_PALETTE_SIZE + 1, rgb_t(0, 224, 0)); } diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp index 725c827421d..5a3076e0a68 100644 --- a/src/mame/drivers/electron.cpp +++ b/src/mame/drivers/electron.cpp @@ -243,7 +243,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( btm2105, electron ) MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_COLOR(rgb_t::amber) + MCFG_SCREEN_COLOR(rgb_t::amber()) /* expansion port */ MCFG_DEVICE_MODIFY("exp") diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp index 3d373805bb8..cab678421da 100644 --- a/src/mame/drivers/embargo.cpp +++ b/src/mame/drivers/embargo.cpp @@ -57,7 +57,7 @@ uint32_t embargo_state::screen_update_embargo(screen_device &screen, bitmap_rgb3 for (i = 0; i < 8; i++) { - pen_t pen = (data & 0x01) ? rgb_t::white : rgb_t::black; + pen_t pen = (data & 0x01) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y, x) = pen; data = data >> 1; diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp index 13f60d38d33..017eb8cceb0 100644 --- a/src/mame/drivers/enigma2.cpp +++ b/src/mame/drivers/enigma2.cpp @@ -329,7 +329,7 @@ uint32_t enigma2_state::screen_update_enigma2a(screen_device &screen, bitmap_rgb video_data = video_data >> 1; } - pen = bit ? rgb_t::white : rgb_t::black; + pen = bit ? rgb_t::white() : rgb_t::black(); bitmap.pix32(bitmap_y, x) = pen; /* next pixel */ diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp index 23419e04572..6ebc7dc719f 100644 --- a/src/mame/drivers/fk1.cpp +++ b/src/mame/drivers/fk1.cpp @@ -411,7 +411,7 @@ static MACHINE_CONFIG_START( fk1, fk1_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fk1_state,fk1_irq_callback) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(fk1_state, screen_update) diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index ad6cbfc1fe9..b7167e05dbb 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -389,7 +389,7 @@ static MACHINE_CONFIG_START( h19, h19_state ) //MCFG_DEVICE_PERIODIC_INT_DRIVER(h19_state, irq0_line_hold, 50) // for testing, causes a keyboard scan /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index da091d92203..3e497346b79 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -737,7 +737,7 @@ static MACHINE_CONFIG_START( homelab, homelab_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", homelab_state, homelab_frame) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(40*8, 25*8) @@ -770,7 +770,7 @@ static MACHINE_CONFIG_START( homelab3, homelab_state ) MCFG_MACHINE_RESET_OVERRIDE(homelab_state,homelab3) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(64*8, 32*8) @@ -803,7 +803,7 @@ static MACHINE_CONFIG_START( brailab4, homelab_state ) MCFG_MACHINE_RESET_OVERRIDE(homelab_state,brailab4) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(64*8, 32*8) diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index 6afc13f6f5f..ef43a24e820 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -1350,7 +1350,7 @@ static MACHINE_CONFIG_START(hp64k , hp64k_state) MCFG_I8275_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_drq_w)) MCFG_I8275_VRTC_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_vrtc_w)) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE("crtc" , i8275_device , screen_update) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(720 , 390) diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 95dc9c23992..b6cff8a6343 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -1063,7 +1063,7 @@ static MACHINE_CONFIG_START( hp9845b, hp9845b_state ) MCFG_HPHYBRID_PA_CHANGED(WRITE8(hp9845b_state , pa_w)) // video hardware - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(hp9845b_state, screen_update) // These parameters are for alpha video MCFG_SCREEN_RAW_PARAMS(VIDEO_PIXEL_CLOCK , VIDEO_HTOTAL , 0 , VIDEO_HBSTART , VIDEO_VTOTAL , 0 , VIDEO_ACTIVE_SCANLINES) diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp index 457d2df700c..9a224bd68ba 100644 --- a/src/mame/drivers/hyperscan.cpp +++ b/src/mame/drivers/hyperscan.cpp @@ -515,7 +515,7 @@ uint32_t hyperscan_state::spg290_screen_update(screen_device &screen, bitmap_rgb } else { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); } return 0; diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp index 449b6e74dae..7c9412d54b0 100644 --- a/src/mame/drivers/ie15.cpp +++ b/src/mame/drivers/ie15.cpp @@ -656,7 +656,7 @@ GFXDECODE_END //PALETTE_INIT_MEMBER( ie15_state, ie15 ) //{ -// palette.set_pen_color(0, rgb_t::black); // black +// palette.set_pen_color(0, rgb_t::black()); // black // palette.set_pen_color(1, 0x00, 0xc0, 0x00); // green //} @@ -670,7 +670,7 @@ static MACHINE_CONFIG_START( ie15, ie15_state ) //MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_30_8MHz/(2*IE15_HORZ_START))) /* Video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(ie15_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_30_8MHz/2, IE15_TOTAL_HORZ, IE15_HORZ_START, IE15_HORZ_START+IE15_DISP_HORZ, IE15_TOTAL_VERT, IE15_VERT_START, diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index 744ef86aa9d..7790f04c521 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -133,7 +133,7 @@ static MACHINE_CONFIG_START( ipds, ipds_state ) MCFG_CPU_IO_MAP(ipds_io) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE("i8275", i8275_device, screen_update) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp index 13927e1f491..66e946bbdb5 100644 --- a/src/mame/drivers/iq151.cpp +++ b/src/mame/drivers/iq151.cpp @@ -385,7 +385,7 @@ static MACHINE_CONFIG_START( iq151, iq151_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(iq151_state, screen_update) diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index 9d101935040..ab05c502fb5 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -656,9 +656,9 @@ SLOT_INTERFACE_END PALETTE_INIT_MEMBER(itt3030_state, itt3030) { - palette.set_pen_color(0,rgb_t::black); - palette.set_pen_color(1,rgb_t(215,229,82)); - palette.set_pen_color(2,rgb_t::black); + palette.set_pen_color(0, rgb_t::black()); + palette.set_pen_color(1, rgb_t(215, 229, 82)); + palette.set_pen_color(2, rgb_t::black()); } static MACHINE_CONFIG_START( itt3030, itt3030_state ) diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp index 947afbc0f5b..4c2a97662f8 100644 --- a/src/mame/drivers/k8915.cpp +++ b/src/mame/drivers/k8915.cpp @@ -156,7 +156,7 @@ static MACHINE_CONFIG_START( k8915, k8915_state ) MCFG_CPU_IO_MAP(k8915_io) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(k8915_state, screen_update) diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index 2bfec2e002d..1086bf0cf1b 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -203,7 +203,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state ) MCFG_MACHINE_RESET_OVERRIDE(kaypro_state, kaypro ) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(80*7, 24*10) diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp index c35dd52c45b..c478f1cc07e 100644 --- a/src/mame/drivers/laser3k.cpp +++ b/src/mame/drivers/laser3k.cpp @@ -934,7 +934,7 @@ INPUT_PORTS_END // actual laser3000 has a digital RGB palette... static const rgb_t laser3k_palette[] = { - rgb_t::black, + rgb_t::black(), rgb_t(0xE3, 0x1E, 0x60), /* Dark Red */ rgb_t(0x60, 0x4E, 0xBD), /* Dark Blue */ rgb_t(0xFF, 0x44, 0xFD), /* Purple */ diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp index d3323bab19f..d2cf6c183dd 100644 --- a/src/mame/drivers/m10.cpp +++ b/src/mame/drivers/m10.cpp @@ -160,7 +160,7 @@ PALETTE_INIT_MEMBER(m10_state,m10) if (i & 0x01) color = rgb_t(pal1bit(~i >> 3), pal1bit(~i >> 2), pal1bit(~i >> 1)); else - color = rgb_t::black; + color = rgb_t::black(); palette.set_pen_color(i, color); } diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp index b312dcabc27..43a8ae91449 100644 --- a/src/mame/drivers/m14.cpp +++ b/src/mame/drivers/m14.cpp @@ -113,7 +113,7 @@ PALETTE_INIT_MEMBER(m14_state, m14) if (i & 0x01) color = rgb_t(pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 3)); else - color = (i & 0x10) ? rgb_t::white : rgb_t::black; + color = (i & 0x10) ? rgb_t::white() : rgb_t::black(); palette.set_pen_color(i, color); } diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp index 89cdb4937cd..8a331688c63 100644 --- a/src/mame/drivers/m79amb.cpp +++ b/src/mame/drivers/m79amb.cpp @@ -79,7 +79,7 @@ uint32_t m79amb_state::screen_update_ramtek(screen_device &screen, bitmap_rgb32 for (i = 0; i < 8; i++) { - pen_t pen = (data & 0x80) ? rgb_t::white : rgb_t::black; + pen_t pen = (data & 0x80) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y, x) = pen; x++; diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp index 2e15e71fccb..39c41f1811c 100644 --- a/src/mame/drivers/mgames.cpp +++ b/src/mame/drivers/mgames.cpp @@ -287,7 +287,7 @@ PALETTE_INIT_MEMBER(mgames_state, mgames) if (i & 0x01) color = rgb_t(pal2bit((i & 0x6) >> 1), pal2bit((i & 0x18) >> 3), pal2bit((i & 0x60) >> 5)); else - color = rgb_t::black; + color = rgb_t::black(); palette.set_pen_color(i, color); } diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 4c4600051b6..12ace551f1d 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -257,7 +257,7 @@ static MACHINE_CONFIG_START( micral, micral_state ) MCFG_MACHINE_RESET_OVERRIDE(micral_state, micral) // video hardware - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(250)) MCFG_SCREEN_UPDATE_DRIVER(micral_state, screen_update) diff --git a/src/mame/drivers/minivadr.cpp b/src/mame/drivers/minivadr.cpp index 0add43544fd..4fb18b916ed 100644 --- a/src/mame/drivers/minivadr.cpp +++ b/src/mame/drivers/minivadr.cpp @@ -72,7 +72,7 @@ uint32_t minivadr_state::screen_update_minivadr(screen_device &screen, bitmap_rg for (i = 0; i < 8; i++) { - pen_t pen = (data & 0x80) ? rgb_t::white : rgb_t::black; + pen_t pen = (data & 0x80) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y, x) = pen; data = data << 1; diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp index 6dd4cf4e1ba..89415a179bc 100644 --- a/src/mame/drivers/mmagic.cpp +++ b/src/mame/drivers/mmagic.cpp @@ -215,15 +215,15 @@ uint32_t mmagic_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap { uint8_t gfx = m_tiles[(code << 4) + tx]; - bitmap.pix32(y * 12 + tx, x * 8 + 0) = BIT(gfx, 4) ? rgb_t::black : m_palette->pen_color(color); - bitmap.pix32(y * 12 + tx, x * 8 + 1) = BIT(gfx, 5) ? rgb_t::black : m_palette->pen_color(color); - bitmap.pix32(y * 12 + tx, x * 8 + 2) = BIT(gfx, 6) ? rgb_t::black : m_palette->pen_color(color); - bitmap.pix32(y * 12 + tx, x * 8 + 3) = BIT(gfx, 7) ? rgb_t::black : m_palette->pen_color(color); - - bitmap.pix32(y * 12 + tx, x * 8 + 4) = BIT(gfx, 0) ? rgb_t::black : m_palette->pen_color(color); - bitmap.pix32(y * 12 + tx, x * 8 + 5) = BIT(gfx, 1) ? rgb_t::black : m_palette->pen_color(color); - bitmap.pix32(y * 12 + tx, x * 8 + 6) = BIT(gfx, 2) ? rgb_t::black : m_palette->pen_color(color); - bitmap.pix32(y * 12 + tx, x * 8 + 7) = BIT(gfx, 3) ? rgb_t::black : m_palette->pen_color(color); + bitmap.pix32(y * 12 + tx, x * 8 + 0) = BIT(gfx, 4) ? rgb_t::black() : m_palette->pen_color(color); + bitmap.pix32(y * 12 + tx, x * 8 + 1) = BIT(gfx, 5) ? rgb_t::black() : m_palette->pen_color(color); + bitmap.pix32(y * 12 + tx, x * 8 + 2) = BIT(gfx, 6) ? rgb_t::black() : m_palette->pen_color(color); + bitmap.pix32(y * 12 + tx, x * 8 + 3) = BIT(gfx, 7) ? rgb_t::black() : m_palette->pen_color(color); + + bitmap.pix32(y * 12 + tx, x * 8 + 4) = BIT(gfx, 0) ? rgb_t::black() : m_palette->pen_color(color); + bitmap.pix32(y * 12 + tx, x * 8 + 5) = BIT(gfx, 1) ? rgb_t::black() : m_palette->pen_color(color); + bitmap.pix32(y * 12 + tx, x * 8 + 6) = BIT(gfx, 2) ? rgb_t::black() : m_palette->pen_color(color); + bitmap.pix32(y * 12 + tx, x * 8 + 7) = BIT(gfx, 3) ? rgb_t::black() : m_palette->pen_color(color); } } } @@ -233,7 +233,7 @@ uint32_t mmagic_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap { static const int BALL_SIZE = 4; int ball_y = (m_ball_y >> 4) * 12 + (m_ball_y & 0x0f); - bitmap.plot_box(m_ball_x - BALL_SIZE + 1, ball_y - BALL_SIZE + 1, BALL_SIZE, BALL_SIZE, rgb_t::white); + bitmap.plot_box(m_ball_x - BALL_SIZE + 1, ball_y - BALL_SIZE + 1, BALL_SIZE, BALL_SIZE, rgb_t::white()); } return 0; diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index 06d7fc007be..6d8317f1a8a 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -155,7 +155,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state ) MCFG_CPU_IO_MAP(modellot_io) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(64*8, 16*16) diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp index c8256a2699a..627d65b5043 100644 --- a/src/mame/drivers/mx2178.cpp +++ b/src/mame/drivers/mx2178.cpp @@ -162,7 +162,7 @@ static MACHINE_CONFIG_START( mx2178, mx2178_state ) MCFG_CPU_IO_MAP(mx2178_io) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not correct MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp index 214597f30b5..b7bc6672b6f 100644 --- a/src/mame/drivers/nokia_3310.cpp +++ b/src/mame/drivers/nokia_3310.cpp @@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( noki3310, noki3310_state ) MCFG_CPU_PROGRAM_MAP(noki3310_map) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", LCD, rgb_t::white) + MCFG_SCREEN_ADD_MONOCHROME("screen", LCD, rgb_t::white()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(84, 48) diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 5d967376e85..44db8161f4c 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -751,7 +751,7 @@ SCN2674_DRAW_CHARACTER_MEMBER(octopus_state::display_pixels) uint8_t tile = m_vram[address & 0x0fff]; uint8_t data = m_fontram[(tile * 16) + linecount]; for (int z=0;z<8;z++) - bitmap.pix32(y,x + z) = BIT(data,z) ? rgb_t::white : rgb_t::black; + bitmap.pix32(y,x + z) = BIT(data,z) ? rgb_t::white() : rgb_t::black(); } } diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index 9bd2e761bff..f2e4b8b3878 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -530,7 +530,7 @@ static MACHINE_CONFIG_START( osbexec, osbexec_state ) MCFG_CPU_IO_MAP( osbexec_io) MCFG_Z80_DAISY_CHAIN( osbexec_daisy_config ) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(osbexec_state, screen_update) MCFG_SCREEN_RAW_PARAMS( MAIN_CLOCK/2, 768, 0, 640, 260, 0, 240 ) /* May not be correct */ MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp index 5f5ddafc15d..f94df70c8b5 100644 --- a/src/mame/drivers/osborne1.cpp +++ b/src/mame/drivers/osborne1.cpp @@ -244,7 +244,7 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state ) MCFG_CPU_IO_MAP(osborne1_io) MCFG_Z80_SET_IRQACK_CALLBACK(WRITELINE(osborne1_state, irqack_w)) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(osborne1_state, screen_update) MCFG_SCREEN_RAW_PARAMS( MAIN_CLOCK, 1024, 0, 104*8, 260, 0, 24*10 ) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp index 6cbe0602a6b..8d518f794aa 100644 --- a/src/mame/drivers/p2000t.cpp +++ b/src/mame/drivers/p2000t.cpp @@ -78,10 +78,10 @@ static const gfx_layout p2000m_charlayout = PALETTE_INIT_MEMBER(p2000t_state,p2000m) { - palette.set_pen_color(0,rgb_t::white); /* white */ - palette.set_pen_color(1,rgb_t::black); /* black */ - palette.set_pen_color(2,rgb_t::black); /* black */ - palette.set_pen_color(3,rgb_t::white); /* white */ + palette.set_pen_color(0,rgb_t::white()); /* white */ + palette.set_pen_color(1,rgb_t::black()); /* black */ + palette.set_pen_color(2,rgb_t::black()); /* black */ + palette.set_pen_color(3,rgb_t::white()); /* white */ } static GFXDECODE_START( p2000m ) diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp index 1394270f1af..b984d374d10 100644 --- a/src/mame/drivers/pc8001.cpp +++ b/src/mame/drivers/pc8001.cpp @@ -354,14 +354,14 @@ INPUT_PORTS_END static const rgb_t PALETTE_PC8001[] = { - rgb_t::black, + rgb_t::black(), rgb_t(0x00, 0x00, 0xff), rgb_t(0xff, 0x00, 0x00), rgb_t(0xff, 0x00, 0xff), rgb_t(0x00, 0xff, 0x00), rgb_t(0x00, 0xff, 0xff), rgb_t(0xff, 0xff, 0x00), - rgb_t::white + rgb_t::white() }; UPD3301_DRAW_CHARACTER_MEMBER( pc8001_state::pc8001_display_pixels ) diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp index 59167132565..1cd3ab9eab6 100644 --- a/src/mame/drivers/pcxt.cpp +++ b/src/mame/drivers/pcxt.cpp @@ -183,7 +183,7 @@ uint32_t isa8_cga_tetriskr_device::screen_update(screen_device &screen, bitmap_r //popmessage("%04x",m_start_offs); - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); for(y=0;y<200/8;y++) { diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index d7b5603b1eb..e194517c460 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -252,7 +252,7 @@ static MACHINE_CONFIG_START( olypeopl, peoplepc_state) MCFG_DEVICE_ADD("ppi8255", I8255, 0) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_RAW_PARAMS(XTAL_22MHz,640,0,640,475,0,475) MCFG_SCREEN_UPDATE_DEVICE( "h46505", mc6845_device, screen_update ) diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index e138218cc69..48d13d063d0 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -1399,7 +1399,7 @@ uint32_t pet_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, c MC6845_BEGIN_UPDATE( pet_state::pet_begin_update ) { - bitmap.fill(rgb_t::black); + bitmap.erase(cliprect); } MC6845_UPDATE_ROW( pet80_state::pet80_update_row ) @@ -1734,7 +1734,7 @@ static MACHINE_CONFIG_START( pet, pet_state ) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(320, 200) @@ -2158,7 +2158,7 @@ static MACHINE_CONFIG_START( pet80, pet80_state ) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(640, 250) diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp index f980912a824..99ef3aabe0e 100644 --- a/src/mame/drivers/plan80.cpp +++ b/src/mame/drivers/plan80.cpp @@ -235,7 +235,7 @@ static MACHINE_CONFIG_START( plan80, plan80_state ) MCFG_CPU_IO_MAP(plan80_io) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(plan80_state, screen_update) diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp index aa2897dc9b7..143963a5f0f 100644 --- a/src/mame/drivers/pmd85.cpp +++ b/src/mame/drivers/pmd85.cpp @@ -600,7 +600,7 @@ static MACHINE_CONFIG_START( pmd85, pmd85_state ) MCFG_PIT8253_CLK2(1) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(0) MCFG_SCREEN_SIZE(288, 256) diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp index 138b6be9479..2e33ed2164d 100644 --- a/src/mame/drivers/pyl601.cpp +++ b/src/mame/drivers/pyl601.cpp @@ -530,7 +530,7 @@ static MACHINE_CONFIG_START( pyl601, pyl601_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", pyl601_state, pyl601_interrupt) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(640, 200) diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp index 72e72ce175c..205c5bfec00 100644 --- a/src/mame/drivers/quizshow.cpp +++ b/src/mame/drivers/quizshow.cpp @@ -86,8 +86,8 @@ public: PALETTE_INIT_MEMBER(quizshow_state, quizshow) { - palette.set_indirect_color(0, rgb_t::black); - palette.set_indirect_color(1, rgb_t::white); + palette.set_indirect_color(0, rgb_t::black()); + palette.set_indirect_color(1, rgb_t::white()); // normal, blink/off, invert, blink+invert const int lut_pal[16] = { diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index a21b239b960..6c914262cec 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -346,7 +346,7 @@ I82730_UPDATE_ROW( rc759_state::txt_update_row ) width = 15 - width; for (int p = 0; p < width; p++) - bitmap.pix32(y, i * width + p) = BIT(gfx, 15 - p) ? rgb_t::white : rgb_t::black; + bitmap.pix32(y, i * width + p) = BIT(gfx, 15 - p) ? rgb_t::white() : rgb_t::black(); } } diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp index d7394194231..a2bfaeead02 100644 --- a/src/mame/drivers/rd100.cpp +++ b/src/mame/drivers/rd100.cpp @@ -94,7 +94,7 @@ static MACHINE_CONFIG_START( rd100, rd100_state ) MCFG_MACHINE_RESET_OVERRIDE(rd100_state, rd100) // video hardware - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(250)) MCFG_SCREEN_UPDATE_DRIVER(rd100_state, screen_update) diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp index 848fef29e59..8b3d83f1b7b 100644 --- a/src/mame/drivers/rotaryf.cpp +++ b/src/mame/drivers/rotaryf.cpp @@ -145,8 +145,8 @@ uint32_t rotaryf_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma { offs_t offs; pen_t pens[2]; - pens[0] = rgb_t::black; - pens[1] = rgb_t::white; + pens[0] = rgb_t::black(); + pens[1] = rgb_t::white(); uint8_t i,x,y,data; for (offs = 0; offs < m_videoram.bytes(); offs++) diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index c61cdab8199..e5bde2e2117 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -154,7 +154,7 @@ PALETTE_INIT_MEMBER(safarir_state, safarir) for (i = 0; i < palette.entries() / 2; i++) { - palette.set_pen_color((i * 2) + 0, rgb_t::black); + palette.set_pen_color((i * 2) + 0, rgb_t::black()); palette.set_pen_color((i * 2) + 1, rgb_t(pal1bit(i >> 2), pal1bit(i >> 1), pal1bit(i >> 0))); } } diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index 41800fd1249..24c02aad665 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -324,7 +324,7 @@ static MACHINE_CONFIG_START( sbrain, sbrain_state ) MCFG_CPU_IO_MAP(sbrain_subio) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(sbrain_state, screen_update) diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp index f1d9bb4d89a..808c736c53f 100644 --- a/src/mame/drivers/seabattl.cpp +++ b/src/mame/drivers/seabattl.cpp @@ -122,12 +122,12 @@ PALETTE_INIT_MEMBER(seabattl_state, seabattl) // scr for (int i = 0; i < 8; i++) { - palette.set_pen_color(8 + 2 * i + 0, rgb_t::black); + palette.set_pen_color(8 + 2 * i + 0, rgb_t::black()); palette.set_pen_color(8 + 2 * i + 1, rgb_t((i & 1) ? 0xff : 0x00, (i & 2) ? 0xff : 0x00, (i & 4) ? 0xff : 0x00)); } // wave - palette.set_pen_color(24, rgb_t::black); + palette.set_pen_color(24, rgb_t::black()); palette.set_pen_color(25, rgb_t(0x00, 0xff, 0xff)); // cyan } diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp index 4e1de7de558..a6ee208c139 100644 --- a/src/mame/drivers/skydiver.cpp +++ b/src/mame/drivers/skydiver.cpp @@ -124,8 +124,8 @@ PALETTE_INIT_MEMBER(skydiver_state, skydiver) switch (colortable_source[i]) { - case 0: color = rgb_t::black; break; - case 1: color = rgb_t::white; break; + case 0: color = rgb_t::black(); break; + case 1: color = rgb_t::white(); break; default: color = rgb_t(0xa0, 0xa0, 0xa0); break; /* grey */ } diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp index 42031a5d19e..f7ae90084d3 100644 --- a/src/mame/drivers/sm1800.cpp +++ b/src/mame/drivers/sm1800.cpp @@ -127,9 +127,9 @@ READ8_MEMBER( sm1800_state::sm1800_8255_portc_r ) PALETTE_INIT_MEMBER(sm1800_state, sm1800) { - palette.set_pen_color(0, rgb_t::black); // black + palette.set_pen_color(0, rgb_t::black()); // black palette.set_pen_color(1, 0xa0, 0xa0, 0xa0); // white - palette.set_pen_color(2, rgb_t::white); // highlight + palette.set_pen_color(2, rgb_t::white()); // highlight } diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp index bed8b5fe679..f1577fb88ec 100644 --- a/src/mame/drivers/sm7238.cpp +++ b/src/mame/drivers/sm7238.cpp @@ -332,7 +332,7 @@ GFXDECODE_END PALETTE_INIT_MEMBER(sm7238_state, sm7238) { - palette.set_pen_color(0, rgb_t::black); // black + palette.set_pen_color(0, rgb_t::black()); palette.set_pen_color(1, 0x00, 0xc0, 0x00); // green palette.set_pen_color(2, 0x00, 0xff, 0x00); // highlight } diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp index a6161fd3baf..68bb374fdbf 100644 --- a/src/mame/drivers/sstrangr.cpp +++ b/src/mame/drivers/sstrangr.cpp @@ -67,12 +67,12 @@ uint32_t sstrangr_state::screen_update_sstrangr(screen_device &screen, bitmap_rg if (m_flip_screen) { - pen = (data & 0x80) ? rgb_t::white : rgb_t::black; + pen = (data & 0x80) ? rgb_t::white() : rgb_t::black(); data = data << 1; } else { - pen = (data & 0x01) ? rgb_t::white : rgb_t::black; + pen = (data & 0x01) ? rgb_t::white() : rgb_t::black(); data = data >> 1; } diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index 23ba93129ac..19c5ffcc043 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -767,7 +767,7 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state ) MCFG_80186_IRQ_SLAVE_ACK(DEVREAD8(DEVICE_SELF, tandy2k_state, irq_callback)) // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_SIZE(640, 400) diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp index b2797de10de..fcb6f5f57c1 100644 --- a/src/mame/drivers/tdv2324.cpp +++ b/src/mame/drivers/tdv2324.cpp @@ -267,7 +267,7 @@ static MACHINE_CONFIG_START( tdv2324, tdv2324_state ) MCFG_CPU_PROGRAM_MAP(tdv2324_fdc_mem) // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DRIVER(tdv2324_state, screen_update) MCFG_SCREEN_SIZE(800, 400) diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp index c9752b14bc1..baf8f85d0ba 100644 --- a/src/mame/drivers/tek405x.cpp +++ b/src/mame/drivers/tek405x.cpp @@ -1000,7 +1000,7 @@ static MACHINE_CONFIG_START( tek4051, tek4051_state ) // video hardware MCFG_VECTOR_ADD("vector") - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, VECTOR, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, VECTOR, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_SIZE(1024, 780) @@ -1107,7 +1107,7 @@ static MACHINE_CONFIG_START( tek4052, tek4052_state ) // video hardware MCFG_VECTOR_ADD("vector") - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, VECTOR, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, VECTOR, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_SIZE(1024, 780) diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp index c9be0ff4ab5..35740e9efcb 100644 --- a/src/mame/drivers/ti99_2.cpp +++ b/src/mame/drivers/ti99_2.cpp @@ -376,7 +376,7 @@ static MACHINE_CONFIG_START( ti99_2, ti99_2_state ) /* video hardware */ /*MCFG_TMS9928A( &tms9918_interface )*/ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(256, 192) diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index b143a3ef69b..a94bdc0928d 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -127,7 +127,7 @@ uint32_t toratora_state::screen_update_toratora(screen_device &screen, bitmap_rg for (i = 0; i < 8; i++) { - pen_t pen = (data & 0x80) ? rgb_t::white : rgb_t::black; + pen_t pen = (data & 0x80) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y, x) = pen; data = data << 1; diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index db5be64a456..c0f7c8128ea 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -437,7 +437,7 @@ uint32_t trs80m2_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma { if (m_blnkvid) { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); } else { @@ -706,7 +706,7 @@ static MACHINE_CONFIG_START( trs80m2, trs80m2_state ) MCFG_CPU_IO_MAP(z80_io) // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_UPDATE_DRIVER(trs80m2_state, screen_update) @@ -796,7 +796,7 @@ static MACHINE_CONFIG_START( trs80m16, trs80m16_state ) MCFG_DEVICE_DISABLE() // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_UPDATE_DRIVER(trs80m2_state, screen_update) diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 989d299e94a..cdf607d23f2 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -496,7 +496,7 @@ static MACHINE_CONFIG_START( ts803, ts803_state ) MCFG_Z80_DAISY_CHAIN(daisy_chain) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(640,240) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1) diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp index ea4e8aa50e7..fc7dd583340 100644 --- a/src/mame/drivers/tv990.cpp +++ b/src/mame/drivers/tv990.cpp @@ -334,13 +334,13 @@ INPUT_CHANGED_MEMBER(tv990_state::color) { case 0: default: - color = rgb_t::green; + color = rgb_t::green(); break; case 1: - color = rgb_t::amber; + color = rgb_t::amber(); break; case 2: - color = rgb_t::white; + color = rgb_t::white(); break; } m_screen->static_set_color(*m_screen, color); @@ -367,7 +367,7 @@ static MACHINE_CONFIG_START( tv990, tv990_state ) MCFG_CPU_PROGRAM_MAP(tv990_mem) MCFG_CPU_VBLANK_INT_DRIVER("screen", tv990_state, vblank) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(tv990_state, screen_update) MCFG_SCREEN_SIZE(132*16, 50*16) MCFG_SCREEN_VISIBLE_AREA(0, (80*16)-1, 0, (50*16)-1) diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index e2146e67586..92d0f93c5ca 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -173,7 +173,7 @@ static MACHINE_CONFIG_START( uts20, univac_state ) MCFG_Z80_DAISY_CHAIN(daisy_chain) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(univac_state, screen_update) diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp index 020b2d17df2..544a67c8a5d 100644 --- a/src/mame/drivers/vboy.cpp +++ b/src/mame/drivers/vboy.cpp @@ -1249,10 +1249,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(vboy_state::timer_pad_tick) PALETTE_INIT_MEMBER(vboy_state, vboy) { - palette.set_pen_color(0, rgb_t::black); - palette.set_pen_color(1, rgb_t::black); - palette.set_pen_color(2, rgb_t::black); - palette.set_pen_color(3, rgb_t::black); + palette.set_pen_color(0, rgb_t::black()); + palette.set_pen_color(1, rgb_t::black()); + palette.set_pen_color(2, rgb_t::black()); + palette.set_pen_color(3, rgb_t::black()); } void vboy_state::m_set_irq(uint16_t irq_vector) diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp index cea5dcdcb0a..86f2e8c1b32 100644 --- a/src/mame/drivers/victor9k.cpp +++ b/src/mame/drivers/victor9k.cpp @@ -679,7 +679,7 @@ static MACHINE_CONFIG_START( victor9k, victor9k_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb) // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_UPDATE_DEVICE(HD46505S_TAG, hd6845_device, screen_update) diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 116ea175f5e..612ed90bace 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -746,7 +746,7 @@ static MACHINE_CONFIG_START( vixen, vixen_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vixen_state,vixen_int_ack) // video hardware - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber()) MCFG_SCREEN_UPDATE_DRIVER(vixen_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_23_9616MHz/2, 96*8, 0*8, 81*8, 27*10, 0*10, 26*10) diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index 0322f74b082..ac516d92432 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -405,7 +405,7 @@ static MACHINE_CONFIG_START( vt100, vt100_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vt100_state,vt100_irq_callback) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(80*10, 25*10) diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp index 7f70b553a77..400a346e952 100644 --- a/src/mame/drivers/vta2000.cpp +++ b/src/mame/drivers/vta2000.cpp @@ -152,7 +152,7 @@ GFXDECODE_END PALETTE_INIT_MEMBER(vta2000_state, vta2000) { - palette.set_pen_color(0, rgb_t::black); // black + palette.set_pen_color(0, rgb_t::black()); palette.set_pen_color(1, 0x00, 0xc0, 0x00); // green palette.set_pen_color(2, 0x00, 0xff, 0x00); // highlight } diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp index f2f403c87e2..0a72bb80273 100644 --- a/src/mame/drivers/vtech2.cpp +++ b/src/mame/drivers/vtech2.cpp @@ -360,7 +360,7 @@ GFXDECODE_END static const rgb_t vt_colors[] = { - rgb_t::black, + rgb_t::black(), rgb_t(0x00, 0x00, 0x7f), /* blue */ rgb_t(0x00, 0x7f, 0x00), /* green */ rgb_t(0x00, 0x7f, 0x7f), /* cyan */ @@ -375,7 +375,7 @@ static const rgb_t vt_colors[] = rgb_t(0xff, 0x00, 0x00), /* bright red */ rgb_t(0xff, 0x00, 0xff), /* bright magenta */ rgb_t(0xff, 0xff, 0x00), /* bright yellow */ - rgb_t::white + rgb_t::white() }; diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp index 32b11714263..dd1eed7ac61 100644 --- a/src/mame/drivers/warpsped.cpp +++ b/src/mame/drivers/warpsped.cpp @@ -304,8 +304,8 @@ GFXDECODE_END PALETTE_INIT_MEMBER(warpspeed_state, warpspeed) { // tilemaps - palette.set_pen_color(0,rgb_t::black); /* black */ - palette.set_pen_color(1,rgb_t::white); /* white */ + palette.set_pen_color(0,rgb_t::black()); /* black */ + palette.set_pen_color(1,rgb_t::white()); /* white */ // circles for ( int i = 0; i < 8; i++ ) diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index eb38f24b0ce..41b82014385 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -874,7 +874,7 @@ static MACHINE_CONFIG_START( wicat, wicat_state ) MCFG_X2210_ADD("vsram") // XD2210 - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_SIZE(720,300) MCFG_SCREEN_VISIBLE_AREA(0,720-1,0,300-1) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/zac2650.cpp b/src/mame/drivers/zac2650.cpp index 0672bf1218a..3fe273ddf5e 100644 --- a/src/mame/drivers/zac2650.cpp +++ b/src/mame/drivers/zac2650.cpp @@ -189,10 +189,10 @@ INPUT_PORTS_END PALETTE_INIT_MEMBER(zac2650_state, zac2650) { - palette.set_pen_color(0,rgb_t::black); - palette.set_pen_color(1,rgb_t::white); - palette.set_pen_color(2,rgb_t::black); - palette.set_pen_color(3,rgb_t::black); + palette.set_pen_color(0, rgb_t::black()); + palette.set_pen_color(1, rgb_t::white()); + palette.set_pen_color(2, rgb_t::black()); + palette.set_pen_color(3, rgb_t::black()); } /************************************************************************************************ diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 1c2a1058bc1..47a996d9e03 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -353,7 +353,7 @@ static MACHINE_CONFIG_START( zorba, zorba_state ) MCFG_CPU_PROGRAM_MAP(zorba_kbdmem) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DEVICE("crtc", i8275_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", zorba) diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index b4b6986fa20..d6d652a85ae 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -280,7 +280,7 @@ static MACHINE_CONFIG_START( zrt80, zrt80_state ) MCFG_CPU_IO_MAP(zrt80_io) /* video hardware */ - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp index e1955fc80d3..86671e6ff5f 100644 --- a/src/mame/drivers/zx.cpp +++ b/src/mame/drivers/zx.cpp @@ -306,14 +306,14 @@ INPUT_PORTS_END PALETTE_INIT_MEMBER(zx_state, zx) { - palette.set_pen_color(0,rgb_t::white); /* white */ - palette.set_pen_color(1,rgb_t::black); /* black */ + palette.set_pen_color(0, rgb_t::white()); + palette.set_pen_color(1, rgb_t::black()); } PALETTE_INIT_MEMBER(zx_state,ts1000) { - palette.set_pen_color(0,rgb_t(64, 244, 244)); /* cyan */ - palette.set_pen_color(1,rgb_t::black); /* black */ + palette.set_pen_color(0, rgb_t(64, 244, 244)); /* cyan */ + palette.set_pen_color(1, rgb_t::black()); } static MACHINE_CONFIG_START( zx80, zx_state ) diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp index f92098e5ab6..cc37bad5778 100644 --- a/src/mame/machine/sms.cpp +++ b/src/mame/machine/sms.cpp @@ -1341,9 +1341,9 @@ VIDEO_RESET_MEMBER(sms_state,sms1) uint8_t sscope_binocular_hack = m_port_scope_binocular->read(); if (sscope_binocular_hack & 0x01) - m_prevleft_bitmap.fill(rgb_t::black); + m_prevleft_bitmap.fill(rgb_t::black()); if (sscope_binocular_hack & 0x02) - m_prevright_bitmap.fill(rgb_t::black); + m_prevright_bitmap.fill(rgb_t::black()); } m_sscope_state = 0; @@ -1452,7 +1452,7 @@ uint32_t sms_state::screen_update_sms1(screen_device &screen, bitmap_rgb32 &bitm } } } - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); } return 0; @@ -1481,12 +1481,12 @@ VIDEO_RESET_MEMBER(sms_state,gamegear) { if (m_prev_bitmap_copied) { - m_prev_bitmap.fill(rgb_t::black); + m_prev_bitmap.fill(rgb_t::black()); m_prev_bitmap_copied = false; } if (m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode()) { - m_gg_sms_mode_bitmap.fill(rgb_t::black); + m_gg_sms_mode_bitmap.fill(rgb_t::black()); memset(m_line_buffer.get(), 0, 160 * 4 * sizeof(int)); } } @@ -1648,7 +1648,7 @@ uint32_t sms_state::screen_update_gamegear(screen_device &screen, bitmap_rgb32 & copybitmap(bitmap, *source_bitmap, 0, 0, 0, 0, cliprect); if (m_prev_bitmap_copied) { - m_prev_bitmap.fill(rgb_t::black); + m_prev_bitmap.fill(rgb_t::black()); m_prev_bitmap_copied = false; } } diff --git a/src/mame/machine/vectrex.cpp b/src/mame/machine/vectrex.cpp index dda048384f4..55b6c072f98 100644 --- a/src/mame/machine/vectrex.cpp +++ b/src/mame/machine/vectrex.cpp @@ -103,7 +103,7 @@ void vectrex_state::vectrex_configuration() switch ((cport >> 2) & 0x07) { case 0x00: - m_imager_colors[0] = m_imager_colors[1] = m_imager_colors[2] = rgb_t::black; + m_imager_colors[0] = m_imager_colors[1] = m_imager_colors[2] = rgb_t::black(); break; case 0x01: m_imager_colors[0] = m_imager_colors[1] = m_imager_colors[2] = VC_DARKRED; @@ -133,7 +133,7 @@ void vectrex_state::vectrex_configuration() switch ((cport >> 5) & 0x07) { case 0x00: - m_imager_colors[3] = m_imager_colors[4] = m_imager_colors[5] = rgb_t::black; + m_imager_colors[3] = m_imager_colors[4] = m_imager_colors[5] = rgb_t::black(); break; case 0x01: m_imager_colors[3] = m_imager_colors[4] = m_imager_colors[5] = VC_DARKRED; @@ -162,8 +162,8 @@ void vectrex_state::vectrex_configuration() else { vector_add_point_function = &vectrex_state::vectrex_add_point; - m_beam_color = rgb_t::white; - m_imager_colors[0] = m_imager_colors[1] = m_imager_colors[2] = m_imager_colors[3] = m_imager_colors[4] = m_imager_colors[5] = rgb_t::white; + m_beam_color = rgb_t::white(); + m_imager_colors[0] = m_imager_colors[1] = m_imager_colors[2] = m_imager_colors[3] = m_imager_colors[4] = m_imager_colors[5] = rgb_t::white(); } m_lightpen_port = m_io_lpenconf->read() & 0x03; } @@ -302,9 +302,9 @@ WRITE8_MEMBER(vectrex_state::vectrex_psg_port_w) DRIVER_INIT_MEMBER(vectrex_state,vectrex) { m_imager_angles = unknown_game_angles; - m_beam_color = rgb_t::white; + m_beam_color = rgb_t::white(); for (auto & elem : m_imager_colors) - elem = rgb_t::white; + elem = rgb_t::white(); /* * Minestorm's PRNG doesn't work with a 0 seed (mines in the first diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index a1b1a596f8b..52e1f27be6f 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -73,8 +73,8 @@ GFXDECODE_END PALETTE_INIT_MEMBER(asr733_device, asr733) { - palette.set_pen_color(0,rgb_t::white); /* white */ - palette.set_pen_color(1,rgb_t::black); /* black */ + palette.set_pen_color(0, rgb_t::white()); /* white */ + palette.set_pen_color(1, rgb_t::black()); /* black */ } diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index 60a46e6a4e1..1857091b613 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -193,7 +193,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED( abc1600_mover_device::crtc_update ) static MACHINE_CONFIG_FRAGMENT( abc1600_mover ) MCFG_DEFAULT_LAYOUT(layout_abc1600) - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(abc1600_mover_device, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_64MHz, 0x3e0, 0, 0x300, 0x433, 0, 0x400) @@ -1255,7 +1255,7 @@ uint32_t abc1600_mover_device::screen_update(screen_device &screen, bitmap_rgb32 } else { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); } return 0; diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp index 9a0bfe681fe..f3bb0e884b6 100644 --- a/src/mame/video/abc800.cpp +++ b/src/mame/video/abc800.cpp @@ -90,7 +90,7 @@ void abc800c_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) if (color) { - bool black = bitmap.pix32(y, x) == rgb_t::black; + bool black = bitmap.pix32(y, x) == rgb_t::black(); bool opaque = !BIT(fgctl, 3); if (black || opaque) @@ -126,7 +126,7 @@ void abc800_state::video_start() uint32_t abc800c_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { // clear screen - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); // draw text if (!BIT(m_fgctl, 7)) @@ -274,7 +274,7 @@ MC6845_UPDATE_ROW( abc800m_state::abc800m_update_row ) uint32_t abc800m_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { // clear screen - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); // draw HR graphics hr_update(bitmap, cliprect); diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp index 4c917ea6477..e8beb16d1ca 100644 --- a/src/mame/video/abc802.cpp +++ b/src/mame/video/abc802.cpp @@ -208,7 +208,7 @@ MACHINE_CONFIG_FRAGMENT( abc802_video ) MCFG_MC6845_UPDATE_ROW_CB(abc802_state, abc802_update_row) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(abc802_state, vs_w)) - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber()) MCFG_SCREEN_UPDATE_DRIVER(abc802_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz, 0x300, 0, 0x1e0, 0x13a, 0, 0xf0) diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp index 115f526f46e..83c8cbe2ff1 100644 --- a/src/mame/video/abc806.cpp +++ b/src/mame/video/abc806.cpp @@ -398,7 +398,7 @@ void abc806_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) { int x = HORIZONTAL_PORCH_HACK + (ABC800_CHAR_WIDTH * 4) - 16 + (sx * 4) + pixel; - if (BIT(dot, 15) || (bitmap.pix32(y, x) == rgb_t::black)) + if (BIT(dot, 15) || (bitmap.pix32(y, x) == rgb_t::black())) { bitmap.pix32(y, x) = pen[(dot >> 12) & 0x07]; } @@ -451,7 +451,7 @@ void abc806_state::video_start() uint32_t abc806_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { // clear screen - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); if (!m_txoff) { diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp index fce638f5374..7dc2708f571 100644 --- a/src/mame/video/apple2.cpp +++ b/src/mame/video/apple2.cpp @@ -1608,7 +1608,7 @@ void a2_video_device::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, c */ static const rgb_t apple2_palette[] = { - rgb_t::black, + rgb_t::black(), rgb_t(0xE3, 0x1E, 0x60), /* Dark Red */ rgb_t(0x60, 0x4E, 0xBD), /* Dark Blue */ rgb_t(0xFF, 0x44, 0xFD), /* Purple */ diff --git a/src/mame/video/capbowl.cpp b/src/mame/video/capbowl.cpp index ba9cad970ac..f521da6ba03 100644 --- a/src/mame/video/capbowl.cpp +++ b/src/mame/video/capbowl.cpp @@ -133,7 +133,7 @@ uint32_t capbowl_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma /* if we're blanked, just fill with black */ if (m_tms34061->m_display.blanked) { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); return 0; } diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp index a268628aaa6..9d1de33d516 100644 --- a/src/mame/video/cgc7900.cpp +++ b/src/mame/video/cgc7900.cpp @@ -26,14 +26,14 @@ PALETTE_INIT_MEMBER(cgc7900_state, cgc7900) { - palette.set_pen_color(0, rgb_t::black); + palette.set_pen_color(0, rgb_t::black()); palette.set_pen_color(1, rgb_t(0x00, 0x00, 0xff)); palette.set_pen_color(2, rgb_t(0x00, 0xff, 0x00)); palette.set_pen_color(3, rgb_t(0x00, 0xff, 0xff)); palette.set_pen_color(4, rgb_t(0xff, 0x00, 0x00)); palette.set_pen_color(5, rgb_t(0xff, 0x00, 0xff)); palette.set_pen_color(6, rgb_t(0xff, 0xff, 0x00)); - palette.set_pen_color(7, rgb_t::white); + palette.set_pen_color(7, rgb_t::white()); } /*************************************************************************** diff --git a/src/mame/video/darkmist.cpp b/src/mame/video/darkmist.cpp index 4734c7362a7..1d3826f3d33 100644 --- a/src/mame/video/darkmist.cpp +++ b/src/mame/video/darkmist.cpp @@ -72,7 +72,7 @@ PALETTE_INIT_MEMBER(darkmist_state, darkmist) const uint8_t *spr_clut = memregion("spr_clut")->base(); const uint8_t *tx_clut = memregion("tx_clut")->base(); - palette.set_indirect_color(0x100, rgb_t::black); + palette.set_indirect_color(0x100, rgb_t::black()); for (int i = 0; i < 0x400; i++) { diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp index 0c9c9835c73..4a84d510380 100644 --- a/src/mame/video/decodmd1.cpp +++ b/src/mame/video/decodmd1.cpp @@ -297,14 +297,14 @@ uint32_t decodmd_type1_device::screen_update( screen_device &screen, bitmap_rgb3 else if (data1 & 0x01) // both are the same, so either high intensity or none at all col = rgb_t(0xff,0xaa,0x00); else - col = rgb_t::black; + col = rgb_t::black(); bitmap.pix32(y,x+dot) = col; if((data2 & 0x01) != (data4 & 0x01)) col = rgb_t(0x7f,0x55,0x00); else if (data2 & 0x01) // both are the same, so either high intensity or none at all col = rgb_t(0xff,0xaa,0x00); else - col = rgb_t::black; + col = rgb_t::black(); bitmap.pix32(y,x+dot+1) = col; data1 >>= 1; data2 >>= 1; diff --git a/src/mame/video/firetrk.cpp b/src/mame/video/firetrk.cpp index 492c904852d..c19477615ee 100644 --- a/src/mame/video/firetrk.cpp +++ b/src/mame/video/firetrk.cpp @@ -28,10 +28,10 @@ PALETTE_INIT_MEMBER(firetrk_state, firetrk) }; static const rgb_t palette_source[] = { - rgb_t::black, + rgb_t::black(), rgb_t(0x5b, 0x5b, 0x5b), rgb_t(0xa4, 0xa4, 0xa4), - rgb_t::white + rgb_t::white() }; m_color1_mask = m_color2_mask = 0; @@ -108,8 +108,8 @@ PALETTE_INIT_MEMBER(firetrk_state,montecar) prom_to_palette(i, color_prom[0x100 + colortable_source[i]]); } - palette.set_pen_color(ARRAY_LENGTH(colortable_source) + 0, rgb_t::black); - palette.set_pen_color(ARRAY_LENGTH(colortable_source) + 1, rgb_t::white); + palette.set_pen_color(ARRAY_LENGTH(colortable_source) + 0, rgb_t::black()); + palette.set_pen_color(ARRAY_LENGTH(colortable_source) + 1, rgb_t::white()); } diff --git a/src/mame/video/galaxian.cpp b/src/mame/video/galaxian.cpp index 12fa18015c3..36dce6579f6 100644 --- a/src/mame/video/galaxian.cpp +++ b/src/mame/video/galaxian.cpp @@ -920,7 +920,7 @@ void galaxian_state::stars_draw_row(bitmap_rgb32 &bitmap, int maxx, int y, uint3 void galaxian_state::galaxian_draw_background(bitmap_rgb32 &bitmap, const rectangle &cliprect) { /* erase the background to black first */ - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); /* update the star origin to the current frame */ stars_update_origin(); @@ -948,7 +948,7 @@ void galaxian_state::background_draw_colorsplit(bitmap_rgb32 &bitmap, const rect rectangle draw = cliprect; draw.max_x = std::min(draw.max_x, split_flipped * GALAXIAN_XSCALE - 1); if (draw.min_x <= draw.max_x) - bitmap.fill(rgb_t::black, draw); + bitmap.fill(rgb_t::black(), draw); draw = cliprect; draw.min_x = std::max(draw.min_x, split_flipped * GALAXIAN_XSCALE); @@ -965,7 +965,7 @@ void galaxian_state::background_draw_colorsplit(bitmap_rgb32 &bitmap, const rect draw = cliprect; draw.min_x = std::max(draw.min_x, split * GALAXIAN_XSCALE); if (draw.min_x <= draw.max_x) - bitmap.fill(rgb_t::black, draw); + bitmap.fill(rgb_t::black(), draw); } } @@ -999,7 +999,7 @@ void galaxian_state::scramble_draw_stars(bitmap_rgb32 &bitmap, const rectangle & void galaxian_state::scramble_draw_background(bitmap_rgb32 &bitmap, const rectangle &cliprect) { /* blue background - 390 ohm resistor */ - bitmap.fill(m_background_enable ? rgb_t(0,0,0x56) : rgb_t::black, cliprect); + bitmap.fill(m_background_enable ? rgb_t(0,0,0x56) : rgb_t::black(), cliprect); scramble_draw_stars(bitmap, cliprect, 256); } @@ -1008,7 +1008,7 @@ void galaxian_state::scramble_draw_background(bitmap_rgb32 &bitmap, const rectan void galaxian_state::anteater_draw_background(bitmap_rgb32 &bitmap, const rectangle &cliprect) { /* blue background, horizontal split as seen on flyer and real cabinet */ - background_draw_colorsplit(bitmap, cliprect, m_background_enable ? rgb_t(0,0,0x56) : rgb_t::black, 56, 256-56); + background_draw_colorsplit(bitmap, cliprect, m_background_enable ? rgb_t(0,0,0x56) : rgb_t::black(), 56, 256-56); scramble_draw_stars(bitmap, cliprect, 256); } @@ -1017,7 +1017,7 @@ void galaxian_state::anteater_draw_background(bitmap_rgb32 &bitmap, const rectan void galaxian_state::jumpbug_draw_background(bitmap_rgb32 &bitmap, const rectangle &cliprect) { /* blue background - 390 ohm resistor */ - bitmap.fill(m_background_enable ? rgb_t(0,0,0x56) : rgb_t::black, cliprect); + bitmap.fill(m_background_enable ? rgb_t(0,0,0x56) : rgb_t::black(), cliprect); /* render stars same as galaxian but nothing in the status area */ diff --git a/src/mame/video/hyhoo.cpp b/src/mame/video/hyhoo.cpp index ab1baaa04db..6eb81502881 100644 --- a/src/mame/video/hyhoo.cpp +++ b/src/mame/video/hyhoo.cpp @@ -248,7 +248,7 @@ uint32_t hyhoo_state::screen_update_hyhoo(screen_device &screen, bitmap_rgb32 &b if (m_dispflag) copybitmap(bitmap, m_tmpbitmap, m_flipscreen, m_flipscreen, 0, 0, cliprect); else - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); return 0; } diff --git a/src/mame/video/itech8.cpp b/src/mame/video/itech8.cpp index 9a30fb66117..de7769e9144 100644 --- a/src/mame/video/itech8.cpp +++ b/src/mame/video/itech8.cpp @@ -586,7 +586,7 @@ uint32_t itech8_state::screen_update_2layer(screen_device &screen, bitmap_rgb32 /* if we're blanked, just fill with black */ if (m_tms34061->m_display.blanked) { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); return 0; } @@ -621,7 +621,7 @@ uint32_t itech8_state::screen_update_grmatch(screen_device &screen, bitmap_rgb32 /* if we're blanked, just fill with black */ if (m_tms34061->m_display.blanked) { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); return 0; } @@ -669,7 +669,7 @@ uint32_t itech8_state::screen_update_2page(screen_device &screen, bitmap_rgb32 & /* if we're blanked, just fill with black */ if (m_tms34061->m_display.blanked) { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); return 0; } @@ -700,7 +700,7 @@ uint32_t itech8_state::screen_update_2page_large(screen_device &screen, bitmap_r /* if we're blanked, just fill with black */ if (m_tms34061->m_display.blanked) { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); return 0; } diff --git a/src/mame/video/jedi.cpp b/src/mame/video/jedi.cpp index 73b356e13a7..0a3d98ee23a 100644 --- a/src/mame/video/jedi.cpp +++ b/src/mame/video/jedi.cpp @@ -327,7 +327,7 @@ uint32_t jedi_state::screen_update_jedi(screen_device &screen, bitmap_rgb32 &bit { /* if no video, clear it all to black */ if (*m_video_off & 0x01) - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); else { /* draw the background/text layers, followed by the sprites diff --git a/src/mame/video/kaypro.cpp b/src/mame/video/kaypro.cpp index 0fa39f9e3a2..4f7d639de83 100644 --- a/src/mame/video/kaypro.cpp +++ b/src/mame/video/kaypro.cpp @@ -13,7 +13,7 @@ PALETTE_INIT_MEMBER(kaypro_state,kaypro) { - palette.set_pen_color(0, rgb_t::black); /* black */ + palette.set_pen_color(0, rgb_t::black()); palette.set_pen_color(1, rgb_t(0, 220, 0)); /* green */ palette.set_pen_color(2, rgb_t(0, 110, 0)); /* low intensity green */ } diff --git a/src/mame/video/liberatr.cpp b/src/mame/video/liberatr.cpp index 5f9be929e27..3420a318427 100644 --- a/src/mame/video/liberatr.cpp +++ b/src/mame/video/liberatr.cpp @@ -303,7 +303,7 @@ uint32_t liberatr_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm pen_t pens[NUM_PENS]; get_pens(pens); - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); draw_planet(bitmap, pens); draw_bitmap(bitmap, pens); diff --git a/src/mame/video/malzak.cpp b/src/mame/video/malzak.cpp index 18c97f5383a..2a086a9a1fe 100644 --- a/src/mame/video/malzak.cpp +++ b/src/mame/video/malzak.cpp @@ -24,7 +24,7 @@ uint32_t malzak_state::screen_update_malzak(screen_device &screen, bitmap_rgb32 int sx, sy; int x,y; - bitmap.fill(rgb_t::black); + bitmap.erase(cliprect); m_trom->screen_update(screen, bitmap, cliprect); diff --git a/src/mame/video/mcr3.cpp b/src/mame/video/mcr3.cpp index f4a1467c037..ca6add96287 100644 --- a/src/mame/video/mcr3.cpp +++ b/src/mame/video/mcr3.cpp @@ -75,7 +75,7 @@ PALETTE_INIT_MEMBER(mcr3_state,spyhunt) for (i = 0; i < palette.entries(); i++) { - palette.set_pen_color(i,rgb_t::black); /* black */ + palette.set_pen_color(i,rgb_t::black()); } /* alpha colors are hard-coded */ diff --git a/src/mame/video/mw8080bw.cpp b/src/mame/video/mw8080bw.cpp index 2fe963efe06..6fb940571cc 100644 --- a/src/mame/video/mw8080bw.cpp +++ b/src/mame/video/mw8080bw.cpp @@ -20,7 +20,7 @@ uint32_t mw8080bw_state::screen_update_mw8080bw(screen_device &screen, bitmap_rg while (1) { /* plot the current pixel */ - pen_t pen = (video_data & 0x01) ? rgb_t::white : rgb_t::black; + pen_t pen = (video_data & 0x01) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y - MW8080BW_VCOUNTER_START_NO_VBLANK, x) = pen; /* next pixel */ @@ -35,7 +35,7 @@ uint32_t mw8080bw_state::screen_update_mw8080bw(screen_device &screen, bitmap_rg for (i = 0; i < 4; i++) { - pen = (video_data & 0x01) ? rgb_t::white : rgb_t::black; + pen = (video_data & 0x01) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y - MW8080BW_VCOUNTER_START_NO_VBLANK, 256 + i) = pen; video_data = video_data >> 1; @@ -122,7 +122,7 @@ uint32_t mw8080bw_state::screen_update_spcenctr(screen_device &screen, bitmap_rg { /* plot the current pixel */ uint8_t bit = video_data & 0x01; - pen_t pen = bit ? rgb_t::white : rgb_t::black; + pen_t pen = bit ? rgb_t::white() : rgb_t::black(); /* possibly draw trench in the background, top of trench first */ if (!(width & 0x80) && draw_trench) @@ -172,11 +172,11 @@ uint32_t mw8080bw_state::screen_update_spcenctr(screen_device &screen, bitmap_rg for (i = 0; i < 4; i++) { if(video_data & 0x01) - pen = rgb_t::white; + pen = rgb_t::white(); else if(m_spcenctr_brightness) pen = rgb_t(m_spcenctr_brightness, m_spcenctr_brightness, m_spcenctr_brightness); else - pen = rgb_t::black; + pen = rgb_t::black(); bitmap.pix32(y - MW8080BW_VCOUNTER_START_NO_VBLANK, 256 + i) = pen; @@ -278,7 +278,7 @@ uint32_t mw8080bw_state::screen_update_phantom2(screen_device &screen, bitmap_rg if ((bit == 0) && (cloud_data & 0x01)) pen = PHANTOM2_RGB32_CLOUD_PEN; else - pen = bit ? rgb_t::white : rgb_t::black; + pen = bit ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y - MW8080BW_VCOUNTER_START_NO_VBLANK, x) = pen; @@ -313,7 +313,7 @@ uint32_t mw8080bw_state::screen_update_phantom2(screen_device &screen, bitmap_rg for (i = 0; i < 4; i++) { - pen = (video_data & 0x01) ? rgb_t::white : rgb_t::black; + pen = (video_data & 0x01) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y - MW8080BW_VCOUNTER_START_NO_VBLANK, 256 + i) = pen; video_data = video_data >> 1; @@ -377,7 +377,7 @@ uint32_t mw8080bw_state::screen_update_invaders(screen_device &screen, bitmap_rg while (1) { /* plot the current pixel */ - pen_t pen = (video_data & 0x01) ? rgb_t::white : rgb_t::black; + pen_t pen = (video_data & 0x01) ? rgb_t::white() : rgb_t::black(); if (flip) bitmap.pix32(MW8080BW_VBSTART - 1 - (y - MW8080BW_VCOUNTER_START_NO_VBLANK), MW8080BW_HPIXCOUNT - 1 - x) = pen; @@ -396,7 +396,7 @@ uint32_t mw8080bw_state::screen_update_invaders(screen_device &screen, bitmap_rg for (i = 0; i < 4; i++) { - pen = (video_data & 0x01) ? rgb_t::white : rgb_t::black; + pen = (video_data & 0x01) ? rgb_t::white() : rgb_t::black(); if (flip) bitmap.pix32(MW8080BW_VBSTART - 1 - (y - MW8080BW_VCOUNTER_START_NO_VBLANK), MW8080BW_HPIXCOUNT - 1 - (256 + i)) = pen; diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp index 1485f475024..8c3ca76e5cc 100644 --- a/src/mame/video/newbrain.cpp +++ b/src/mame/video/newbrain.cpp @@ -151,7 +151,7 @@ uint32_t newbrain_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm } else { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); } return 0; @@ -180,7 +180,7 @@ GFXDECODE_END MACHINE_CONFIG_FRAGMENT( newbrain_video ) MCFG_DEFAULT_LAYOUT(layout_newbrain) - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(newbrain_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/video/pc1512.cpp b/src/mame/video/pc1512.cpp index 67da8993fb1..d951b0627e1 100644 --- a/src/mame/video/pc1512.cpp +++ b/src/mame/video/pc1512.cpp @@ -13,7 +13,7 @@ static const rgb_t PALETTE_1512[] = { - rgb_t::black, + rgb_t::black(), rgb_t(0x00, 0x00, 0xaa), rgb_t(0x00, 0xaa, 0x00), rgb_t(0x00, 0xaa, 0xaa), @@ -28,7 +28,7 @@ static const rgb_t PALETTE_1512[] = rgb_t(0xff, 0x55, 0x55), rgb_t(0xff, 0x55, 0xff), rgb_t(0xff, 0xff, 0x55), - rgb_t::white + rgb_t::white() }; static const int PALETTE_0[] = { 0, 3, 5, 7 }; @@ -580,7 +580,7 @@ uint32_t pc1512_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap } else { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); } return 0; diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index d6827a3b882..d3bbbc6fc83 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -226,9 +226,9 @@ SCN2674_DRAW_CHARACTER_MEMBER(pcx_video_device::display_pixels) PALETTE_INIT_MEMBER(pcdx_video_device, pcdx) { - palette.set_pen_color(0,rgb_t::black); - palette.set_pen_color(1,rgb_t::white); - palette.set_pen_color(2,rgb_t(128,128,128)); + palette.set_pen_color(0, rgb_t::black()); + palette.set_pen_color(1, rgb_t::white()); + palette.set_pen_color(2, rgb_t(128, 128, 128)); } TIMER_DEVICE_CALLBACK_MEMBER(pcd_video_device::mouse_timer) diff --git a/src/mame/video/quasar.cpp b/src/mame/video/quasar.cpp index 911c697f674..86377605bd7 100644 --- a/src/mame/video/quasar.cpp +++ b/src/mame/video/quasar.cpp @@ -57,7 +57,7 @@ PALETTE_INIT_MEMBER(quasar_state,quasar) b = 0x4f * bit0 + 0xa8 * bit1; /* intensity 0 */ - palette.set_indirect_color(0x100 + i, rgb_t::black); + palette.set_indirect_color(0x100 + i, rgb_t::black()); /* intensity 1 */ color = rgb_t(r >> 2, g >> 2, b >> 2); diff --git a/src/mame/video/special.cpp b/src/mame/video/special.cpp index 10f3c326f50..af450b01049 100644 --- a/src/mame/video/special.cpp +++ b/src/mame/video/special.cpp @@ -14,8 +14,8 @@ VIDEO_START_MEMBER(special_state,special) { - m_palette->set_pen_color(0,rgb_t::black); /* black */ - m_palette->set_pen_color(1,rgb_t::white); /* white */ + m_palette->set_pen_color(0, rgb_t::black()); + m_palette->set_pen_color(1, rgb_t::white()); } uint32_t special_state::screen_update_special(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp index bca70563d12..a995ae4c63b 100644 --- a/src/mame/video/v1050.cpp +++ b/src/mame/video/v1050.cpp @@ -113,7 +113,7 @@ MACHINE_CONFIG_FRAGMENT( v1050_video ) MCFG_MC6845_UPDATE_ROW_CB(v1050_state, crtc_update_row) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(v1050_state, crtc_vs_w)) - MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(H46505_TAG, h46505_device, screen_update) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) diff --git a/src/mame/video/vector06.cpp b/src/mame/video/vector06.cpp index bd9b3e1720a..6b9b57071fc 100644 --- a/src/mame/video/vector06.cpp +++ b/src/mame/video/vector06.cpp @@ -57,5 +57,5 @@ uint32_t vector06_state::screen_update_vector06(screen_device &screen, bitmap_in PALETTE_INIT_MEMBER(vector06_state, vector06) { for (uint8_t i=0; i<16; i++) - m_palette->set_pen_color( i, rgb_t::black ); + m_palette->set_pen_color(i, rgb_t::black()); } diff --git a/src/mame/video/vicdual.cpp b/src/mame/video/vicdual.cpp index 36af072f9a3..f541766edfd 100644 --- a/src/mame/video/vicdual.cpp +++ b/src/mame/video/vicdual.cpp @@ -12,14 +12,14 @@ static const pen_t pens_from_color_prom[] = { - rgb_t::black, + rgb_t::black(), rgb_t(0x00, 0xff, 0x00), rgb_t(0x00, 0x00, 0xff), rgb_t(0x00, 0xff, 0xff), rgb_t(0xff, 0x00, 0x00), rgb_t(0xff, 0xff, 0x00), rgb_t(0xff, 0x00, 0xff), - rgb_t::white + rgb_t::white() }; @@ -55,7 +55,7 @@ uint32_t vicdual_state::screen_update_bw(screen_device &screen, bitmap_rgb32 &bi } /* plot the current pixel */ - pen = (video_data & 0x80) ? rgb_t::white : rgb_t::black; + pen = (video_data & 0x80) ? rgb_t::white() : rgb_t::black(); bitmap.pix32(y, x) = pen; /* next pixel */ diff --git a/src/mame/video/warpwarp.cpp b/src/mame/video/warpwarp.cpp index de2a6757c60..b25964d30b6 100644 --- a/src/mame/video/warpwarp.cpp +++ b/src/mame/video/warpwarp.cpp @@ -96,7 +96,7 @@ PALETTE_INIT_MEMBER(warpwarp_state,warpwarp) bit1 = (i >> 7) & 0x01; b = combine_2_weights(weights_tiles_b, bit0, bit1); - palette.set_pen_color((i * 2) + 0, rgb_t::black); + palette.set_pen_color((i * 2) + 0, rgb_t::black()); palette.set_pen_color((i * 2) + 1, rgb_t(r, g, b)); } diff --git a/src/mame/video/zaccaria.cpp b/src/mame/video/zaccaria.cpp index eed10399409..7ccc287cf61 100644 --- a/src/mame/video/zaccaria.cpp +++ b/src/mame/video/zaccaria.cpp @@ -60,7 +60,7 @@ PALETTE_INIT_MEMBER(zaccaria_state, zaccaria) black anyway. */ if (((i % 64) / 8) == 0) - palette.set_indirect_color(i, rgb_t::black); + palette.set_indirect_color(i, rgb_t::black()); else { int bit0, bit1, bit2; diff --git a/src/mame/video/zodiack.cpp b/src/mame/video/zodiack.cpp index 984e7aa12bb..79f210ac9a4 100644 --- a/src/mame/video/zodiack.cpp +++ b/src/mame/video/zodiack.cpp @@ -77,7 +77,7 @@ PALETTE_INIT_MEMBER(zodiack_state,zodiack) } /* white for bullets */ - palette.set_indirect_color(0x30, rgb_t::white); + palette.set_indirect_color(0x30, rgb_t::white()); for (i = 0; i < 0x20; i++) palette.set_pen_indirect(i, (i & 3) ? i : 0); diff --git a/src/mame/video/zx8301.cpp b/src/mame/video/zx8301.cpp index 5c9f27dbc18..6de85a07b8a 100644 --- a/src/mame/video/zx8301.cpp +++ b/src/mame/video/zx8301.cpp @@ -327,7 +327,7 @@ uint32_t zx8301_device::screen_update(screen_device &screen, bitmap_rgb32 &bitma } else { - bitmap.fill(rgb_t::black, cliprect); + bitmap.erase(cliprect); } return 0; -- cgit v1.2.3