diff options
author | MooglyGuy <therealmogminer@gmail.com> | 2018-05-16 09:37:54 +0200 |
---|---|---|
committer | mooglyguy <therealmogminer@gmail.com> | 2018-05-16 11:58:08 +0200 |
commit | c83e2a853d4e1643fcc85b68ada3c6f7f33adea4 (patch) | |
tree | 39b249e1a0a9b2056e9815d0a284fd483338362c /src/mame/video | |
parent | 2242ff00893a83a113150609bd525f098d632e8d (diff) |
- Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
uglier, but this is intended to discourage ongoing use, and will be gradually eliminated.
Diffstat (limited to 'src/mame/video')
195 files changed, 653 insertions, 693 deletions
diff --git a/src/mame/video/8080bw.cpp b/src/mame/video/8080bw.cpp index 4f213e05648..c8c49c9a613 100644 --- a/src/mame/video/8080bw.cpp +++ b/src/mame/video/8080bw.cpp @@ -13,7 +13,7 @@ #include "includes/8080bw.h" -MACHINE_START_MEMBER(_8080bw_state,extra_8080bw_vh) +void _8080bw_state::machine_start_extra_8080bw_vh() { save_item(NAME(m_flip_screen)); save_item(NAME(m_color_map)); diff --git a/src/mame/video/aerofgt.cpp b/src/mame/video/aerofgt.cpp index 7b39d8d9181..fd04bdeead4 100644 --- a/src/mame/video/aerofgt.cpp +++ b/src/mame/video/aerofgt.cpp @@ -71,7 +71,7 @@ void aerofgt_state::aerofgt_register_state_globals( ) save_item(NAME(m_spritepalettebank)); } -VIDEO_START_MEMBER(aerofgt_state,pspikes) +void aerofgt_state::video_start_pspikes() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); /* no bg2 in this game */ @@ -82,7 +82,7 @@ VIDEO_START_MEMBER(aerofgt_state,pspikes) save_item(NAME(m_spikes91_lookup)); } -VIDEO_START_MEMBER(aerofgt_state,karatblz) +void aerofgt_state::video_start_karatblz() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_tile_info<0>),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_tile_info<1>),this),TILEMAP_SCAN_ROWS,8,8,64,64); @@ -94,7 +94,7 @@ VIDEO_START_MEMBER(aerofgt_state,karatblz) aerofgt_register_state_globals(); } -VIDEO_START_MEMBER(aerofgt_state,spinlbrk) +void aerofgt_state::video_start_spinlbrk() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::spinlbrk_tile_info<0>),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_tile_info<1>),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -109,7 +109,7 @@ VIDEO_START_MEMBER(aerofgt_state,spinlbrk) aerofgt_register_state_globals(); } -VIDEO_START_MEMBER(aerofgt_state,turbofrc) +void aerofgt_state::video_start_turbofrc() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_tile_info<0>),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_tile_info<1>),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -365,7 +365,7 @@ uint32_t aerofgt_state::screen_update_aerofgt(screen_device &screen, bitmap_ind1 ***************************************************************************/ // BOOTLEG -VIDEO_START_MEMBER(aerofgt_state,wbbc97) +void aerofgt_state::video_start_wbbc97() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); /* no bg2 in this game */ diff --git a/src/mame/video/alpha68k.cpp b/src/mame/video/alpha68k.cpp index 9fbfc853229..5fa130a8eab 100644 --- a/src/mame/video/alpha68k.cpp +++ b/src/mame/video/alpha68k.cpp @@ -40,7 +40,7 @@ WRITE16_MEMBER(alpha68k_state::alpha68k_videoram_w) m_fix_tilemap->mark_tile_dirty(offset / 2); } -VIDEO_START_MEMBER(alpha68k_state,alpha68k) +void alpha68k_state::video_start_alpha68k() { m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(alpha68k_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp index 15aa9319a7d..6521e501352 100644 --- a/src/mame/video/amiga.cpp +++ b/src/mame/video/amiga.cpp @@ -124,12 +124,10 @@ PALETTE_INIT_MEMBER(amiga_state,amiga) * *************************************/ -VIDEO_START_MEMBER( amiga_state, amiga ) +void amiga_state::video_start_amiga() { - int j; - /* generate tables that produce the correct playfield color for dual playfield mode */ - for (j = 0; j < 64; j++) + for (int j = 0; j < 64; j++) { int pf1pix = ((j >> 0) & 1) | ((j >> 1) & 2) | ((j >> 2) & 4); int pf2pix = ((j >> 1) & 1) | ((j >> 2) & 2) | ((j >> 3) & 4); diff --git a/src/mame/video/amigaaga.cpp b/src/mame/video/amigaaga.cpp index d73a1f4c373..1aacb91b8d4 100644 --- a/src/mame/video/amigaaga.cpp +++ b/src/mame/video/amigaaga.cpp @@ -76,9 +76,9 @@ void amiga_state::aga_palette_write(int color_reg, uint16_t data) * *************************************/ -VIDEO_START_MEMBER(amiga_state,amiga_aga) +void amiga_state::video_start_amiga_aga() { - VIDEO_START_CALL_MEMBER( amiga ); + video_start_amiga(); m_aga_diwhigh_written = 0; m_screen->register_screen_bitmap(m_flickerfixer32); diff --git a/src/mame/video/ampoker2.cpp b/src/mame/video/ampoker2.cpp index 686e3618715..1d7fb1c5b91 100644 --- a/src/mame/video/ampoker2.cpp +++ b/src/mame/video/ampoker2.cpp @@ -153,7 +153,7 @@ void ampoker2_state::video_start() 8, 8, 64, 32); } -VIDEO_START_MEMBER(ampoker2_state,sigma2k) +void ampoker2_state::video_start_sigma2k() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ampoker2_state::s2k_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp index 180ee08aaa0..6062e178d61 100644 --- a/src/mame/video/apple2.cpp +++ b/src/mame/video/apple2.cpp @@ -561,7 +561,7 @@ void apple2_state::apple2_video_start(const uint8_t *vram, const uint8_t *aux_vr -VIDEO_START_MEMBER(apple2_state,apple2) +void apple2_state::video_start_apple2() { apple2_video_start(m_ram->pointer(), m_ram->pointer()+0x10000, VAR_80COL | VAR_ALTCHARSET | VAR_DHIRES, 4); @@ -573,7 +573,7 @@ VIDEO_START_MEMBER(apple2_state,apple2) } -VIDEO_START_MEMBER(apple2_state,apple2p) +void apple2_state::video_start_apple2p() { apple2_video_start(m_ram->pointer(), m_ram->pointer(), VAR_80COL | VAR_ALTCHARSET | VAR_DHIRES, 8); @@ -585,7 +585,7 @@ VIDEO_START_MEMBER(apple2_state,apple2p) } -VIDEO_START_MEMBER(apple2_state,apple2e) +void apple2_state::video_start_apple2e() { device_a2eauxslot_card_interface *auxslotdevice = m_a2eauxslot->get_a2eauxslot_card(); if (auxslotdevice) @@ -599,7 +599,7 @@ VIDEO_START_MEMBER(apple2_state,apple2e) } -VIDEO_START_MEMBER(apple2_state,apple2c) +void apple2_state::video_start_apple2c() { apple2_video_start(m_ram->pointer(), m_ram->pointer()+0x10000, 0, 8); } diff --git a/src/mame/video/apple2gs.cpp b/src/mame/video/apple2gs.cpp index 2f10133e7e3..6f39ea2d8b0 100644 --- a/src/mame/video/apple2gs.cpp +++ b/src/mame/video/apple2gs.cpp @@ -15,7 +15,7 @@ -VIDEO_START_MEMBER(apple2gs_state,apple2gs) +void apple2gs_state::video_start_apple2gs() { m_bordercolor = 0; apple2_video_start(m_slowmem.get(), m_slowmem.get()+0x10000, 0, 8); diff --git a/src/mame/video/apple3.cpp b/src/mame/video/apple3.cpp index 724907d6c23..21bdbe6ef6b 100644 --- a/src/mame/video/apple3.cpp +++ b/src/mame/video/apple3.cpp @@ -118,7 +118,7 @@ void apple3_state::apple3_write_charmem() -VIDEO_START_MEMBER(apple3_state,apple3) +void apple3_state::video_start_apple3() { int i, j; uint32_t v; diff --git a/src/mame/video/argus.cpp b/src/mame/video/argus.cpp index 90a80b8e183..a35cfe2f794 100644 --- a/src/mame/video/argus.cpp +++ b/src/mame/video/argus.cpp @@ -259,7 +259,7 @@ void argus_state::reset_common() m_palette_intensity = 0; } -VIDEO_START_MEMBER(argus_state,argus) +void argus_state::video_start_argus() { /* info offset w h col row */ m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); @@ -280,7 +280,7 @@ VIDEO_START_MEMBER(argus_state,argus) save_item(NAME(m_prvscrollx)); } -VIDEO_RESET_MEMBER(argus_state,argus) +void argus_state::video_reset_argus() { m_lowbitscroll = 0; m_prvscrollx = 0; @@ -290,7 +290,7 @@ VIDEO_RESET_MEMBER(argus_state,argus) reset_common(); } -VIDEO_START_MEMBER(argus_state,valtric) +void argus_state::video_start_valtric() { /* info offset w h col row */ m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::valtric_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); @@ -308,13 +308,13 @@ VIDEO_START_MEMBER(argus_state,valtric) save_item(NAME(m_mosaic)); } -VIDEO_RESET_MEMBER(argus_state,valtric) +void argus_state::video_reset_valtric() { m_valtric_mosaic = 0x0f; reset_common(); } -VIDEO_START_MEMBER(argus_state,butasan) +void argus_state::video_start_butasan() { /* info offset w h col row */ m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::butasan_get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -342,7 +342,7 @@ VIDEO_START_MEMBER(argus_state,butasan) save_item(NAME(m_butasan_unknown)); } -VIDEO_RESET_MEMBER(argus_state,butasan) +void argus_state::video_reset_butasan() { m_butasan_page_latch = 0; m_butasan_bg1_status = 0x01; diff --git a/src/mame/video/armedf.cpp b/src/mame/video/armedf.cpp index e68f4cf98ac..a6056e00ce8 100644 --- a/src/mame/video/armedf.cpp +++ b/src/mame/video/armedf.cpp @@ -111,7 +111,7 @@ TILE_GET_INFO_MEMBER(armedf_state::get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(armedf_state,terraf) +void armedf_state::video_start_terraf() { m_sprite_offy = (m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ @@ -134,7 +134,7 @@ VIDEO_START_MEMBER(armedf_state,terraf) save_pointer(NAME(m_text_videoram.get()), 0x1000); } -VIDEO_START_MEMBER(armedf_state,armedf) +void armedf_state::video_start_armedf() { m_sprite_offy = (m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ diff --git a/src/mame/video/astrocde.cpp b/src/mame/video/astrocde.cpp index cc53ca0cf1a..2e383501505 100644 --- a/src/mame/video/astrocde.cpp +++ b/src/mame/video/astrocde.cpp @@ -179,7 +179,7 @@ void astrocde_state::video_start() } -VIDEO_START_MEMBER(astrocde_state,profpac) +void astrocde_state::video_start_profpac() { /* allocate timers */ m_scanline_timer = timer_alloc(TIMER_SCANLINE); diff --git a/src/mame/video/atarig1.cpp b/src/mame/video/atarig1.cpp index 7f769a77a4e..2563051e852 100644 --- a/src/mame/video/atarig1.cpp +++ b/src/mame/video/atarig1.cpp @@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(atarig1_state::get_playfield_tile_info) * *************************************/ -VIDEO_START_MEMBER(atarig1_state,atarig1) +void atarig1_state::video_start_atarig1() { /* blend the playfields and free the temporary one */ blend_gfx(0, 2, 0x0f, 0x10); diff --git a/src/mame/video/atarig42.cpp b/src/mame/video/atarig42.cpp index b553cc0f512..f196d7edc39 100644 --- a/src/mame/video/atarig42.cpp +++ b/src/mame/video/atarig42.cpp @@ -67,7 +67,7 @@ TILEMAP_MAPPER_MEMBER(atarig42_state::atarig42_playfield_scan) * *************************************/ -VIDEO_START_MEMBER(atarig42_state,atarig42) +void atarig42_state::video_start_atarig42() { /* blend the playfields and free the temporary one */ blend_gfx(0, 2, 0x0f, 0x30); diff --git a/src/mame/video/atarigt.cpp b/src/mame/video/atarigt.cpp index 6f1808b797f..aba6ad65d2f 100644 --- a/src/mame/video/atarigt.cpp +++ b/src/mame/video/atarigt.cpp @@ -76,7 +76,7 @@ TILEMAP_MAPPER_MEMBER(atarigt_state::atarigt_playfield_scan) * *************************************/ -VIDEO_START_MEMBER(atarigt_state,atarigt) +void atarigt_state::video_start_atarigt() { /* blend the playfields and free the temporary one */ blend_gfx(0, 2, 0x0f, 0x30); diff --git a/src/mame/video/atarisy1.cpp b/src/mame/video/atarisy1.cpp index be249e8e873..0fb6723c126 100644 --- a/src/mame/video/atarisy1.cpp +++ b/src/mame/video/atarisy1.cpp @@ -143,7 +143,7 @@ const atari_motion_objects_config atarisy1_state::s_mob_config = 0xffff /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(atarisy1_state,atarisy1) +void atarisy1_state::video_start_atarisy1() { /* first decode the graphics */ uint16_t motable[256]; diff --git a/src/mame/video/atarisy2.cpp b/src/mame/video/atarisy2.cpp index 0c735cccc4f..d040767f014 100644 --- a/src/mame/video/atarisy2.cpp +++ b/src/mame/video/atarisy2.cpp @@ -77,7 +77,7 @@ const atari_motion_objects_config atarisy2_state::s_mob_config = 0 /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(atarisy2_state,atarisy2) +void atarisy2_state::video_start_atarisy2() { /* reset the statics */ m_yscroll_reset_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(atarisy2_state::reset_yscroll_callback),this)); diff --git a/src/mame/video/badlands.cpp b/src/mame/video/badlands.cpp index c8c0a955b99..b6f7b28823b 100644 --- a/src/mame/video/badlands.cpp +++ b/src/mame/video/badlands.cpp @@ -68,7 +68,7 @@ const atari_motion_objects_config badlands_state::s_mob_config = 0, /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(badlands_state,badlands) +void badlands_state::video_start_badlands() { /* save states */ save_item(NAME(m_playfield_tile_bank)); diff --git a/src/mame/video/bbc.cpp b/src/mame/video/bbc.cpp index 96e53a0e380..5d3e34e9969 100644 --- a/src/mame/video/bbc.cpp +++ b/src/mame/video/bbc.cpp @@ -298,7 +298,7 @@ void bbc_state::setvideoshadow(int vdusel) * Initialize the BBC video emulation ************************************************************************/ -VIDEO_START_MEMBER(bbc_state, bbc) +void bbc_state::video_start_bbc() { m_cursor_size = 1; diff --git a/src/mame/video/bbusters.cpp b/src/mame/video/bbusters.cpp index 19092dfd82d..36344f66657 100644 --- a/src/mame/video/bbusters.cpp +++ b/src/mame/video/bbusters.cpp @@ -70,7 +70,7 @@ WRITE16_MEMBER(bbusters_state::pf2_w) /******************************************************************************/ -VIDEO_START_MEMBER(bbusters_state,bbuster) +void bbusters_state::video_start_bbuster() { m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); @@ -82,7 +82,7 @@ VIDEO_START_MEMBER(bbusters_state,bbuster) save_item(NAME(m_scale_line_count)); } -VIDEO_START_MEMBER(bbusters_state,mechatt) +void bbusters_state::video_start_mechatt() { m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); diff --git a/src/mame/video/blstroid.cpp b/src/mame/video/blstroid.cpp index af8c6b9a12e..7c716113524 100644 --- a/src/mame/video/blstroid.cpp +++ b/src/mame/video/blstroid.cpp @@ -69,7 +69,7 @@ const atari_motion_objects_config blstroid_state::s_mob_config = 0 /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(blstroid_state,blstroid) +void blstroid_state::video_start_blstroid() { m_irq_off_timer = timer_alloc(TIMER_IRQ_OFF); m_irq_on_timer = timer_alloc(TIMER_IRQ_ON); diff --git a/src/mame/video/blueprnt.cpp b/src/mame/video/blueprnt.cpp index 756a7db1abd..3e6666e6805 100644 --- a/src/mame/video/blueprnt.cpp +++ b/src/mame/video/blueprnt.cpp @@ -116,7 +116,7 @@ TILE_GET_INFO_MEMBER(blueprnt_state::get_bg_tile_info) -VIDEO_START_MEMBER(blueprnt_state,blueprnt) +void blueprnt_state::video_start_blueprnt() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(blueprnt_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/bosco.cpp b/src/mame/video/bosco.cpp index 2936382386e..463955f109b 100644 --- a/src/mame/video/bosco.cpp +++ b/src/mame/video/bosco.cpp @@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(bosco_state::fg_get_tile_info ) ***************************************************************************/ -VIDEO_START_MEMBER(bosco_state,bosco) +void bosco_state::video_start_bosco() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bosco_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bosco_state::fg_get_tile_info),this),tilemap_mapper_delegate(FUNC(bosco_state::fg_tilemap_scan),this), 8,8, 8,32); diff --git a/src/mame/video/btime.cpp b/src/mame/video/btime.cpp index f0341bb9c6a..266ded94ccd 100644 --- a/src/mame/video/btime.cpp +++ b/src/mame/video/btime.cpp @@ -116,14 +116,14 @@ Start the video hardware emulation. ***************************************************************************/ -VIDEO_START_MEMBER(btime_state,disco) +void btime_state::video_start_disco() { // graphics are in RAM m_gfxdecode->gfx(0)->set_source(m_deco_charram); m_gfxdecode->gfx(1)->set_source(m_deco_charram); } -VIDEO_START_MEMBER(btime_state,bnj) +void btime_state::video_start_bnj() { /* the background area is twice as wide as the screen */ int width = 256; diff --git a/src/mame/video/cave.cpp b/src/mame/video/cave.cpp index 4850caf1e1b..f4ee8cfe192 100644 --- a/src/mame/video/cave.cpp +++ b/src/mame/video/cave.cpp @@ -388,13 +388,13 @@ void cave_state::cave_vh_start( int num ) } } -VIDEO_START_MEMBER(cave_state,cave_1_layer){ cave_vh_start(1); } -VIDEO_START_MEMBER(cave_state,cave_2_layers){ cave_vh_start(2); } -VIDEO_START_MEMBER(cave_state,cave_3_layers){ cave_vh_start(3); } -VIDEO_START_MEMBER(cave_state,cave_4_layers){ cave_vh_start(4); } +void cave_state::video_start_cave_1_layer() { cave_vh_start(1); } +void cave_state::video_start_cave_2_layers() { cave_vh_start(2); } +void cave_state::video_start_cave_3_layers() { cave_vh_start(3); } +void cave_state::video_start_cave_4_layers() { cave_vh_start(4); } -VIDEO_START_MEMBER(cave_state,sailormn_3_layers) +void cave_state::video_start_sailormn_3_layers() { cave_vh_start(2); diff --git a/src/mame/video/cclimber.cpp b/src/mame/video/cclimber.cpp index f2aeac11cfe..1322e1a05cc 100644 --- a/src/mame/video/cclimber.cpp +++ b/src/mame/video/cclimber.cpp @@ -452,7 +452,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::toproller_get_bg_tile_info) } -VIDEO_START_MEMBER(cclimber_state,cclimber) +void cclimber_state::video_start_cclimber() { m_pf_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); @@ -469,7 +469,7 @@ VIDEO_START_MEMBER(cclimber_state,cclimber) } -VIDEO_START_MEMBER(cclimber_state,swimmer) +void cclimber_state::video_start_swimmer() { m_pf_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::swimmer_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); @@ -488,7 +488,7 @@ VIDEO_START_MEMBER(cclimber_state,swimmer) } -VIDEO_START_MEMBER(cclimber_state,toprollr) +void cclimber_state::video_start_toprollr() { m_pf_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::toprollr_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/centiped.cpp b/src/mame/video/centiped.cpp index 0918e4df3bd..16b25029100 100644 --- a/src/mame/video/centiped.cpp +++ b/src/mame/video/centiped.cpp @@ -92,7 +92,7 @@ void centiped_state::init_common() } -VIDEO_START_MEMBER(centiped_state,centiped) +void centiped_state::video_start_centiped() { init_common(); init_penmask(); @@ -101,7 +101,7 @@ VIDEO_START_MEMBER(centiped_state,centiped) } -VIDEO_START_MEMBER(centiped_state,warlords) +void centiped_state::video_start_warlords() { init_common(); @@ -109,7 +109,7 @@ VIDEO_START_MEMBER(centiped_state,warlords) } -VIDEO_START_MEMBER(centiped_state,milliped) +void centiped_state::video_start_milliped() { init_common(); init_penmask(); @@ -118,7 +118,7 @@ VIDEO_START_MEMBER(centiped_state,milliped) } -VIDEO_START_MEMBER(centiped_state,bullsdrt) +void centiped_state::video_start_bullsdrt() { init_common(); init_penmask(); diff --git a/src/mame/video/champbas.cpp b/src/mame/video/champbas.cpp index 6ce7f968f01..67bd88ab6f6 100644 --- a/src/mame/video/champbas.cpp +++ b/src/mame/video/champbas.cpp @@ -159,12 +159,12 @@ TILE_GET_INFO_MEMBER(champbas_state::exctsccr_get_bg_tile_info) * *************************************/ -VIDEO_START_MEMBER(champbas_state,champbas) +void champbas_state::video_start_champbas() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(champbas_state::champbas_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } -VIDEO_START_MEMBER(champbas_state,exctsccr) +void champbas_state::video_start_exctsccr() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(champbas_state::exctsccr_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/cinemat.cpp b/src/mame/video/cinemat.cpp index cd7e7a28793..92177e35ab9 100644 --- a/src/mame/video/cinemat.cpp +++ b/src/mame/video/cinemat.cpp @@ -168,25 +168,25 @@ void cinemat_state::video_start() } -VIDEO_START_MEMBER(cinemat_state,cinemat_16level) +void cinemat_state::video_start_cinemat_16level() { m_color_mode = COLOR_16LEVEL; } -VIDEO_START_MEMBER(cinemat_state,cinemat_64level) +void cinemat_state::video_start_cinemat_64level() { m_color_mode = COLOR_64LEVEL; } -VIDEO_START_MEMBER(cinemat_state,cinemat_color) +void cinemat_state::video_start_cinemat_color() { m_color_mode = COLOR_RGB; } -VIDEO_START_MEMBER(cinemat_state,cinemat_qb3color) +void cinemat_state::video_start_cinemat_qb3color() { m_color_mode = COLOR_QB3; } diff --git a/src/mame/video/clshroad.cpp b/src/mame/video/clshroad.cpp index 6e6e14b5730..fbdde418cc1 100644 --- a/src/mame/video/clshroad.cpp +++ b/src/mame/video/clshroad.cpp @@ -199,7 +199,7 @@ WRITE8_MEMBER(clshroad_state::vram_1_w) } -VIDEO_START_MEMBER(clshroad_state,firebatl) +void clshroad_state::video_start_firebatl() { /* These 2 use the graphics and scroll value */ m_tilemap_0a = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); @@ -217,7 +217,7 @@ VIDEO_START_MEMBER(clshroad_state,firebatl) m_tilemap_1->configure_groups(*m_gfxdecode->gfx(2), 0x0f); } -VIDEO_START_MEMBER(clshroad_state,clshroad) +void clshroad_state::video_start_clshroad() { /* These 2 use the graphics and scroll value */ m_tilemap_0a = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); diff --git a/src/mame/video/cninja.cpp b/src/mame/video/cninja.cpp index aede19bd9c0..38db38ede0b 100644 --- a/src/mame/video/cninja.cpp +++ b/src/mame/video/cninja.cpp @@ -11,7 +11,7 @@ /******************************************************************************/ -VIDEO_START_MEMBER(cninja_state,stoneage) +void cninja_state::video_start_stoneage() { /* The bootleg has broken scroll registers */ m_deco_tilegen[0]->set_scrolldx(3, 0, -10, -10); /* pf4 16x16 tilemap */ @@ -251,7 +251,7 @@ uint32_t cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind1 return 0; } -VIDEO_START_MEMBER(cninja_state,mutantf) +void cninja_state::video_start_mutantf() { m_sprgen[0]->alloc_sprite_bitmap(); m_sprgen[1]->alloc_sprite_bitmap(); diff --git a/src/mame/video/combatsc.cpp b/src/mame/video/combatsc.cpp index 3fcbbabedeb..883f27f4a1e 100644 --- a/src/mame/video/combatsc.cpp +++ b/src/mame/video/combatsc.cpp @@ -252,7 +252,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_text_info_bootleg) ***************************************************************************/ -VIDEO_START_MEMBER(combatsc_state,combatsc) +void combatsc_state::video_start_combatsc() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -271,7 +271,7 @@ VIDEO_START_MEMBER(combatsc_state,combatsc) save_pointer(NAME(m_spriteram[1].get()), 0x800); } -VIDEO_START_MEMBER(combatsc_state,combatscb) +void combatsc_state::video_start_combatscb() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp index 24420e6d8dc..c34647ec0f6 100644 --- a/src/mame/video/cps1.cpp +++ b/src/mame/video/cps1.cpp @@ -1683,7 +1683,7 @@ CPS1 VIDEO RENDERER #define CPS2_OBJ_YOFFS 0x0a /* Y offset (always 0x0010) */ -MACHINE_RESET_MEMBER(cps_state,cps) +void cps_state::machine_reset_cps() { const char *gamename = machine().system().name; const struct CPS1config *pCFG = &cps1_config_table[0]; @@ -2243,11 +2243,11 @@ void cps_state::cps1_update_transmasks() } } -VIDEO_START_MEMBER(cps_state,cps) +void cps_state::video_start_cps() { int i; - MACHINE_RESET_CALL_MEMBER(cps); + machine_reset_cps(); /* Put in some const */ m_scroll_size = 0x4000; /* scroll1, scroll2, scroll3 */ @@ -2340,16 +2340,16 @@ VIDEO_START_MEMBER(cps_state,cps) machine().save().register_postload(save_prepost_delegate(FUNC(cps_state::cps1_get_video_base), this)); } -VIDEO_START_MEMBER(cps_state,cps1) +void cps_state::video_start_cps1() { m_cps_version = 1; - VIDEO_START_CALL_MEMBER(cps); + video_start_cps(); } -VIDEO_START_MEMBER(cps_state,cps2) +void cps_state::video_start_cps2() { m_cps_version = 2; - VIDEO_START_CALL_MEMBER(cps); + video_start_cps(); } /*************************************************************************** diff --git a/src/mame/video/cvs.cpp b/src/mame/video/cvs.cpp index 824573f2ccc..ff13e91e749 100644 --- a/src/mame/video/cvs.cpp +++ b/src/mame/video/cvs.cpp @@ -117,7 +117,7 @@ WRITE8_MEMBER(cvs_state::cvs_scroll_w) } -VIDEO_START_MEMBER(cvs_state,cvs) +void cvs_state::video_start_cvs() { cvs_init_stars(); diff --git a/src/mame/video/ddragon.cpp b/src/mame/video/ddragon.cpp index 6c4f33f454b..415f8189f84 100644 --- a/src/mame/video/ddragon.cpp +++ b/src/mame/video/ddragon.cpp @@ -92,7 +92,7 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_fg_16color_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(ddragon_state,ddragon) +void ddragon_state::video_start_ddragon() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ddragon_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(ddragon_state::background_scan),this), 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ddragon_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/ddragon3.cpp b/src/mame/video/ddragon3.cpp index cdb40e0e3d3..9a5b4a9200f 100644 --- a/src/mame/video/ddragon3.cpp +++ b/src/mame/video/ddragon3.cpp @@ -144,7 +144,7 @@ void wwfwfest_state::video_start() } -VIDEO_START_MEMBER(wwfwfest_state,wwfwfstb) +void wwfwfest_state::video_start_wwfwfstb() { wwfwfest_state::video_start(); diff --git a/src/mame/video/dec0.cpp b/src/mame/video/dec0.cpp index f89f85c3148..0c7677b80f7 100644 --- a/src/mame/video/dec0.cpp +++ b/src/mame/video/dec0.cpp @@ -373,14 +373,14 @@ WRITE16_MEMBER(dec0_state::dec0_priority_w) COMBINE_DATA(&m_pri); } -VIDEO_START_MEMBER(dec0_state,dec0_nodma) +void dec0_state::video_start_dec0_nodma() { save_item(NAME(m_pri)); m_buffered_spriteram = m_spriteram; save_pointer(NAME(m_buffered_spriteram), 0x800/2); } -VIDEO_START_MEMBER(dec0_state,dec0) +void dec0_state::video_start_dec0() { save_item(NAME(m_pri)); m_buffered_spriteram = auto_alloc_array(machine(), uint16_t, 0x800/2); diff --git a/src/mame/video/dec8.cpp b/src/mame/video/dec8.cpp index fed8235b07f..cd8f3c49cdd 100644 --- a/src/mame/video/dec8.cpp +++ b/src/mame/video/dec8.cpp @@ -238,7 +238,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_cobracom_fix_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,cobracom) +void dec8_state::video_start_cobracom() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_cobracom_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -272,7 +272,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_ghostb_fix_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,ghostb) +void dec8_state::video_start_ghostb() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_ghostb_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -314,7 +314,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_oscar_fix_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,oscar) +void dec8_state::video_start_oscar() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_oscar_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -387,7 +387,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_lastmisn_fix_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,lastmisn) +void dec8_state::video_start_lastmisn() { allocate_buffered_spriteram16(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_tile_info),this), tilemap_mapper_delegate(FUNC(dec8_state::lastmisn_scan_rows),this), 16, 16, 32, 32); @@ -397,7 +397,7 @@ VIDEO_START_MEMBER(dec8_state,lastmisn) m_game_uses_priority = 0; } -VIDEO_START_MEMBER(dec8_state,shackled) +void dec8_state::video_start_shackled() { allocate_buffered_spriteram16(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_tile_info),this), tilemap_mapper_delegate(FUNC(dec8_state::lastmisn_scan_rows),this), 16, 16, 32, 32); @@ -451,7 +451,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_srdarwin_tile_info) tileinfo.group = color; } -VIDEO_START_MEMBER(dec8_state,srdarwin) +void dec8_state::video_start_srdarwin() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_srdarwin_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 16); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_srdarwin_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -519,7 +519,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_gondo_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,gondo) +void dec8_state::video_start_gondo() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -530,7 +530,7 @@ VIDEO_START_MEMBER(dec8_state,gondo) m_game_uses_priority = 0; } -VIDEO_START_MEMBER(dec8_state,garyoret) +void dec8_state::video_start_garyoret() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/deco32.cpp b/src/mame/video/deco32.cpp index fe7c2fd097d..98d7686cf29 100644 --- a/src/mame/video/deco32.cpp +++ b/src/mame/video/deco32.cpp @@ -83,14 +83,14 @@ void deco32_state::allocate_rowscroll(int size1, int size2, int size3, int size4 save_pointer(NAME(m_pf_rowscroll[3].get()), size4); } -VIDEO_START_MEMBER( captaven_state, captaven ) +void captaven_state::video_start_captaven() { deco32_state::allocate_spriteram(0); deco32_state::allocate_rowscroll(0x4000/4, 0x2000/4, 0x4000/4, 0x2000/4); deco32_state::video_start(); } -VIDEO_START_MEMBER( fghthist_state, fghthist ) +void fghthist_state::video_start_fghthist() { m_sprgen[0]->alloc_sprite_bitmap(); deco32_state::allocate_spriteram(0); @@ -99,11 +99,10 @@ VIDEO_START_MEMBER( fghthist_state, fghthist ) deco32_state::video_start(); } -VIDEO_START_MEMBER( nslasher_state, nslasher ) +void nslasher_state::video_start_nslasher() { - int width, height; - width = m_screen->width(); - height = m_screen->height(); + int width = m_screen->width(); + int height = m_screen->height(); m_tilemap_alpha_bitmap=std::make_unique<bitmap_ind16>(width, height ); for (int chip = 0; chip < 2; chip++) { @@ -114,7 +113,7 @@ VIDEO_START_MEMBER( nslasher_state, nslasher ) deco32_state::video_start(); } -VIDEO_START_MEMBER( dragngun_state, dragngun ) +void dragngun_state::video_start_dragngun() { m_screen->register_screen_bitmap(m_temp_render_bitmap); deco32_state::allocate_rowscroll(0x4000/4, 0x2000/4, 0x4000/4, 0x2000/4); diff --git a/src/mame/video/deco_mlc.cpp b/src/mame/video/deco_mlc.cpp index 85f066de120..00f226a562f 100644 --- a/src/mame/video/deco_mlc.cpp +++ b/src/mame/video/deco_mlc.cpp @@ -17,7 +17,7 @@ /******************************************************************************/ -VIDEO_START_MEMBER(deco_mlc_state,mlc) +void deco_mlc_state::video_start_mlc() { int max_color = (0x800 / m_gfxdecode->gfx(0)->granularity()); m_colour_mask=max_color - 1; diff --git a/src/mame/video/digdug.cpp b/src/mame/video/digdug.cpp index bfd31abe377..72b5f1840c5 100644 --- a/src/mame/video/digdug.cpp +++ b/src/mame/video/digdug.cpp @@ -140,7 +140,7 @@ TILE_GET_INFO_MEMBER(digdug_state::tx_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(digdug_state,digdug) +void digdug_state::video_start_digdug() { m_bg_select = 0; m_tx_color_mode = 0; diff --git a/src/mame/video/divebomb.cpp b/src/mame/video/divebomb.cpp index c1b58941930..3fa5288f43d 100644 --- a/src/mame/video/divebomb.cpp +++ b/src/mame/video/divebomb.cpp @@ -132,7 +132,7 @@ PALETTE_INIT_MEMBER(divebomb_state, divebomb) } -VIDEO_START_MEMBER(divebomb_state,divebomb) +void divebomb_state::video_start_divebomb() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(divebomb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/dkong.cpp b/src/mame/video/dkong.cpp index 9db63239907..a0e69876274 100644 --- a/src/mame/video/dkong.cpp +++ b/src/mame/video/dkong.cpp @@ -908,7 +908,7 @@ void dkong_state::check_palette() } } -VIDEO_START_MEMBER(dkong_state,dkong_base) +void dkong_state::video_start_dkong_base() { m_cd4049_b = (log(0.0 - log(cd4049_al)) - log(0.0 - log((1.0-cd4049_al))) ) / log(cd4049_vh/cd4049_vl); m_cd4049_a = log(0.0 - log(cd4049_al)) - m_cd4049_b * log(cd4049_vh); @@ -948,9 +948,9 @@ VIDEO_START_MEMBER(dkong_state,dkong_base) } -VIDEO_START_MEMBER(dkong_state,dkong) +void dkong_state::video_start_dkong() { - VIDEO_START_CALL_MEMBER(dkong_base); + video_start_dkong_base(); m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(dkong_state::scanline_callback),this)); m_scanline_timer->adjust(m_screen->time_until_pos(0)); diff --git a/src/mame/video/docastle.cpp b/src/mame/video/docastle.cpp index 38ed7995853..ef6069a5caf 100644 --- a/src/mame/video/docastle.cpp +++ b/src/mame/video/docastle.cpp @@ -114,7 +114,7 @@ void docastle_state::video_start() video_start_common(0x00ff); } -VIDEO_START_MEMBER(docastle_state,dorunrun) +void docastle_state::video_start_dorunrun() { video_start_common(0xff00); } diff --git a/src/mame/video/dynax.cpp b/src/mame/video/dynax.cpp index 6177c371c92..ed484338348 100644 --- a/src/mame/video/dynax.cpp +++ b/src/mame/video/dynax.cpp @@ -885,7 +885,7 @@ void dynax_state::dynax_common_reset() save_item(NAME(m_hanamai_priority)); } -VIDEO_START_MEMBER(dynax_state,hanamai) +void dynax_state::video_start_hanamai() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[0][1] = std::make_unique<uint8_t[]>(256 * 256); @@ -909,7 +909,7 @@ VIDEO_START_MEMBER(dynax_state,hanamai) save_pointer(NAME(m_pixmap[3][1].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,hnoridur) +void dynax_state::video_start_hnoridur() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[0][1] = std::make_unique<uint8_t[]>(256 * 256); @@ -935,13 +935,13 @@ VIDEO_START_MEMBER(dynax_state,hnoridur) save_pointer(NAME(m_pixmap[3][1].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,mcnpshnt) +void dynax_state::video_start_mcnpshnt() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); m_priority_table = priority_mcnpshnt; } -VIDEO_START_MEMBER(dynax_state,sprtmtch) +void dynax_state::video_start_sprtmtch() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[0][1] = std::make_unique<uint8_t[]>(256 * 256); @@ -961,7 +961,7 @@ VIDEO_START_MEMBER(dynax_state,sprtmtch) save_pointer(NAME(m_pixmap[2][1].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,jantouki) +void dynax_state::video_start_jantouki() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[0][1] = std::make_unique<uint8_t[]>(256 * 256); @@ -1002,7 +1002,7 @@ VIDEO_START_MEMBER(dynax_state,jantouki) save_pointer(NAME(m_pixmap[7][1].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,mjdialq2) +void dynax_state::video_start_mjdialq2() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[1][0] = std::make_unique<uint8_t[]>(256 * 256); @@ -1015,33 +1015,33 @@ VIDEO_START_MEMBER(dynax_state,mjdialq2) save_pointer(NAME(m_pixmap[1][0].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,mjelctrn) +void dynax_state::video_start_mjelctrn() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); m_priority_table = priority_mjelctrn; m_update_irq_func = &dynax_state::mjelctrn_update_irq; } -VIDEO_START_MEMBER(dynax_state,mjembase) +void dynax_state::video_start_mjembase() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); m_priority_table = priority_mjembase; m_update_irq_func = &dynax_state::mjelctrn_update_irq; } -VIDEO_START_MEMBER(dynax_state,neruton) +void dynax_state::video_start_neruton() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); // m_priority_table = priority_mjelctrn; m_update_irq_func = &dynax_state::mjelctrn_update_irq; } -VIDEO_START_MEMBER(dynax_state,tenkai) +void dynax_state::video_start_tenkai() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); m_priority_table = priority_mjelctrn; m_update_irq_func = &dynax_state::tenkai_update_irq; diff --git a/src/mame/video/eolith.cpp b/src/mame/video/eolith.cpp index 2df768faaef..4a7005dbe32 100644 --- a/src/mame/video/eolith.cpp +++ b/src/mame/video/eolith.cpp @@ -21,7 +21,7 @@ READ16_MEMBER(eolith_state::eolith_vram_r) return m_vram[offset+(0x40000/2)*m_buffer]; } -VIDEO_START_MEMBER(eolith_state,eolith) +void eolith_state::video_start_eolith() { m_vram = std::make_unique<uint16_t[]>(0x40000); save_pointer(NAME(m_vram.get()), 0x40000); diff --git a/src/mame/video/eprom.cpp b/src/mame/video/eprom.cpp index 6fbb6e34657..8c409b40e94 100644 --- a/src/mame/video/eprom.cpp +++ b/src/mame/video/eprom.cpp @@ -122,7 +122,7 @@ const atari_motion_objects_config eprom_state::s_mob_config = 0 /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(eprom_state,eprom) +void eprom_state::video_start_eprom() { /* save states */ save_item(NAME(m_screen_intensity)); @@ -164,7 +164,7 @@ const atari_motion_objects_config eprom_state::s_guts_mob_config = 0 /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(eprom_state,guts) +void eprom_state::video_start_guts() { /* save states */ save_item(NAME(m_screen_intensity)); diff --git a/src/mame/video/equites.cpp b/src/mame/video/equites.cpp index 66e366a9632..10bdbd0a401 100644 --- a/src/mame/video/equites.cpp +++ b/src/mame/video/equites.cpp @@ -117,7 +117,7 @@ TILE_GET_INFO_MEMBER(splndrbt_state::splndrbt_bg_info) * *************************************/ -VIDEO_START_MEMBER(equites_state,equites) +void equites_state::video_start_equites() { m_fg_videoram = std::make_unique<uint8_t[]>(0x800); save_pointer(NAME(m_fg_videoram.get()), 0x800); @@ -130,7 +130,7 @@ VIDEO_START_MEMBER(equites_state,equites) m_bg_tilemap->set_scrolldx(0, -10); } -VIDEO_START_MEMBER(splndrbt_state,splndrbt) +void splndrbt_state::video_start_splndrbt() { assert(m_screen->format() == BITMAP_FORMAT_IND16); diff --git a/src/mame/video/espial.cpp b/src/mame/video/espial.cpp index 1a969eb45d7..6d56fa15dfd 100644 --- a/src/mame/video/espial.cpp +++ b/src/mame/video/espial.cpp @@ -95,7 +95,7 @@ void espial_state::video_start() save_item(NAME(m_flipscreen)); } -VIDEO_START_MEMBER(espial_state,netwars) +void espial_state::video_start_netwars() { /* Net Wars has a tile map that's twice as big as Espial's */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(espial_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); diff --git a/src/mame/video/f1gp.cpp b/src/mame/video/f1gp.cpp index a28a6f12874..f1860266a33 100644 --- a/src/mame/video/f1gp.cpp +++ b/src/mame/video/f1gp.cpp @@ -44,9 +44,7 @@ TILE_GET_INFO_MEMBER(f1gp_state::get_fg_tile_info) ***************************************************************************/ - - -VIDEO_START_MEMBER(f1gp_state,f1gp) +void f1gp_state::video_start_f1gp() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -60,7 +58,7 @@ VIDEO_START_MEMBER(f1gp_state,f1gp) } -VIDEO_START_MEMBER(f1gp_state,f1gpb) +void f1gp_state::video_start_f1gpb() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -92,7 +90,7 @@ uint32_t f1gp_state::f1gp_ol2_tile_callback( uint32_t code ) -VIDEO_START_MEMBER(f1gp_state,f1gp2) +void f1gp_state::video_start_f1gp2() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp2_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/fastfred.cpp b/src/mame/video/fastfred.cpp index c32c7eefe1c..291a0d24bc6 100644 --- a/src/mame/video/fastfred.cpp +++ b/src/mame/video/fastfred.cpp @@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(fastfred_state::get_tile_info) * *************************************/ -VIDEO_START_MEMBER(fastfred_state,fastfred) +void fastfred_state::video_start_fastfred() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -325,7 +325,7 @@ WRITE_LINE_MEMBER(fastfred_state::imago_charbank_w) } } -VIDEO_START_MEMBER(fastfred_state,imago) +void fastfred_state::video_start_imago() { m_web_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_web),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_bg),this), TILEMAP_SCAN_ROWS,8,8,32,32); diff --git a/src/mame/video/firetrk.cpp b/src/mame/video/firetrk.cpp index c19477615ee..c82c990629c 100644 --- a/src/mame/video/firetrk.cpp +++ b/src/mame/video/firetrk.cpp @@ -219,7 +219,7 @@ void firetrk_state::video_start() } -VIDEO_START_MEMBER(firetrk_state,superbug) +void firetrk_state::video_start_superbug() { m_screen->register_screen_bitmap(m_helper1); m_screen->register_screen_bitmap(m_helper2); @@ -229,7 +229,7 @@ VIDEO_START_MEMBER(firetrk_state,superbug) } -VIDEO_START_MEMBER(firetrk_state,montecar) +void firetrk_state::video_start_montecar() { m_screen->register_screen_bitmap(m_helper1); m_screen->register_screen_bitmap(m_helper2); diff --git a/src/mame/video/flstory.cpp b/src/mame/video/flstory.cpp index be695acd92a..55bcfd77292 100644 --- a/src/mame/video/flstory.cpp +++ b/src/mame/video/flstory.cpp @@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(flstory_state::get_rumba_tile_info) 0); } -VIDEO_START_MEMBER(flstory_state,flstory) +void flstory_state::video_start_flstory() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); // m_bg_tilemap->set_transparent_pen(15); @@ -70,7 +70,7 @@ VIDEO_START_MEMBER(flstory_state,flstory) save_item(NAME(m_paletteram_ext)); } -VIDEO_START_MEMBER(flstory_state,rumba) +void flstory_state::video_start_rumba() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::get_rumba_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); // m_bg_tilemap->set_transparent_pen(15); @@ -87,7 +87,7 @@ VIDEO_START_MEMBER(flstory_state,rumba) save_item(NAME(m_paletteram_ext)); } -VIDEO_START_MEMBER(flstory_state,victnine) +void flstory_state::video_start_victnine() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::victnine_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/fromanc2.cpp b/src/mame/video/fromanc2.cpp index 2eac256be6b..3073e93ea6d 100644 --- a/src/mame/video/fromanc2.cpp +++ b/src/mame/video/fromanc2.cpp @@ -255,7 +255,7 @@ WRITE16_MEMBER(fromanc2_state::fromanc4_gfxreg_2_w) ******************************************************************************/ -VIDEO_START_MEMBER(fromanc2_state,fromanc2) +void fromanc2_state::video_start_fromanc2() { m_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromanc2_get_tile_info<0, 0>, "v0_l0", this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromanc2_get_tile_info<0, 1>, "v0_l1", this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -293,7 +293,7 @@ VIDEO_START_MEMBER(fromanc2_state,fromanc2) save_item(NAME(m_gfxbank[1])); } -VIDEO_START_MEMBER(fromanc2_state,fromancr) +void fromanc2_state::video_start_fromancr() { m_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromancr_get_tile_info<0, 0>, "v0_l0", this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromancr_get_tile_info<0, 1>, "v0_l1", this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -329,7 +329,7 @@ VIDEO_START_MEMBER(fromanc2_state,fromancr) save_item(NAME(m_gfxbank[1])); } -VIDEO_START_MEMBER(fromanc2_state,fromanc4) +void fromanc2_state::video_start_fromanc4() { m_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromancr_get_tile_info<0, 0>, "v0_l0", this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); m_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromancr_get_tile_info<0, 1>, "v0_l1", this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); diff --git a/src/mame/video/fromance.cpp b/src/mame/video/fromance.cpp index 06ffec1c4e2..7490bc9cbc3 100644 --- a/src/mame/video/fromance.cpp +++ b/src/mame/video/fromance.cpp @@ -85,7 +85,7 @@ void fromance_state::init_common( ) save_pointer(NAME(m_local_paletteram.get()), 0x800 * 2); } -VIDEO_START_MEMBER(fromance_state,fromance) +void fromance_state::video_start_fromance() { /* allocate tilemaps */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fromance_state::get_fromance_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); @@ -94,7 +94,7 @@ VIDEO_START_MEMBER(fromance_state,fromance) init_common(); } -VIDEO_START_MEMBER(fromance_state,nekkyoku) +void fromance_state::video_start_nekkyoku() { /* allocate tilemaps */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fromance_state::get_nekkyoku_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); @@ -103,15 +103,15 @@ VIDEO_START_MEMBER(fromance_state,nekkyoku) init_common(); } -VIDEO_START_MEMBER(fromance_state,pipedrm) +void fromance_state::video_start_pipedrm() { - VIDEO_START_CALL_MEMBER(fromance); + video_start_fromance(); m_scrolly_ofs = 0x00; } -VIDEO_START_MEMBER(fromance_state,hatris) +void fromance_state::video_start_hatris() { - VIDEO_START_CALL_MEMBER(fromance); + video_start_fromance(); m_scrollx_ofs = 0xB9; m_scrolly_ofs = 0x00; } diff --git a/src/mame/video/funworld.cpp b/src/mame/video/funworld.cpp index 4c390c42e9a..7a3300bd2f7 100644 --- a/src/mame/video/funworld.cpp +++ b/src/mame/video/funworld.cpp @@ -125,17 +125,17 @@ TILE_GET_INFO_MEMBER(funworld_state::get_bg_tile_info) } -VIDEO_START_MEMBER(funworld_state, funworld) +void funworld_state::video_start_funworld() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 29); } -VIDEO_START_MEMBER(funworld_state, magicrd2) +void funworld_state::video_start_magicrd2() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 112, 34); } -VIDEO_START_MEMBER(funworld_state, chinatow) +void funworld_state::video_start_chinatow() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 31); } diff --git a/src/mame/video/gaelco.cpp b/src/mame/video/gaelco.cpp index 6e1b93899e7..e753deef09b 100644 --- a/src/mame/video/gaelco.cpp +++ b/src/mame/video/gaelco.cpp @@ -75,7 +75,7 @@ WRITE16_MEMBER(gaelco_state::gaelco_vram_w) ***************************************************************************/ -VIDEO_START_MEMBER(gaelco_state,bigkarnk) +void gaelco_state::video_start_bigkarnk() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -84,7 +84,7 @@ VIDEO_START_MEMBER(gaelco_state,bigkarnk) m_tilemap[1]->set_transmask(0, 0xff01, 0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ } -VIDEO_START_MEMBER(gaelco_state,maniacsq) +void gaelco_state::video_start_maniacsq() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); diff --git a/src/mame/video/gaelco2.cpp b/src/mame/video/gaelco2.cpp index 5632581de32..27baa999618 100644 --- a/src/mame/video/gaelco2.cpp +++ b/src/mame/video/gaelco2.cpp @@ -259,7 +259,7 @@ WRITE16_MEMBER(gaelco2_state::gaelco2_palette_w) ***************************************************************************/ -VIDEO_START_MEMBER(gaelco2_state,gaelco2) +void gaelco2_state::video_start_gaelco2() { m_videoram = m_spriteram->live(); @@ -279,7 +279,7 @@ VIDEO_START_MEMBER(gaelco2_state,gaelco2) m_dual_monitor = 0; } -VIDEO_START_MEMBER(gaelco2_state,gaelco2_dual) +void gaelco2_state::video_start_gaelco2_dual() { m_videoram = m_spriteram->live(); diff --git a/src/mame/video/gaiden.cpp b/src/mame/video/gaiden.cpp index d66dc509bf2..bdc8a08b7ff 100644 --- a/src/mame/video/gaiden.cpp +++ b/src/mame/video/gaiden.cpp @@ -69,7 +69,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_tx_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(gaiden_state,gaiden) +void gaiden_state::video_start_gaiden() { /* set up tile layers */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); @@ -92,7 +92,7 @@ VIDEO_START_MEMBER(gaiden_state,gaiden) } -VIDEO_START_MEMBER(gaiden_state,raiga) +void gaiden_state::video_start_raiga() { /* set up tile layers */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); @@ -110,7 +110,7 @@ VIDEO_START_MEMBER(gaiden_state,raiga) m_screen->register_screen_bitmap(m_sprite_bitmap); } -VIDEO_START_MEMBER(gaiden_state,drgnbowl) +void gaiden_state::video_start_drgnbowl() { /* set up tile layers */ m_background = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); diff --git a/src/mame/video/galaga.cpp b/src/mame/video/galaga.cpp index e86c2350e98..d1893441f4a 100644 --- a/src/mame/video/galaga.cpp +++ b/src/mame/video/galaga.cpp @@ -428,7 +428,7 @@ TILE_GET_INFO_MEMBER(galaga_state::get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(galaga_state,galaga) +void galaga_state::video_start_galaga() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaga_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(galaga_state::tilemap_scan),this),8,8,36,28); m_fg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0x1f); diff --git a/src/mame/video/galaxia.cpp b/src/mame/video/galaxia.cpp index 94b6c423c61..2d5d6a56939 100644 --- a/src/mame/video/galaxia.cpp +++ b/src/mame/video/galaxia.cpp @@ -83,7 +83,7 @@ void galaxia_state::init_common() cvs_init_stars(); } -VIDEO_START_MEMBER(galaxia_state,galaxia) +void galaxia_state::video_start_galaxia() { init_common(); @@ -93,7 +93,7 @@ VIDEO_START_MEMBER(galaxia_state,galaxia) } -VIDEO_START_MEMBER(galaxia_state,astrowar) +void galaxia_state::video_start_astrowar() { init_common(); diff --git a/src/mame/video/galaxold.cpp b/src/mame/video/galaxold.cpp index b8787b288c5..29b92a463e0 100644 --- a/src/mame/video/galaxold.cpp +++ b/src/mame/video/galaxold.cpp @@ -425,7 +425,7 @@ void galaxold_state::video_start_common() state_save_register(); } -VIDEO_START_MEMBER(galaxold_state,galaxold_plain) +void galaxold_state::video_start_galaxold_plain() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -436,18 +436,18 @@ VIDEO_START_MEMBER(galaxold_state,galaxold_plain) m_color_mask = (m_gfxdecode->gfx(0)->granularity() == 4) ? 7 : 3; } -VIDEO_START_MEMBER(galaxold_state,galaxold) +void galaxold_state::video_start_galaxold() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_draw_stars = &galaxold_state::galaxold_draw_stars; m_draw_bullets = &galaxold_state::galaxold_draw_bullets; } -VIDEO_START_MEMBER(galaxold_state,scrambold) +void galaxold_state::video_start_scrambold() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); /* FIXME: This most probably needs to be adjusted * again when RAW video params are added to scramble @@ -461,57 +461,57 @@ VIDEO_START_MEMBER(galaxold_state,scrambold) m_draw_background = &galaxold_state::scrambold_draw_background; } -VIDEO_START_MEMBER(galaxold_state, newsin7) +void galaxold_state::video_start_newsin7() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_leftclip = 0; } -VIDEO_START_MEMBER(galaxold_state,darkplnt) +void galaxold_state::video_start_darkplnt() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_bg_tilemap->set_scrolldx(0, 0); m_draw_bullets = &galaxold_state::darkplnt_draw_bullets; } -VIDEO_START_MEMBER(galaxold_state,rescue) +void galaxold_state::video_start_rescue() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_draw_stars = &galaxold_state::rescue_draw_stars; m_draw_background = &galaxold_state::rescue_draw_background; } -VIDEO_START_MEMBER(galaxold_state,minefld) +void galaxold_state::video_start_minefld() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_draw_stars = &galaxold_state::rescue_draw_stars; m_draw_background = &galaxold_state::minefld_draw_background; } -VIDEO_START_MEMBER(galaxold_state,stratgyx) +void galaxold_state::video_start_stratgyx() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_draw_background = &galaxold_state::stratgyx_draw_background; } -VIDEO_START_MEMBER(galaxold_state,ckongs) +void galaxold_state::video_start_ckongs() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_modify_spritecode = &galaxold_state::mshuttle_modify_spritecode; } -VIDEO_START_MEMBER(galaxold_state,mariner) +void galaxold_state::video_start_mariner() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_draw_stars = &galaxold_state::mariner_draw_stars; @@ -522,17 +522,17 @@ VIDEO_START_MEMBER(galaxold_state,mariner) m_modify_charcode = &galaxold_state::mariner_modify_charcode; } -VIDEO_START_MEMBER(galaxold_state,mimonkey) +void galaxold_state::video_start_mimonkey() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_modify_charcode = &galaxold_state::mimonkey_modify_charcode; m_modify_spritecode = &galaxold_state::mimonkey_modify_spritecode; } -VIDEO_START_MEMBER(galaxold_state,dkongjrm) +void galaxold_state::video_start_dkongjrm() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_modify_charcode = &galaxold_state::pisces_modify_charcode; m_modify_spritecode = &galaxold_state::dkongjrm_modify_spritecode; @@ -540,17 +540,17 @@ VIDEO_START_MEMBER(galaxold_state,dkongjrm) m_spriteram2_present= 1; } -VIDEO_START_MEMBER(galaxold_state,dkongjrmc) +void galaxold_state::video_start_dkongjrmc() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_modify_charcode = &galaxold_state::pisces_modify_charcode; m_modify_spritecode = &galaxold_state::dkongjrmc_modify_spritecode; } -VIDEO_START_MEMBER(galaxold_state,scorpion) +void galaxold_state::video_start_scorpion() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_modify_spritecode = &galaxold_state::batman2_modify_spritecode; } @@ -560,9 +560,9 @@ void galaxold_state::pisces_modify_spritecode(uint8_t *spriteram, int *code, int *code |= (m_gfxbank[0] << 6); } -VIDEO_START_MEMBER(galaxold_state,pisces) +void galaxold_state::video_start_pisces() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_modify_charcode = &galaxold_state::pisces_modify_charcode; m_modify_spritecode = &galaxold_state::pisces_modify_spritecode; @@ -584,9 +584,9 @@ void galaxold_state::theend_draw_bullets(bitmap_ind16 &bitmap, const rectangle & } } -VIDEO_START_MEMBER(galaxold_state,theend) +void galaxold_state::video_start_theend() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_draw_bullets = &galaxold_state::theend_draw_bullets; } @@ -600,9 +600,9 @@ void galaxold_state::mooncrst_modify_spritecode(uint8_t *spriteram, int *code, i } } -VIDEO_START_MEMBER(galaxold_state,mooncrst) +void galaxold_state::video_start_mooncrst() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_modify_charcode = &galaxold_state::mooncrst_modify_charcode; m_modify_spritecode = &galaxold_state::mooncrst_modify_spritecode; @@ -618,9 +618,9 @@ void galaxold_state::rockclim_modify_spritecode(uint8_t *spriteram, int *code, i if (m_gfxbank[2]) *code|=0x40; } -VIDEO_START_MEMBER(galaxold_state,rockclim) +void galaxold_state::video_start_rockclim() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_rockclim_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::rockclim_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_draw_background = &galaxold_state::rockclim_draw_background; @@ -645,7 +645,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::drivfrcg_get_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(galaxold_state,drivfrcg) +void galaxold_state::video_start_drivfrcg() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::drivfrcg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -659,7 +659,7 @@ VIDEO_START_MEMBER(galaxold_state,drivfrcg) m_color_mask = 0xff; } -VIDEO_START_MEMBER(galaxold_state,ad2083) +void galaxold_state::video_start_ad2083() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::drivfrcg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -695,7 +695,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::racknrol_get_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(galaxold_state,racknrol) +void galaxold_state::video_start_racknrol() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::racknrol_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -726,7 +726,7 @@ void galaxold_state::harem_modify_spritecode(uint8_t *spriteram, int *code, int *code |= (m_gfxbank[0] << 7) | 0x40; } -VIDEO_START_MEMBER(galaxold_state,harem) +void galaxold_state::video_start_harem() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::harem_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -739,16 +739,16 @@ VIDEO_START_MEMBER(galaxold_state,harem) m_modify_spritecode = &galaxold_state::harem_modify_spritecode; } -VIDEO_START_MEMBER(galaxold_state,ozon1) +void galaxold_state::video_start_ozon1() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_bg_tilemap->set_scrolldx(0, 384-256); } -VIDEO_START_MEMBER(galaxold_state,bongo) +void galaxold_state::video_start_bongo() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_bg_tilemap->set_scrolldx(0, 384-256); @@ -775,9 +775,9 @@ TILE_GET_INFO_MEMBER(galaxold_state::dambustr_get_tile_info2) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(galaxold_state,dambustr) +void galaxold_state::video_start_dambustr() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_dambustr_bg_split_line = 0; m_dambustr_bg_color_1 = 0; @@ -1797,9 +1797,9 @@ void galaxold_state::bagmanmc_modify_spritecode(uint8_t *spriteram, int *code, i *code |= (m_gfxbank[0] << 7) | 0x40; } -VIDEO_START_MEMBER(galaxold_state,bagmanmc) +void galaxold_state::video_start_bagmanmc() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_modify_charcode = &galaxold_state::bagmanmc_modify_charcode; m_modify_spritecode = &galaxold_state::bagmanmc_modify_spritecode; diff --git a/src/mame/video/galivan.cpp b/src/mame/video/galivan.cpp index a5ccf0ad347..b64e3231933 100644 --- a/src/mame/video/galivan.cpp +++ b/src/mame/video/galivan.cpp @@ -174,7 +174,7 @@ TILE_GET_INFO_MEMBER(galivan_state::ninjemak_get_tx_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(galivan_state,galivan) +void galivan_state::video_start_galivan() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -182,7 +182,7 @@ VIDEO_START_MEMBER(galivan_state,galivan) m_tx_tilemap->set_transparent_pen(15); } -VIDEO_START_MEMBER(galivan_state,ninjemak) +void galivan_state::video_start_ninjemak() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 512, 32); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/galspnbl.cpp b/src/mame/video/galspnbl.cpp index 9b442a3b0bf..31556de9cc4 100644 --- a/src/mame/video/galspnbl.cpp +++ b/src/mame/video/galspnbl.cpp @@ -30,7 +30,7 @@ void galspnbl_state::draw_background( bitmap_ind16 &bitmap, const rectangle &cli } } -VIDEO_START_MEMBER(galspnbl_state,galspnbl) +void galspnbl_state::video_start_galspnbl() { /* allocate bitmaps */ m_screen->register_screen_bitmap(m_sprite_bitmap); diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index 6f15aad5be3..da21e239b86 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -265,7 +265,7 @@ TIMER_CALLBACK_MEMBER(gameplan_state::via_0_ca1_timer_callback) * *************************************/ -VIDEO_START_MEMBER(gameplan_state,common) +void gameplan_state::video_start() { m_videoram_size = (HBSTART - HBEND) * (VBSTART - VBEND); m_videoram = std::make_unique<uint8_t[]>(m_videoram_size); @@ -277,32 +277,13 @@ VIDEO_START_MEMBER(gameplan_state,common) } -VIDEO_START_MEMBER(gameplan_state,gameplan) -{ - VIDEO_START_CALL_MEMBER(common); -} - - -VIDEO_START_MEMBER(gameplan_state,leprechn) -{ - VIDEO_START_CALL_MEMBER(common); -} - - -VIDEO_START_MEMBER(gameplan_state,trvquest) -{ - VIDEO_START_CALL_MEMBER(common); -} - - - /************************************* * * Reset * *************************************/ -VIDEO_RESET_MEMBER(gameplan_state,gameplan) +void gameplan_state::video_reset_gameplan() { m_via_0_ca1_timer->adjust(m_screen->time_until_pos(VBSTART)); } @@ -316,8 +297,7 @@ VIDEO_RESET_MEMBER(gameplan_state,gameplan) *************************************/ MACHINE_CONFIG_START(gameplan_state::gameplan_video) - MCFG_VIDEO_START_OVERRIDE(gameplan_state,gameplan) - MCFG_VIDEO_RESET_OVERRIDE(gameplan_state,gameplan) + set_video_reset_cb(config, driver_callback_delegate(&video_reset_gameplan, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(GAMEPLAN_PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) @@ -326,7 +306,6 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(gameplan_state::leprechn_video) - MCFG_VIDEO_START_OVERRIDE(gameplan_state,leprechn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gameplan_state, screen_update_leprechn) MACHINE_CONFIG_END @@ -334,7 +313,6 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(gameplan_state::trvquest_video) gameplan_video(config); - MCFG_VIDEO_START_OVERRIDE(gameplan_state,trvquest) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gameplan_state, screen_update_gameplan) MACHINE_CONFIG_END diff --git a/src/mame/video/gberet.cpp b/src/mame/video/gberet.cpp index 37b5a1e999a..d9c72f67edf 100644 --- a/src/mame/video/gberet.cpp +++ b/src/mame/video/gberet.cpp @@ -117,7 +117,7 @@ TILE_GET_INFO_MEMBER(gberet_state::get_bg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, flags); } -VIDEO_START_MEMBER(gberet_state,gberet) +void gberet_state::video_start_gberet() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gberet_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0x10); diff --git a/src/mame/video/gladiatr.cpp b/src/mame/video/gladiatr.cpp index 03702a38cb9..0ad9ff4f251 100644 --- a/src/mame/video/gladiatr.cpp +++ b/src/mame/video/gladiatr.cpp @@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(gladiatr_state_base::fg_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(ppking_state,ppking) +void ppking_state::video_start_ppking() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ppking_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ppking_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); @@ -59,7 +59,7 @@ VIDEO_START_MEMBER(ppking_state,ppking) save_item(NAME(m_fg_tile_bank)); } -VIDEO_START_MEMBER(gladiatr_state,gladiatr) +void gladiatr_state::video_start_gladiatr() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); diff --git a/src/mame/video/goldstar.cpp b/src/mame/video/goldstar.cpp index 369c6f89de1..5274c5f0d31 100644 --- a/src/mame/video/goldstar.cpp +++ b/src/mame/video/goldstar.cpp @@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel3_tile_info) 0); } -VIDEO_START_MEMBER(goldstar_state, goldstar) +void goldstar_state::video_start_goldstar() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -120,7 +120,7 @@ VIDEO_START_MEMBER(goldstar_state, goldstar) m_cm_enable_reg = 0x0b; } -VIDEO_START_MEMBER(goldstar_state, cherrym) +void goldstar_state::video_start_cherrym() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -345,7 +345,7 @@ TILE_GET_INFO_MEMBER(wingco_state::get_magical_fg_tile_info) } -VIDEO_START_MEMBER(wingco_state, bingowng) +void wingco_state::video_start_bingowng() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wingco_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -358,7 +358,7 @@ VIDEO_START_MEMBER(wingco_state, bingowng) m_cm_enable_reg = 0x0b; } -VIDEO_START_MEMBER(wingco_state, magical) +void wingco_state::video_start_magical() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wingco_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wingco_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -599,7 +599,7 @@ TILE_GET_INFO_MEMBER(sanghopm_state::get_reel3_tile_info) } -VIDEO_START_MEMBER(sanghopm_state, sangho) +void sanghopm_state::video_start_sangho() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sanghopm_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); @@ -704,7 +704,7 @@ TILE_GET_INFO_MEMBER(unkch_state::get_reel3_tile_info) } -VIDEO_START_MEMBER(unkch_state, unkch) +void unkch_state::video_start_unkch() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(unkch_state::get_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(unkch_state::get_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); diff --git a/src/mame/video/gottlieb.cpp b/src/mame/video/gottlieb.cpp index 0186340942a..1bacddb2902 100644 --- a/src/mame/video/gottlieb.cpp +++ b/src/mame/video/gottlieb.cpp @@ -157,7 +157,7 @@ void gottlieb_state::video_start() save_item(NAME(m_transparent0)); } -VIDEO_START_MEMBER(gottlieb_state,screwloo) +void gottlieb_state::video_start_screwloo() { static const int resistances[4] = { 2000, 1000, 470, 240 }; diff --git a/src/mame/video/hec2hrp.cpp b/src/mame/video/hec2hrp.cpp index fcc874726e1..7309705a389 100644 --- a/src/mame/video/hec2hrp.cpp +++ b/src/mame/video/hec2hrp.cpp @@ -111,7 +111,7 @@ void hec2hrp_state::hector_80c(bitmap_ind16 &bitmap, uint8_t *page, int ymax, in } -VIDEO_START_MEMBER(hec2hrp_state,hec2hrp) +void hec2hrp_state::video_start_hec2hrp() { Init_Hector_Palette(); } diff --git a/src/mame/video/hnayayoi.cpp b/src/mame/video/hnayayoi.cpp index 3de4f445f74..fd85b75e16f 100644 --- a/src/mame/video/hnayayoi.cpp +++ b/src/mame/video/hnayayoi.cpp @@ -28,7 +28,7 @@ void hnayayoi_state::video_start() common_vh_start(4); /* 4 bitmaps -> 2 layers */ } -VIDEO_START_MEMBER(hnayayoi_state,untoucha) +void hnayayoi_state::video_start_untoucha() { common_vh_start(8); /* 8 bitmaps -> 4 layers */ } diff --git a/src/mame/video/holeland.cpp b/src/mame/video/holeland.cpp index 3000a758edb..043a5d0519b 100644 --- a/src/mame/video/holeland.cpp +++ b/src/mame/video/holeland.cpp @@ -55,7 +55,7 @@ TILE_GET_INFO_MEMBER(holeland_state::crzrally_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(holeland_state,holeland) +void holeland_state::video_start_holeland() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(holeland_state::holeland_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -65,7 +65,7 @@ VIDEO_START_MEMBER(holeland_state,holeland) save_item(NAME(m_palette_offset)); } -VIDEO_START_MEMBER(holeland_state,crzrally) +void holeland_state::video_start_crzrally() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(holeland_state::crzrally_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/homedata.cpp b/src/mame/video/homedata.cpp index 7ef82a6564e..0e2b3546fa8 100644 --- a/src/mame/video/homedata.cpp +++ b/src/mame/video/homedata.cpp @@ -618,7 +618,7 @@ TILE_GET_INFO_MEMBER(homedata_state::mirderby_get_info1_1) ***************************************************************************/ -VIDEO_START_MEMBER(homedata_state,mrokumei) +void homedata_state::video_start_mrokumei() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); @@ -629,7 +629,7 @@ VIDEO_START_MEMBER(homedata_state,mrokumei) m_bg_tilemap[1][1]->set_transparent_pen(0); } -VIDEO_START_MEMBER(homedata_state,reikaids) +void homedata_state::video_start_reikaids() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -650,7 +650,7 @@ VIDEO_START_MEMBER(homedata_state,reikaids) m_bg_tilemap[1][3]->set_transparent_pen(0xff); } -VIDEO_START_MEMBER(homedata_state,pteacher) +void homedata_state::video_start_pteacher() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -661,7 +661,7 @@ VIDEO_START_MEMBER(homedata_state,pteacher) m_bg_tilemap[1][1]->set_transparent_pen(0xff); } -VIDEO_START_MEMBER(homedata_state,lemnangl) +void homedata_state::video_start_lemnangl() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -672,7 +672,7 @@ VIDEO_START_MEMBER(homedata_state,lemnangl) m_bg_tilemap[1][1]->set_transparent_pen(0x0f); } -VIDEO_START_MEMBER(homedata_state,mirderby) +void homedata_state::video_start_mirderby() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); diff --git a/src/mame/video/hyperspt.cpp b/src/mame/video/hyperspt.cpp index 6b268069dc7..dbe2c638798 100644 --- a/src/mame/video/hyperspt.cpp +++ b/src/mame/video/hyperspt.cpp @@ -186,7 +186,7 @@ TILE_GET_INFO_MEMBER(hyperspt_state::roadf_get_bg_tile_info) SET_TILE_INFO_MEMBER(1, code, color, flags); } -VIDEO_START_MEMBER(hyperspt_state,roadf) +void hyperspt_state::video_start_roadf() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(hyperspt_state::roadf_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); diff --git a/src/mame/video/ironhors.cpp b/src/mame/video/ironhors.cpp index 16434bbdf86..51e61200d0a 100644 --- a/src/mame/video/ironhors.cpp +++ b/src/mame/video/ironhors.cpp @@ -254,7 +254,7 @@ TILE_GET_INFO_MEMBER(ironhors_state::farwest_get_bg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, flags); } -VIDEO_START_MEMBER(ironhors_state,farwest) +void ironhors_state::video_start_farwest() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ironhors_state::farwest_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/jack.cpp b/src/mame/video/jack.cpp index 745dd151df6..348804bf69e 100644 --- a/src/mame/video/jack.cpp +++ b/src/mame/video/jack.cpp @@ -174,7 +174,7 @@ TILE_GET_INFO_MEMBER(jack_state::joinem_get_bg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(jack_state,joinem) +void jack_state::video_start_joinem() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(jack_state::joinem_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),this), 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/jpmimpct.cpp b/src/mame/video/jpmimpct.cpp index 8d68a44bd49..bf6e87390e0 100644 --- a/src/mame/video/jpmimpct.cpp +++ b/src/mame/video/jpmimpct.cpp @@ -127,7 +127,7 @@ TMS340X0_SCANLINE_RGB32_CB_MEMBER(jpmimpct_state::scanline_update) * *************************************/ -VIDEO_START_MEMBER(jpmimpct_state,jpmimpct) +void jpmimpct_state::video_start_jpmimpct() { memset(&m_bt477, 0, sizeof(m_bt477)); diff --git a/src/mame/video/kaneko16.cpp b/src/mame/video/kaneko16.cpp index 20fefcb1f56..594f06f377c 100644 --- a/src/mame/video/kaneko16.cpp +++ b/src/mame/video/kaneko16.cpp @@ -18,7 +18,7 @@ WRITE16_MEMBER(kaneko16_state::kaneko16_display_enable) COMBINE_DATA(&m_disp_enable); } -VIDEO_START_MEMBER(kaneko16_state,kaneko16) +void kaneko16_state::video_start_kaneko16() { m_disp_enable = 1; // default enabled for games not using it save_item(NAME(m_disp_enable)); @@ -113,7 +113,7 @@ PALETTE_INIT_MEMBER(kaneko16_berlwall_state,berlwall) palette.set_pen_color(i,pal5bit(i >> 5),pal5bit(i >> 10),pal5bit(i >> 0)); } -VIDEO_START_MEMBER(kaneko16_berlwall_state,berlwall) +void kaneko16_berlwall_state::video_start_berlwall() { uint8_t *RAM = memregion("gfx3")->base(); @@ -160,15 +160,11 @@ VIDEO_START_MEMBER(kaneko16_berlwall_state,berlwall) } } - VIDEO_START_CALL_MEMBER(kaneko16); + video_start_kaneko16(); } - - - - /* Select the high color background image (out of 32 in the ROMs) */ READ16_MEMBER(kaneko16_berlwall_state::kaneko16_bg15_select_r) { diff --git a/src/mame/video/karnov.cpp b/src/mame/video/karnov.cpp index b9f6443bd26..753e8876996 100644 --- a/src/mame/video/karnov.cpp +++ b/src/mame/video/karnov.cpp @@ -99,7 +99,7 @@ WRITE16_MEMBER(karnov_state::karnov_playfield_swap_w) /******************************************************************************/ -VIDEO_START_MEMBER(karnov_state,karnov) +void karnov_state::video_start_karnov() { /* Allocate bitmap & tilemap */ m_bitmap_f = std::make_unique<bitmap_ind16>(512, 512); @@ -110,7 +110,7 @@ VIDEO_START_MEMBER(karnov_state,karnov) m_fix_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(karnov_state,wndrplnt) +void karnov_state::video_start_wndrplnt() { /* Allocate bitmap & tilemap */ m_bitmap_f = std::make_unique<bitmap_ind16>(512, 512); diff --git a/src/mame/video/kaypro.cpp b/src/mame/video/kaypro.cpp index 86ca79a7506..f67bbec61ed 100644 --- a/src/mame/video/kaypro.cpp +++ b/src/mame/video/kaypro.cpp @@ -307,7 +307,7 @@ WRITE8_MEMBER( kaypro_state::kaypro484_videoram_w ) m_p_videoram[m_mc6845_video_address] = data; } -VIDEO_START_MEMBER(kaypro_state,kaypro) +void kaypro_state::video_start_kaypro() { m_p_videoram = memregion("roms")->base()+0x3000; } diff --git a/src/mame/video/kickgoal.cpp b/src/mame/video/kickgoal.cpp index 71aa4f2f7c4..ac479affc00 100644 --- a/src/mame/video/kickgoal.cpp +++ b/src/mame/video/kickgoal.cpp @@ -117,7 +117,7 @@ void kickgoal_state::kickgoal_draw_sprites(bitmap_ind16 &bitmap,const rectangle } -VIDEO_START_MEMBER(kickgoal_state,kickgoal) +void kickgoal_state::video_start_kickgoal() { m_sprbase = 0x0000; @@ -137,7 +137,7 @@ VIDEO_START_MEMBER(kickgoal_state,kickgoal) m_bgtm->set_transparent_pen(15); } -VIDEO_START_MEMBER(kickgoal_state,actionhw) +void kickgoal_state::video_start_actionhw() { m_sprbase = 0x4000; m_fg_base = 0x7000 * 2; diff --git a/src/mame/video/kingobox.cpp b/src/mame/video/kingobox.cpp index 9a81d46f9d1..34da91d38c3 100644 --- a/src/mame/video/kingobox.cpp +++ b/src/mame/video/kingobox.cpp @@ -193,7 +193,7 @@ TILE_GET_INFO_MEMBER(kingofb_state::get_fg_tile_info) SET_TILE_INFO_MEMBER(bank, code, color, 0); } -VIDEO_START_MEMBER(kingofb_state,kingofb) +void kingofb_state::video_start_kingofb() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 16, 16, 16, 16); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); @@ -257,7 +257,7 @@ TILE_GET_INFO_MEMBER(kingofb_state::ringking_get_bg_tile_info) SET_TILE_INFO_MEMBER(4, code, color, 0); } -VIDEO_START_MEMBER(kingofb_state,ringking) +void kingofb_state::video_start_ringking() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::ringking_get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 16, 16, 16, 16); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp index 205a0c1da87..aecf917fafd 100644 --- a/src/mame/video/konamigx.cpp +++ b/src/mame/video/konamigx.cpp @@ -1133,7 +1133,7 @@ void konamigx_state::common_init() } -VIDEO_START_MEMBER(konamigx_state, konamigx_5bpp) +void konamigx_state::video_start_konamigx_5bpp() { common_init(); @@ -1145,7 +1145,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_5bpp) konamigx_mixer_primode(4); } -VIDEO_START_MEMBER(konamigx_state, dragoonj) +void konamigx_state::video_start_dragoonj() { common_init(); @@ -1155,20 +1155,20 @@ VIDEO_START_MEMBER(konamigx_state, dragoonj) m_k056832->set_layer_offs(3, 3+1, 0); } -VIDEO_START_MEMBER(konamigx_state, le2) +void konamigx_state::video_start_le2() { common_init(); konamigx_mixer_primode(-1); // swapped layer B and C priorities? } -VIDEO_START_MEMBER(konamigx_state, konamigx_6bpp) +void konamigx_state::video_start_konamigx_6bpp() { common_init(); konamigx_mixer_primode(5); } -VIDEO_START_MEMBER(konamigx_state, konamigx_type3) +void konamigx_state::video_start_konamigx_type3() { int width = m_screen->width(); int height = m_screen->height(); @@ -1204,7 +1204,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_type3) m_konamigx_palformat = 1; } -VIDEO_START_MEMBER(konamigx_state, konamigx_type4) +void konamigx_state::video_start_konamigx_type4() { int width = m_screen->width(); int height = m_screen->height(); @@ -1232,7 +1232,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_type4) } -VIDEO_START_MEMBER(konamigx_state, konamigx_type4_vsn) +void konamigx_state::video_start_konamigx_type4_vsn() { int width = m_screen->width(); int height = m_screen->height(); @@ -1259,7 +1259,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_type4_vsn) m_konamigx_palformat = 0; } -VIDEO_START_MEMBER(konamigx_state, konamigx_type4_sd2) +void konamigx_state::video_start_konamigx_type4_sd2() { int width = m_screen->width(); int height = m_screen->height(); @@ -1289,7 +1289,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_type4_sd2) } -VIDEO_START_MEMBER(konamigx_state, opengolf) +void konamigx_state::video_start_opengolf() { common_init(); @@ -1324,7 +1324,7 @@ VIDEO_START_MEMBER(konamigx_state, opengolf) } -VIDEO_START_MEMBER(konamigx_state, racinfrc) +void konamigx_state::video_start_racinfrc() { common_init(); diff --git a/src/mame/video/ladyfrog.cpp b/src/mame/video/ladyfrog.cpp index 3dae84121f8..08381c91616 100644 --- a/src/mame/video/ladyfrog.cpp +++ b/src/mame/video/ladyfrog.cpp @@ -124,7 +124,7 @@ void ladyfrog_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } } -VIDEO_START_MEMBER(ladyfrog_state,ladyfrog_common) +void ladyfrog_state::video_start_ladyfrog_common() { m_spriteram = std::make_unique<uint8_t[]>(160); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ladyfrog_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -146,13 +146,13 @@ void ladyfrog_state::video_start() { // weird, there are sprite tiles at 0x000 and 0x400, but they don't contain all the sprites! m_spritetilebase = 0x800; - VIDEO_START_CALL_MEMBER(ladyfrog_common); + video_start_ladyfrog_common(); } -VIDEO_START_MEMBER(ladyfrog_state,toucheme) +void ladyfrog_state::video_start_toucheme() { m_spritetilebase = 0x000; - VIDEO_START_CALL_MEMBER(ladyfrog_common); + video_start_ladyfrog_common(); } diff --git a/src/mame/video/lasso.cpp b/src/mame/video/lasso.cpp index ab49ebd86da..66141f52308 100644 --- a/src/mame/video/lasso.cpp +++ b/src/mame/video/lasso.cpp @@ -170,7 +170,7 @@ void lasso_state::video_start() m_bg_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(lasso_state,wwjgtin) +void lasso_state::video_start_wwjgtin() { /* create tilemaps */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lasso_state::lasso_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -179,7 +179,7 @@ VIDEO_START_MEMBER(lasso_state,wwjgtin) m_bg_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(lasso_state,pinbo) +void lasso_state::video_start_pinbo() { /* create tilemap */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lasso_state::pinbo_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/lastduel.cpp b/src/mame/video/lastduel.cpp index 62cbfb3a905..0e777f78e79 100644 --- a/src/mame/video/lastduel.cpp +++ b/src/mame/video/lastduel.cpp @@ -76,7 +76,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fix_info) ***************************************************************************/ -VIDEO_START_MEMBER(lastduel_state,lastduel) +void lastduel_state::video_start_lastduel() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); @@ -91,7 +91,7 @@ VIDEO_START_MEMBER(lastduel_state,lastduel) m_tilemap_priority = 0; } -VIDEO_START_MEMBER(lastduel_state,madgear) +void lastduel_state::video_start_madgear() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); diff --git a/src/mame/video/legionna.cpp b/src/mame/video/legionna.cpp index 89bfe3c6302..b86fcdf38a6 100644 --- a/src/mame/video/legionna.cpp +++ b/src/mame/video/legionna.cpp @@ -256,7 +256,7 @@ void legionna_state::common_video_start() m_text_layer->set_transparent_pen(15); } -VIDEO_START_MEMBER(legionna_state,legionna) +void legionna_state::video_start_legionna() { common_video_start(); @@ -266,7 +266,7 @@ VIDEO_START_MEMBER(legionna_state,legionna) m_sprite_pri_mask[3] = 0xfffe; } -VIDEO_START_MEMBER(legionna_state,heatbrl) +void legionna_state::video_start_heatbrl() { common_video_start(); @@ -277,9 +277,9 @@ VIDEO_START_MEMBER(legionna_state,heatbrl) m_sprite_pri_mask[3] = 0xffff; } -VIDEO_START_MEMBER(legionna_state,godzilla) +void legionna_state::video_start_godzilla() { - VIDEO_START_CALL_MEMBER(legionna); + video_start_legionna(); m_has_extended_banking = 1; m_has_extended_priority = 0; @@ -291,7 +291,7 @@ VIDEO_START_MEMBER(legionna_state,godzilla) m_sprite_pri_mask[3] = 0xffff; } -VIDEO_START_MEMBER(legionna_state,denjinmk) +void legionna_state::video_start_denjinmk() { common_video_allocate_ptr(); @@ -314,7 +314,7 @@ VIDEO_START_MEMBER(legionna_state,denjinmk) m_text_layer->set_transparent_pen(7);//? } -VIDEO_START_MEMBER(legionna_state,cupsoc) +void legionna_state::video_start_cupsoc() { common_video_allocate_ptr(); @@ -332,9 +332,9 @@ VIDEO_START_MEMBER(legionna_state,cupsoc) m_text_layer->set_transparent_pen(15); } -VIDEO_START_MEMBER(legionna_state,grainbow) +void legionna_state::video_start_grainbow() { - VIDEO_START_CALL_MEMBER(legionna); + video_start_legionna(); m_sprite_xoffs = m_sprite_yoffs = 16; m_has_extended_banking = 0; diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp index 33f0d3590bd..7878adad9ec 100644 --- a/src/mame/video/leland.cpp +++ b/src/mame/video/leland.cpp @@ -56,7 +56,7 @@ TIMER_CALLBACK_MEMBER(leland_state::scanline_callback) * *************************************/ -VIDEO_START_MEMBER(leland_state,leland) +void leland_state::video_start_leland() { /* allocate memory */ m_video_ram = make_unique_clear<uint8_t[]>(VRAM_SIZE); @@ -78,7 +78,7 @@ VIDEO_START_MEMBER(leland_state,leland) } } -VIDEO_START_MEMBER(leland_state,ataxx) +void leland_state::video_start_ataxx() { /* first do the standard stuff */ m_video_ram = make_unique_clear<uint8_t[]>(VRAM_SIZE); @@ -532,7 +532,7 @@ uint32_t leland_state::screen_update_ataxx(screen_device &screen, bitmap_ind16 & MACHINE_CONFIG_START(leland_state::leland_video) - MCFG_VIDEO_START_OVERRIDE(leland_state,leland) + set_video_start_cb(config, driver_callback_delegate(&video_start_leland, this)); MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(BBGGGRRR) @@ -548,7 +548,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(leland_state::ataxx_video) leland_video(config); - MCFG_VIDEO_START_OVERRIDE(leland_state,ataxx) + set_video_start_cb(config, driver_callback_delegate(&video_start_ataxx, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(leland_state, screen_update_ataxx) diff --git a/src/mame/video/liberate.cpp b/src/mame/video/liberate.cpp index a0b55e4eb12..f270a21ca18 100644 --- a/src/mame/video/liberate.cpp +++ b/src/mame/video/liberate.cpp @@ -202,7 +202,7 @@ WRITE8_MEMBER(liberate_state::prosport_bg_vram_w) /***************************************************************************/ -VIDEO_START_MEMBER(liberate_state,prosoccr) +void liberate_state::video_start_prosoccr() { m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); @@ -216,7 +216,7 @@ VIDEO_START_MEMBER(liberate_state,prosoccr) save_pointer(NAME(m_fg_gfx), 0x6000); } -VIDEO_START_MEMBER(liberate_state,boomrang) +void liberate_state::video_start_boomrang() { m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); @@ -225,7 +225,7 @@ VIDEO_START_MEMBER(liberate_state,boomrang) m_fix_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(liberate_state,liberate) +void liberate_state::video_start_liberate() { m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); @@ -233,7 +233,7 @@ VIDEO_START_MEMBER(liberate_state,liberate) m_fix_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(liberate_state,prosport) +void liberate_state::video_start_prosport() { m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::prosport_get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); diff --git a/src/mame/video/lwings.cpp b/src/mame/video/lwings.cpp index acda77e9590..ebcaf8b5059 100644 --- a/src/mame/video/lwings.cpp +++ b/src/mame/video/lwings.cpp @@ -79,18 +79,19 @@ TILE_GET_INFO_MEMBER(lwings_state::get_bg2_tile_info) void lwings_state::video_start() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::lwings_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_fg_tilemap->set_transparent_pen(3); + + m_bg1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::lwings_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); } -VIDEO_START_MEMBER(lwings_state,trojan) +void lwings_state::video_start_trojan() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap->set_transparent_pen(3); + m_bg1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::trojan_get_bg1_tile_info),this),TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_bg2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(lwings_state::get_bg2_memory_offset),this), 16, 16, 32, 16); - m_fg_tilemap->set_transparent_pen(3); m_bg1_tilemap->set_transmask(0, 0xffff, 0x0001); /* split type 0 is totally transparent in front half */ m_bg1_tilemap->set_transmask(1, 0xf07f, 0x0f81); /* split type 1 has pens 7-11 opaque in front half */ @@ -98,16 +99,16 @@ VIDEO_START_MEMBER(lwings_state,trojan) m_spr_avenger_hw = 0; } -VIDEO_START_MEMBER(lwings_state,avengers) +void lwings_state::video_start_avengers() { - VIDEO_START_CALL_MEMBER(trojan); + video_start_trojan(); m_bg2_avenger_hw = 1; m_spr_avenger_hw = 1; } -VIDEO_START_MEMBER(lwings_state,avengersb) +void lwings_state::video_start_avengersb() { - VIDEO_START_CALL_MEMBER(trojan); + video_start_trojan(); m_bg2_avenger_hw = 0; m_spr_avenger_hw = 1; } diff --git a/src/mame/video/m10.cpp b/src/mame/video/m10.cpp index e3d2fda7e9a..dd37e8cc507 100644 --- a/src/mame/video/m10.cpp +++ b/src/mame/video/m10.cpp @@ -95,7 +95,7 @@ inline void m10_state::plot_pixel_m10( bitmap_ind16 &bm, int x, int y, int col ) (IREMM10_HBSTART - 1) - (x - IREMM10_HBEND)) = col; // only when flip_screen(?) } -VIDEO_START_MEMBER(m10_state,m10) +void m10_state::video_start_m10() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m10_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(m10_state::tilemap_scan),this), 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(0); @@ -105,7 +105,7 @@ VIDEO_START_MEMBER(m10_state,m10) return ; } -VIDEO_START_MEMBER(m10_state,m15) +void m10_state::video_start_m15() { m_gfxdecode->set_gfx(0,std::make_unique<gfx_element>(m_palette, charlayout, m_chargen, 0, 8, 0)); diff --git a/src/mame/video/m62.cpp b/src/mame/video/m62.cpp index e250bd8c1ac..f5948c47fd9 100644 --- a/src/mame/video/m62.cpp +++ b/src/mame/video/m62.cpp @@ -388,7 +388,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kungfum_bg_tile_info) tileinfo.category = 0; } -VIDEO_START_MEMBER(m62_state,kungfum) +void m62_state::video_start_kungfum() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_kungfum_bg_tile_info),this), 32, 0, 8, 8, 64, 32); } @@ -468,7 +468,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun2_bg_tile_info) tileinfo.group = 0; } -VIDEO_START_MEMBER(m62_state,ldrun2) +void m62_state::video_start_ldrun2() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_ldrun2_bg_tile_info),this), 1, 1, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ @@ -530,7 +530,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_battroad_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, 0); } -VIDEO_START_MEMBER(m62_state,battroad) +void m62_state::video_start_battroad() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_battroad_bg_tile_info),this), 1, 1, 8, 8, 64, 32); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_battroad_fg_tile_info),this), 1, 1, 8, 8, 32, 32); @@ -566,7 +566,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun4_bg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0); } -VIDEO_START_MEMBER(m62_state,ldrun4) +void m62_state::video_start_ldrun4() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_ldrun4_bg_tile_info),this), 1, 0, 8, 8, 64, 32); } @@ -605,7 +605,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_lotlot_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, 0); } -VIDEO_START_MEMBER(m62_state,lotlot) +void m62_state::video_start_lotlot() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_lotlot_bg_tile_info),this), 1, 1, 12, 10, 32, 64); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_lotlot_fg_tile_info),this), 1, 1, 12, 10, 32, 64); @@ -664,7 +664,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kidniki_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ( ( color & 0xc0 ) << 2 ), color & 0x1f, 0); } -VIDEO_START_MEMBER(m62_state,kidniki) +void m62_state::video_start_kidniki() { m_bg_tilemap = &machine().tilemap().create(*m_chr_decode, tilemap_get_info_delegate(FUNC(m62_state::get_kidniki_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ @@ -719,7 +719,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunkr_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0x10) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0); } -VIDEO_START_MEMBER(m62_state,spelunkr) +void m62_state::video_start_spelunkr() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_spelunkr_bg_tile_info),this), 1, 1, 8, 8, 64, 64); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_spelunkr_fg_tile_info),this), 1, 1, 12, 8, 32, 32); @@ -761,7 +761,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunk2_bg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0xf0) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0 ); } -VIDEO_START_MEMBER(m62_state,spelunk2) +void m62_state::video_start_spelunk2() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_spelunk2_bg_tile_info),this), 1, 1, 8, 8, 64, 64); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_spelunkr_fg_tile_info),this), 1, 1, 12, 8, 32, 32); @@ -804,7 +804,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_youjyudn_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), (color & 0x0f), 0); } -VIDEO_START_MEMBER(m62_state,youjyudn) +void m62_state::video_start_youjyudn() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_youjyudn_bg_tile_info),this), 1, 0, 8, 16, 64, 16); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_youjyudn_fg_tile_info),this), 1, 1, 12, 8, 32, 32); @@ -846,7 +846,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_horizon_bg_tile_info) tileinfo.group = 0; } -VIDEO_START_MEMBER(m62_state,horizon) +void m62_state::video_start_horizon() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_horizon_bg_tile_info),this), 32, 0, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ diff --git a/src/mame/video/m72.cpp b/src/mame/video/m72.cpp index 4fd2c3498b3..7cabb13d583 100644 --- a/src/mame/video/m72.cpp +++ b/src/mame/video/m72.cpp @@ -110,7 +110,7 @@ void m72_state::register_savestate() } -VIDEO_START_MEMBER(m72_state,m72) +void m72_state::video_start_m72() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); @@ -144,9 +144,9 @@ VIDEO_START_MEMBER(m72_state,m72) register_savestate(); } -VIDEO_START_MEMBER(m72_state,xmultipl) +void m72_state::video_start_xmultipl() { - VIDEO_START_CALL_MEMBER(m72); + video_start_m72(); m_fg_tilemap->set_scrolldx(4,64); m_fg_tilemap->set_scrolldy(-128, 0); @@ -157,9 +157,9 @@ VIDEO_START_MEMBER(m72_state,xmultipl) } -VIDEO_START_MEMBER(m72_state,hharry) +void m72_state::video_start_hharry() { - VIDEO_START_CALL_MEMBER(m72); + video_start_m72(); m_bg_tilemap->set_transmask(2,0x0001,0xfffe); // ? maybe the standard logic is ok. @@ -181,7 +181,7 @@ TILEMAP_MAPPER_MEMBER(m72_state::m82_scan_rows) return row*256 + col; } -VIDEO_START_MEMBER(m72_state,m82) +void m72_state::video_start_m82() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); @@ -220,7 +220,7 @@ VIDEO_START_MEMBER(m72_state,m82) // M84 -VIDEO_START_MEMBER(m72_state,rtype2) +void m72_state::video_start_rtype2() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); @@ -247,9 +247,9 @@ VIDEO_START_MEMBER(m72_state,rtype2) } -VIDEO_START_MEMBER(m72_state,hharryu) +void m72_state::video_start_hharryu() { - VIDEO_START_CALL_MEMBER(rtype2); + video_start_rtype2(); m_fg_tilemap->set_scrolldx(4,3); m_bg_tilemap->set_scrolldx(6,0); @@ -258,9 +258,9 @@ VIDEO_START_MEMBER(m72_state,hharryu) } // m85 -VIDEO_START_MEMBER(m72_state,poundfor) +void m72_state::video_start_poundfor() { - VIDEO_START_CALL_MEMBER(rtype2); + video_start_rtype2(); m_fg_tilemap->set_scrolldx(6,0); m_bg_tilemap->set_scrolldx(6,0); diff --git a/src/mame/video/m90.cpp b/src/mame/video/m90.cpp index 6b581241b26..b45bb21fe30 100644 --- a/src/mame/video/m90.cpp +++ b/src/mame/video/m90.cpp @@ -73,7 +73,7 @@ void m90_state::video_start() m_last_pf[1] = 2; } -VIDEO_START_MEMBER(m90_state,bomblord) +void m90_state::video_start_bomblord() { common_tilemap_init(); @@ -83,7 +83,7 @@ VIDEO_START_MEMBER(m90_state,bomblord) m_pf_layer[0][1]->set_transparent_pen(0); } -VIDEO_START_MEMBER(m90_state,dynablsb) +void m90_state::video_start_dynablsb() { common_tilemap_init(); diff --git a/src/mame/video/m92.cpp b/src/mame/video/m92.cpp index 62efdbc1a85..89ce838feaf 100644 --- a/src/mame/video/m92.cpp +++ b/src/mame/video/m92.cpp @@ -246,7 +246,7 @@ WRITE16_MEMBER(m92_state::m92_master_control_w) /*****************************************************************************/ -VIDEO_START_MEMBER(m92_state,m92) +void m92_state::video_start_m92() { m_spritebuffer_timer = timer_alloc(TIMER_SPRITEBUFFER); @@ -300,9 +300,9 @@ VIDEO_START_MEMBER(m92_state,m92) save_item(NAME(m_paletteram)); } -VIDEO_START_MEMBER(m92_state,ppan) +void m92_state::video_start_ppan() { - VIDEO_START_CALL_MEMBER(m92); + video_start_m92(); for (int laynum = 0; laynum < 3; laynum++) { diff --git a/src/mame/video/mac.cpp b/src/mame/video/mac.cpp index 5883d7f102d..e2735b80445 100644 --- a/src/mame/video/mac.cpp +++ b/src/mame/video/mac.cpp @@ -74,7 +74,7 @@ PALETTE_INIT_MEMBER(mac_state,macgsc) palette.set_pen_color(3, 0x00, 0x00, 0x00); } -VIDEO_START_MEMBER(mac_state,mac) +void mac_state::video_start_mac() { } @@ -213,18 +213,18 @@ uint32_t mac_state::screen_update_macpb160(screen_device &screen, bitmap_ind16 & // IIci/IIsi RAM-Based Video (RBV) and children: V8, Eagle, Spice, VASP, Sonora -VIDEO_START_MEMBER(mac_state,macrbv) +void mac_state::video_start_macrbv() { } -VIDEO_RESET_MEMBER(mac_state,maceagle) +void mac_state::video_reset_maceagle() { m_rbv_montype = 32; m_rbv_palette[0xfe] = 0xffffff; m_rbv_palette[0xff] = 0; } -VIDEO_RESET_MEMBER(mac_state,macrbv) +void mac_state::video_reset_macrbv() { rectangle visarea; int htotal, vtotal; @@ -282,7 +282,7 @@ VIDEO_RESET_MEMBER(mac_state,macrbv) target->set_view(view); } -VIDEO_RESET_MEMBER(mac_state,macsonora) +void mac_state::video_reset_macsonora() { rectangle visarea; int htotal, vtotal; @@ -339,7 +339,7 @@ VIDEO_RESET_MEMBER(mac_state,macsonora) target->set_view(view); } -VIDEO_START_MEMBER(mac_state,macsonora) +void mac_state::video_start_macsonora() { memset(m_rbv_regs, 0, sizeof(m_rbv_regs)); @@ -359,7 +359,7 @@ VIDEO_START_MEMBER(mac_state,macsonora) m_rbv_type = RBV_TYPE_SONORA; } -VIDEO_START_MEMBER(mac_state,macv8) +void mac_state::video_start_macv8() { memset(m_rbv_regs, 0, sizeof(m_rbv_regs)); @@ -885,7 +885,7 @@ TIMER_CALLBACK_MEMBER(mac_state::dafb_cursor_tick) m_cursor_timer->adjust(m_screen->time_until_pos(m_cursor_line, 0), 0); } -VIDEO_START_MEMBER(mac_state,macdafb) +void mac_state::video_start_macdafb() { m_vbl_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mac_state::dafb_vbl_tick),this)); m_cursor_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mac_state::dafb_cursor_tick),this)); @@ -894,7 +894,7 @@ VIDEO_START_MEMBER(mac_state,macdafb) m_cursor_timer->adjust(attotime::never); } -VIDEO_RESET_MEMBER(mac_state,macdafb) +void mac_state::video_reset_macdafb() { m_rbv_count = 0; m_rbv_clutoffs = 0; diff --git a/src/mame/video/madalien.cpp b/src/mame/video/madalien.cpp index f07b9badfcf..7247e6cf78d 100644 --- a/src/mame/video/madalien.cpp +++ b/src/mame/video/madalien.cpp @@ -117,7 +117,7 @@ WRITE8_MEMBER(madalien_state::madalien_videoram_w) } -VIDEO_START_MEMBER(madalien_state,madalien) +void madalien_state::video_start_madalien() { int i; @@ -378,7 +378,7 @@ MACHINE_CONFIG_START(madalien_state::madalien_video) MCFG_PALETTE_ADD("palette", 0x30) MCFG_PALETTE_INDIRECT_ENTRIES(0x20) MCFG_PALETTE_INIT_OWNER(madalien_state,madalien) - MCFG_VIDEO_START_OVERRIDE(madalien_state,madalien) + set_video_start_cb(config, driver_callback_delegate(&video_start_madalien, this)); MCFG_MC6845_ADD("crtc", MC6845, "screen", PIXEL_CLOCK / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/video/mappy.cpp b/src/mame/video/mappy.cpp index fafc84915ad..95883e83f22 100644 --- a/src/mame/video/mappy.cpp +++ b/src/mame/video/mappy.cpp @@ -308,7 +308,7 @@ TILE_GET_INFO_MEMBER(mappy_state::mappy_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(mappy_state,superpac) +void mappy_state::video_start_superpac() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::superpac_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); m_screen->register_screen_bitmap(m_sprite_bitmap); @@ -316,14 +316,14 @@ VIDEO_START_MEMBER(mappy_state,superpac) m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 31); } -VIDEO_START_MEMBER(mappy_state,phozon) +void mappy_state::video_start_phozon() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::phozon_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 15); } -VIDEO_START_MEMBER(mappy_state,mappy) +void mappy_state::video_start_mappy() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::mappy_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::mappy_tilemap_scan),this),8,8,36,60); diff --git a/src/mame/video/mbee.cpp b/src/mame/video/mbee.cpp index deba6df738e..708e354f146 100644 --- a/src/mame/video/mbee.cpp +++ b/src/mame/video/mbee.cpp @@ -285,7 +285,7 @@ WRITE8_MEMBER ( mbee_state::m6545_data_w ) ************************************************************/ -VIDEO_START_MEMBER( mbee_state, mono ) +void mbee_state::video_start_mono() { m_p_videoram = memregion("videoram")->base(); m_p_gfxram = memregion("gfx")->base()+0x1000; @@ -294,7 +294,7 @@ VIDEO_START_MEMBER( mbee_state, mono ) m_is_premium = 0; } -VIDEO_START_MEMBER( mbee_state, standard ) +void mbee_state::video_start_standard() { m_p_videoram = memregion("videoram")->base(); m_p_gfxram = memregion("gfx")->base()+0x1000; @@ -303,7 +303,7 @@ VIDEO_START_MEMBER( mbee_state, standard ) m_is_premium = 0; } -VIDEO_START_MEMBER( mbee_state, premium ) +void mbee_state::video_start_premium() { m_p_videoram = memregion("videoram")->base(); m_p_colorram = memregion("colorram")->base(); diff --git a/src/mame/video/mcr3.cpp b/src/mame/video/mcr3.cpp index f8b36f4d27c..27e32467a49 100644 --- a/src/mame/video/mcr3.cpp +++ b/src/mame/video/mcr3.cpp @@ -95,7 +95,7 @@ void mcr3_state::video_start() } -VIDEO_START_MEMBER(mcr3_state,spyhunt) +void mcr3_state::video_start_spyhunt() { // initialize the background tilemap m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(mcr3_state::spyhunt_bg_scan),this), 64,32, 64,32); diff --git a/src/mame/video/mcr68.cpp b/src/mame/video/mcr68.cpp index 10479d10075..c15db91f8ad 100644 --- a/src/mame/video/mcr68.cpp +++ b/src/mame/video/mcr68.cpp @@ -38,7 +38,7 @@ TILE_GET_INFO_MEMBER(mcr68_state::get_bg_tile_info) * *************************************/ -VIDEO_START_MEMBER(mcr68_state,mcr68) +void mcr68_state::video_start_mcr68() { /* initialize the background tilemap */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr68_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32); diff --git a/src/mame/video/megasys1.cpp b/src/mame/video/megasys1.cpp index 13b99f9fd2f..7dd5ed50e38 100644 --- a/src/mame/video/megasys1.cpp +++ b/src/mame/video/megasys1.cpp @@ -198,7 +198,7 @@ actual code sent to the hardware. -VIDEO_START_MEMBER(megasys1_state,megasys1) +void megasys1_state::video_start_megasys1() { m_spriteram = &m_ram[0x8000/2]; diff --git a/src/mame/video/metro.cpp b/src/mame/video/metro.cpp index cd223c00496..b32d3c0a2fc 100644 --- a/src/mame/video/metro.cpp +++ b/src/mame/video/metro.cpp @@ -49,14 +49,14 @@ TILEMAP_MAPPER_MEMBER(metro_state::tilemap_scan_gstrik2) return val; } -VIDEO_START_MEMBER(metro_state,blzntrnd) +void metro_state::video_start_blzntrnd() { m_k053936_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(metro_state::metro_k053936_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 512); m_screen->register_screen_bitmap(m_vdp_bitmap); } -VIDEO_START_MEMBER(metro_state,gstrik2) +void metro_state::video_start_gstrik2() { m_k053936_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(metro_state::metro_k053936_gstrik2_get_tile_info),this), tilemap_mapper_delegate(FUNC(metro_state::tilemap_scan_gstrik2),this), 16, 16, 128, 256); diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp index e060100015d..6d4ebf86fb7 100644 --- a/src/mame/video/midtunit.cpp +++ b/src/mame/video/midtunit.cpp @@ -88,7 +88,7 @@ static struct * *************************************/ -VIDEO_START_MEMBER(midtunit_state,midtunit) +void midtunit_state::video_start_midtunit() { /* allocate memory */ local_videoram = std::make_unique<uint16_t[]>(0x100000/2); @@ -112,16 +112,16 @@ VIDEO_START_MEMBER(midtunit_state,midtunit) } -VIDEO_START_MEMBER(midwunit_state,midwunit) +void midwunit_state::video_start_midwunit() { - VIDEO_START_CALL_MEMBER(midtunit); + video_start_midtunit(); m_gfx_rom_large = 1; } -VIDEO_START_MEMBER(midxunit_state,midxunit) +void midxunit_state::video_start_midxunit() { - VIDEO_START_CALL_MEMBER(midtunit); + video_start_midtunit(); m_gfx_rom_large = 1; videobank_select = 1; } diff --git a/src/mame/video/midyunit.cpp b/src/mame/video/midyunit.cpp index 5c409dab39e..2faf4fa741e 100644 --- a/src/mame/video/midyunit.cpp +++ b/src/mame/video/midyunit.cpp @@ -39,7 +39,7 @@ enum * *************************************/ -VIDEO_START_MEMBER(midyunit_state,common) +void midyunit_state::video_start_common() { /* allocate memory */ m_cmos_ram = std::make_unique<uint16_t[]>((0x2000 * 4)/2); @@ -69,47 +69,41 @@ VIDEO_START_MEMBER(midyunit_state,common) } -VIDEO_START_MEMBER(midyunit_state,midyunit_4bit) +void midyunit_state::video_start_midyunit_4bit() { - int i; - - VIDEO_START_CALL_MEMBER(common); + video_start_common(); /* init for 4-bit */ - for (i = 0; i < 65536; i++) + for (int i = 0; i < 65536; i++) m_pen_map[i] = ((i & 0xf000) >> 8) | (i & 0x000f); m_palette_mask = 0x00ff; } -VIDEO_START_MEMBER(midyunit_state,midyunit_6bit) +void midyunit_state::video_start_midyunit_6bit() { - int i; - - VIDEO_START_CALL_MEMBER(common); + video_start_common(); /* init for 6-bit */ - for (i = 0; i < 65536; i++) + for (int i = 0; i < 65536; i++) m_pen_map[i] = ((i & 0xc000) >> 8) | (i & 0x0f3f); m_palette_mask = 0x0fff; } -VIDEO_START_MEMBER(midyunit_state,mkyawdim) +void midyunit_state::video_start_mkyawdim() { - VIDEO_START_CALL_MEMBER(midyunit_6bit); + video_start_midyunit_6bit(); m_yawdim_dma = 1; } -VIDEO_START_MEMBER(midyunit_state,midzunit) +void midyunit_state::video_start_midzunit() { - int i; - - VIDEO_START_CALL_MEMBER(common); + video_start_common(); /* init for 8-bit */ - for (i = 0; i < 65536; i++) + for (int i = 0; i < 65536; i++) m_pen_map[i] = i & 0x1fff; m_palette_mask = 0x1fff; } diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp index 6032119a7bd..ef874f9e66b 100644 --- a/src/mame/video/midzeus.cpp +++ b/src/mame/video/midzeus.cpp @@ -276,7 +276,7 @@ midzeus_renderer::midzeus_renderer(midzeus_state &state) m_state(state) {} -VIDEO_START_MEMBER(midzeus_state,midzeus) +void midzeus_state::video_start_midzeus() { int i; diff --git a/src/mame/video/mitchell.cpp b/src/mame/video/mitchell.cpp index b92a66dd096..c46d87e3f5f 100644 --- a/src/mame/video/mitchell.cpp +++ b/src/mame/video/mitchell.cpp @@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(mitchell_state::get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(mitchell_state,pang) +void mitchell_state::video_start_pang() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mitchell_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/model1.cpp b/src/mame/video/model1.cpp index 65fe8bed3e6..b10c4e3640c 100644 --- a/src/mame/video/model1.cpp +++ b/src/mame/video/model1.cpp @@ -1562,7 +1562,7 @@ void model1_state::tgp_scan() m_render_done = 0; } -VIDEO_START_MEMBER(model1_state, model1) +void model1_state::video_start_model1() { m_view = std::make_unique<model1_state::view_t>(); diff --git a/src/mame/video/moo.cpp b/src/mame/video/moo.cpp index 9d9327a2c1b..95a3075bce5 100644 --- a/src/mame/video/moo.cpp +++ b/src/mame/video/moo.cpp @@ -34,7 +34,7 @@ K056832_CB_MEMBER(moo_state::tile_callback) *color = m_layer_colorbase[layer] | (*color >> 2 & 0x0f); } -VIDEO_START_MEMBER(moo_state,moo) +void moo_state::video_start_moo() { assert(m_screen->format() == BITMAP_FORMAT_RGB32); @@ -48,7 +48,7 @@ VIDEO_START_MEMBER(moo_state,moo) m_k056832->set_layer_offs(3, 6 + 1, 0); } -VIDEO_START_MEMBER(moo_state,bucky) +void moo_state::video_start_bucky() { assert(m_screen->format() == BITMAP_FORMAT_RGB32); diff --git a/src/mame/video/ms32.cpp b/src/mame/video/ms32.cpp index 214f2998e16..d70ffe34e16 100644 --- a/src/mame/video/ms32.cpp +++ b/src/mame/video/ms32.cpp @@ -113,7 +113,7 @@ void ms32_state::video_start() save_item(NAME(m_brt_b)); } -VIDEO_START_MEMBER(ms32_state,f1superb) +void ms32_state::video_start_f1superb() { ms32_state::video_start(); diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp index 564b9ca6ce0..ce6a5cfcc72 100644 --- a/src/mame/video/mystston.cpp +++ b/src/mame/video/mystston.cpp @@ -213,7 +213,7 @@ void mystston_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec * *************************************/ -VIDEO_START_MEMBER(mystston_state,mystston) +void mystston_state::video_start_mystston() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mystston_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 32); @@ -232,7 +232,7 @@ VIDEO_START_MEMBER(mystston_state,mystston) * *************************************/ -VIDEO_RESET_MEMBER(mystston_state,mystston) +void mystston_state::video_reset_mystston() { m_interrupt_timer->adjust(m_screen->time_until_pos(FIRST_INT_VPOS - 1, INT_HPOS), FIRST_INT_VPOS); } @@ -311,8 +311,8 @@ GFXDECODE_END *************************************/ MACHINE_CONFIG_START(mystston_state::mystston_video) - MCFG_VIDEO_START_OVERRIDE(mystston_state,mystston) - MCFG_VIDEO_RESET_OVERRIDE(mystston_state,mystston) + set_video_start_cb(config, driver_callback_delegate(&video_start_mystston, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_mystston, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mystston) MCFG_PALETTE_ADD("palette", 0x40) diff --git a/src/mame/video/mystwarr.cpp b/src/mame/video/mystwarr.cpp index d7de9635b94..b36a01b8355 100644 --- a/src/mame/video/mystwarr.cpp +++ b/src/mame/video/mystwarr.cpp @@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(mystwarr_state::get_gai_936_tile_info) SET_TILE_INFO_MEMBER(0, tileno, colour, 0); } -VIDEO_START_MEMBER(mystwarr_state, gaiapols) +void mystwarr_state::video_start_gaiapols() { m_gametype = 0; @@ -181,7 +181,7 @@ TILE_GET_INFO_MEMBER(mystwarr_state::get_ult_936_tile_info) SET_TILE_INFO_MEMBER(0, tileno, colour, (dat1[tile_index]&0x40) ? TILE_FLIPX : 0); } -VIDEO_START_MEMBER(mystwarr_state, dadandrn) +void mystwarr_state::video_start_dadandrn() { m_gametype = 1; @@ -203,7 +203,7 @@ VIDEO_START_MEMBER(mystwarr_state, dadandrn) m_ult_936_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(mystwarr_state, mystwarr) +void mystwarr_state::video_start_mystwarr() { m_gametype = 0; @@ -219,7 +219,7 @@ VIDEO_START_MEMBER(mystwarr_state, mystwarr) m_cbparam = 0; } -VIDEO_START_MEMBER(mystwarr_state, metamrph) +void mystwarr_state::video_start_metamrph() { m_gametype = 0; @@ -234,7 +234,7 @@ VIDEO_START_MEMBER(mystwarr_state, metamrph) m_k056832->set_layer_offs(3, 3+4, 0); // attract sky background to sea } -VIDEO_START_MEMBER(mystwarr_state, viostorm) +void mystwarr_state::video_start_viostorm() { m_gametype = 0; @@ -248,7 +248,7 @@ VIDEO_START_MEMBER(mystwarr_state, viostorm) m_k056832->set_layer_offs(3, 3+1, 0); } -VIDEO_START_MEMBER(mystwarr_state, martchmp) +void mystwarr_state::video_start_martchmp() { m_gametype = 0; diff --git a/src/mame/video/n8080.cpp b/src/mame/video/n8080.cpp index eab68ba12ca..641686ca647 100644 --- a/src/mame/video/n8080.cpp +++ b/src/mame/video/n8080.cpp @@ -83,7 +83,7 @@ void n8080_state::helifire_next_line( ) } -VIDEO_START_MEMBER(n8080_state,spacefev) +void n8080_state::video_start_spacefev() { m_cannon_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::spacefev_stop_red_cannon),this)); @@ -94,7 +94,7 @@ VIDEO_START_MEMBER(n8080_state,spacefev) } -VIDEO_START_MEMBER(n8080_state,sheriff) +void n8080_state::video_start_sheriff() { flip_screen_set(0); @@ -103,17 +103,15 @@ VIDEO_START_MEMBER(n8080_state,sheriff) } -VIDEO_START_MEMBER(n8080_state,helifire) +void n8080_state::video_start_helifire() { - uint8_t data = 0; - int i; - save_item(NAME(m_helifire_mv)); save_item(NAME(m_helifire_sc)); save_item(NAME(m_helifire_flash)); save_item(NAME(m_helifire_LSFR)); - for (i = 0; i < 63; i++) + uint8_t data = 0; + for (int i = 0; i < 63; i++) { int bit = (data >> 6) ^ diff --git a/src/mame/video/namcofl.cpp b/src/mame/video/namcofl.cpp index f23c3648f33..dc2d126ead6 100644 --- a/src/mame/video/namcofl.cpp +++ b/src/mame/video/namcofl.cpp @@ -88,7 +88,7 @@ int namcofl_state::FLobjcode2tile(int code) return code; } -VIDEO_START_MEMBER(namcofl_state,namcofl) +void namcofl_state::video_start_namcofl() { c123_tilemap_init(NAMCOFL_TILEGFX, memregion(NAMCOFL_TILEMASKREGION)->base(), namcos2_shared_state::c123_tilemap_delegate(&namcofl_state::TilemapCB, this)); c355_obj_init(NAMCOFL_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&namcofl_state::FLobjcode2tile, this)); diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp index ae13ed4e4b5..32b362013e4 100644 --- a/src/mame/video/namconb1.cpp +++ b/src/mame/video/namconb1.cpp @@ -124,7 +124,7 @@ int namconb1_state::NB1objcode2tile( int code ) return (code&0x7ff) + bank*0x800; } -VIDEO_START_MEMBER(namconb1_state,namconb1) +void namconb1_state::video_start_namconb1() { c123_tilemap_init(NAMCONB1_TILEGFX, memregion(NAMCONB1_TILEMASKREGION)->base(), namcos2_shared_state::c123_tilemap_delegate(&namconb1_state::NB1TilemapCB, this)); c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&namconb1_state::NB1objcode2tile, this)); @@ -182,7 +182,7 @@ int namconb1_state::NB2objcode2tile( int code ) return code; } /* NB2objcode2tile */ -VIDEO_START_MEMBER(namconb1_state,namconb2) +void namconb1_state::video_start_namconb2() { c123_tilemap_init(NAMCONB1_TILEGFX, memregion(NAMCONB1_TILEMASKREGION)->base(), namcos2_shared_state::c123_tilemap_delegate(&namconb1_state::NB2TilemapCB, this)); c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&namconb1_state::NB2objcode2tile, this)); diff --git a/src/mame/video/namcos21.cpp b/src/mame/video/namcos21.cpp index 5fdb1deda54..e3de189abaf 100644 --- a/src/mame/video/namcos21.cpp +++ b/src/mame/video/namcos21.cpp @@ -360,7 +360,7 @@ void namcos21_state::draw_quad(int sx[4], int sy[4], int zcode[4], int color) rendertri(&c, &d, &a, color, depthcueenable); } -VIDEO_START_MEMBER(namcos21_state,namcos21) +void namcos21_state::video_start_namcos21() { if( m_gametype == NAMCOS21_WINRUN91 ) { diff --git a/src/mame/video/nbmj8688.cpp b/src/mame/video/nbmj8688.cpp index 7e42b075668..18d7e73df1a 100644 --- a/src/mame/video/nbmj8688.cpp +++ b/src/mame/video/nbmj8688.cpp @@ -582,37 +582,37 @@ void nbmj8688_state::postload() m_screen_refresh = 1; } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_8bit) +void nbmj8688_state::video_start_mbmj8688_8bit() { m_gfxmode = GFXTYPE_8BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_hybrid_12bit) +void nbmj8688_state::video_start_mbmj8688_hybrid_12bit() { m_gfxmode = GFXTYPE_HYBRID_12BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_pure_12bit) +void nbmj8688_state::video_start_mbmj8688_pure_12bit() { m_gfxmode = GFXTYPE_PURE_12BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_hybrid_16bit) +void nbmj8688_state::video_start_mbmj8688_hybrid_16bit() { m_gfxmode = GFXTYPE_HYBRID_16BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_pure_16bit) +void nbmj8688_state::video_start_mbmj8688_pure_16bit() { m_gfxmode = GFXTYPE_PURE_16BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_pure_16bit_LCD) +void nbmj8688_state::video_start_mbmj8688_pure_16bit_LCD() { m_gfxmode = GFXTYPE_PURE_16BIT; common_video_start(); diff --git a/src/mame/video/nbmj8891.cpp b/src/mame/video/nbmj8891.cpp index f941d6c61bf..64c62ddb17b 100644 --- a/src/mame/video/nbmj8891.cpp +++ b/src/mame/video/nbmj8891.cpp @@ -480,7 +480,7 @@ void nbmj8891_state::gfxdraw() ******************************************************************************/ -VIDEO_START_MEMBER( nbmj8891_state, _1layer ) +void nbmj8891_state::video_start__1layer() { int width = m_screen->width(); int height = m_screen->height(); diff --git a/src/mame/video/nbmj9195.cpp b/src/mame/video/nbmj9195.cpp index 828f18e646c..8de3ce8f24f 100644 --- a/src/mame/video/nbmj9195.cpp +++ b/src/mame/video/nbmj9195.cpp @@ -368,7 +368,7 @@ WRITE8_MEMBER(nbmj9195_state::clut_1_w){ clut_w(offset, data, 1); } ******************************************************************************/ -VIDEO_START_MEMBER(nbmj9195_state,_1layer) +void nbmj9195_state::video_start__1layer() { int width = m_screen->width(); int height = m_screen->height(); @@ -457,7 +457,7 @@ void nbmj9195_state::postload() m_screen_refresh = 1; } -VIDEO_START_MEMBER(nbmj9195_state,nb22090) +void nbmj9195_state::video_start_nb22090() { nbmj9195_state::video_start(); diff --git a/src/mame/video/ninjakd2.cpp b/src/mame/video/ninjakd2.cpp index 67f8d547475..e6282435509 100644 --- a/src/mame/video/ninjakd2.cpp +++ b/src/mame/video/ninjakd2.cpp @@ -154,7 +154,7 @@ void ninjakd2_state::video_start() m_stencil_compare_function = stencil_ninjakd2; } -VIDEO_START_MEMBER(ninjakd2_state,mnight) +void ninjakd2_state::video_start_mnight() { video_init_common(0); @@ -163,7 +163,7 @@ VIDEO_START_MEMBER(ninjakd2_state,mnight) m_stencil_compare_function = stencil_mnight; } -VIDEO_START_MEMBER(ninjakd2_state,arkarea) +void ninjakd2_state::video_start_arkarea() { video_init_common(0); @@ -172,7 +172,7 @@ VIDEO_START_MEMBER(ninjakd2_state,arkarea) m_stencil_compare_function = stencil_arkarea; } -VIDEO_START_MEMBER(ninjakd2_state,robokid) +void ninjakd2_state::video_start_robokid() { video_init_common(0x0800); m_vram_bank_mask = 1; @@ -188,7 +188,7 @@ VIDEO_START_MEMBER(ninjakd2_state,robokid) m_stencil_compare_function = stencil_robokid; } -VIDEO_START_MEMBER(ninjakd2_state,omegaf) +void ninjakd2_state::video_start_omegaf() { video_init_common(0x2000); m_vram_bank_mask = 7; diff --git a/src/mame/video/nmk16.cpp b/src/mame/video/nmk16.cpp index 6416edaf964..9d82f63caff 100644 --- a/src/mame/video/nmk16.cpp +++ b/src/mame/video/nmk16.cpp @@ -101,7 +101,7 @@ void nmk16_state::nmk16_video_init() } -VIDEO_START_MEMBER(nmk16_state,bioship) +void nmk16_state::video_start_bioship() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); @@ -116,7 +116,7 @@ VIDEO_START_MEMBER(nmk16_state,bioship) } -VIDEO_START_MEMBER(nmk16_state,strahl) +void nmk16_state::video_start_strahl() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::strahl_get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); @@ -130,7 +130,7 @@ VIDEO_START_MEMBER(nmk16_state,strahl) nmk16_video_init(); } -VIDEO_START_MEMBER(nmk16_state,macross) +void nmk16_state::video_start_macross() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); @@ -140,7 +140,7 @@ VIDEO_START_MEMBER(nmk16_state,macross) nmk16_video_init(); } -VIDEO_START_MEMBER(nmk16_state,gunnail) +void nmk16_state::video_start_gunnail() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); @@ -154,7 +154,7 @@ VIDEO_START_MEMBER(nmk16_state,gunnail) m_simple_scroll = 0; } -VIDEO_START_MEMBER(nmk16_state,macross2) +void nmk16_state::video_start_macross2() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<1>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); @@ -170,13 +170,13 @@ VIDEO_START_MEMBER(nmk16_state,macross2) /* from the other side of the tilemap (!) */ } -VIDEO_START_MEMBER(nmk16_state,raphero) +void nmk16_state::video_start_raphero() { - VIDEO_START_CALL_MEMBER( macross2 ); + video_start_macross2(); m_simple_scroll = 0; } -VIDEO_START_MEMBER(nmk16_state,bjtwin) +void nmk16_state::video_start_bjtwin() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::bjtwin_get_bg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); @@ -722,7 +722,7 @@ uint32_t nmk16_state::screen_update_bjtwin(screen_device &screen, bitmap_ind16 & ***************************************************************************/ -VIDEO_START_MEMBER(nmk16_state,afega) +void nmk16_state::video_start_afega() { m_spriteram_old = make_unique_clear<uint16_t[]>(0x1000/2); m_spriteram_old2 = make_unique_clear<uint16_t[]>(0x1000/2); @@ -743,7 +743,7 @@ VIDEO_START_MEMBER(nmk16_state,afega) } -VIDEO_START_MEMBER(nmk16_state,grdnstrm) +void nmk16_state::video_start_grdnstrm() { m_spriteram_old = make_unique_clear<uint16_t[]>(0x1000/2); m_spriteram_old2 = make_unique_clear<uint16_t[]>(0x1000/2); @@ -765,7 +765,7 @@ VIDEO_START_MEMBER(nmk16_state,grdnstrm) } -VIDEO_START_MEMBER(nmk16_state,firehawk) +void nmk16_state::video_start_firehawk() { m_spriteram_old = make_unique_clear<uint16_t[]>(0x1000/2); m_spriteram_old2 = make_unique_clear<uint16_t[]>(0x1000/2); diff --git a/src/mame/video/nova2001.cpp b/src/mame/video/nova2001.cpp index c39c7db04e8..3ee7d318473 100644 --- a/src/mame/video/nova2001.cpp +++ b/src/mame/video/nova2001.cpp @@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_fg_tile_info) * *************************************/ -VIDEO_START_MEMBER(nova2001_state,nova2001) +void nova2001_state::video_start_nova2001() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::nova2001_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::nova2001_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -172,13 +172,13 @@ VIDEO_START_MEMBER(nova2001_state,nova2001) m_bg_tilemap->set_scrolldx(0, -7); } -VIDEO_START_MEMBER(nova2001_state,pkunwar) +void nova2001_state::video_start_pkunwar() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::pkunwar_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(nova2001_state,ninjakun) +void nova2001_state::video_start_ninjakun() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::ninjakun_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::ninjakun_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -186,7 +186,7 @@ VIDEO_START_MEMBER(nova2001_state,ninjakun) m_bg_tilemap->set_scrolldx(7, 0); } -VIDEO_START_MEMBER(nova2001_state,raiders5) +void nova2001_state::video_start_raiders5() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::raiders5_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::raiders5_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/ojankohs.cpp b/src/mame/video/ojankohs.cpp index 8e3fa06c6c8..6d27a04a4cb 100644 --- a/src/mame/video/ojankohs.cpp +++ b/src/mame/video/ojankohs.cpp @@ -254,7 +254,7 @@ WRITE8_MEMBER(ojankohs_state::ojankoc_videoram_w) ******************************************************************************/ -VIDEO_START_MEMBER(ojankohs_state,ojankohs) +void ojankohs_state::video_start_ojankohs() { m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ojankohs_state::ojankohs_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); // m_videoram = std::make_unique<uint8_t[]>(0x1000); @@ -262,20 +262,20 @@ VIDEO_START_MEMBER(ojankohs_state,ojankohs) // m_paletteram = std::make_unique<uint8_t[]>(0x800); } -VIDEO_START_MEMBER(ojankohs_state,ojankoy) +void ojankohs_state::video_start_ojankoy() { m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ojankohs_state::ojankoy_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); // m_videoram = std::make_unique<uint8_t[]>(0x2000); // m_colorram = std::make_unique<uint8_t[]>(0x1000); } -VIDEO_START_MEMBER(ojankohs_state,ccasino) +void ojankohs_state::video_start_ccasino() { - VIDEO_START_CALL_MEMBER(ojankoy); + video_start_ojankoy(); m_paletteram.allocate(0x800); } -VIDEO_START_MEMBER(ojankohs_state,ojankoc) +void ojankohs_state::video_start_ojankoc() { m_screen->register_screen_bitmap(m_tmpbitmap); m_videoram.allocate(0x8000); diff --git a/src/mame/video/orion.cpp b/src/mame/video/orion.cpp index a6d9148dd3c..40f422560d7 100644 --- a/src/mame/video/orion.cpp +++ b/src/mame/video/orion.cpp @@ -13,7 +13,7 @@ #include "emu.h" #include "includes/orion.h" -VIDEO_START_MEMBER(orion_state,orion128) +void orion_state::video_start_orion128() { } diff --git a/src/mame/video/pacman.cpp b/src/mame/video/pacman.cpp index e46ae8cbb75..49fbea6d140 100644 --- a/src/mame/video/pacman.cpp +++ b/src/mame/video/pacman.cpp @@ -157,7 +157,7 @@ void pacman_state::init_save_state() } -VIDEO_START_MEMBER(pacman_state,pacman) +void pacman_state::video_start_pacman() { init_save_state(); @@ -176,9 +176,9 @@ VIDEO_START_MEMBER(pacman_state,pacman) m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(pacman_state::pacman_get_tile_info),this), tilemap_mapper_delegate(FUNC(pacman_state::pacman_scan_rows),this), 8, 8, 36, 28 ); } -VIDEO_START_MEMBER(pacman_state,birdiy) +void pacman_state::video_start_birdiy() { - VIDEO_START_CALL_MEMBER( pacman ); + video_start_pacman(); m_xoffsethack = 0; m_inv_spr = 1; // sprites are mirrored in X-axis compared to normal behaviour } @@ -309,7 +309,7 @@ uint32_t pacman_state::screen_update_pacman(screen_device &screen, bitmap_ind16 **************************************************************************/ -VIDEO_START_MEMBER(pacman_state,pengo) +void pacman_state::video_start_pengo() { init_save_state(); @@ -363,7 +363,7 @@ TILE_GET_INFO_MEMBER(pacman_state::s2650_get_tile_info) SET_TILE_INFO_MEMBER(0,code,attr & 0x1f,0); } -VIDEO_START_MEMBER(pacman_state,s2650games) +void pacman_state::video_start_s2650games() { init_save_state(); @@ -531,7 +531,7 @@ void pacman_state::jrpacman_mark_tile_dirty( int offset ) } } -VIDEO_START_MEMBER(pacman_state,jrpacman) +void pacman_state::video_start_jrpacman() { init_save_state(); diff --git a/src/mame/video/pgm.cpp b/src/mame/video/pgm.cpp index f655e48c1b4..97d1a1313c6 100644 --- a/src/mame/video/pgm.cpp +++ b/src/mame/video/pgm.cpp @@ -611,7 +611,7 @@ TILE_GET_INFO_MEMBER(pgm_state::get_pgm_bg_tilemap_tile_info) /*** Video - Start / Update ****************************************************/ -VIDEO_START_MEMBER(pgm_state,pgm) +void pgm_state::video_start_pgm() { int i; diff --git a/src/mame/video/phoenix.cpp b/src/mame/video/phoenix.cpp index 9407302810e..aaffc95198e 100644 --- a/src/mame/video/phoenix.cpp +++ b/src/mame/video/phoenix.cpp @@ -166,7 +166,7 @@ TILE_GET_INFO_MEMBER(phoenix_state::get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(phoenix_state,phoenix) +void phoenix_state::video_start_phoenix() { m_videoram_pg[0] = std::make_unique<uint8_t[]>(0x1000); memset(m_videoram_pg[0].get(), 0x00, 0x1000 * sizeof(uint8_t)); diff --git a/src/mame/video/playch10.cpp b/src/mame/video/playch10.cpp index 80e38fe7a07..7402da322ef 100644 --- a/src/mame/video/playch10.cpp +++ b/src/mame/video/playch10.cpp @@ -82,7 +82,7 @@ void playch10_state::video_start() 8, 8, 32, 32); } -VIDEO_START_MEMBER(playch10_state,playch10_hboard) +void playch10_state::video_start_playch10_hboard() { const uint8_t *bios = memregion("maincpu")->base(); m_pc10_bios = (bios[3] == 0x2a) ? 1 : 2; diff --git a/src/mame/video/playmark.cpp b/src/mame/video/playmark.cpp index 4601f6d4fa9..210970e59cb 100644 --- a/src/mame/video/playmark.cpp +++ b/src/mame/video/playmark.cpp @@ -90,7 +90,7 @@ TILE_GET_INFO_MEMBER(playmark_state::bigtwinb_get_tx_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(playmark_state,bigtwin) +void playmark_state::video_start_bigtwin() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -106,7 +106,7 @@ VIDEO_START_MEMBER(playmark_state,bigtwin) } -VIDEO_START_MEMBER(playmark_state,bigtwinb) +void playmark_state::video_start_bigtwinb() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwinb_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -126,7 +126,7 @@ VIDEO_START_MEMBER(playmark_state,bigtwinb) } -VIDEO_START_MEMBER(playmark_state,wbeachvl) +void playmark_state::video_start_wbeachvl() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); @@ -143,7 +143,7 @@ VIDEO_START_MEMBER(playmark_state,wbeachvl) m_pri_masks[2] = 0; } -VIDEO_START_MEMBER(playmark_state,excelsr) +void playmark_state::video_start_excelsr() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -158,7 +158,7 @@ VIDEO_START_MEMBER(playmark_state,excelsr) m_pri_masks[2] = 0xfff0; } -VIDEO_START_MEMBER(playmark_state,hotmind) +void playmark_state::video_start_hotmind() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -179,7 +179,7 @@ VIDEO_START_MEMBER(playmark_state,hotmind) m_pri_masks[2] = 0; } -VIDEO_START_MEMBER(playmark_state,luckboomh) +void playmark_state::video_start_luckboomh() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -219,7 +219,7 @@ TILEMAP_MAPPER_MEMBER(playmark_state::playmark_tilemap_scan_pages) // theres enough ram for 64*128 on each tilemap.. -VIDEO_START_MEMBER(playmark_state,hrdtimes) +void playmark_state::video_start_hrdtimes() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(playmark_state::playmark_tilemap_scan_pages),this), 16, 16, 128, 32); diff --git a/src/mame/video/polepos.cpp b/src/mame/video/polepos.cpp index 355af8b52dc..14488ea32d5 100644 --- a/src/mame/video/polepos.cpp +++ b/src/mame/video/polepos.cpp @@ -187,7 +187,7 @@ TILE_GET_INFO_MEMBER(polepos_state::tx_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(polepos_state,polepos) +void polepos_state::video_start_polepos() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(polepos_state::bg_get_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,16); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(polepos_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); diff --git a/src/mame/video/psikyo.cpp b/src/mame/video/psikyo.cpp index 2f9c27ec83e..3aa088a4cda 100644 --- a/src/mame/video/psikyo.cpp +++ b/src/mame/video/psikyo.cpp @@ -94,7 +94,7 @@ void psikyo_state::psikyo_switch_banks( int tmap, int bank ) } -VIDEO_START_MEMBER(psikyo_state,psikyo) +void psikyo_state::video_start_psikyo() { /* The Hardware is Capable of Changing the Dimensions of the Tilemaps, its safer to create the various sized tilemaps now as opposed to later */ @@ -119,9 +119,9 @@ VIDEO_START_MEMBER(psikyo_state,psikyo) save_item(NAME(m_old_linescroll)); } -VIDEO_START_MEMBER(psikyo_state,sngkace) +void psikyo_state::video_start_sngkace() { - VIDEO_START_CALL_MEMBER( psikyo ); + video_start_psikyo(); psikyo_switch_banks(0, 0); // sngkace / samuraia don't use banking psikyo_switch_banks(1, 1); // They share "gfx2" to save memory on other boards diff --git a/src/mame/video/psychic5.cpp b/src/mame/video/psychic5.cpp index fedcf72dd3f..9d9398f4f71 100644 --- a/src/mame/video/psychic5.cpp +++ b/src/mame/video/psychic5.cpp @@ -187,7 +187,7 @@ void psychic5_state::video_start() } -VIDEO_START_MEMBER(psychic5_state,psychic5) +void psychic5_state::video_start_psychic5() { video_start(); @@ -199,7 +199,7 @@ VIDEO_START_MEMBER(psychic5_state,psychic5) } -VIDEO_START_MEMBER(psychic5_state,bombsa) +void psychic5_state::video_start_bombsa() { video_start(); @@ -210,7 +210,7 @@ VIDEO_START_MEMBER(psychic5_state,bombsa) save_item(NAME(m_bombsa_unknown)); } -VIDEO_RESET_MEMBER(psychic5_state,psychic5) +void psychic5_state::video_reset_psychic5() { m_bg_clip_mode = 0; m_ps5_vram_page = 0; diff --git a/src/mame/video/punchout.cpp b/src/mame/video/punchout.cpp index 8d64b464376..c217aefb7c5 100644 --- a/src/mame/video/punchout.cpp +++ b/src/mame/video/punchout.cpp @@ -110,7 +110,7 @@ void punchout_state::video_start() } -VIDEO_START_MEMBER(punchout_state,armwrest) +void punchout_state::video_start_armwrest() { m_bg_top_tilemap = &machine().tilemap().create(*m_gfxdecode, 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(*m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::armwrest_bot_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); diff --git a/src/mame/video/qdrmfgp.cpp b/src/mame/video/qdrmfgp.cpp index 8eb80c74aca..f48b0f9fdec 100644 --- a/src/mame/video/qdrmfgp.cpp +++ b/src/mame/video/qdrmfgp.cpp @@ -26,7 +26,7 @@ K056832_CB_MEMBER(qdrmfgp_state::qdrmfgp2_tile_callback) ***************************************************************************/ -VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp) +void qdrmfgp_state::video_start_qdrmfgp() { m_k056832->set_layer_association(0); @@ -36,7 +36,7 @@ VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp) m_k056832->set_layer_offs(3, 8, 0); } -VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp2) +void qdrmfgp_state::video_start_qdrmfgp2() { m_k056832->set_layer_association(0); diff --git a/src/mame/video/qix.cpp b/src/mame/video/qix.cpp index 6963e14c003..e2f9bed2142 100644 --- a/src/mame/video/qix.cpp +++ b/src/mame/video/qix.cpp @@ -19,7 +19,7 @@ * *************************************/ -VIDEO_START_MEMBER(qix_state,qix) +void qix_state::video_start_qix() { /* allocate memory for the full video RAM */ m_videoram.allocate(256 * 256); @@ -384,7 +384,7 @@ MACHINE_CONFIG_START(qix_state::qix_video) MCFG_DEVICE_ADD("videocpu", MC6809E, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ MCFG_DEVICE_PROGRAM_MAP(qix_video_map) - MCFG_VIDEO_START_OVERRIDE(qix_state,qix) + set_video_start_cb(config, driver_callback_delegate(&video_start_qix, this)); MCFG_MC6845_ADD("vid_u18", MC6845, "screen", QIX_CHARACTER_CLOCK) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/video/quasar.cpp b/src/mame/video/quasar.cpp index 86377605bd7..30d995b8aef 100644 --- a/src/mame/video/quasar.cpp +++ b/src/mame/video/quasar.cpp @@ -89,7 +89,7 @@ PALETTE_INIT_MEMBER(quasar_state,quasar) } -VIDEO_START_MEMBER(quasar_state,quasar) +void quasar_state::video_start_quasar() { m_effectram = std::make_unique<uint8_t[]>(0x400); diff --git a/src/mame/video/raiden.cpp b/src/mame/video/raiden.cpp index 2b55df6e67d..178103e2e3a 100644 --- a/src/mame/video/raiden.cpp +++ b/src/mame/video/raiden.cpp @@ -238,7 +238,7 @@ void raiden_state::video_start() save_item(NAME(m_flipscreen)); } -VIDEO_START_MEMBER(raiden_state,raidenb) +void raiden_state::video_start_raidenb() { m_bg_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_back_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); m_fg_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_fore_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); diff --git a/src/mame/video/rallyx.cpp b/src/mame/video/rallyx.cpp index b41a5e74a4a..6fca095a0b8 100644 --- a/src/mame/video/rallyx.cpp +++ b/src/mame/video/rallyx.cpp @@ -330,7 +330,7 @@ void rallyx_state::rallyx_video_start_common( ) m_drawmode_table[3] = DRAWMODE_NONE; } -VIDEO_START_MEMBER(rallyx_state,rallyx) +void rallyx_state::video_start_rallyx() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -344,7 +344,7 @@ VIDEO_START_MEMBER(rallyx_state,rallyx) } -VIDEO_START_MEMBER(rallyx_state,jungler) +void rallyx_state::video_start_jungler() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -356,7 +356,7 @@ VIDEO_START_MEMBER(rallyx_state,jungler) } -VIDEO_START_MEMBER(rallyx_state,locomotn) +void rallyx_state::video_start_locomotn() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -368,7 +368,7 @@ VIDEO_START_MEMBER(rallyx_state,locomotn) } -VIDEO_START_MEMBER(rallyx_state,commsega) +void rallyx_state::video_start_commsega() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); diff --git a/src/mame/video/rbisland.cpp b/src/mame/video/rbisland.cpp index c326b856f01..21103c3d0dd 100644 --- a/src/mame/video/rbisland.cpp +++ b/src/mame/video/rbisland.cpp @@ -69,7 +69,7 @@ the Y settings are active low. */ -VIDEO_START_MEMBER(rbisland_state,jumping) +void rbisland_state::video_start_jumping() { m_pc080sn->set_trans_pen(1, 15); diff --git a/src/mame/video/redalert.cpp b/src/mame/video/redalert.cpp index 609794abbdb..0ba20bed2fb 100644 --- a/src/mame/video/redalert.cpp +++ b/src/mame/video/redalert.cpp @@ -162,7 +162,7 @@ void redalert_state::get_panther_pens(pen_t *pens) * *************************************/ -VIDEO_START_MEMBER(redalert_state,redalert) +void redalert_state::video_start_redalert() { m_bitmap_colorram = std::make_unique<uint8_t[]>(0x0400); @@ -171,9 +171,9 @@ VIDEO_START_MEMBER(redalert_state,redalert) m_control_xor = 0x00; } -VIDEO_START_MEMBER(redalert_state,ww3) +void redalert_state::video_start_ww3() { - VIDEO_START_CALL_MEMBER( redalert ); + video_start_redalert(); m_control_xor = 0x04; } @@ -413,14 +413,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(redalert_state::redalert_video) - MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) + set_video_start_cb(config, driver_callback_delegate(&video_start_redalert, this)); redalert_video_common(config); MACHINE_CONFIG_END MACHINE_CONFIG_START(redalert_state::ww3_video) - MCFG_VIDEO_START_OVERRIDE(redalert_state, ww3 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_ww3, this)); redalert_video_common(config); MACHINE_CONFIG_END @@ -433,7 +433,7 @@ MACHINE_CONFIG_END *************************************/ MACHINE_CONFIG_START(redalert_state::demoneye_video) - MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) + set_video_start_cb(config, driver_callback_delegate(&video_start_redalert, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -446,7 +446,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(redalert_state::panther_video) - MCFG_VIDEO_START_OVERRIDE(redalert_state,ww3) + set_video_start_cb(config, driver_callback_delegate(&video_start_ww3, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/video/rohga.cpp b/src/mame/video/rohga.cpp index e1e6da0e055..36bc1df2a9c 100644 --- a/src/mame/video/rohga.cpp +++ b/src/mame/video/rohga.cpp @@ -74,7 +74,7 @@ uint32_t rohga_state::screen_update_rohga(screen_device &screen, bitmap_ind16 &b -VIDEO_START_MEMBER(rohga_state,wizdfire) +void rohga_state::video_start_wizdfire() { m_sprgen[0]->alloc_sprite_bitmap(); m_sprgen[1]->alloc_sprite_bitmap(); diff --git a/src/mame/video/rpunch.cpp b/src/mame/video/rpunch.cpp index b3a072db267..f5287369276 100644 --- a/src/mame/video/rpunch.cpp +++ b/src/mame/video/rpunch.cpp @@ -66,7 +66,7 @@ TIMER_CALLBACK_MEMBER(rpunch_state::crtc_interrupt_gen) } -VIDEO_START_MEMBER(rpunch_state,rpunch) +void rpunch_state::video_start_rpunch() { m_sprite_xoffs = 0; @@ -85,9 +85,9 @@ VIDEO_START_MEMBER(rpunch_state,rpunch) } -VIDEO_START_MEMBER(rpunch_state,svolley) +void rpunch_state::video_start_svolley() { - VIDEO_START_CALL_MEMBER(rpunch); + video_start_rpunch(); m_background[0]->set_scrolldx(8, 0); // aligns middle net sprite with bg as shown in reference m_sprite_xoffs = -4; } diff --git a/src/mame/video/runaway.cpp b/src/mame/video/runaway.cpp index 65a4dd9a4c6..807ad43533a 100644 --- a/src/mame/video/runaway.cpp +++ b/src/mame/video/runaway.cpp @@ -76,7 +76,7 @@ void runaway_state::video_start() } -VIDEO_START_MEMBER(runaway_state,qwak) +void runaway_state::video_start_qwak() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(runaway_state::qwak_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 30); diff --git a/src/mame/video/sauro.cpp b/src/mame/video/sauro.cpp index c6b7965e3e8..81cad77a68f 100644 --- a/src/mame/video/sauro.cpp +++ b/src/mame/video/sauro.cpp @@ -91,7 +91,7 @@ WRITE8_MEMBER(sauro_state::sauro_scroll_fg_w) m_fg_tilemap->set_scrollx(0, scroll); } -VIDEO_START_MEMBER(sauro_state,sauro) +void sauro_state::video_start_sauro() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -162,7 +162,7 @@ uint32_t sauro_state::screen_update_sauro(screen_device &screen, bitmap_ind16 &b /* Tricky Doc */ -VIDEO_START_MEMBER(sauro_state,trckydoc) +void sauro_state::video_start_trckydoc() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/seibuspi.cpp b/src/mame/video/seibuspi.cpp index e393e87b870..a3a288e4cf5 100644 --- a/src/mame/video/seibuspi.cpp +++ b/src/mame/video/seibuspi.cpp @@ -791,14 +791,14 @@ void seibuspi_state::video_start() register_video_state(); } -VIDEO_START_MEMBER(seibuspi_state,ejanhs) +void seibuspi_state::video_start_ejanhs() { video_start(); memset(m_alpha_table, 0, 0x2000); // no alpha blending } -VIDEO_START_MEMBER(seibuspi_state,sys386f) +void seibuspi_state::video_start_sys386f() { m_video_dma_length = 0; m_video_dma_address = 0; diff --git a/src/mame/video/seta.cpp b/src/mame/video/seta.cpp index 9999b8927b2..7276e6e3a7d 100644 --- a/src/mame/video/seta.cpp +++ b/src/mame/video/seta.cpp @@ -420,9 +420,9 @@ WRITE16_MEMBER(seta_state::twineagl_tilebank_w) /* 2 layers */ -VIDEO_START_MEMBER(seta_state,seta_2_layers) +void seta_state::video_start_seta_2_layers() { - VIDEO_START_CALL_MEMBER( seta_no_layers ); + video_start_seta_no_layers(); /* Each layer consists of 2 tilemaps: only one can be displayed at any given time */ @@ -454,9 +454,9 @@ VIDEO_START_MEMBER(seta_state,seta_2_layers) m_tilemap[layer][bank]->set_transparent_pen(0); } -VIDEO_START_MEMBER(seta_state,oisipuzl_2_layers) +void seta_state::video_start_oisipuzl_2_layers() { - VIDEO_START_CALL_MEMBER(seta_2_layers); + video_start_seta_2_layers(); m_tilemaps_flip = 1; // position kludges @@ -465,9 +465,9 @@ VIDEO_START_MEMBER(seta_state,oisipuzl_2_layers) /* 1 layer */ -VIDEO_START_MEMBER(seta_state,seta_1_layer) +void seta_state::video_start_seta_1_layer() { - VIDEO_START_CALL_MEMBER( seta_no_layers ); + video_start_seta_no_layers(); /* Each layer consists of 2 tilemaps: only one can be displayed at any given time */ @@ -487,26 +487,26 @@ VIDEO_START_MEMBER(seta_state,seta_1_layer) m_tilemap[0][bank]->set_transparent_pen(0); } -VIDEO_START_MEMBER(setaroul_state,setaroul_1_layer) +void setaroul_state::video_start_setaroul_1_layer() { - VIDEO_START_CALL_MEMBER(seta_1_layer); + video_start_seta_1_layer(); // position kludges m_seta001->set_bg_yoffsets( 0, -0x1 ); m_seta001->set_bg_xoffsets( 0, 0x2 ); } -VIDEO_START_MEMBER(jockeyc_state,jockeyc_1_layer) +void jockeyc_state::video_start_jockeyc_1_layer() { - VIDEO_START_CALL_MEMBER(seta_1_layer); + video_start_seta_1_layer(); // position kludges m_seta001->set_fg_yoffsets( -0x12+8, 0x0e ); } -VIDEO_START_MEMBER(seta_state,twineagl_1_layer) +void seta_state::video_start_twineagl_1_layer() { - VIDEO_START_CALL_MEMBER( seta_no_layers ); + video_start_seta_no_layers(); /* Each layer consists of 2 tilemaps: only one can be displayed at any given time */ @@ -533,7 +533,7 @@ SETA001_SPRITE_GFXBANK_CB_MEMBER(seta_state::setac_gfxbank_callback) } /* NO layers, only sprites */ -VIDEO_START_MEMBER(seta_state,seta_no_layers) +void seta_state::video_start_seta_no_layers() { m_tilemap[0][0] = nullptr; m_tilemap[0][1] = nullptr; @@ -553,9 +553,9 @@ VIDEO_START_MEMBER(seta_state,seta_no_layers) m_seta001->set_bg_yoffsets( 0x1, -0x1 ); } -VIDEO_START_MEMBER(seta_state,kyustrkr_no_layers) +void seta_state::video_start_kyustrkr_no_layers() { - VIDEO_START_CALL_MEMBER(seta_no_layers); + video_start_seta_no_layers(); // position kludges m_seta001->set_fg_yoffsets( -0x0a, 0x0e ); diff --git a/src/mame/video/seta2.cpp b/src/mame/video/seta2.cpp index 1ba670cc770..149f563ce35 100644 --- a/src/mame/video/seta2.cpp +++ b/src/mame/video/seta2.cpp @@ -457,21 +457,21 @@ void seta2_state::video_start() m_yoffset = 0; } -VIDEO_START_MEMBER(seta2_state,xoffset) +void seta2_state::video_start_xoffset() { video_start(); m_xoffset = 0x200; } -VIDEO_START_MEMBER(seta2_state,xoffset1) +void seta2_state::video_start_xoffset1() { video_start(); m_xoffset = 0x1; } -VIDEO_START_MEMBER(seta2_state,yoffset) +void seta2_state::video_start_yoffset() { video_start(); diff --git a/src/mame/video/shangkid.cpp b/src/mame/video/shangkid.cpp index 03356df4951..ffa07e54e37 100644 --- a/src/mame/video/shangkid.cpp +++ b/src/mame/video/shangkid.cpp @@ -43,7 +43,7 @@ TILE_GET_INFO_MEMBER(shangkid_state::get_bg_tile_info){ (memregion( "proms" )->base()[0x800+color*4]==2)?1:0; } -VIDEO_START_MEMBER(shangkid_state,shangkid) +void shangkid_state::video_start_shangkid() { m_background = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(shangkid_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); } diff --git a/src/mame/video/slapfght.cpp b/src/mame/video/slapfght.cpp index cd1ef5465e9..0106ccd1338 100644 --- a/src/mame/video/slapfght.cpp +++ b/src/mame/video/slapfght.cpp @@ -51,14 +51,14 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_fix_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(slapfght_state, perfrman) +void slapfght_state::video_start_perfrman() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_pf_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(slapfght_state, slapfight) +void slapfght_state::video_start_slapfight() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_pf1_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_fix_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/snk.cpp b/src/mame/video/snk.cpp index b15fe0b0c04..15359c799da 100644 --- a/src/mame/video/snk.cpp +++ b/src/mame/video/snk.cpp @@ -184,7 +184,7 @@ TILE_GET_INFO_MEMBER(snk_state::gwar_get_bg_tile_info) /**************************************************************************************/ -VIDEO_START_MEMBER(snk_state,snk_3bpp_shadow) +void snk_state::video_start_snk_3bpp_shadow() { int i; @@ -200,7 +200,7 @@ VIDEO_START_MEMBER(snk_state,snk_3bpp_shadow) m_palette->shadow_table()[i] = i | 0x200; } -VIDEO_START_MEMBER(snk_state,snk_4bpp_shadow) +void snk_state::video_start_snk_4bpp_shadow() { int i; @@ -221,9 +221,9 @@ VIDEO_START_MEMBER(snk_state,snk_4bpp_shadow) } -VIDEO_START_MEMBER(snk_state,marvins) +void snk_state::video_start_marvins() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); @@ -242,9 +242,9 @@ VIDEO_START_MEMBER(snk_state,marvins) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,jcross) +void snk_state::video_start_jcross() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::aso_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 64); @@ -261,9 +261,9 @@ VIDEO_START_MEMBER(snk_state,jcross) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,sgladiat) +void snk_state::video_start_sgladiat() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::aso_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); @@ -280,9 +280,9 @@ VIDEO_START_MEMBER(snk_state,sgladiat) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,hal21) +void snk_state::video_start_hal21() { - VIDEO_START_CALL_MEMBER(jcross); + video_start_jcross(); m_bg_tilemap->set_scrolldy(8, -32+256); @@ -290,9 +290,9 @@ VIDEO_START_MEMBER(snk_state,hal21) m_yscroll_mask = 0x1ff; } -VIDEO_START_MEMBER(snk_state,aso) +void snk_state::video_start_aso() { - VIDEO_START_CALL_MEMBER(jcross); + video_start_jcross(); m_bg_tilemap->set_scrolldx(15+256, 24+256); @@ -301,9 +301,9 @@ VIDEO_START_MEMBER(snk_state,aso) } -VIDEO_START_MEMBER(snk_state,tnk3) +void snk_state::video_start_tnk3() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::tnk3_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 64); @@ -319,9 +319,9 @@ VIDEO_START_MEMBER(snk_state,tnk3) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,ikari) +void snk_state::video_start_ikari() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::ikari_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::ikari_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); @@ -335,12 +335,10 @@ VIDEO_START_MEMBER(snk_state,ikari) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,gwar) +void snk_state::video_start_gwar() { - int i; - /* prepare drawmode table */ - for(i = 0; i <= 14; i++) m_drawmode_table[i] = DRAWMODE_SOURCE; + for (int i = 0; i <= 14; i++) m_drawmode_table[i] = DRAWMODE_SOURCE; m_drawmode_table[15] = DRAWMODE_NONE; memset(m_empty_tile, 0xf, sizeof(m_empty_tile)); @@ -358,16 +356,16 @@ VIDEO_START_MEMBER(snk_state,gwar) m_is_psychos = 0; } -VIDEO_START_MEMBER(snk_state,psychos) +void snk_state::video_start_psychos() { - VIDEO_START_CALL_MEMBER(gwar); + video_start_gwar(); m_is_psychos = 1; } -VIDEO_START_MEMBER(snk_state,tdfever) +void snk_state::video_start_tdfever() { - VIDEO_START_CALL_MEMBER(gwar); - VIDEO_START_CALL_MEMBER(snk_4bpp_shadow); + video_start_gwar(); + video_start_snk_4bpp_shadow(); } /**************************************************************************************/ diff --git a/src/mame/video/snk6502.cpp b/src/mame/video/snk6502.cpp index 46f6a8107a8..a4cd713758b 100644 --- a/src/mame/video/snk6502.cpp +++ b/src/mame/video/snk6502.cpp @@ -170,7 +170,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::get_fg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(snk6502_state,snk6502) +void snk6502_state::video_start_snk6502() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -186,9 +186,9 @@ void snk6502_state::postload() m_gfxdecode->gfx(0)->mark_all_dirty(); } -VIDEO_START_MEMBER(snk6502_state,pballoon) +void snk6502_state::video_start_pballoon() { - VIDEO_START_CALL_MEMBER( snk6502 ); + video_start_snk6502(); m_bg_tilemap->set_scrolldy(-16, -16); m_fg_tilemap->set_scrolldy(-16, -16); @@ -301,7 +301,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_fg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(snk6502_state,satansat) +void snk6502_state::video_start_satansat() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/snk68.cpp b/src/mame/video/snk68.cpp index 597b36d00fd..ea29e5f557e 100644 --- a/src/mame/video/snk68.cpp +++ b/src/mame/video/snk68.cpp @@ -66,7 +66,7 @@ void snk68_state::video_start() save_item(NAME(m_fg_tile_offset)); } -VIDEO_START_MEMBER(snk68_state,searchar) +void snk68_state::video_start_searchar() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk68_state::get_searchar_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/snookr10.cpp b/src/mame/video/snookr10.cpp index fb854d72d07..94d7560abd8 100644 --- a/src/mame/video/snookr10.cpp +++ b/src/mame/video/snookr10.cpp @@ -246,12 +246,12 @@ void snookr10_state::video_start() m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } -VIDEO_START_MEMBER(snookr10_state, apple10) +void snookr10_state::video_start_apple10() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::apple10_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } -VIDEO_START_MEMBER(snookr10_state, crystalc) +void snookr10_state::video_start_crystalc() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::crystalc_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } diff --git a/src/mame/video/spbactn.cpp b/src/mame/video/spbactn.cpp index 11e386c5184..297b2aa9435 100644 --- a/src/mame/video/spbactn.cpp +++ b/src/mame/video/spbactn.cpp @@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_fg_tile_info) -VIDEO_START_MEMBER(spbactn_state,spbactn) +void spbactn_state::video_start_spbactn() { /* allocate bitmaps */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); @@ -55,9 +55,9 @@ VIDEO_START_MEMBER(spbactn_state,spbactn) m_fg_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(spbactn_state,spbactnp) +void spbactn_state::video_start_spbactnp() { - VIDEO_START_CALL_MEMBER(spbactn); + video_start_spbactn(); // no idea.. m_extra_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(spbactn_state::get_extra_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 16, 16); } diff --git a/src/mame/video/special.cpp b/src/mame/video/special.cpp index c343d7df3ca..e5143b0eae5 100644 --- a/src/mame/video/special.cpp +++ b/src/mame/video/special.cpp @@ -13,7 +13,7 @@ #include "includes/special.h" -VIDEO_START_MEMBER(special_state,special) +void special_state::video_start_special() { m_palette->set_pen_color(0, rgb_t::black()); m_palette->set_pen_color(1, rgb_t::white()); @@ -35,7 +35,8 @@ uint32_t special_state::screen_update_special(screen_device &screen, bitmap_ind1 } return 0; } -VIDEO_START_MEMBER(special_state,specialp) + +void special_state::video_start_specialp() { } @@ -82,7 +83,7 @@ PALETTE_INIT_MEMBER(special_state,specimx) } -VIDEO_START_MEMBER(special_state,specimx) +void special_state::video_start_specimx() { m_specimx_colorram = std::make_unique<uint8_t[]>(0x3000); } @@ -122,7 +123,7 @@ PALETTE_INIT_MEMBER(special_state,erik) } -VIDEO_START_MEMBER(special_state,erik) +void special_state::video_start_erik() { } diff --git a/src/mame/video/spectrum.cpp b/src/mame/video/spectrum.cpp index 9f475d94c45..6da3e961cba 100644 --- a/src/mame/video/spectrum.cpp +++ b/src/mame/video/spectrum.cpp @@ -22,7 +22,7 @@ /*************************************************************************** Start the video hardware emulation. ***************************************************************************/ -VIDEO_START_MEMBER(spectrum_state,spectrum) +void spectrum_state::video_start_spectrum() { m_frame_invert_count = 16; m_frame_number = 0; @@ -43,7 +43,7 @@ VIDEO_START_MEMBER(spectrum_state,spectrum) } -VIDEO_START_MEMBER(spectrum_state,spectrum_128) +void spectrum_state::video_start_spectrum_128() { m_frame_invert_count = 16; m_frame_number = 0; diff --git a/src/mame/video/sslam.cpp b/src/mame/video/sslam.cpp index 77cbfc0d2e3..28268c6d5d6 100644 --- a/src/mame/video/sslam.cpp +++ b/src/mame/video/sslam.cpp @@ -137,7 +137,7 @@ WRITE16_MEMBER(sslam_state::powerbls_bg_tileram_w) m_bg_tilemap->mark_tile_dirty(offset>>1); } -VIDEO_START_MEMBER(sslam_state,sslam) +void sslam_state::video_start_sslam() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_md_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_md_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -150,7 +150,7 @@ VIDEO_START_MEMBER(sslam_state,sslam) save_item(NAME(m_sprites_x_offset)); } -VIDEO_START_MEMBER(sslam_state,powerbls) +void sslam_state::video_start_powerbls() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_powerbls_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); diff --git a/src/mame/video/ssv.cpp b/src/mame/video/ssv.cpp index ed500fd9c3e..77b5660b0ed 100644 --- a/src/mame/video/ssv.cpp +++ b/src/mame/video/ssv.cpp @@ -200,7 +200,7 @@ void ssv_state::video_start() save_item(NAME(m_shadow_pen_shift)); } -VIDEO_START_MEMBER(ssv_state,eaglshot) +void ssv_state::video_start_eaglshot() { ssv_state::video_start(); @@ -225,7 +225,7 @@ WRITE16_MEMBER(ssv_state::gdfs_tmapram_w) m_gdfs_tmap->mark_tile_dirty(offset); } -VIDEO_START_MEMBER(ssv_state,gdfs) +void ssv_state::video_start_gdfs() { ssv_state::video_start(); diff --git a/src/mame/video/suna8.cpp b/src/mame/video/suna8.cpp index c12dbeb9d85..277314ea4a5 100644 --- a/src/mame/video/suna8.cpp +++ b/src/mame/video/suna8.cpp @@ -163,10 +163,10 @@ void suna8_state::suna8_vh_start_common(bool has_text, GFXBANK_TYPE_T gfxbank_ty #endif } -VIDEO_START_MEMBER(suna8_state,suna8_text) { suna8_vh_start_common( true, GFXBANK_TYPE_SPARKMAN); } -VIDEO_START_MEMBER(suna8_state,suna8_sparkman) { suna8_vh_start_common( false, GFXBANK_TYPE_SPARKMAN); } -VIDEO_START_MEMBER(suna8_state,suna8_brickzn) { suna8_vh_start_common( false, GFXBANK_TYPE_BRICKZN); } -VIDEO_START_MEMBER(suna8_state,suna8_starfigh) { suna8_vh_start_common( false, GFXBANK_TYPE_STARFIGH); } +void suna8_state::video_start_suna8_text() { suna8_vh_start_common( true, GFXBANK_TYPE_SPARKMAN); } +void suna8_state::video_start_suna8_sparkman() { suna8_vh_start_common( false, GFXBANK_TYPE_SPARKMAN); } +void suna8_state::video_start_suna8_brickzn() { suna8_vh_start_common( false, GFXBANK_TYPE_BRICKZN); } +void suna8_state::video_start_suna8_starfigh() { suna8_vh_start_common( false, GFXBANK_TYPE_STARFIGH); } /*************************************************************************** diff --git a/src/mame/video/super80.cpp b/src/mame/video/super80.cpp index b88b4f4c064..62e098f3e8c 100644 --- a/src/mame/video/super80.cpp +++ b/src/mame/video/super80.cpp @@ -282,7 +282,7 @@ uint32_t super80_state::screen_update_super80m(screen_device &screen, bitmap_ind return 0; } -VIDEO_START_MEMBER(super80_state,super80) +void super80_state::video_start_super80() { m_vidpg = 0xfe00; } diff --git a/src/mame/video/superqix.cpp b/src/mame/video/superqix.cpp index b153246381a..4a2233a23a7 100644 --- a/src/mame/video/superqix.cpp +++ b/src/mame/video/superqix.cpp @@ -49,12 +49,12 @@ TILE_GET_INFO_MEMBER(superqix_state_base::sqix_get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(hotsmash_state, pbillian) +void hotsmash_state::video_start_pbillian() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(hotsmash_state::pb_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); } -VIDEO_START_MEMBER(superqix_state_base, superqix) +void superqix_state_base::video_start_superqix() { m_fg_bitmap[0] = std::make_unique<bitmap_ind16>(256, 256); m_fg_bitmap[1] = std::make_unique<bitmap_ind16>(256, 256); diff --git a/src/mame/video/system1.cpp b/src/mame/video/system1.cpp index 890a7498778..f12ad2d7e64 100644 --- a/src/mame/video/system1.cpp +++ b/src/mame/video/system1.cpp @@ -156,7 +156,7 @@ void system1_state::video_start() } -VIDEO_START_MEMBER(system1_state,system2) +void system1_state::video_start_system2() { video_start_common(8); } diff --git a/src/mame/video/system16.cpp b/src/mame/video/system16.cpp index d7e66cf9c21..be4fd505b3b 100644 --- a/src/mame/video/system16.cpp +++ b/src/mame/video/system16.cpp @@ -348,7 +348,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys16_textram_w) /***************************************************************************/ -VIDEO_START_MEMBER(segas1x_bootleg_state,system16) +void segas1x_bootleg_state::video_start_system16() { /* Normal colors */ compute_resistor_weights(0, 255, -1.0, @@ -415,9 +415,9 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,system16) setup_system16_bootleg_spritebanking(); } -VIDEO_START_MEMBER(segas1x_bootleg_state,system18old) +void segas1x_bootleg_state::video_start_system18old() { - VIDEO_START_CALL_MEMBER(system16); + video_start_system16(); m_bg1_trans = 1; @@ -539,7 +539,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w) } -VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg) +void segas1x_bootleg_state::video_start_s16a_bootleg() { /* Normal colors */ compute_resistor_weights(0, 255, -1.0, @@ -568,21 +568,21 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg) m_bg_tilemaps[1]->set_transparent_pen(0); } -VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg_wb3bl) +void segas1x_bootleg_state::video_start_s16a_bootleg_wb3bl() { - VIDEO_START_CALL_MEMBER(s16a_bootleg); + video_start_s16a_bootleg(); setup_system16_bootleg_spritebanking(); } -VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg_shinobi) +void segas1x_bootleg_state::video_start_s16a_bootleg_shinobi() { - VIDEO_START_CALL_MEMBER(s16a_bootleg); + video_start_s16a_bootleg(); setup_system16_bootleg_spritebanking(); } -VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg_passsht) +void segas1x_bootleg_state::video_start_s16a_bootleg_passsht() { - VIDEO_START_CALL_MEMBER(s16a_bootleg); + video_start_s16a_bootleg(); setup_system16_bootleg_spritebanking(); } diff --git a/src/mame/video/taito_b.cpp b/src/mame/video/taito_b.cpp index caf0590af34..87b870e437f 100644 --- a/src/mame/video/taito_b.cpp +++ b/src/mame/video/taito_b.cpp @@ -37,7 +37,7 @@ WRITE16_MEMBER(taitob_state::realpunc_video_ctrl_w) COMBINE_DATA(&m_realpunc_video_ctrl); } -VIDEO_START_MEMBER(taitob_state,taitob_core) +void taitob_state::video_start_taitob_core() { m_framebuffer[0] = std::make_unique<bitmap_ind16>(512, 256); m_framebuffer[1] = std::make_unique<bitmap_ind16>(512, 256); @@ -49,7 +49,7 @@ VIDEO_START_MEMBER(taitob_state,taitob_core) save_item(NAME(*m_framebuffer[1])); } -VIDEO_START_MEMBER(taitob_state,taitob_color_order0) +void taitob_state::video_start_taitob_color_order0() { /*graphics are shared, only that they use different palette*/ /*this is the basic layout used in: Nastar, Ashura Blaster, Hit the Ice, Rambo3, Tetris*/ @@ -60,29 +60,29 @@ VIDEO_START_MEMBER(taitob_state,taitob_color_order0) /* bg, fg, tx color_base are set in the tc0180vcu interface */ - VIDEO_START_CALL_MEMBER(taitob_core); + video_start_taitob_core(); } -VIDEO_START_MEMBER(taitob_state,taitob_color_order1) +void taitob_state::video_start_taitob_color_order1() { /* this is the reversed layout used in: Crime City, Puzzle Bobble */ m_b_sp_color_base = 0x80 * 16; - VIDEO_START_CALL_MEMBER(taitob_core); + video_start_taitob_core(); } -VIDEO_START_MEMBER(taitob_state,taitob_color_order2) +void taitob_state::video_start_taitob_color_order2() { /*this is used in: rambo3a, masterw, silentd, selfeena, ryujin */ m_b_sp_color_base = 0x10 * 16; - VIDEO_START_CALL_MEMBER(taitob_core); + video_start_taitob_core(); } -VIDEO_START_MEMBER(taitob_state,hitice) +void taitob_state::video_start_hitice() { - VIDEO_START_CALL_MEMBER(taitob_color_order0); + video_start_taitob_color_order0(); m_b_fg_color_base = 0x80; /* hitice also uses this for the pixel_bitmap */ @@ -91,18 +91,18 @@ VIDEO_START_MEMBER(taitob_state,hitice) save_item(NAME(*m_pixel_bitmap)); } -VIDEO_RESET_MEMBER(taitob_state,hitice) +void taitob_state::video_reset_hitice() { /* kludge: clear the bitmap on startup */ hitice_clear_pixel_bitmap(); } -VIDEO_START_MEMBER(taitob_state,realpunc) +void taitob_state::video_start_realpunc() { m_realpunc_bitmap = std::make_unique<bitmap_ind16>(m_screen->width(), m_screen->height()); - VIDEO_START_CALL_MEMBER(taitob_color_order0); + video_start_taitob_color_order0(); } diff --git a/src/mame/video/taito_f2.cpp b/src/mame/video/taito_f2.cpp index eb6ac55efcf..c8fcbc1b98f 100644 --- a/src/mame/video/taito_f2.cpp +++ b/src/mame/video/taito_f2.cpp @@ -76,132 +76,132 @@ void taitof2_state::taitof2_core_vh_start (int sprite_type, int hide, int flip_h /* ( spritetype, hide, hideflip, xoffs, yoffs, flipx, flipy, textflipx, textflipy) */ /**************************************************************************************/ -VIDEO_START_MEMBER(taitof2_state,taitof2_default) +void taitof2_state::video_start_taitof2_default() { taitof2_core_vh_start(0, 0, 0); } -VIDEO_START_MEMBER(taitof2_state,taitof2_megab)/* Megab, Liquidk */ +void taitof2_state::video_start_taitof2_megab()/* Megab, Liquidk */ { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_quiz)/* Quiz Crayons, Quiz Jinsei */ +void taitof2_state::video_start_taitof2_quiz()/* Quiz Crayons, Quiz Jinsei */ { taitof2_core_vh_start(3, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_finalb) +void taitof2_state::video_start_taitof2_finalb() { taitof2_core_vh_start(0, 1, 1); } -VIDEO_START_MEMBER(taitof2_state,taitof2_ssi) +void taitof2_state::video_start_taitof2_ssi() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_growl) +void taitof2_state::video_start_taitof2_growl() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_ninjak) +void taitof2_state::video_start_taitof2_ninjak() { taitof2_core_vh_start(0, 0, 0); } -VIDEO_START_MEMBER(taitof2_state,taitof2_qzchikyu) +void taitof2_state::video_start_taitof2_qzchikyu() { taitof2_core_vh_start(0, 0, 4); } -VIDEO_START_MEMBER(taitof2_state,taitof2_solfigtr) +void taitof2_state::video_start_taitof2_solfigtr() { taitof2_core_vh_start(0, 3, -3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_koshien) +void taitof2_state::video_start_taitof2_koshien() { taitof2_core_vh_start(0, 1, - 1); } -VIDEO_START_MEMBER(taitof2_state,taitof2_gunfront) +void taitof2_state::video_start_taitof2_gunfront() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_thundfox) +void taitof2_state::video_start_taitof2_thundfox() { taitof2_core_vh_start(0, 3, -3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_mjnquest) +void taitof2_state::video_start_taitof2_mjnquest() { taitof2_core_vh_start(0, 0, 0); m_tc0100scn->set_bg_tilemask(0x7fff); } -VIDEO_START_MEMBER(taitof2_state,taitof2_footchmp) +void taitof2_state::video_start_taitof2_footchmp() { taitof2_core_vh_start(0, 3, 3); m_game = FOOTCHMP; } -VIDEO_START_MEMBER(taitof2_state,taitof2_hthero) +void taitof2_state::video_start_taitof2_hthero() { taitof2_core_vh_start(0, 3, 3); m_game = FOOTCHMP; } -VIDEO_START_MEMBER(taitof2_state,taitof2_deadconx) +void taitof2_state::video_start_taitof2_deadconx() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_deadconxj) +void taitof2_state::video_start_taitof2_deadconxj() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_metalb) +void taitof2_state::video_start_taitof2_metalb() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_yuyugogo) +void taitof2_state::video_start_taitof2_yuyugogo() { taitof2_core_vh_start(1, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_yesnoj) +void taitof2_state::video_start_taitof2_yesnoj() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_dinorex) +void taitof2_state::video_start_taitof2_dinorex() { taitof2_core_vh_start(3, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_dondokod)/* dondokod, cameltry */ +void taitof2_state::video_start_taitof2_dondokod()/* dondokod, cameltry */ { m_pivot_xdisp = -16; m_pivot_ydisp = 0; taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_pulirula) +void taitof2_state::video_start_taitof2_pulirula() { m_pivot_xdisp = -10; /* alignment seems correct (see level 2, falling */ m_pivot_ydisp = 16; /* block of ice after armour man) */ taitof2_core_vh_start(2, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_driftout) +void taitof2_state::video_start_taitof2_driftout() { m_pivot_xdisp = -16; m_pivot_ydisp = 16; diff --git a/src/mame/video/taito_f3.cpp b/src/mame/video/taito_f3.cpp index 842b02863d5..ae0108d10fc 100644 --- a/src/mame/video/taito_f3.cpp +++ b/src/mame/video/taito_f3.cpp @@ -530,7 +530,7 @@ WRITE_LINE_MEMBER(taito_f3_state::screen_vblank_f3) } } -VIDEO_START_MEMBER(taito_f3_state,f3) +void taito_f3_state::video_start_f3() { const struct F3config *pCFG=&f3_config_table[0]; int i; diff --git a/src/mame/video/taito_l.cpp b/src/mame/video/taito_l.cpp index 908697ddda1..1380b7f35d8 100644 --- a/src/mame/video/taito_l.cpp +++ b/src/mame/video/taito_l.cpp @@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(taitol_state::get_tx_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(taitol_state, taito_l) +void taitol_state::video_start_taito_l() { m_buff_spriteram = make_unique_clear<u8[]>(SPRITERAM_SIZE); int i; diff --git a/src/mame/video/taito_z.cpp b/src/mame/video/taito_z.cpp index 67be80bf41a..7b52d2d688b 100644 --- a/src/mame/video/taito_z.cpp +++ b/src/mame/video/taito_z.cpp @@ -6,7 +6,7 @@ /**********************************************************/ -VIDEO_START_MEMBER(taitoz_state,taitoz) +void taitoz_state::video_start_taitoz() { m_road_palbank = 3; m_sci_spriteframe = 0; diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp index 71154bd763b..16e7bc20261 100644 --- a/src/mame/video/tatsumi.cpp +++ b/src/mame/video/tatsumi.cpp @@ -131,7 +131,7 @@ void cyclwarr_state::tile_expand() /********************************************************************/ -VIDEO_START_MEMBER(apache3_state,apache3) +void apache3_state::video_start_apache3() { m_tx_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_shadow_pen_array = make_unique_clear<uint8_t[]>(8192); @@ -141,7 +141,7 @@ VIDEO_START_MEMBER(apache3_state,apache3) m_tx_layer->set_transparent_pen(0); } -VIDEO_START_MEMBER(roundup5_state,roundup5) +void roundup5_state::video_start_roundup5() { m_tx_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_shadow_pen_array = make_unique_clear<uint8_t[]>(8192); @@ -152,7 +152,7 @@ VIDEO_START_MEMBER(roundup5_state,roundup5) m_gfxdecode->gfx(1)->set_source((uint8_t *)m_roundup5_vram.get()); } -VIDEO_START_MEMBER(cyclwarr_state,cyclwarr) +void cyclwarr_state::video_start_cyclwarr() { tile_expand(); m_layer[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cyclwarr_state::get_tile_info_bigfight<0>),this),TILEMAP_SCAN_ROWS,8,8,64,512); @@ -164,7 +164,7 @@ VIDEO_START_MEMBER(cyclwarr_state,cyclwarr) m_shadow_pen_array = make_unique_clear<uint8_t[]>(8192); } -VIDEO_START_MEMBER(cyclwarr_state,bigfight) +void cyclwarr_state::video_start_bigfight() { tile_expand(); m_layer[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cyclwarr_state::get_tile_info_bigfight<0>),this),TILEMAP_SCAN_ROWS,8,8,128,256); diff --git a/src/mame/video/tecmo16.cpp b/src/mame/video/tecmo16.cpp index e256f9b1fc2..c3106f71075 100644 --- a/src/mame/video/tecmo16.cpp +++ b/src/mame/video/tecmo16.cpp @@ -88,7 +88,7 @@ void tecmo16_state::video_start() save_state(); } -VIDEO_START_MEMBER(tecmo16_state,ginkun) +void tecmo16_state::video_start_ginkun() { /* set up tile layers */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); @@ -110,7 +110,7 @@ VIDEO_START_MEMBER(tecmo16_state,ginkun) save_state(); } -VIDEO_START_MEMBER(tecmo16_state,riot) +void tecmo16_state::video_start_riot() { /* set up tile layers */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); diff --git a/src/mame/video/tetrisp2.cpp b/src/mame/video/tetrisp2.cpp index 7c8ab3befd2..42157d0ed32 100644 --- a/src/mame/video/tetrisp2.cpp +++ b/src/mame/video/tetrisp2.cpp @@ -216,8 +216,7 @@ WRITE16_MEMBER(tetrisp2_state::rocknms_sub_vram_rot_w) } - -VIDEO_START_MEMBER(tetrisp2_state,tetrisp2) +void tetrisp2_state::video_start_tetrisp2() { m_flipscreen_old = -1; @@ -236,13 +235,13 @@ VIDEO_START_MEMBER(tetrisp2_state,tetrisp2) save_pointer(NAME(m_priority.get()), 0x40000); } -VIDEO_START_MEMBER(tetrisp2_state,nndmseal) +void tetrisp2_state::video_start_nndmseal() { - VIDEO_START_CALL_MEMBER( tetrisp2 ); + video_start_tetrisp2(); m_tilemap_bg->set_scrolldx(-4,-4); } -VIDEO_START_MEMBER(tetrisp2_state,rockntread) +void tetrisp2_state::video_start_rockntread() { m_flipscreen_old = -1; @@ -263,9 +262,9 @@ VIDEO_START_MEMBER(tetrisp2_state,rockntread) } -VIDEO_START_MEMBER(tetrisp2_state,rocknms) +void tetrisp2_state::video_start_rocknms() { - VIDEO_START_CALL_MEMBER( rockntread ); + video_start_rockntread(); m_tilemap_sub_bg = &machine().tilemap().create(*m_sub_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_bg),this),TILEMAP_SCAN_ROWS,16, 16, 32, 256); // rockn ms(sub) m_tilemap_sub_fg = &machine().tilemap().create(*m_sub_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_fg),this),TILEMAP_SCAN_ROWS,8, 8, 64, 64); @@ -722,7 +721,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::stepstag_get_tile_info_fg) 0); } -VIDEO_START_MEMBER(stepstag_state,stepstag) +void stepstag_state::video_start_stepstag() { m_flipscreen_old = -1; diff --git a/src/mame/video/thomson.cpp b/src/mame/video/thomson.cpp index 697c4744a20..81819c5616a 100644 --- a/src/mame/video/thomson.cpp +++ b/src/mame/video/thomson.cpp @@ -1118,7 +1118,7 @@ static const uint16_t mo5_pal_init[16] = }; -VIDEO_START_MEMBER( thomson_state, thom ) +void thomson_state::video_start_thom() { LOG (( "thom: video start called\n" )); diff --git a/src/mame/video/tiamc1.cpp b/src/mame/video/tiamc1.cpp index 93ff43af73f..38979334c07 100644 --- a/src/mame/video/tiamc1.cpp +++ b/src/mame/video/tiamc1.cpp @@ -188,7 +188,7 @@ void tiamc1_state::video_start() m_gfxdecode->gfx(0)->set_source(m_charram); } -VIDEO_START_MEMBER(tiamc1_state, kot) +void tiamc1_state::video_start_kot() { m_charram = memregion("gfx2")->base(); diff --git a/src/mame/video/timeplt.cpp b/src/mame/video/timeplt.cpp index f2c80dd4b62..47d9735bfdb 100644 --- a/src/mame/video/timeplt.cpp +++ b/src/mame/video/timeplt.cpp @@ -130,13 +130,13 @@ void timeplt_state::video_start() save_item(NAME(m_video_enable)); } -VIDEO_START_MEMBER(timeplt_state,psurge) +void timeplt_state::video_start_psurge() { video_start(); m_video_enable = 1; //psurge doesn't seem to have the video enable } -VIDEO_START_MEMBER(timeplt_state,chkun) +void timeplt_state::video_start_chkun() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(timeplt_state::get_chkun_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_video_enable = 0; diff --git a/src/mame/video/timex.cpp b/src/mame/video/timex.cpp index 2f4a657cfc2..4db76598a84 100644 --- a/src/mame/video/timex.cpp +++ b/src/mame/video/timex.cpp @@ -26,7 +26,7 @@ inline void spectrum_state::spectrum_plot_pixel(bitmap_ind16 &bitmap, int x, int } /* Update FLASH status for ts2068. Assumes flash update every 1/2s. */ -VIDEO_START_MEMBER(spectrum_state,ts2068) +void spectrum_state::video_start_ts2068() { m_frame_invert_count = 30; diff --git a/src/mame/video/tmnt.cpp b/src/mame/video/tmnt.cpp index 7da27c28eee..e1cb469d712 100644 --- a/src/mame/video/tmnt.cpp +++ b/src/mame/video/tmnt.cpp @@ -206,7 +206,7 @@ K05324X_CB_MEMBER(tmnt_state::prmrsocr_sprite_callback) ***************************************************************************/ -VIDEO_START_MEMBER(tmnt_state,cuebrick) +void tmnt_state::video_start_cuebrick() { m_layer_colorbase[0] = 0; m_layer_colorbase[1] = 32; @@ -214,7 +214,7 @@ VIDEO_START_MEMBER(tmnt_state,cuebrick) m_sprite_colorbase = 16; } -VIDEO_START_MEMBER(tmnt_state,mia) +void tmnt_state::video_start_mia() { m_layer_colorbase[0] = 0; m_layer_colorbase[1] = 32; @@ -225,7 +225,7 @@ VIDEO_START_MEMBER(tmnt_state,mia) save_item(NAME(m_tmnt_priorityflag)); } -VIDEO_START_MEMBER(tmnt_state,tmnt) +void tmnt_state::video_start_tmnt() { m_layer_colorbase[0] = 0; m_layer_colorbase[1] = 32; @@ -238,7 +238,7 @@ VIDEO_START_MEMBER(tmnt_state,tmnt) m_palette->set_shadow_factor(0.75); } -VIDEO_START_MEMBER(tmnt_state,lgtnfght)/* also tmnt2, ssriders */ +void tmnt_state::video_start_lgtnfght()/* also tmnt2, ssriders */ { m_k053245->set_z_rejection(0); @@ -250,7 +250,7 @@ VIDEO_START_MEMBER(tmnt_state,lgtnfght)/* also tmnt2, ssriders */ save_item(NAME(m_lasten)); } -VIDEO_START_MEMBER(tmnt_state,glfgreat) +void tmnt_state::video_start_glfgreat() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tmnt_state::glfgreat_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); m_roz_tilemap->set_transparent_pen(0); @@ -263,7 +263,7 @@ VIDEO_START_MEMBER(tmnt_state,glfgreat) save_item(NAME(m_glfgreat_roz_rom_mode)); } -VIDEO_START_MEMBER(tmnt_state,prmrsocr) +void tmnt_state::video_start_prmrsocr() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tmnt_state::prmrsocr_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 256); m_roz_tilemap->set_transparent_pen(0); @@ -274,7 +274,7 @@ VIDEO_START_MEMBER(tmnt_state,prmrsocr) save_item(NAME(m_glfgreat_roz_char_bank)); } -VIDEO_START_MEMBER(tmnt_state,blswhstl) +void tmnt_state::video_start_blswhstl() { m_blswhstl_rombank = -1; save_item(NAME(m_blswhstl_rombank)); diff --git a/src/mame/video/toaplan1.cpp b/src/mame/video/toaplan1.cpp index 190b0a5c6f5..0fc3e7e2706 100644 --- a/src/mame/video/toaplan1.cpp +++ b/src/mame/video/toaplan1.cpp @@ -286,7 +286,7 @@ void toaplan1_state::register_common() } -VIDEO_START_MEMBER(toaplan1_rallybik_state,rallybik) +void toaplan1_rallybik_state::video_start_rallybik() { m_spritegen->alloc_sprite_bitmap(*m_screen); m_spritegen->gfx(0)->set_colorbase(64*16); @@ -312,7 +312,7 @@ VIDEO_START_MEMBER(toaplan1_rallybik_state,rallybik) register_common(); } -VIDEO_START_MEMBER(toaplan1_state,toaplan1) +void toaplan1_state::video_start_toaplan1() { toaplan1_create_tilemaps(); toaplan1_vram_alloc(); diff --git a/src/mame/video/toaplan2.cpp b/src/mame/video/toaplan2.cpp index 86bddaec96f..91b84325581 100644 --- a/src/mame/video/toaplan2.cpp +++ b/src/mame/video/toaplan2.cpp @@ -71,7 +71,7 @@ void toaplan2_state::truxton2_postload() m_gfxdecode->gfx(0)->mark_all_dirty(); } -VIDEO_START_MEMBER(toaplan2_state,toaplan2) +void toaplan2_state::video_start_toaplan2() { /* our current VDP implementation needs this bitmap to work with */ m_screen->register_screen_bitmap(m_custom_priority_bitmap); @@ -89,9 +89,9 @@ VIDEO_START_MEMBER(toaplan2_state,toaplan2) } } -VIDEO_START_MEMBER(toaplan2_state,truxton2) +void toaplan2_state::video_start_truxton2() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); /* Create the Text tilemap for this game */ m_gfxdecode->gfx(0)->set_source(reinterpret_cast<uint8_t *>(m_tx_gfxram16.target())); @@ -100,9 +100,9 @@ VIDEO_START_MEMBER(toaplan2_state,truxton2) create_tx_tilemap(0x1d5, 0x16a); } -VIDEO_START_MEMBER(toaplan2_state,fixeightbl) +void toaplan2_state::video_start_fixeightbl() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); /* Create the Text tilemap for this game */ create_tx_tilemap(); @@ -116,25 +116,25 @@ VIDEO_START_MEMBER(toaplan2_state,fixeightbl) m_vdp0->init_scroll_regs(); } -VIDEO_START_MEMBER(toaplan2_state,bgaregga) +void toaplan2_state::video_start_bgaregga() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); /* Create the Text tilemap for this game */ create_tx_tilemap(0x1d4, 0x16b); } -VIDEO_START_MEMBER(toaplan2_state,bgareggabl) +void toaplan2_state::video_start_bgareggabl() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); /* Create the Text tilemap for this game */ create_tx_tilemap(4, 4); } -VIDEO_START_MEMBER(toaplan2_state,batrider) +void toaplan2_state::video_start_batrider() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); m_vdp0->disable_sprite_buffer(); // disable buffering on this game diff --git a/src/mame/video/trackfld.cpp b/src/mame/video/trackfld.cpp index e4531d3a140..f697fb82872 100644 --- a/src/mame/video/trackfld.cpp +++ b/src/mame/video/trackfld.cpp @@ -167,7 +167,7 @@ TILE_GET_INFO_MEMBER(trackfld_state::get_bg_tile_info) SET_TILE_INFO_MEMBER(1, code, color, flags); } -VIDEO_START_MEMBER(trackfld_state,trackfld) +void trackfld_state::video_start_trackfld() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(trackfld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); @@ -175,9 +175,9 @@ VIDEO_START_MEMBER(trackfld_state,trackfld) } -VIDEO_START_MEMBER(trackfld_state,atlantol) +void trackfld_state::video_start_atlantol() { - VIDEO_START_CALL_MEMBER( trackfld ); + video_start_trackfld(); m_sprites_gfx_banked = 1; } diff --git a/src/mame/video/tsamurai.cpp b/src/mame/video/tsamurai.cpp index 9b59bcd4d8a..8617aca95eb 100644 --- a/src/mame/video/tsamurai.cpp +++ b/src/mame/video/tsamurai.cpp @@ -50,7 +50,7 @@ void tsamurai_state::video_start() save_item(NAME(m_textbank1)); } -VIDEO_START_MEMBER(tsamurai_state, tsamurai) +void tsamurai_state::video_start_tsamurai() { m_background = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_foreground = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -62,9 +62,9 @@ VIDEO_START_MEMBER(tsamurai_state, tsamurai) video_start(); } -VIDEO_START_MEMBER(tsamurai_state, m660) +void tsamurai_state::video_start_m660() { - VIDEO_START_CALL_MEMBER(tsamurai); + video_start_tsamurai(); save_item(NAME(m_textbank2)); } @@ -249,7 +249,7 @@ TILE_GET_INFO_MEMBER(tsamurai_state::get_vsgongf_tile_info) 0); } -VIDEO_START_MEMBER(tsamurai_state,vsgongf) +void tsamurai_state::video_start_vsgongf() { m_foreground = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_vsgongf_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); diff --git a/src/mame/video/tumbleb.cpp b/src/mame/video/tumbleb.cpp index a515f219f7d..249bff7ea3b 100644 --- a/src/mame/video/tumbleb.cpp +++ b/src/mame/video/tumbleb.cpp @@ -220,7 +220,7 @@ void tumbleb_state::tumbleb_tilemap_redraw() m_pf2_alt_tilemap->mark_all_dirty(); } -VIDEO_START_MEMBER(tumbleb_state,pangpang) +void tumbleb_state::video_start_pangpang() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -233,7 +233,7 @@ VIDEO_START_MEMBER(tumbleb_state,pangpang) } -VIDEO_START_MEMBER(tumbleb_state,tumblepb) +void tumbleb_state::video_start_tumblepb() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -245,7 +245,7 @@ VIDEO_START_MEMBER(tumbleb_state,tumblepb) machine().save().register_postload(save_prepost_delegate(FUNC(tumbleb_state::tumbleb_tilemap_redraw), this)); } -VIDEO_START_MEMBER(tumbleb_state,sdfight) +void tumbleb_state::video_start_sdfight() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); // 64*64 to prevent bad tilemap wrapping? - check real behavior m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -257,7 +257,7 @@ VIDEO_START_MEMBER(tumbleb_state,sdfight) machine().save().register_postload(save_prepost_delegate(FUNC(tumbleb_state::tumbleb_tilemap_redraw), this)); } -VIDEO_START_MEMBER(tumbleb_state,fncywld) +void tumbleb_state::video_start_fncywld() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -270,7 +270,7 @@ VIDEO_START_MEMBER(tumbleb_state,fncywld) } -VIDEO_START_MEMBER(tumbleb_state,suprtrio) +void tumbleb_state::video_start_suprtrio() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); diff --git a/src/mame/video/turbo.cpp b/src/mame/video/turbo.cpp index 0f043545483..3ac5965666b 100644 --- a/src/mame/video/turbo.cpp +++ b/src/mame/video/turbo.cpp @@ -160,14 +160,14 @@ TILE_GET_INFO_MEMBER(turbo_state::get_fg_tile_info) } -VIDEO_START_MEMBER(turbo_state,turbo) +void turbo_state::video_start_turbo() { /* initialize the foreground tilemap */ m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); } -VIDEO_START_MEMBER(turbo_state,buckrog) +void turbo_state::video_start_buckrog() { /* initialize the foreground tilemap */ m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); diff --git a/src/mame/video/twincobr.cpp b/src/mame/video/twincobr.cpp index dafed1b7c30..4c02a7b0d7c 100644 --- a/src/mame/video/twincobr.cpp +++ b/src/mame/video/twincobr.cpp @@ -82,7 +82,7 @@ void twincobr_state::twincobr_create_tilemaps() m_tx_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(twincobr_state,toaplan0) +void twincobr_state::video_start_toaplan0() { m_spritegen->alloc_sprite_bitmap(*m_screen); diff --git a/src/mame/video/tx1.cpp b/src/mame/video/tx1.cpp index dabfc0a9ae3..93193d0d6c0 100644 --- a/src/mame/video/tx1.cpp +++ b/src/mame/video/tx1.cpp @@ -1096,7 +1096,7 @@ void tx1_state::tx1_draw_objects(uint8_t *bitmap) * *************************************/ -VIDEO_START_MEMBER(tx1_state,tx1) +void tx1_state::video_start_tx1() { /* Allocate a large bitmap that covers the three screens */ m_bitmap = std::make_unique<bitmap_ind16>(768, 256); @@ -2989,7 +2989,7 @@ void tx1_state::bb_combine_layers(bitmap_ind16 &bitmap, int screen) } } -VIDEO_START_MEMBER(tx1_state,buggyboy) +void tx1_state::video_start_buggyboy() { /* Allocate some bitmaps */ m_chr_bmp = std::make_unique<uint8_t[]>(3 * 256 * 240); @@ -3003,7 +3003,7 @@ VIDEO_START_MEMBER(tx1_state,buggyboy) m_interrupt_timer->adjust(m_screen->time_until_pos(CURSOR_YPOS, CURSOR_XPOS)); } -VIDEO_START_MEMBER(tx1_state,buggybjr) +void tx1_state::video_start_buggybjr() { /* Allocate some bitmaps */ m_chr_bmp = std::make_unique<uint8_t[]>(256 * 240); diff --git a/src/mame/video/ut88.cpp b/src/mame/video/ut88.cpp index f8c8bd7b4ba..5892844b62d 100644 --- a/src/mame/video/ut88.cpp +++ b/src/mame/video/ut88.cpp @@ -24,7 +24,7 @@ const gfx_layout ut88_charlayout = 8*8 /* size of one char */ }; -VIDEO_START_MEMBER(ut88_state,ut88) +void ut88_state::video_start_ut88() { } diff --git a/src/mame/video/warpwarp.cpp b/src/mame/video/warpwarp.cpp index 593956231cf..d0d9f91540e 100644 --- a/src/mame/video/warpwarp.cpp +++ b/src/mame/video/warpwarp.cpp @@ -40,7 +40,7 @@ PALETTE_INIT_MEMBER(warpwarp_state,navarone) palette.set_pen_color(3, geebee_palette[0]); } -MACHINE_RESET_MEMBER(warpwarp_state,kaitei) +void warpwarp_state::machine_reset_kaitei() { // Some PCB videos/images shows a b&w arrangement, others a full colorized one. // This is due of the monitor type used, cfr. http://news.livedoor.com/article/detail/5604337/ @@ -193,17 +193,17 @@ TILE_GET_INFO_MEMBER(warpwarp_state::warpwarp_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(warpwarp_state,geebee) +void warpwarp_state::video_start_geebee() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::geebee_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } -VIDEO_START_MEMBER(warpwarp_state,navarone) +void warpwarp_state::video_start_navarone() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::navarone_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } -VIDEO_START_MEMBER(warpwarp_state,warpwarp) +void warpwarp_state::video_start_warpwarp() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::warpwarp_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } diff --git a/src/mame/video/wc90.cpp b/src/mame/video/wc90.cpp index 84aff9903c9..36f3478caad 100644 --- a/src/mame/video/wc90.cpp +++ b/src/mame/video/wc90.cpp @@ -79,7 +79,7 @@ void wc90_state::video_start() m_tx_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(wc90_state,wc90t) +void wc90_state::video_start_wc90t() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::track_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,64,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::track_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); diff --git a/src/mame/video/wecleman.cpp b/src/mame/video/wecleman.cpp index 4bb6c0c1120..807891055ee 100644 --- a/src/mame/video/wecleman.cpp +++ b/src/mame/video/wecleman.cpp @@ -859,7 +859,7 @@ WRITE16_MEMBER(wecleman_state::wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w) Initializations ***************************************************************************/ -VIDEO_START_MEMBER(wecleman_state,wecleman) +void wecleman_state::video_start_wecleman() { /* Sprite banking - each bank is 0x20000 bytes (we support 0x40 bank codes) @@ -961,7 +961,7 @@ K051316_CB_MEMBER(wecleman_state::hotchase_zoom_callback_2) } -VIDEO_START_MEMBER(wecleman_state,hotchase) +void wecleman_state::video_start_hotchase() { /* Sprite banking - each bank is 0x20000 bytes (we support 0x40 bank codes) diff --git a/src/mame/video/wgp.cpp b/src/mame/video/wgp.cpp index d0e162fc463..9d12fb3d3f8 100644 --- a/src/mame/video/wgp.cpp +++ b/src/mame/video/wgp.cpp @@ -70,7 +70,7 @@ void wgp_state::video_start() core_vh_start(32, 16); } -VIDEO_START_MEMBER(wgp_state,wgp2) +void wgp_state::video_start_wgp2() { core_vh_start(32, 16); } diff --git a/src/mame/video/williams.cpp b/src/mame/video/williams.cpp index 52ef8a61356..19f1c25ebd7 100644 --- a/src/mame/video/williams.cpp +++ b/src/mame/video/williams.cpp @@ -167,7 +167,7 @@ void williams_state::state_save_register() } -VIDEO_START_MEMBER(williams_state,williams) +void williams_state::video_start_williams() { blitter_init(m_blitter_config, nullptr); create_palette_lookup(); @@ -175,7 +175,7 @@ VIDEO_START_MEMBER(williams_state,williams) } -VIDEO_START_MEMBER(blaster_state,blaster) +void blaster_state::video_start_blaster() { blitter_init(m_blitter_config, memregion("proms")->base()); create_palette_lookup(); @@ -185,7 +185,7 @@ VIDEO_START_MEMBER(blaster_state,blaster) } -VIDEO_START_MEMBER(williams2_state,williams2) +void williams2_state::video_start_williams2() { blitter_init(m_blitter_config, nullptr); diff --git a/src/mame/video/x1.cpp b/src/mame/video/x1.cpp index dc872754dd8..141d9bc900a 100644 --- a/src/mame/video/x1.cpp +++ b/src/mame/video/x1.cpp @@ -19,7 +19,7 @@ * *************************************/ -VIDEO_START_MEMBER(x1_state,x1) +void x1_state::video_start_x1() { m_gfx_bitmap_ram = make_unique_clear<uint8_t[]>(0xc000*2); m_bitmapbank->configure_entries(0, 2, m_gfx_bitmap_ram.get(), 0xc000); diff --git a/src/mame/video/x68k.cpp b/src/mame/video/x68k.cpp index 7a8912a80b0..54a18233e5c 100644 --- a/src/mame/video/x68k.cpp +++ b/src/mame/video/x68k.cpp @@ -1084,7 +1084,7 @@ TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg1_tile_16) SET_TILE_INFO_MEMBER(1,code,colour,flags); } -VIDEO_START_MEMBER(x68k_state,x68000) +void x68k_state::video_start_x68000() { int gfx_index; diff --git a/src/mame/video/xevious.cpp b/src/mame/video/xevious.cpp index 9d336b437f2..e88ce76fa55 100644 --- a/src/mame/video/xevious.cpp +++ b/src/mame/video/xevious.cpp @@ -138,7 +138,7 @@ TILE_GET_INFO_MEMBER(xevious_state::get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(xevious_state,xevious) +void xevious_state::video_start_xevious() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(xevious_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(xevious_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); diff --git a/src/mame/video/xmen.cpp b/src/mame/video/xmen.cpp index e3592f4f678..70190803777 100644 --- a/src/mame/video/xmen.cpp +++ b/src/mame/video/xmen.cpp @@ -49,7 +49,7 @@ K053246_CB_MEMBER(xmen_state::sprite_callback) ***************************************************************************/ -VIDEO_START_MEMBER(xmen_state,xmen6p) +void xmen_state::video_start_xmen6p() { m_k053246->k053247_get_ram( &m_k053247_ram); diff --git a/src/mame/video/zaxxon.cpp b/src/mame/video/zaxxon.cpp index 04323f11742..f863737bc1a 100644 --- a/src/mame/video/zaxxon.cpp +++ b/src/mame/video/zaxxon.cpp @@ -150,13 +150,13 @@ void zaxxon_state::video_start() } -VIDEO_START_MEMBER(zaxxon_state,razmataz) +void zaxxon_state::video_start_razmataz() { video_start_common(tilemap_get_info_delegate(FUNC(zaxxon_state::razmataz_get_fg_tile_info),this)); } -VIDEO_START_MEMBER(zaxxon_state,congo) +void zaxxon_state::video_start_congo() { /* allocate our own spriteram since it is not accessible by the main CPU */ m_spriteram.allocate(0x100); |