diff options
Diffstat (limited to 'src/mame/video/punchout.c')
-rw-r--r-- | src/mame/video/punchout.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index b9ff09dbd25..8a5ee38882b 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -119,38 +119,36 @@ TILEMAP_MAPPER_MEMBER(punchout_state::armwrest_bs1_scan_flipx) } -VIDEO_START( punchout ) +void punchout_state::video_start() { - punchout_state *state = machine.driver_data<punchout_state>(); - state->m_bg_top_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::top_get_info),state), TILEMAP_SCAN_ROWS, 8,8, 32,32); - state->m_bg_bot_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bot_get_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); - state->m_bg_bot_tilemap->set_scroll_rows(32); + m_bg_top_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::top_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_bot_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bot_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,32); + m_bg_bot_tilemap->set_scroll_rows(32); - state->m_spr1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),state), TILEMAP_SCAN_ROWS, 8,8, 16,32); - state->m_spr2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs2_get_info),state), TILEMAP_SCAN_ROWS, 8,8, 16,32); + m_spr1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); + m_spr2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs2_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); - state->m_fg_tilemap = NULL; + m_fg_tilemap = NULL; - state->m_spr1_tilemap->set_transparent_pen(0x07); - state->m_spr2_tilemap->set_transparent_pen(0x03); + m_spr1_tilemap->set_transparent_pen(0x07); + m_spr2_tilemap->set_transparent_pen(0x03); } -VIDEO_START( armwrest ) +VIDEO_START_MEMBER(punchout_state,armwrest) { - punchout_state *state = machine.driver_data<punchout_state>(); - state->m_bg_top_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_top_get_info),state), TILEMAP_SCAN_ROWS, 8,8, 32,32); - state->m_bg_bot_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_bot_get_info),state), TILEMAP_SCAN_ROWS, 8,8, 32,32); - - state->m_spr1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),state), tilemap_mapper_delegate(FUNC(punchout_state::armwrest_bs1_scan),state), 8,8, 32,16); - state->m_spr1_tilemap_flipx = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),state), tilemap_mapper_delegate(FUNC(punchout_state::armwrest_bs1_scan_flipx),state), 8,8, 32,16); - state->m_spr2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs2_get_info),state), TILEMAP_SCAN_ROWS, 8,8, 16,32); - state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_fg_get_info),state), TILEMAP_SCAN_ROWS, 8,8, 32,32); - - state->m_spr1_tilemap->set_transparent_pen(0x07); - state->m_spr1_tilemap_flipx->set_transparent_pen(0x07); - state->m_spr2_tilemap->set_transparent_pen(0x03); - state->m_fg_tilemap->set_transparent_pen(0x07); + m_bg_top_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_top_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_bot_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_bot_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + + m_spr1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), tilemap_mapper_delegate(FUNC(punchout_state::armwrest_bs1_scan),this), 8,8, 32,16); + m_spr1_tilemap_flipx = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), tilemap_mapper_delegate(FUNC(punchout_state::armwrest_bs1_scan_flipx),this), 8,8, 32,16); + m_spr2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs2_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); + m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_fg_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + + m_spr1_tilemap->set_transparent_pen(0x07); + m_spr1_tilemap_flipx->set_transparent_pen(0x07); + m_spr2_tilemap->set_transparent_pen(0x03); + m_fg_tilemap->set_transparent_pen(0x07); } |