summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vinicius Sa <viniciusjavs@pm.me>2018-06-26 06:42:48 +0000
committer Vas Crabb <cuavas@users.noreply.github.com>2018-07-13 01:50:57 +1000
commit71ff42a290370d2c49f4a0ad817c3a67e4fa770b (patch)
tree0d5409ecd19d63337a24f145e35577a3d9d04419
parent361308b8dd9a159ccb9c72fe97a6fc7265bd41cc (diff)
1942: Some macro cleanup. (nw)
-rw-r--r--src/mame/drivers/1942.cpp33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp
index a511a3b4cd0..9fa5b4f6394 100644
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@@ -574,17 +574,17 @@ MACHINE_CONFIG_START(_1942_state::_1942)
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1942)
- MCFG_PALETTE_ADD("palette", 64*4+4*32*8+16*16)
+ MCFG_PALETTE_ADD(m_palette, 64*4+4*32*8+16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
MCFG_PALETTE_INIT_OWNER(_1942_state, 1942)
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- 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(_1942_state, screen_update)
- MCFG_SCREEN_PALETTE("palette")
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+ screen.set_refresh_hz(60);
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
+ screen.set_size(32*8, 32*8);
+ screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
+ screen.set_screen_update(FUNC(_1942_state::screen_update));
+ screen.set_palette(m_palette);
/* sound hardware */
SPEAKER(config, "mono").front_center();
@@ -642,17 +642,18 @@ MACHINE_CONFIG_START(_1942p_state::_1942p)
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1942p)
- MCFG_PALETTE_ADD("palette", 0x500)
+
+ MCFG_PALETTE_ADD(m_palette, 0x500)
MCFG_PALETTE_INDIRECT_ENTRIES(0x400)
MCFG_PALETTE_INIT_OWNER(_1942p_state, 1942p)
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- 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(_1942p_state, screen_update)
- MCFG_SCREEN_PALETTE("palette")
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+ screen.set_refresh_hz(60);
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
+ screen.set_size(32*8, 32*8);
+ screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
+ screen.set_screen_update(FUNC(_1942p_state::screen_update));
+ screen.set_palette(m_palette);
/* sound hardware */