diff options
Diffstat (limited to 'src/mame/video/dooyong.c')
-rw-r--r-- | src/mame/video/dooyong.c | 358 |
1 files changed, 175 insertions, 183 deletions
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index 3257ee6d3b5..379ac6f975e 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -619,299 +619,291 @@ SCREEN_UPDATE_IND16( popbingo ) } -VIDEO_START( lastday ) +VIDEO_START_MEMBER(dooyong_state,lastday) { - dooyong_state *state = machine.driver_data<dooyong_state>(); /* Configure tilemap callbacks */ - state->m_bg_tilerom = state->memregion("gfx5")->base(); - state->m_fg_tilerom = state->memregion("gfx6")->base(); - state->m_bg_tilerom2 = NULL; - state->m_fg_tilerom2 = NULL; - state->m_bg_gfx = 2; - state->m_fg_gfx = 3; - state->m_tx_tilemap_mode = 0; + m_bg_tilerom = memregion("gfx5")->base(); + m_fg_tilerom = memregion("gfx6")->base(); + m_bg_tilerom2 = NULL; + m_fg_tilerom2 = NULL; + m_bg_gfx = 2; + m_fg_gfx = 3; + m_tx_tilemap_mode = 0; /* Create tilemaps */ - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),state), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),state), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ - state->m_fg_tilemap->set_transparent_pen(15); - state->m_tx_tilemap->set_transparent_pen(15); + m_fg_tilemap->set_transparent_pen(15); + m_tx_tilemap->set_transparent_pen(15); /* Text layer is offset on this machine */ - state->m_tx_tilemap->set_scrolly(0, 8); + m_tx_tilemap->set_scrolly(0, 8); - memset(state->m_bgscroll8, 0, 0x10); - memset(state->m_bg2scroll8, 0, 0x10); - memset(state->m_fgscroll8, 0, 0x10); - memset(state->m_fg2scroll8, 0, 0x10); + memset(m_bgscroll8, 0, 0x10); + memset(m_bg2scroll8, 0, 0x10); + memset(m_fgscroll8, 0, 0x10); + memset(m_fg2scroll8, 0, 0x10); /* Register for save/restore */ - state_save_register_global_array(machine, state->m_bgscroll8); - state_save_register_global_array(machine, state->m_fgscroll8); - state_save_register_global(machine, state->m_sprites_disabled); - state_save_register_global(machine, state->m_interrupt_line_1); - state_save_register_global(machine, state->m_interrupt_line_2); + state_save_register_global_array(machine(), m_bgscroll8); + state_save_register_global_array(machine(), m_fgscroll8); + state_save_register_global(machine(), m_sprites_disabled); + state_save_register_global(machine(), m_interrupt_line_1); + state_save_register_global(machine(), m_interrupt_line_2); } -VIDEO_START( gulfstrm ) +VIDEO_START_MEMBER(dooyong_state,gulfstrm) { - dooyong_state *state = machine.driver_data<dooyong_state>(); /* Configure tilemap callbacks */ - state->m_bg_tilerom = state->memregion("gfx5")->base(); - state->m_fg_tilerom = state->memregion("gfx6")->base(); - state->m_bg_tilerom2 = NULL; - state->m_fg_tilerom2 = NULL; - state->m_bg_gfx = 2; - state->m_fg_gfx = 3; - state->m_tx_tilemap_mode = 0; + m_bg_tilerom = memregion("gfx5")->base(); + m_fg_tilerom = memregion("gfx6")->base(); + m_bg_tilerom2 = NULL; + m_fg_tilerom2 = NULL; + m_bg_gfx = 2; + m_fg_gfx = 3; + m_tx_tilemap_mode = 0; /* Create tilemaps */ - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),state), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),state), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ - state->m_fg_tilemap->set_transparent_pen(15); - state->m_tx_tilemap->set_transparent_pen(15); + m_fg_tilemap->set_transparent_pen(15); + m_tx_tilemap->set_transparent_pen(15); /* Text layer is offset on this machine */ - state->m_tx_tilemap->set_scrolly(0, 8); + m_tx_tilemap->set_scrolly(0, 8); - memset(state->m_bgscroll8, 0, 0x10); - memset(state->m_bg2scroll8, 0, 0x10); - memset(state->m_fgscroll8, 0, 0x10); - memset(state->m_fg2scroll8, 0, 0x10); + memset(m_bgscroll8, 0, 0x10); + memset(m_bg2scroll8, 0, 0x10); + memset(m_fgscroll8, 0, 0x10); + memset(m_fg2scroll8, 0, 0x10); /* Register for save/restore */ - state_save_register_global_array(machine, state->m_bgscroll8); - state_save_register_global_array(machine, state->m_fgscroll8); - state_save_register_global(machine, state->m_interrupt_line_1); - state_save_register_global(machine, state->m_interrupt_line_2); + state_save_register_global_array(machine(), m_bgscroll8); + state_save_register_global_array(machine(), m_fgscroll8); + state_save_register_global(machine(), m_interrupt_line_1); + state_save_register_global(machine(), m_interrupt_line_2); } -VIDEO_START( pollux ) +VIDEO_START_MEMBER(dooyong_state,pollux) { - dooyong_state *state = machine.driver_data<dooyong_state>(); /* Configure tilemap callbacks */ - state->m_bg_tilerom = state->memregion("gfx5")->base(); - state->m_fg_tilerom = state->memregion("gfx6")->base(); - state->m_bg_tilerom2 = NULL; - state->m_fg_tilerom2 = NULL; - state->m_bg_gfx = 2; - state->m_fg_gfx = 3; - state->m_tx_tilemap_mode = 0; + m_bg_tilerom = memregion("gfx5")->base(); + m_fg_tilerom = memregion("gfx6")->base(); + m_bg_tilerom2 = NULL; + m_fg_tilerom2 = NULL; + m_bg_gfx = 2; + m_fg_gfx = 3; + m_tx_tilemap_mode = 0; /* Create tilemaps */ - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),state), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),state), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ - state->m_fg_tilemap->set_transparent_pen(15); - state->m_tx_tilemap->set_transparent_pen(15); + m_fg_tilemap->set_transparent_pen(15); + m_tx_tilemap->set_transparent_pen(15); - memset(state->m_bgscroll8, 0, 0x10); - memset(state->m_bg2scroll8, 0, 0x10); - memset(state->m_fgscroll8, 0, 0x10); - memset(state->m_fg2scroll8, 0, 0x10); + memset(m_bgscroll8, 0, 0x10); + memset(m_bg2scroll8, 0, 0x10); + memset(m_fgscroll8, 0, 0x10); + memset(m_fg2scroll8, 0, 0x10); /* Register for save/restore */ - state_save_register_global_array(machine, state->m_bgscroll8); - state_save_register_global_array(machine, state->m_fgscroll8); - state_save_register_global(machine, state->m_interrupt_line_1); - state_save_register_global(machine, state->m_interrupt_line_2); + state_save_register_global_array(machine(), m_bgscroll8); + state_save_register_global_array(machine(), m_fgscroll8); + state_save_register_global(machine(), m_interrupt_line_1); + state_save_register_global(machine(), m_interrupt_line_2); } -VIDEO_START( bluehawk ) +VIDEO_START_MEMBER(dooyong_state,bluehawk) { - dooyong_state *state = machine.driver_data<dooyong_state>(); /* Configure tilemap callbacks */ - state->m_bg_tilerom = state->memregion("gfx3")->base() + 0x78000; - state->m_fg_tilerom = state->memregion("gfx4")->base() + 0x78000; - state->m_fg2_tilerom = state->memregion("gfx5")->base() + 0x38000; - state->m_bg_tilerom2 = NULL; - state->m_fg_tilerom2 = NULL; - state->m_fg2_tilerom2 = NULL; - state->m_bg_gfx = 2; - state->m_fg_gfx = 3; - state->m_fg2_gfx = 4; - state->m_tx_tilemap_mode = 1; + m_bg_tilerom = memregion("gfx3")->base() + 0x78000; + m_fg_tilerom = memregion("gfx4")->base() + 0x78000; + m_fg2_tilerom = memregion("gfx5")->base() + 0x38000; + m_bg_tilerom2 = NULL; + m_fg_tilerom2 = NULL; + m_fg2_tilerom2 = NULL; + m_bg_gfx = 2; + m_fg_gfx = 3; + m_fg2_gfx = 4; + m_tx_tilemap_mode = 1; /* Create tilemaps */ - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),state), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_fg2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),state), TILEMAP_SCAN_COLS, + m_fg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),state), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ - state->m_fg_tilemap->set_transparent_pen(15); - state->m_fg2_tilemap->set_transparent_pen(15); - state->m_tx_tilemap->set_transparent_pen(15); + m_fg_tilemap->set_transparent_pen(15); + m_fg2_tilemap->set_transparent_pen(15); + m_tx_tilemap->set_transparent_pen(15); - memset(state->m_bgscroll8, 0, 0x10); - memset(state->m_bg2scroll8, 0, 0x10); - memset(state->m_fgscroll8, 0, 0x10); - memset(state->m_fg2scroll8, 0, 0x10); + memset(m_bgscroll8, 0, 0x10); + memset(m_bg2scroll8, 0, 0x10); + memset(m_fgscroll8, 0, 0x10); + memset(m_fg2scroll8, 0, 0x10); /* Register for save/restore */ - state_save_register_global_array(machine, state->m_bgscroll8); - state_save_register_global_array(machine, state->m_fgscroll8); - state_save_register_global_array(machine, state->m_fg2scroll8); + state_save_register_global_array(machine(), m_bgscroll8); + state_save_register_global_array(machine(), m_fgscroll8); + state_save_register_global_array(machine(), m_fg2scroll8); } -VIDEO_START( flytiger ) +VIDEO_START_MEMBER(dooyong_state,flytiger) { - dooyong_state *state = machine.driver_data<dooyong_state>(); /* Configure tilemap callbacks */ - state->m_bg_tilerom = state->memregion("gfx3")->base() + 0x78000; - state->m_fg_tilerom = state->memregion("gfx4")->base() + 0x78000; - state->m_bg_tilerom2 = NULL; - state->m_fg_tilerom2 = NULL; - state->m_bg_gfx = 2; - state->m_fg_gfx = 3; - state->m_tx_tilemap_mode = 0; + m_bg_tilerom = memregion("gfx3")->base() + 0x78000; + m_fg_tilerom = memregion("gfx4")->base() + 0x78000; + m_bg_tilerom2 = NULL; + m_fg_tilerom2 = NULL; + m_bg_gfx = 2; + m_fg_gfx = 3; + m_tx_tilemap_mode = 0; /* Create tilemaps */ - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::flytiger_get_fg_tile_info),state), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::flytiger_get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),state), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ - state->m_bg_tilemap->set_transparent_pen(15); - state->m_fg_tilemap->set_transparent_pen(15); - state->m_tx_tilemap->set_transparent_pen(15); + m_bg_tilemap->set_transparent_pen(15); + m_fg_tilemap->set_transparent_pen(15); + m_tx_tilemap->set_transparent_pen(15); - memset(state->m_bgscroll8, 0, 0x10); - memset(state->m_bg2scroll8, 0, 0x10); - memset(state->m_fgscroll8, 0, 0x10); - memset(state->m_fg2scroll8, 0, 0x10); + memset(m_bgscroll8, 0, 0x10); + memset(m_bg2scroll8, 0, 0x10); + memset(m_fgscroll8, 0, 0x10); + memset(m_fg2scroll8, 0, 0x10); /* Register for save/restore */ - state_save_register_global_array(machine, state->m_bgscroll8); - state_save_register_global_array(machine, state->m_fgscroll8); - state_save_register_global(machine, state->m_flytiger_pri); + state_save_register_global_array(machine(), m_bgscroll8); + state_save_register_global_array(machine(), m_fgscroll8); + state_save_register_global(machine(), m_flytiger_pri); } -VIDEO_START( primella ) +VIDEO_START_MEMBER(dooyong_state,primella) { - dooyong_state *state = machine.driver_data<dooyong_state>(); /* Configure tilemap callbacks */ - state->m_bg_tilerom = state->memregion("gfx2")->base() + state->memregion("gfx2")->bytes() - 0x8000; - state->m_fg_tilerom = state->memregion("gfx3")->base() + state->memregion("gfx3")->bytes() - 0x8000; - state->m_bg_tilerom2 = NULL; - state->m_fg_tilerom2 = NULL; - state->m_bg_gfx = 1; - state->m_fg_gfx = 2; - state->m_tx_tilemap_mode = 1; + m_bg_tilerom = memregion("gfx2")->base() + memregion("gfx2")->bytes() - 0x8000; + m_fg_tilerom = memregion("gfx3")->base() + memregion("gfx3")->bytes() - 0x8000; + m_bg_tilerom2 = NULL; + m_fg_tilerom2 = NULL; + m_bg_gfx = 1; + m_fg_gfx = 2; + m_tx_tilemap_mode = 1; /* Create tilemaps */ - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),state), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),state), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ - state->m_fg_tilemap->set_transparent_pen(15); - state->m_tx_tilemap->set_transparent_pen(15); + m_fg_tilemap->set_transparent_pen(15); + m_tx_tilemap->set_transparent_pen(15); - memset(state->m_bgscroll8, 0, 0x10); - memset(state->m_bg2scroll8, 0, 0x10); - memset(state->m_fgscroll8, 0, 0x10); - memset(state->m_fg2scroll8, 0, 0x10); + memset(m_bgscroll8, 0, 0x10); + memset(m_bg2scroll8, 0, 0x10); + memset(m_fgscroll8, 0, 0x10); + memset(m_fg2scroll8, 0, 0x10); /* Register for save/restore */ - state_save_register_global_array(machine, state->m_bgscroll8); - state_save_register_global_array(machine, state->m_fgscroll8); - state_save_register_global(machine, state->m_tx_pri); + state_save_register_global_array(machine(), m_bgscroll8); + state_save_register_global_array(machine(), m_fgscroll8); + state_save_register_global(machine(), m_tx_pri); } -VIDEO_START( rshark ) +VIDEO_START_MEMBER(dooyong_state,rshark) { - dooyong_state *state = machine.driver_data<dooyong_state>(); /* Configure tilemap callbacks */ - state->m_bg_tilerom = state->memregion("gfx5")->base(); - state->m_bg2_tilerom = state->memregion("gfx4")->base(); - state->m_fg_tilerom = state->memregion("gfx3")->base(); - state->m_fg2_tilerom = state->memregion("gfx2")->base(); - state->m_bg_tilerom2 = state->memregion("gfx6")->base() + 0x60000; - state->m_bg2_tilerom2 = state->memregion("gfx6")->base() + 0x40000; - state->m_fg_tilerom2 = state->memregion("gfx6")->base() + 0x20000; - state->m_fg2_tilerom2 = state->memregion("gfx6")->base() + 0x00000; - state->m_bg_gfx = 4; - state->m_bg2_gfx = 3; - state->m_fg_gfx = 2; - state->m_fg2_gfx = 1; + m_bg_tilerom = memregion("gfx5")->base(); + m_bg2_tilerom = memregion("gfx4")->base(); + m_fg_tilerom = memregion("gfx3")->base(); + m_fg2_tilerom = memregion("gfx2")->base(); + m_bg_tilerom2 = memregion("gfx6")->base() + 0x60000; + m_bg2_tilerom2 = memregion("gfx6")->base() + 0x40000; + m_fg_tilerom2 = memregion("gfx6")->base() + 0x20000; + m_fg2_tilerom2 = memregion("gfx6")->base() + 0x00000; + m_bg_gfx = 4; + m_bg2_gfx = 3; + m_fg_gfx = 2; + m_fg2_gfx = 1; /* Create tilemaps */ - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - state->m_bg2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg2_tile_info),state), TILEMAP_SCAN_COLS, + m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),state), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - state->m_fg2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),state), TILEMAP_SCAN_COLS, + m_fg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); /* Configure tilemap transparency */ - state->m_bg2_tilemap->set_transparent_pen(15); - state->m_fg_tilemap->set_transparent_pen(15); - state->m_fg2_tilemap->set_transparent_pen(15); + m_bg2_tilemap->set_transparent_pen(15); + m_fg_tilemap->set_transparent_pen(15); + m_fg2_tilemap->set_transparent_pen(15); - memset(state->m_bgscroll8, 0, 0x10); - memset(state->m_bg2scroll8, 0, 0x10); - memset(state->m_fgscroll8, 0, 0x10); - memset(state->m_fg2scroll8, 0, 0x10); + memset(m_bgscroll8, 0, 0x10); + memset(m_bg2scroll8, 0, 0x10); + memset(m_fgscroll8, 0, 0x10); + memset(m_fg2scroll8, 0, 0x10); /* Register for save/restore */ - state_save_register_global_array(machine, state->m_bgscroll8); - state_save_register_global_array(machine, state->m_bg2scroll8); - state_save_register_global_array(machine, state->m_fgscroll8); - state_save_register_global_array(machine, state->m_fg2scroll8); - state_save_register_global(machine, state->m_rshark_pri); + state_save_register_global_array(machine(), m_bgscroll8); + state_save_register_global_array(machine(), m_bg2scroll8); + state_save_register_global_array(machine(), m_fgscroll8); + state_save_register_global_array(machine(), m_fg2scroll8); + state_save_register_global(machine(), m_rshark_pri); } -VIDEO_START( popbingo ) +VIDEO_START_MEMBER(dooyong_state,popbingo) { - dooyong_state *state = machine.driver_data<dooyong_state>(); /* Configure tilemap callbacks */ - state->m_bg_tilerom = state->memregion("gfx2")->base(); - state->m_bg_gfx = 1; + m_bg_tilerom = memregion("gfx2")->base(); + m_bg_gfx = 1; /* Create tilemaps */ - state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - state->m_bg2_tilemap = state->m_fg_tilemap = state->m_fg2_tilemap = NULL; /* Stop scroll handler from crashing on these */ + m_bg2_tilemap = m_fg_tilemap = m_fg2_tilemap = NULL; /* Stop scroll handler from crashing on these */ - memset(state->m_bgscroll8, 0, 0x10); - memset(state->m_bg2scroll8, 0, 0x10); - memset(state->m_fgscroll8, 0, 0x10); - memset(state->m_fg2scroll8, 0, 0x10); + memset(m_bgscroll8, 0, 0x10); + memset(m_bg2scroll8, 0, 0x10); + memset(m_fgscroll8, 0, 0x10); + memset(m_fg2scroll8, 0, 0x10); /* Register for save/restore */ - state_save_register_global_array(machine, state->m_bgscroll8); - state_save_register_global_array(machine, state->m_bg2scroll8); // Not used atm - state_save_register_global_array(machine, state->m_fgscroll8); // Not used atm - state_save_register_global_array(machine, state->m_fg2scroll8); // Not used atm - state_save_register_global(machine, state->m_rshark_pri); + state_save_register_global_array(machine(), m_bgscroll8); + state_save_register_global_array(machine(), m_bg2scroll8); // Not used atm + state_save_register_global_array(machine(), m_fgscroll8); // Not used atm + state_save_register_global_array(machine(), m_fg2scroll8); // Not used atm + state_save_register_global(machine(), m_rshark_pri); } |