diff options
Diffstat (limited to 'src/mame/video/kyugo.c')
-rw-r--r-- | src/mame/video/kyugo.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index 28c0232d9da..aace00ed91f 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -14,25 +14,23 @@ ***************************************************************************/ -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(kyugo_state::get_fg_tile_info) { - kyugo_state *state = machine.driver_data<kyugo_state>(); - int code = state->m_fgvideoram[tile_index]; - SET_TILE_INFO(0, + int code = m_fgvideoram[tile_index]; + SET_TILE_INFO_MEMBER(0, code, - 2 * state->m_color_codes[code >> 3] + state->m_fgcolor, + 2 * m_color_codes[code >> 3] + m_fgcolor, 0); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(kyugo_state::get_bg_tile_info) { - kyugo_state *state = machine.driver_data<kyugo_state>(); - int code = state->m_bgvideoram[tile_index]; - int attr = state->m_bgattribram[tile_index]; - SET_TILE_INFO(1, + int code = m_bgvideoram[tile_index]; + int attr = m_bgattribram[tile_index]; + SET_TILE_INFO_MEMBER(1, code | ((attr & 0x03) << 8), - (attr >> 4) | (state->m_bgpalbank << 4), + (attr >> 4) | (m_bgpalbank << 4), TILE_FLIPYX((attr & 0x0c) >> 2)); } @@ -49,8 +47,8 @@ VIDEO_START( kyugo ) state->m_color_codes = state->memregion("proms")->base() + 0x300; - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(kyugo_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(kyugo_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); state->m_fg_tilemap->set_transparent_pen(0); |