diff options
author | 2012-09-06 12:17:17 +0000 | |
---|---|---|
committer | 2012-09-06 12:17:17 +0000 | |
commit | 5800f74cd6d3ec3d2fb2ace34f3fa5bf8f04c18a (patch) (github) | |
tree | 00327bec932267864b09d2120b7c9798dcee66ba | |
parent | d19e0caf9dfa3890af9e9730d73fd0bf28baaf37 (diff) | |
download | mame-5800f74cd6d3ec3d2fb2ace34f3fa5bf8f04c18a.tar.bz2 mame-5800f74cd6d3ec3d2fb2ace34f3fa5bf8f04c18a.zip |
TILE/TILEMAP modernization part 2 (no whatsnew)
838 files changed, 6368 insertions, 6189 deletions
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index 7d8c7d497d4..9e05d8785c8 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -28,13 +28,12 @@ * *************************************/ -static TILE_GET_INFO( get_hitme_tile_info ) +TILE_GET_INFO_MEMBER(hitme_state::get_hitme_tile_info) { - hitme_state *state = machine.driver_data<hitme_state>(); /* the code is the low 6 bits */ - UINT8 code = state->m_videoram[tile_index] & 0x3f; - SET_TILE_INFO(0, code, 0, 0); + UINT8 code = m_videoram[tile_index] & 0x3f; + SET_TILE_INFO_MEMBER(0, code, 0, 0); } @@ -57,14 +56,14 @@ WRITE8_MEMBER(hitme_state::hitme_vidram_w) static VIDEO_START( hitme ) { hitme_state *state = machine.driver_data<hitme_state>(); - state->m_tilemap = tilemap_create(machine, get_hitme_tile_info, TILEMAP_SCAN_ROWS, 8, 10, 40, 19); + state->m_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(hitme_state::get_hitme_tile_info),state), TILEMAP_SCAN_ROWS, 8, 10, 40, 19); } static VIDEO_START( barricad ) { hitme_state *state = machine.driver_data<hitme_state>(); - state->m_tilemap = tilemap_create(machine, get_hitme_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 24); + state->m_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(hitme_state::get_hitme_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 24); } diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 03e0d9e5306..3a2b2cb7a6f 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -478,19 +478,18 @@ static GFXDECODE_START( laserbat ) GFXDECODE_ENTRY( "gfx2", 0x0000, sprites_layout, 0, 8 ) /* Sprites */ GFXDECODE_END -static TILE_GET_INFO( get_tile_info ) +TILE_GET_INFO_MEMBER(laserbat_state::get_tile_info) { - laserbat_state *state = machine.driver_data<laserbat_state>(); // wrong color index! - SET_TILE_INFO(0, state->m_videoram[tile_index], state->m_colorram[tile_index] & 0x7f, 0); + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], m_colorram[tile_index] & 0x7f, 0); } static VIDEO_START( laserbat ) { laserbat_state *state = machine.driver_data<laserbat_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(laserbat_state::get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->save_item(NAME(state->m_videoram)); state->save_item(NAME(state->m_colorram)); diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 645808bd409..15ed6171d41 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -820,48 +820,44 @@ WRITE16_MEMBER(raiden2_state::raidendx_cop_bank_2_w) /* TILEMAP RELATED (move to video file) */ -static TILE_GET_INFO( get_back_tile_info ) +TILE_GET_INFO_MEMBER(raiden2_state::get_back_tile_info) { - raiden2_state *state = machine.driver_data<raiden2_state>(); - int tile = state->back_data[tile_index]; + int tile = back_data[tile_index]; int color = (tile >> 12) | (0 << 4); - tile = (tile & 0xfff) | (state->bg_bank << 12); + tile = (tile & 0xfff) | (bg_bank << 12); - SET_TILE_INFO(1,tile+0x0000,color,0); + SET_TILE_INFO_MEMBER(1,tile+0x0000,color,0); } -static TILE_GET_INFO( get_mid_tile_info ) +TILE_GET_INFO_MEMBER(raiden2_state::get_mid_tile_info) { - raiden2_state *state = machine.driver_data<raiden2_state>(); - int tile = state->mid_data[tile_index]; + int tile = mid_data[tile_index]; int color = (tile >> 12) | (2 << 4); - tile = (tile & 0xfff) | (state->mid_bank << 12); + tile = (tile & 0xfff) | (mid_bank << 12); - SET_TILE_INFO(1,tile,color,0); + SET_TILE_INFO_MEMBER(1,tile,color,0); } -static TILE_GET_INFO( get_fore_tile_info ) +TILE_GET_INFO_MEMBER(raiden2_state::get_fore_tile_info) { - raiden2_state *state = machine.driver_data<raiden2_state>(); - int tile = state->fore_data[tile_index]; + int tile = fore_data[tile_index]; int color = (tile >> 12) | (1 << 4); - tile = (tile & 0xfff) | (state->fg_bank << 12); + tile = (tile & 0xfff) | (fg_bank << 12); - SET_TILE_INFO(1,tile,color,0); + SET_TILE_INFO_MEMBER(1,tile,color,0); } -static TILE_GET_INFO( get_text_tile_info ) +TILE_GET_INFO_MEMBER(raiden2_state::get_text_tile_info) { - raiden2_state *state = machine.driver_data<raiden2_state>(); - int tile = state->text_data[tile_index]; + int tile = text_data[tile_index]; int color = (tile>>12)&0xf; tile &= 0xfff; - SET_TILE_INFO(0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } /* VIDEO START (move to video file) */ @@ -870,10 +866,10 @@ static TILE_GET_INFO( get_text_tile_info ) static VIDEO_START( raiden2 ) { raiden2_state *state = machine.driver_data<raiden2_state>(); - state->text_layer = tilemap_create(machine, get_text_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64,32 ); - state->background_layer = tilemap_create(machine, get_back_tile_info, TILEMAP_SCAN_ROWS, 16,16, 32,32 ); - state->midground_layer = tilemap_create(machine, get_mid_tile_info, TILEMAP_SCAN_ROWS, 16,16, 32,32 ); - state->foreground_layer = tilemap_create(machine, get_fore_tile_info, TILEMAP_SCAN_ROWS, 16,16, 32,32 ); + state->text_layer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(raiden2_state::get_text_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64,32 ); + state->background_layer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(raiden2_state::get_back_tile_info),state), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); + state->midground_layer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(raiden2_state::get_mid_tile_info),state), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); + state->foreground_layer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(raiden2_state::get_fore_tile_info),state), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); state->midground_layer->set_transparent_pen(15); state->foreground_layer->set_transparent_pen(15); diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index bbbe41aaf47..ae7f3e5d34f 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE8_MEMBER(c1942_scroll_w); DECLARE_WRITE8_MEMBER(c1942_c804_w); DECLARE_DRIVER_INIT(1942); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 00656257311..b113b7e2f99 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -40,6 +40,9 @@ public: DECLARE_WRITE8_MEMBER(c1943_d806_w); DECLARE_DRIVER_INIT(1943b); DECLARE_DRIVER_INIT(1943); + TILE_GET_INFO_MEMBER(c1943_get_bg2_tile_info); + TILE_GET_INFO_MEMBER(c1943_get_bg_tile_info); + TILE_GET_INFO_MEMBER(c1943_get_fg_tile_info); }; diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 20a18240c00..4b8d8277230 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -86,6 +86,7 @@ public: DECLARE_WRITE8_MEMBER(sound_control_3_w); DECLARE_DRIVER_INIT(undoukai); DECLARE_DRIVER_INIT(40love); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index b31986b95d0..c72b9d5bf41 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -28,6 +28,7 @@ public: DECLARE_WRITE8_MEMBER(fenraya_videoram_w); DECLARE_WRITE8_MEMBER(sound_control_w); DECLARE_DRIVER_INIT(unkpacg); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index db7579bd13f..1128338f0dd 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -54,6 +54,7 @@ public: DECLARE_WRITE8_MEMBER(aeroboto_3000_w); DECLARE_WRITE8_MEMBER(aeroboto_videoram_w); DECLARE_WRITE8_MEMBER(aeroboto_tilecolor_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index b005e5af51a..31e4ea32d58 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -68,6 +68,12 @@ public: DECLARE_WRITE16_MEMBER(wbbc97_bitmap_enable_w); DECLARE_WRITE16_MEMBER(pspikesb_oki_banking_w); DECLARE_WRITE16_MEMBER(aerfboo2_okim6295_banking_w); + TILE_GET_INFO_MEMBER(get_pspikes_tile_info); + TILE_GET_INFO_MEMBER(karatblz_bg1_tile_info); + TILE_GET_INFO_MEMBER(karatblz_bg2_tile_info); + TILE_GET_INFO_MEMBER(spinlbrk_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 0bc94b0563f..96b6cacec30 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -61,6 +61,8 @@ public: DECLARE_WRITE8_MEMBER(airbustr_colorram2_w); DECLARE_WRITE8_MEMBER(airbustr_scrollregs_w); DECLARE_DRIVER_INIT(airbustr); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 782d0aeb5d6..a82d2c978e1 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -88,6 +88,7 @@ public: DECLARE_DRIVER_INIT(timesold); DECLARE_DRIVER_INIT(kyros); DECLARE_DRIVER_INIT(sstingry); + TILE_GET_INFO_MEMBER(get_tile_info); }; /* game_id - used to deal with a few game specific situations */ diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index c6cb840b2f9..73b092b930a 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -18,6 +18,8 @@ public: DECLARE_WRITE8_MEMBER(ampoker2_videoram_w); DECLARE_DRIVER_INIT(rabbitpk); DECLARE_DRIVER_INIT(piccolop); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(s2k_get_bg_tile_info); }; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 4f777aa1ab9..2ab88ee947c 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -38,6 +38,8 @@ public: DECLARE_WRITE8_MEMBER(amspdwy_videoram_w); DECLARE_WRITE8_MEMBER(amspdwy_colorram_w); DECLARE_READ8_MEMBER(amspdwy_sound_r); + TILE_GET_INFO_MEMBER(get_tile_info); + TILEMAP_MAPPER_MEMBER(tilemap_scan_cols_back); }; diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 968396b8283..0a6237174a6 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -53,6 +53,9 @@ public: DECLARE_WRITE8_MEMBER(angelkds_paletteram_w); DECLARE_DRIVER_INIT(angelkds); DECLARE_DRIVER_INIT(spcpostn); + TILE_GET_INFO_MEMBER(get_tx_tile_info); + TILE_GET_INFO_MEMBER(get_bgtop_tile_info); + TILE_GET_INFO_MEMBER(get_bgbot_tile_info); }; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 865dea76952..babe6d152a2 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -43,6 +43,8 @@ public: DECLARE_WRITE8_MEMBER(appoooh_out_w); DECLARE_DRIVER_INIT(robowres); DECLARE_DRIVER_INIT(robowresb); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index ed4c915e973..bade9881034 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -40,6 +40,9 @@ public: DECLARE_WRITE16_MEMBER(aquarium_mid_videoram_w); DECLARE_WRITE16_MEMBER(aquarium_bak_videoram_w); DECLARE_DRIVER_INIT(aquarium); + TILE_GET_INFO_MEMBER(get_aquarium_txt_tile_info); + TILE_GET_INFO_MEMBER(get_aquarium_mid_tile_info); + TILE_GET_INFO_MEMBER(get_aquarium_bak_tile_info); }; diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index 4bd2641ddf1..5c004e704b8 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -66,6 +66,14 @@ public: DECLARE_WRITE8_MEMBER(butasan_pagedram_w); DECLARE_WRITE8_MEMBER(valtric_unknown_w); DECLARE_WRITE8_MEMBER(butasan_unknown_w); + TILE_GET_INFO_MEMBER(argus_get_tx_tile_info); + TILE_GET_INFO_MEMBER(argus_get_bg0_tile_info); + TILE_GET_INFO_MEMBER(argus_get_bg1_tile_info); + TILE_GET_INFO_MEMBER(valtric_get_tx_tile_info); + TILE_GET_INFO_MEMBER(valtric_get_bg_tile_info); + TILE_GET_INFO_MEMBER(butasan_get_tx_tile_info); + TILE_GET_INFO_MEMBER(butasan_get_bg0_tile_info); + TILE_GET_INFO_MEMBER(butasan_get_bg1_tile_info); }; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 13903ba2c16..a235e834be1 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -73,6 +73,7 @@ public: DECLARE_DRIVER_INIT(arkangc2); DECLARE_DRIVER_INIT(arkbloc2); DECLARE_DRIVER_INIT(arkangc); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 90ce73eb1ee..a72071602ab 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -68,6 +68,13 @@ public: DECLARE_DRIVER_INIT(kozure); DECLARE_DRIVER_INIT(terraf); DECLARE_DRIVER_INIT(terrafb); + TILEMAP_MAPPER_MEMBER(armedf_scan_type1); + TILEMAP_MAPPER_MEMBER(armedf_scan_type2); + TILEMAP_MAPPER_MEMBER(armedf_scan_type3); + TILE_GET_INFO_MEMBER(get_nb1414m4_tx_tile_info); + TILE_GET_INFO_MEMBER(get_armedf_tx_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; class bigfghtr_state : public armedf_state diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 4b898373065..1888cc01dc4 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -63,6 +63,13 @@ public: DECLARE_WRITE8_MEMBER(ym2203_write_a); DECLARE_WRITE8_MEMBER(ym2203_write_b); DECLARE_DRIVER_INIT(ashnojoe); + TILE_GET_INFO_MEMBER(get_joe_tile_info); + TILE_GET_INFO_MEMBER(get_joe_tile_info_2); + TILE_GET_INFO_MEMBER(get_joe_tile_info_3); + TILE_GET_INFO_MEMBER(get_joe_tile_info_4); + TILE_GET_INFO_MEMBER(get_joe_tile_info_5); + TILE_GET_INFO_MEMBER(get_joe_tile_info_6); + TILE_GET_INFO_MEMBER(get_joe_tile_info_7); }; diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index 2d68d1b9cff..86b2cd0c67e 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -72,6 +72,9 @@ public: DECLARE_WRITE8_MEMBER(atarifb_alpha1_videoram_w); DECLARE_WRITE8_MEMBER(atarifb_alpha2_videoram_w); DECLARE_WRITE8_MEMBER(atarifb_field_videoram_w); + TILE_GET_INFO_MEMBER(alpha1_get_tile_info); + TILE_GET_INFO_MEMBER(alpha2_get_tile_info); + TILE_GET_INFO_MEMBER(field_get_tile_info); }; diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index 0a2c9795d95..dd6b6505321 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -44,6 +44,8 @@ public: DECLARE_DRIVER_INIT(pitfightj); DECLARE_DRIVER_INIT(pitfight); DECLARE_DRIVER_INIT(pitfightb); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 66d2c6edca7..beda5e4adb9 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -46,6 +46,9 @@ public: DECLARE_DIRECT_UPDATE_MEMBER(atarig42_sloop_direct_handler); DECLARE_DRIVER_INIT(roadriot); DECLARE_DRIVER_INIT(guardian); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); + TILEMAP_MAPPER_MEMBER(atarig42_playfield_scan); }; diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index e869f05e381..14c33073570 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -65,6 +65,9 @@ public: DECLARE_DRIVER_INIT(primrage20); DECLARE_DRIVER_INIT(primrage); DECLARE_DRIVER_INIT(tmek); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); + TILEMAP_MAPPER_MEMBER(atarigt_playfield_scan); }; diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 3a877a09c0e..c0dee7c1b53 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -40,6 +40,9 @@ public: DECLARE_DRIVER_INIT(spclords); DECLARE_DRIVER_INIT(rrreveng); DECLARE_DRIVER_INIT(motofren); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); + TILEMAP_MAPPER_MEMBER(atarigx2_playfield_scan); }; diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index ce15d3a09fe..985b22df3e3 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -59,6 +59,8 @@ public: DECLARE_DRIVER_INIT(marble); DECLARE_DRIVER_INIT(roadrunn); DECLARE_DRIVER_INIT(indytemp); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 16f45ccbd5c..9279911c47d 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -73,6 +73,8 @@ public: DECLARE_DRIVER_INIT(csprint); DECLARE_DRIVER_INIT(paperboy); DECLARE_DRIVER_INIT(720); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 044f98e0eb0..8ada7da6978 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -27,6 +27,7 @@ public: DECLARE_WRITE8_MEMBER(nvram_enable_w); DECLARE_WRITE8_MEMBER(atetris_videoram_w); DECLARE_DRIVER_INIT(atetris); + TILE_GET_INFO_MEMBER(get_tile_info); }; /*----------- defined in video/atetris.c -----------*/ diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index c899560c5bc..aa822224aa6 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(audio_io_w); DECLARE_READ16_MEMBER(badlandsb_unk_r); DECLARE_DRIVER_INIT(badlands); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index 593ee21e897..f9449b14380 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -43,6 +43,7 @@ public: DECLARE_READ8_MEMBER(dial_input_p1_r); DECLARE_READ8_MEMBER(dial_input_p2_r); DECLARE_DRIVER_INIT(bagman); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 4b0760d13b5..e8238f2c247 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE8_MEMBER(bankp_videoram2_w); DECLARE_WRITE8_MEMBER(bankp_colorram2_w); DECLARE_WRITE8_MEMBER(bankp_out_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index 849b9b00ae4..4417ad00c89 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -32,6 +32,10 @@ public: DECLARE_READ8_MEMBER(baraduke_spriteram_r); DECLARE_WRITE8_MEMBER(baraduke_spriteram_w); DECLARE_DRIVER_INIT(baraduke); + TILEMAP_MAPPER_MEMBER(tx_tilemap_scan); + TILE_GET_INFO_MEMBER(tx_get_tile_info); + TILE_GET_INFO_MEMBER(get_tile_info0); + TILE_GET_INFO_MEMBER(get_tile_info1); }; diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index 6260fb7a31d..96db20385cc 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -20,6 +20,9 @@ public: DECLARE_READ16_MEMBER(special_port2_r); DECLARE_WRITE16_MEMBER(latch_w); DECLARE_DRIVER_INIT(batman); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); + TILE_GET_INFO_MEMBER(get_playfield2_tile_info); }; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index 9105117ac2c..9a2b6aed5b8 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE8_MEMBER(battlane_spriteram_w); DECLARE_WRITE8_MEMBER(battlane_bitmap_w); DECLARE_WRITE8_MEMBER(battlane_video_ctrl_w); + TILE_GET_INFO_MEMBER(get_tile_info_bg); + TILEMAP_MAPPER_MEMBER(battlane_tilemap_scan_rows_2x2); }; diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index bb84bada06b..e8ec6157344 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -31,6 +31,7 @@ public: DECLARE_WRITE8_MEMBER(battlex_flipscreen_w); DECLARE_CUSTOM_INPUT_MEMBER(battlex_in0_b4_r); DECLARE_DRIVER_INIT(battlex); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 56e6c3b22b7..5b59182be6d 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -49,6 +49,9 @@ public: DECLARE_WRITE16_MEMBER(bbusters_video_w); DECLARE_WRITE16_MEMBER(bbusters_pf1_w); DECLARE_WRITE16_MEMBER(bbusters_pf2_w); + TILE_GET_INFO_MEMBER(get_bbusters_tile_info); + TILE_GET_INFO_MEMBER(get_pf1_tile_info); + TILE_GET_INFO_MEMBER(get_pf2_tile_info); }; diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 1b33f52de3b..f4af6bb8950 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -25,6 +25,10 @@ public: DECLARE_WRITE16_MEMBER(bsb_videoram_w); DECLARE_WRITE16_MEMBER(bsb_videoram2_w); DECLARE_WRITE16_MEMBER(bsb_videoram3_w); + TILEMAP_MAPPER_MEMBER(bsb_bg_scan); + TILE_GET_INFO_MEMBER(get_bsb_tile_info); + TILE_GET_INFO_MEMBER(get_bsb_tile2_info); + TILE_GET_INFO_MEMBER(get_bsb_tile3_info); }; diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index e8a71720b98..23b9c8985f3 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -44,6 +44,9 @@ public: DECLARE_WRITE16_MEMBER(bionicc_paletteram_w); DECLARE_WRITE16_MEMBER(bionicc_scroll_w); DECLARE_WRITE16_MEMBER(bionicc_gfxctrl_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index c795882cee8..baeaab2602a 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -79,6 +79,7 @@ public: DECLARE_READ8_MEMBER(bking_pos_r); DECLARE_WRITE8_MEMBER(unk_w); DECLARE_WRITE8_MEMBER(port_b_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 561eb481649..cb2cf23c220 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -55,6 +55,10 @@ public: DECLARE_WRITE8_MEMBER(blktiger_video_control_w); DECLARE_WRITE8_MEMBER(blktiger_video_enable_w); DECLARE_WRITE8_MEMBER(blktiger_screen_layout_w); + TILEMAP_MAPPER_MEMBER(bg8x4_scan); + TILEMAP_MAPPER_MEMBER(bg4x8_scan); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index bd2986be7e6..daf7ce1d595 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -42,6 +42,8 @@ public: DECLARE_WRITE16_MEMBER(blmbycar_vram_0_w); DECLARE_WRITE16_MEMBER(blmbycar_vram_1_w); DECLARE_DRIVER_INIT(blmbycar); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); }; diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index c2251f7e526..5940825e96e 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -21,6 +21,7 @@ public: DECLARE_WRITE8_MEMBER(blockade_videoram_w); DECLARE_WRITE8_MEMBER(blockade_env_on_w); DECLARE_WRITE8_MEMBER(blockade_env_off_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index ab9041e01ef..732f06ba4f6 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -22,6 +22,9 @@ public: DECLARE_WRITE16_MEMBER(bloodbro_bgvideoram_w); DECLARE_WRITE16_MEMBER(bloodbro_fgvideoram_w); DECLARE_WRITE16_MEMBER(bloodbro_txvideoram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index c48803fb79a..4e681054581 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -17,6 +17,7 @@ public: DECLARE_WRITE16_MEMBER(blstroid_halt_until_hblank_0_w); DECLARE_READ16_MEMBER(inputs_r); DECLARE_DRIVER_INIT(blstroid); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 33b42de87c2..f4446920a98 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -36,6 +36,7 @@ public: DECLARE_WRITE8_MEMBER(blueprnt_colorram_w); DECLARE_WRITE8_MEMBER(blueprnt_flipscreen_w); DECLARE_WRITE8_MEMBER(dipsw_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index 438b3d5194e..d4065e6ad72 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -39,6 +39,8 @@ public: DECLARE_WRITE8_MEMBER(bogeyman_colorram2_w); DECLARE_WRITE8_MEMBER(bogeyman_paletteram_w); DECLARE_WRITE8_MEMBER(bogeyman_colbank_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index 61b5917f1f7..c9544cee253 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -34,6 +34,8 @@ public: DECLARE_WRITE8_MEMBER(bombjack_colorram_w); DECLARE_WRITE8_MEMBER(bombjack_background_w); DECLARE_WRITE8_MEMBER(bombjack_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 028c787df5e..143da7110e0 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -39,6 +39,8 @@ public: DECLARE_WRITE8_MEMBER(brkthru_1800_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_DRIVER_INIT(brkthru); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index a02310799da..3a74df9efde 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -50,6 +50,7 @@ public: DECLARE_WRITE8_MEMBER(bsktball_led1_w); DECLARE_WRITE8_MEMBER(bsktball_led2_w); DECLARE_WRITE8_MEMBER(bsktball_videoram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 39d73204704..22e0988d322 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -67,6 +67,10 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_INPUT_CHANGED_MEMBER(tilt_pressed); DECLARE_DRIVER_INIT(bwing); + TILE_GET_INFO_MEMBER(get_fgtileinfo); + TILE_GET_INFO_MEMBER(get_bgtileinfo); + TILE_GET_INFO_MEMBER(get_charinfo); + TILEMAP_MAPPER_MEMBER(bwing_scan_cols); }; diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index df97ba8a678..d22eccd21d2 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -30,6 +30,8 @@ public: DECLARE_WRITE8_MEMBER(cabalbl_2_adpcm_w); DECLARE_DRIVER_INIT(cabal); DECLARE_DRIVER_INIT(cabalbl2); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index e74e76af0a9..d86603a9376 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -40,6 +40,7 @@ public: DECLARE_DRIVER_INIT(standard); DECLARE_DRIVER_INIT(comg080); DECLARE_DRIVER_INIT(jjpoker); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 0da2efee967..d25c9190e5a 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -33,6 +33,7 @@ public: DECLARE_READ8_MEMBER(canyon_options_r); DECLARE_WRITE8_MEMBER(canyon_led_w); DECLARE_WRITE8_MEMBER(canyon_videoram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 2727bc4bdd6..d89ce945e5b 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -27,6 +27,7 @@ public: DECLARE_WRITE8_MEMBER(carjmbre_bgcolor_w); DECLARE_WRITE8_MEMBER(carjmbre_8806_w); DECLARE_WRITE8_MEMBER(carjmbre_videoram_w); + TILE_GET_INFO_MEMBER(get_carjmbre_tile_info); }; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 88fefdf82f4..16a2de2fb55 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -181,6 +181,11 @@ public: DECLARE_DRIVER_INIT(sailormn); DECLARE_DRIVER_INIT(dfeveron); DECLARE_DRIVER_INIT(metmqstr); + TILE_GET_INFO_MEMBER(sailormn_get_tile_info_2); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_2); + TILE_GET_INFO_MEMBER(get_tile_info_3); }; /*----------- defined in video/cave.c -----------*/ diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index f35e3d40bff..d779be81752 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -43,6 +43,8 @@ public: DECLARE_WRITE8_MEMBER(cbasebal_scrollx_w); DECLARE_WRITE8_MEMBER(cbasebal_scrolly_w); DECLARE_DRIVER_INIT(cbasebal); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; /*----------- defined in video/cbasebal.c -----------*/ diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 6d49f9e5d2a..47c21af7004 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -52,6 +52,12 @@ public: DECLARE_DRIVER_INIT(cclimberj); DECLARE_DRIVER_INIT(cannonb2); DECLARE_DRIVER_INIT(cannonb); + TILE_GET_INFO_MEMBER(cclimber_get_pf_tile_info); + TILE_GET_INFO_MEMBER(swimmer_get_pf_tile_info); + TILE_GET_INFO_MEMBER(toprollr_get_pf_tile_info); + TILE_GET_INFO_MEMBER(cclimber_get_bs_tile_info); + TILE_GET_INFO_MEMBER(toprollr_get_bs_tile_info); + TILE_GET_INFO_MEMBER(toproller_get_bg_tile_info); }; diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 21123edf7cd..a1b937cebc3 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -63,6 +63,10 @@ public: DECLARE_WRITE8_MEMBER(mazeinv_paletteram_w); DECLARE_DRIVER_INIT(multiped); DECLARE_DRIVER_INIT(bullsdrt); + TILE_GET_INFO_MEMBER(centiped_get_tile_info); + TILE_GET_INFO_MEMBER(warlords_get_tile_info); + TILE_GET_INFO_MEMBER(milliped_get_tile_info); + TILE_GET_INFO_MEMBER(bullsdrt_get_tile_info); }; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index dae1cb66dac..d217ee0aa02 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -47,6 +47,7 @@ public: DECLARE_WRITE8_MEMBER(chaknpop_attrram_w); DECLARE_WRITE8_MEMBER(unknown_port_1_w); DECLARE_WRITE8_MEMBER(unknown_port_2_w); + TILE_GET_INFO_MEMBER(chaknpop_get_tx_tile_info); }; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index b23d1bca6d9..1e3e646a4e8 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -51,6 +51,8 @@ public: DECLARE_WRITE8_MEMBER(champbas_dac2_w); DECLARE_DRIVER_INIT(exctsccr); DECLARE_DRIVER_INIT(champbas); + TILE_GET_INFO_MEMBER(champbas_get_bg_tile_info); + TILE_GET_INFO_MEMBER(exctsccr_get_bg_tile_info); }; diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index b688362b55d..1ce8c404e30 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -31,6 +31,7 @@ public: DECLARE_WRITE8_MEMBER(cheekyms_port_40_w); DECLARE_WRITE8_MEMBER(cheekyms_port_80_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(cheekyms_get_tile_info); }; diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index b69181b04b5..a8656078967 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -32,6 +32,7 @@ public: DECLARE_DRIVER_INIT(circus); DECLARE_DRIVER_INIT(robotbwl); DECLARE_DRIVER_INIT(crash); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 88ac954b7c9..5b790f8f7d1 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -52,6 +52,7 @@ public: DECLARE_WRITE8_MEMBER(circusc_colorram_w); DECLARE_WRITE8_MEMBER(circusc_flipscreen_w); DECLARE_DRIVER_INIT(circusc); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index a29770218b6..5fcaf2e6538 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -73,6 +73,10 @@ public: DECLARE_DRIVER_INIT(cischeat); DECLARE_DRIVER_INIT(bigrun); DECLARE_DRIVER_INIT(f1gpstar); + TILEMAP_MAPPER_MEMBER(cischeat_scan_8x8); + TILEMAP_MAPPER_MEMBER(cischeat_scan_16x16); + TILE_GET_INFO_MEMBER(cischeat_get_scroll_tile_info_8x8); + TILE_GET_INFO_MEMBER(cischeat_get_scroll_tile_info_16x16); }; diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index fb049fdcd26..6dc5e0cd774 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -34,6 +34,9 @@ public: DECLARE_WRITE8_MEMBER(citycon_linecolor_w); DECLARE_WRITE8_MEMBER(citycon_background_w); DECLARE_DRIVER_INIT(citycon); + TILEMAP_MAPPER_MEMBER(citycon_scan); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 73c63d00a62..1561483cba0 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -38,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(cloak_flipscreen_w); void set_current_bitmap_videoram_pointer(); void adjust_xy(int offset); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 834cb465ad8..7e709f588e1 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -20,6 +20,11 @@ public: DECLARE_WRITE8_MEMBER(clshroad_vram_0_w); DECLARE_WRITE8_MEMBER(clshroad_vram_1_w); DECLARE_DRIVER_INIT(firebatl); + TILE_GET_INFO_MEMBER(get_tile_info_0a); + TILE_GET_INFO_MEMBER(get_tile_info_0b); + TILEMAP_MAPPER_MEMBER(tilemap_scan_rows_extra); + TILE_GET_INFO_MEMBER(get_tile_info_fb1); + TILE_GET_INFO_MEMBER(get_tile_info_1); }; diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 30ccb016151..18ed314b29f 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -66,6 +66,12 @@ public: DECLARE_WRITE8_MEMBER(combatsc_portA_w); DECLARE_WRITE8_MEMBER(combatscb_dac_w); DECLARE_DRIVER_INIT(combatsc); + TILE_GET_INFO_MEMBER(get_tile_info0); + TILE_GET_INFO_MEMBER(get_tile_info1); + TILE_GET_INFO_MEMBER(get_text_info); + TILE_GET_INFO_MEMBER(get_tile_info0_bootleg); + TILE_GET_INFO_MEMBER(get_tile_info1_bootleg); + TILE_GET_INFO_MEMBER(get_text_info_bootleg); }; diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 8bf37ca5e81..feae3d745c4 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -41,6 +41,8 @@ public: DECLARE_WRITE8_MEMBER(commando_c804_w); DECLARE_DRIVER_INIT(spaceinv); DECLARE_DRIVER_INIT(commando); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 19aa17ef242..0100d0e8bab 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -34,6 +34,9 @@ public: DECLARE_WRITE8_MEMBER(compgolf_scrollx_lo_w); DECLARE_WRITE8_MEMBER(compgolf_scrolly_lo_w); DECLARE_DRIVER_INIT(compgolf); + TILE_GET_INFO_MEMBER(get_text_info); + TILEMAP_MAPPER_MEMBER(back_scan); + TILE_GET_INFO_MEMBER(get_back_info); }; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index a7c46db7f58..00cbbcd1830 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -54,6 +54,9 @@ public: DECLARE_WRITE8_MEMBER(contra_text_cram_w); DECLARE_WRITE8_MEMBER(contra_K007121_ctrl_0_w); DECLARE_WRITE8_MEMBER(contra_K007121_ctrl_1_w); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index d465d820947..872626bd256 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -40,6 +40,8 @@ public: DECLARE_WRITE8_MEMBER(cop01_vreg_w); DECLARE_CUSTOM_INPUT_MEMBER(mightguy_area_r); DECLARE_DRIVER_INIT(mightguy); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index f0fa31d1da2..7f6f6d20add 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -192,6 +192,12 @@ public: DECLARE_DRIVER_INIT(ssf2tb); DECLARE_DRIVER_INIT(pzloop2); DECLARE_DRIVER_INIT(gigaman2); + TILEMAP_MAPPER_MEMBER(tilemap0_scan); + TILEMAP_MAPPER_MEMBER(tilemap1_scan); + TILEMAP_MAPPER_MEMBER(tilemap2_scan); + TILE_GET_INFO_MEMBER(get_tile0_info); + TILE_GET_INFO_MEMBER(get_tile1_info); + TILE_GET_INFO_MEMBER(get_tile2_info); }; /*----------- defined in drivers/cps1.c -----------*/ diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 6a9e9c90c57..ede36fec682 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -32,6 +32,7 @@ public: DECLARE_WRITE8_MEMBER(crbaloon_videoram_w); DECLARE_WRITE8_MEMBER(crbaloon_colorram_w); DECLARE_CUSTOM_INPUT_MEMBER(pc3092_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index d6c19a9b2c9..bdf5e4655ae 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -39,6 +39,8 @@ public: DECLARE_WRITE16_MEMBER(crospang_fg_videoram_w); DECLARE_WRITE16_MEMBER(crospang_bg_videoram_w); DECLARE_DRIVER_INIT(crospang); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index e6abefc790f..a69c5a3680b 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -45,6 +45,8 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(country_sndpending_r); DECLARE_DRIVER_INIT(crshrace2); DECLARE_DRIVER_INIT(crshrace); + TILE_GET_INFO_MEMBER(get_tile_info1); + TILE_GET_INFO_MEMBER(get_tile_info2); }; /*----------- defined in video/crshrace.c -----------*/ diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index a93fd036a4e..85b6b6cde0d 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -44,6 +44,10 @@ public: DECLARE_DRIVER_INIT(cyberbalt); DECLARE_DRIVER_INIT(cyberbal2p); DECLARE_DRIVER_INIT(cyberbal); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_alpha2_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); + TILE_GET_INFO_MEMBER(get_playfield2_tile_info); }; diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 786d3edea7f..ac8ec866773 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -86,6 +86,7 @@ public: DECLARE_WRITE8_MEMBER(darius_write_portB1); DECLARE_WRITE8_MEMBER(adpcm_data_w); DECLARE_DRIVER_INIT(darius); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 90a765207b0..c38cd9dbed2 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -22,6 +22,9 @@ public: DECLARE_WRITE8_MEMBER(darkmist_hw_w); DECLARE_DRIVER_INIT(darkmist); + TILE_GET_INFO_MEMBER(get_bgtile_info); + TILE_GET_INFO_MEMBER(get_fgtile_info); + TILE_GET_INFO_MEMBER(get_txttile_info); }; diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 977412686ac..447d9a66f6a 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -45,6 +45,8 @@ public: DECLARE_DRIVER_INIT(dbza); DECLARE_DRIVER_INIT(dbz); DECLARE_DRIVER_INIT(dbz2); + TILE_GET_INFO_MEMBER(get_dbz_bg2_tile_info); + TILE_GET_INFO_MEMBER(get_dbz_bg1_tile_info); }; diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index efaee34ea8b..8d8e042af61 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -32,6 +32,10 @@ public: DECLARE_WRITE16_MEMBER(dcon_midground_w); DECLARE_WRITE16_MEMBER(dcon_text_w); DECLARE_DRIVER_INIT(sdgndmps); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_fore_tile_info); + TILE_GET_INFO_MEMBER(get_mid_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 2df8e07820b..d05ca6dc7f3 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -42,6 +42,10 @@ public: DECLARE_READ8_MEMBER(dday_colorram_r); DECLARE_WRITE8_MEMBER(dday_sl_control_w); DECLARE_WRITE8_MEMBER(dday_control_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); + TILE_GET_INFO_MEMBER(get_sl_tile_info); }; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index c975c33a9d9..9dcf7df304c 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -89,6 +89,10 @@ public: DECLARE_DRIVER_INIT(ddragon); DECLARE_DRIVER_INIT(ddragon6809); DECLARE_DRIVER_INIT(chinagat); + TILEMAP_MAPPER_MEMBER(background_scan); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_16color_tile_info); }; diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index ab1c3e25d74..dba603e5321 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -42,6 +42,8 @@ public: DECLARE_WRITE16_MEMBER(ddragon3_bg_videoram_w); DECLARE_WRITE16_MEMBER(ddragon3_fg_videoram_w); DECLARE_WRITE8_MEMBER(oki_bankswitch_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index a3ff9ef3049..ecd830f4f3f 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -52,6 +52,9 @@ public: DECLARE_WRITE8_MEMBER(ddribble_bg_videoram_w); DECLARE_READ8_MEMBER(ddribble_vlm5030_busy_r); DECLARE_WRITE8_MEMBER(ddribble_vlm5030_ctrl_w); + TILEMAP_MAPPER_MEMBER(tilemap_scan); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; /*----------- defined in video/ddribble.c -----------*/ diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index b4df373e951..de856487cb0 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -26,6 +26,11 @@ public: DECLARE_WRITE16_MEMBER(deadang_bank_w); DECLARE_DRIVER_INIT(deadang); DECLARE_DRIVER_INIT(ghunter); + TILEMAP_MAPPER_MEMBER(bg_scan); + TILE_GET_INFO_MEMBER(get_pf3_tile_info); + TILE_GET_INFO_MEMBER(get_pf2_tile_info); + TILE_GET_INFO_MEMBER(get_pf1_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 49e30bc428d..ac943093b74 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -100,6 +100,16 @@ public: DECLARE_DRIVER_INIT(lastmisn); DECLARE_DRIVER_INIT(gondo); DECLARE_DRIVER_INIT(oscar); + TILE_GET_INFO_MEMBER(get_cobracom_fix_tile_info); + TILE_GET_INFO_MEMBER(get_ghostb_fix_tile_info); + TILE_GET_INFO_MEMBER(get_oscar_fix_tile_info); + TILEMAP_MAPPER_MEMBER(lastmisn_scan_rows); + TILE_GET_INFO_MEMBER(get_lastmisn_tile_info); + TILE_GET_INFO_MEMBER(get_lastmisn_fix_tile_info); + TILE_GET_INFO_MEMBER(get_srdarwin_fix_tile_info); + TILE_GET_INFO_MEMBER(get_srdarwin_tile_info); + TILE_GET_INFO_MEMBER(get_gondo_fix_tile_info); + TILE_GET_INFO_MEMBER(get_gondo_tile_info); }; /*----------- defined in video/dec8.c -----------*/ diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 9fd73f23f24..23748fb8504 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -53,6 +53,10 @@ public: DECLARE_WRITE16_MEMBER(deniam16c_oki_rom_bank_w); DECLARE_DRIVER_INIT(karianx); DECLARE_DRIVER_INIT(logicpro); + TILEMAP_MAPPER_MEMBER(scan_pages); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 638f325fe15..ec717b9b7d0 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -67,6 +67,7 @@ public: DECLARE_WRITE8_MEMBER(djboy_paletteram_w); DECLARE_DRIVER_INIT(djboy); DECLARE_DRIVER_INIT(djboyj); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index b6238b49215..a7796e43984 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -237,6 +237,8 @@ public: DECLARE_DRIVER_INIT(dkingjr); DECLARE_DRIVER_INIT(drakton); DECLARE_DRIVER_INIT(dkongx); + TILE_GET_INFO_MEMBER(dkong_bg_tile_info); + TILE_GET_INFO_MEMBER(radarscp1_bg_tile_info); }; /*----------- defined in video/dkong.c -----------*/ diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 946a7410b05..ecb9be5006f 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -41,6 +41,7 @@ public: DECLARE_WRITE8_MEMBER(docastle_flipscreen_on_w); DECLARE_READ8_MEMBER(idsoccer_adpcm_status_r); DECLARE_WRITE8_MEMBER(idsoccer_adpcm_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 50143bb9a4f..e36aab993ed 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -47,6 +47,7 @@ public: DECLARE_WRITE8_MEMBER(dogfgt_bgvideoram_w); DECLARE_WRITE8_MEMBER(dogfgt_scroll_w); DECLARE_WRITE8_MEMBER(dogfgt_1800_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index 898586db0e3..8f684f56d91 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -63,6 +63,12 @@ public: DECLARE_WRITE8_MEMBER(flytiger_ctrl_w); DECLARE_WRITE16_MEMBER(rshark_ctrl_w); DECLARE_READ8_MEMBER(unk_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_fg2_tile_info); + TILE_GET_INFO_MEMBER(flytiger_get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index e9426ca6aa9..a034243c607 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -48,6 +48,7 @@ public: DECLARE_READ8_MEMBER(dragrace_input_r); DECLARE_READ8_MEMBER(dragrace_steering_r); DECLARE_READ8_MEMBER(dragrace_scanline_r); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 74469b4f53f..3c1e466c1c9 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -57,6 +57,12 @@ public: DECLARE_WRITE16_MEMBER(drgnmst_bg_videoram_w); DECLARE_WRITE16_MEMBER(drgnmst_md_videoram_w); DECLARE_DRIVER_INIT(drgnmst); + TILE_GET_INFO_MEMBER(get_drgnmst_fg_tile_info); + TILE_GET_INFO_MEMBER(get_drgnmst_bg_tile_info); + TILE_GET_INFO_MEMBER(get_drgnmst_md_tile_info); + TILEMAP_MAPPER_MEMBER(drgnmst_fg_tilemap_scan_cols); + TILEMAP_MAPPER_MEMBER(drgnmst_md_tilemap_scan_cols); + TILEMAP_MAPPER_MEMBER(drgnmst_bg_tilemap_scan_cols); }; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 1e9408ddf4a..40df8d10bf5 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -28,6 +28,8 @@ public: DECLARE_WRITE8_MEMBER(nmi_enable_w); DECLARE_WRITE8_MEMBER(pcm_set_w); DECLARE_WRITE8_MEMBER(drmicro_videoram_w); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 050033aaaea..0b9ba79bde4 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -36,6 +36,9 @@ public: DECLARE_WRITE16_MEMBER(dynduke_gfxbank_w); DECLARE_WRITE16_MEMBER(dynduke_control_w); DECLARE_DRIVER_INIT(dynduke); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 844b266a186..344be12e3e6 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -24,6 +24,9 @@ public: DECLARE_DRIVER_INIT(klaxp); DECLARE_DRIVER_INIT(guts); DECLARE_DRIVER_INIT(eprom); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); + TILE_GET_INFO_MEMBER(guts_get_playfield_tile_info); }; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index b6c52fe6bf7..a51fcb18f56 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -94,6 +94,10 @@ public: DECLARE_DRIVER_INIT(gekisou); DECLARE_DRIVER_INIT(splndrbt); DECLARE_DRIVER_INIT(equites); + TILE_GET_INFO_MEMBER(equites_fg_info); + TILE_GET_INFO_MEMBER(splndrbt_fg_info); + TILE_GET_INFO_MEMBER(equites_bg_info); + TILE_GET_INFO_MEMBER(splndrbt_bg_info); }; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 3d128e20890..3c50bf8a111 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -56,6 +56,10 @@ public: DECLARE_WRITE16_MEMBER(esd16_vram_1_w); DECLARE_WRITE16_MEMBER(esd16_tilemap0_color_w); DECLARE_WRITE16_MEMBER(esd16_tilemap0_color_jumppop_w); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_0_16x16); + TILE_GET_INFO_MEMBER(get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_1_16x16); }; diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index cf2700ed259..39b3a0350a6 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -45,6 +45,7 @@ public: DECLARE_WRITE8_MEMBER(espial_attributeram_w); DECLARE_WRITE8_MEMBER(espial_scrollram_w); DECLARE_WRITE8_MEMBER(espial_flipscreen_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; /*----------- defined in video/espial.c -----------*/ diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 460cc953237..0ab9c5f1f60 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -39,6 +39,11 @@ public: DECLARE_WRITE8_MEMBER(exedexes_colorram_w); DECLARE_WRITE8_MEMBER(exedexes_c804_w); DECLARE_WRITE8_MEMBER(exedexes_gfxctrl_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); + TILEMAP_MAPPER_MEMBER(exedexes_bg_tilemap_scan); + TILEMAP_MAPPER_MEMBER(exedexes_fg_tilemap_scan); }; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 956ca9ba3aa..4a7586e5678 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -48,6 +48,8 @@ public: DECLARE_DRIVER_INIT(wexpressb); DECLARE_DRIVER_INIT(wexpressb2); DECLARE_DRIVER_INIT(wexpressb3); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index e70b361dd36..3feb3e3f32c 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -64,6 +64,9 @@ public: DECLARE_WRITE16_MEMBER(f1gp_fgscroll_w); DECLARE_WRITE16_MEMBER(f1gp_gfxctrl_w); DECLARE_WRITE16_MEMBER(f1gp2_gfxctrl_w); + TILE_GET_INFO_MEMBER(f1gp_get_roz_tile_info); + TILE_GET_INFO_MEMBER(f1gp2_get_roz_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; /*----------- defined in video/f1gp.c -----------*/ diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index 2b0cc641b38..b8826e37dab 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -53,6 +53,10 @@ public: DECLARE_DRIVER_INIT(boggy84); DECLARE_DRIVER_INIT(jumpcoas); DECLARE_DRIVER_INIT(boggy84b); + TILE_GET_INFO_MEMBER(get_tile_info); + TILE_GET_INFO_MEMBER(imago_get_tile_info_bg); + TILE_GET_INFO_MEMBER(imago_get_tile_info_fg); + TILE_GET_INFO_MEMBER(imago_get_tile_info_web); }; diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index 8923ad2efad..ba9aaef3ef9 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -43,6 +43,8 @@ public: DECLARE_WRITE8_MEMBER(fastlane_k1_k007232_w); DECLARE_READ8_MEMBER(fastlane_k2_k007232_r); DECLARE_WRITE8_MEMBER(fastlane_k2_k007232_w); + TILE_GET_INFO_MEMBER(get_tile_info0); + TILE_GET_INFO_MEMBER(get_tile_info1); }; diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index 134cd68715f..cb89c11962f 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -61,6 +61,7 @@ public: DECLARE_WRITE8_MEMBER(fcombat_videoreg_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_DRIVER_INIT(fcombat); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 73e86bb94de..468bb79d851 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -47,6 +47,8 @@ public: DECLARE_WRITE8_MEMBER(i8039_T0_w); DECLARE_WRITE8_MEMBER(finalizr_videoctrl_w); DECLARE_DRIVER_INIT(finalizr); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index e7ba83096f5..170f9f2834b 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -61,6 +61,11 @@ public: DECLARE_WRITE8_MEMBER(firetrap_bg2_scrollx_w); DECLARE_WRITE8_MEMBER(firetrap_bg2_scrolly_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILEMAP_MAPPER_MEMBER(get_fg_memory_offset); + TILEMAP_MAPPER_MEMBER(get_bg_memory_offset); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 26d605c7f22..a6628bb8e60 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -89,6 +89,12 @@ public: DECLARE_INPUT_CHANGED_MEMBER(service_mode_switch_changed); DECLARE_INPUT_CHANGED_MEMBER(firetrk_horn_changed); DECLARE_INPUT_CHANGED_MEMBER(gear_changed); + TILE_GET_INFO_MEMBER(firetrk_get_tile_info1); + TILE_GET_INFO_MEMBER(superbug_get_tile_info1); + TILE_GET_INFO_MEMBER(montecar_get_tile_info1); + TILE_GET_INFO_MEMBER(firetrk_get_tile_info2); + TILE_GET_INFO_MEMBER(superbug_get_tile_info2); + TILE_GET_INFO_MEMBER(montecar_get_tile_info2); }; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 5cd44dd95b4..cef7a5e50fa 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -55,6 +55,9 @@ public: DECLARE_DRIVER_INIT(fitfight); DECLARE_DRIVER_INIT(histryma); DECLARE_DRIVER_INIT(bbprot); + TILE_GET_INFO_MEMBER(get_fof_bak_tile_info); + TILE_GET_INFO_MEMBER(get_fof_mid_tile_info); + TILE_GET_INFO_MEMBER(get_fof_txt_tile_info); }; diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index 9337ab224f8..c4d1b36a7de 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE8_MEMBER(multiply_w); DECLARE_WRITE8_MEMBER(flkatck_k007121_w); DECLARE_WRITE8_MEMBER(flkatck_k007121_regs_w); + TILE_GET_INFO_MEMBER(get_tile_info_A); + TILE_GET_INFO_MEMBER(get_tile_info_B); }; diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index f7626e4f7aa..d616c8c64d1 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -35,6 +35,9 @@ public: DECLARE_WRITE8_MEMBER(flower_bg1ram_w); DECLARE_WRITE8_MEMBER(flower_flipscreen_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(get_bg0_tile_info); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index f6614b27f5f..acc1e5f0ae9 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -104,6 +104,9 @@ public: DECLARE_WRITE8_MEMBER(sound_control_1_w); DECLARE_WRITE8_MEMBER(sound_control_2_w); DECLARE_WRITE8_MEMBER(sound_control_3_w); + TILE_GET_INFO_MEMBER(get_tile_info); + TILE_GET_INFO_MEMBER(victnine_get_tile_info); + TILE_GET_INFO_MEMBER(get_rumba_tile_info); }; diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index 6fa01c56ba2..64f105a38e0 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -31,6 +31,7 @@ public: DECLARE_WRITE16_MEMBER(foodf_paletteram_w); void foodf_set_flip(int flip); DECLARE_READ8_MEMBER(pot_r); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index f57503c4c13..883e4ebe195 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -41,6 +41,7 @@ public: DECLARE_DRIVER_INIT(gigas); DECLARE_DRIVER_INIT(gigasb); DECLARE_DRIVER_INIT(pbillrds); + TILE_GET_INFO_MEMBER(get_freek_tile_info); }; diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 5ba3c8c91f1..e5434ecddbc 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -83,6 +83,20 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(subcpu_nmi_r); DECLARE_DRIVER_INIT(fromanc4); DECLARE_DRIVER_INIT(fromanc2); + TILE_GET_INFO_MEMBER(fromanc2_get_v0_l0_tile_info); + TILE_GET_INFO_MEMBER(fromanc2_get_v0_l1_tile_info); + TILE_GET_INFO_MEMBER(fromanc2_get_v0_l2_tile_info); + TILE_GET_INFO_MEMBER(fromanc2_get_v0_l3_tile_info); + TILE_GET_INFO_MEMBER(fromanc2_get_v1_l0_tile_info); + TILE_GET_INFO_MEMBER(fromanc2_get_v1_l1_tile_info); + TILE_GET_INFO_MEMBER(fromanc2_get_v1_l2_tile_info); + TILE_GET_INFO_MEMBER(fromanc2_get_v1_l3_tile_info); + TILE_GET_INFO_MEMBER(fromancr_get_v0_l0_tile_info); + TILE_GET_INFO_MEMBER(fromancr_get_v0_l1_tile_info); + TILE_GET_INFO_MEMBER(fromancr_get_v0_l2_tile_info); + TILE_GET_INFO_MEMBER(fromancr_get_v1_l0_tile_info); + TILE_GET_INFO_MEMBER(fromancr_get_v1_l1_tile_info); + TILE_GET_INFO_MEMBER(fromancr_get_v1_l2_tile_info); }; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index a5cea25f1c3..979bd51a8d9 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -72,6 +72,10 @@ public: DECLARE_WRITE8_MEMBER(fromance_adpcm_reset_w); DECLARE_DRIVER_INIT(pipedrm); DECLARE_DRIVER_INIT(hatris); + TILE_GET_INFO_MEMBER(get_fromance_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fromance_fg_tile_info); + TILE_GET_INFO_MEMBER(get_nekkyoku_bg_tile_info); + TILE_GET_INFO_MEMBER(get_nekkyoku_fg_tile_info); }; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 805c9e510b2..63f16ea8c54 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -22,6 +22,8 @@ public: DECLARE_WRITE8_MEMBER(funkybee_gfx_bank_w); DECLARE_WRITE8_MEMBER(funkybee_scroll_w); DECLARE_WRITE8_MEMBER(funkybee_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILEMAP_MAPPER_MEMBER(funkybee_tilemap_scan); }; diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 4cf06bd34ff..b0cc5ed5aa4 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -25,6 +25,7 @@ public: DECLARE_DRIVER_INIT(soccernw); DECLARE_DRIVER_INIT(tabblue); DECLARE_DRIVER_INIT(magicd2a); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index e5f3a1ea0d2..dadff92fa29 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -36,6 +36,10 @@ public: DECLARE_WRITE16_MEMBER(fuuki16_vram_2_w); DECLARE_WRITE16_MEMBER(fuuki16_vram_3_w); DECLARE_WRITE8_MEMBER(fuuki16_oki_banking_w); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_2); + TILE_GET_INFO_MEMBER(get_tile_info_3); }; diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 5915ecaec3e..28759d52574 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -54,6 +54,10 @@ public: DECLARE_WRITE32_MEMBER(fuuki32_vram_1_w); DECLARE_WRITE32_MEMBER(fuuki32_vram_2_w); DECLARE_WRITE32_MEMBER(fuuki32_vram_3_w); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_2); + TILE_GET_INFO_MEMBER(get_tile_info_3); }; diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index a0527898506..1dc9f97e6c5 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -34,6 +34,8 @@ public: DECLARE_WRITE16_MEMBER(thoop_vram_encrypted_w); DECLARE_WRITE16_MEMBER(thoop_encrypted_w); DECLARE_WRITE16_MEMBER(gaelco_vram_w); + TILE_GET_INFO_MEMBER(get_tile_info_gaelco_screen0); + TILE_GET_INFO_MEMBER(get_tile_info_gaelco_screen1); }; diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 7c03edf82be..7129cdd9c59 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -43,6 +43,10 @@ public: DECLARE_DRIVER_INIT(snowboar); DECLARE_DRIVER_INIT(alighunt); DECLARE_DRIVER_INIT(bang); + TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen0); + TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1); + TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen0_dual); + TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1_dual); }; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 8e90ff1be4d..e1a8aaa6e04 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -73,6 +73,10 @@ public: DECLARE_DRIVER_INIT(mastninj); DECLARE_DRIVER_INIT(shadoww); DECLARE_DRIVER_INIT(wildfang); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info_raiga); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index ec30b31df32..9b59ad80c9f 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -50,6 +50,8 @@ public: DECLARE_READ8_MEMBER(custom_mod_r); DECLARE_DRIVER_INIT(galaga); DECLARE_DRIVER_INIT(gatsbee); + TILEMAP_MAPPER_MEMBER(tilemap_scan); + TILE_GET_INFO_MEMBER(get_tile_info); }; class xevious_state : public galaga_state diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h index dd4cbe333ba..ce3eeece749 100644 --- a/src/mame/includes/galaxia.h +++ b/src/mame/includes/galaxia.h @@ -20,6 +20,8 @@ public: DECLARE_WRITE8_MEMBER(galaxia_dataport_w); DECLARE_READ8_MEMBER(galaxia_collision_r); DECLARE_READ8_MEMBER(galaxia_collision_clear); + TILE_GET_INFO_MEMBER(get_galaxia_bg_tile_info); + TILE_GET_INFO_MEMBER(get_astrowar_bg_tile_info); }; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index cfecf607b99..bb02c65fb49 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -218,6 +218,7 @@ public: DECLARE_DRIVER_INIT(superbon); DECLARE_DRIVER_INIT(calipso); DECLARE_DRIVER_INIT(moonwar); + TILE_GET_INFO_MEMBER(bg_get_tile_info); }; diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 6df70081c5d..86a738eb690 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -137,6 +137,11 @@ public: DECLARE_DRIVER_INIT(bullsdrtg); DECLARE_DRIVER_INIT(ladybugg); DECLARE_DRIVER_INIT(4in1); + TILE_GET_INFO_MEMBER(drivfrcg_get_tile_info); + TILE_GET_INFO_MEMBER(racknrol_get_tile_info); + TILE_GET_INFO_MEMBER(dambustr_get_tile_info2); + TILE_GET_INFO_MEMBER(get_tile_info); + TILE_GET_INFO_MEMBER(rockclim_get_tile_info); }; diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 119b512fb1b..62980846ab9 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -45,6 +45,10 @@ public: DECLARE_WRITE8_MEMBER(galivan_scrollx_w); DECLARE_WRITE8_MEMBER(galivan_scrolly_w); DECLARE_DRIVER_INIT(youmab); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); + TILE_GET_INFO_MEMBER(ninjemak_get_bg_tile_info); + TILE_GET_INFO_MEMBER(ninjemak_get_tx_tile_info); }; diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index ec8329cf00e..b5631c5f7c4 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -40,6 +40,8 @@ public: DECLARE_WRITE8_MEMBER(out_lamps0); DECLARE_WRITE8_MEMBER(out_lamps1); DECLARE_DRIVER_INIT(gaplus); + TILEMAP_MAPPER_MEMBER(tilemap_scan); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index 680075d941c..64abb10d69d 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -10,6 +10,7 @@ public: DECLARE_WRITE8_MEMBER(output_port_0_w); DECLARE_WRITE8_MEMBER(gat_videoram_w); DECLARE_WRITE8_MEMBER(output_port_1_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index 9aa3206b6cc..1916710e860 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -25,6 +25,8 @@ public: DECLARE_DRIVER_INIT(gaunt2p); DECLARE_DRIVER_INIT(gauntlet); DECLARE_DRIVER_INIT(vindctr2); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 389389c9ecd..c326ab20d1b 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -50,6 +50,7 @@ public: DECLARE_WRITE8_MEMBER(gberet_sprite_bank_w); DECLARE_WRITE8_MEMBER(gberetb_scroll_w); DECLARE_DRIVER_INIT(mrgoemon); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 26f160857fb..862849482e9 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -52,6 +52,9 @@ public: DECLARE_WRITE16_MEMBER(gcpinbal_tilemaps_word_w); DECLARE_READ16_MEMBER(gcpinbal_ctrl_word_r); DECLARE_WRITE16_MEMBER(gcpinbal_ctrl_word_w); + TILE_GET_INFO_MEMBER(get_bg0_tile_info); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 46cd65fbc55..cd25bbcfb7b 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -39,6 +39,9 @@ public: DECLARE_WRITE16_MEMBER(ginganin_vregs16_w); DECLARE_WRITE8_MEMBER(ptm_irq); DECLARE_DRIVER_INIT(ginganin); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_txt_tile_info); }; diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 93a7b45a6b7..315fdeea8f2 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -58,6 +58,8 @@ public: DECLARE_READ8_MEMBER(f1_r); DECLARE_DRIVER_INIT(gladiatr); DECLARE_DRIVER_INIT(ppking); + TILE_GET_INFO_MEMBER(bg_get_tile_info); + TILE_GET_INFO_MEMBER(fg_get_tile_info); }; /*----------- defined in video/gladiatr.c -----------*/ diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index c69ab66969a..30d0f0f4f25 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -41,6 +41,8 @@ public: DECLARE_WRITE16_MEMBER( glass_mainram_w ); DECLARE_DRIVER_INIT(glass); + TILE_GET_INFO_MEMBER(get_tile_info_glass_screen0); + TILE_GET_INFO_MEMBER(get_tile_info_glass_screen1); }; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index cf041554961..59ae789c049 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -37,6 +37,8 @@ public: DECLARE_WRITE8_MEMBER(gng_bgscrolly_w); DECLARE_WRITE8_MEMBER(gng_flipscreen_w); DECLARE_DRIVER_INIT(diamond); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 7463ba05151..497e53ba81d 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -45,6 +45,9 @@ public: DECLARE_WRITE16_MEMBER(goal92_background_w); DECLARE_WRITE16_MEMBER(goal92_foreground_w); DECLARE_WRITE8_MEMBER(adpcm_control_w); + TILE_GET_INFO_MEMBER(get_text_tile_info); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_fore_tile_info); }; diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 6e2e8e8d44a..d7dd720f01b 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -42,6 +42,8 @@ public: DECLARE_WRITE8_MEMBER(goindol_fg_videoram_w); DECLARE_WRITE8_MEMBER(goindol_bg_videoram_w); DECLARE_DRIVER_INIT(goindol); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 2816601ef4a..3d51d8db658 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -123,6 +123,15 @@ public: DECLARE_DRIVER_INIT(rp36c3); DECLARE_DRIVER_INIT(magoddsc); DECLARE_DRIVER_INIT(nfb96_c1); + TILE_GET_INFO_MEMBER(get_goldstar_fg_tile_info); + TILE_GET_INFO_MEMBER(get_magical_fg_tile_info); + TILE_GET_INFO_MEMBER(get_cherrym_fg_tile_info); + TILE_GET_INFO_MEMBER(get_goldstar_reel1_tile_info); + TILE_GET_INFO_MEMBER(get_goldstar_reel2_tile_info); + TILE_GET_INFO_MEMBER(get_goldstar_reel3_tile_info); + TILE_GET_INFO_MEMBER(get_unkch_reel1_tile_info); + TILE_GET_INFO_MEMBER(get_unkch_reel2_tile_info); + TILE_GET_INFO_MEMBER(get_unkch_reel3_tile_info); }; diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index d8a8ee2db06..fe93f8a22f0 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -22,6 +22,7 @@ public: DECLARE_WRITE8_MEMBER(gomoku_bgram_w); DECLARE_WRITE8_MEMBER(gomoku_flipscreen_w); DECLARE_WRITE8_MEMBER(gomoku_bg_dispsw_w); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index ed1672a09bb..a18a56b2928 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -35,6 +35,9 @@ public: DECLARE_WRITE16_MEMBER(gotcha_gfxbank_w); DECLARE_WRITE16_MEMBER(gotcha_scroll_w); DECLARE_WRITE16_MEMBER(gotcha_oki_bank_w); + TILEMAP_MAPPER_MEMBER(gotcha_tilemap_scan); + TILE_GET_INFO_MEMBER(fg_get_tile_info); + TILE_GET_INFO_MEMBER(bg_get_tile_info); }; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 8c457419a5c..977492f609f 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -295,6 +295,8 @@ public: DECLARE_DRIVER_INIT(vidvince); DECLARE_DRIVER_INIT(ramtiles); DECLARE_DRIVER_INIT(stooges); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_screwloo_bg_tile_info); }; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index 3ba41222ee0..33278051bea 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -31,6 +31,8 @@ public: DECLARE_WRITE8_MEMBER(gotya_colorram_w); DECLARE_WRITE8_MEMBER(gotya_video_control_w); DECLARE_WRITE8_MEMBER(gotya_soundlatch_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILEMAP_MAPPER_MEMBER(tilemap_scan_rows_thehand); }; diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 1f762687e78..6ce5df21057 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -63,6 +63,11 @@ public: DECLARE_WRITE8_MEMBER(grchamp_portB_0_w); DECLARE_WRITE8_MEMBER(grchamp_portA_2_w); DECLARE_WRITE8_MEMBER(grchamp_portB_2_w); + TILE_GET_INFO_MEMBER(get_text_tile_info); + TILE_GET_INFO_MEMBER(get_left_tile_info); + TILE_GET_INFO_MEMBER(get_right_tile_info); + TILE_GET_INFO_MEMBER(get_center_tile_info); + TILEMAP_MAPPER_MEMBER(get_memory_offset); }; /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 1959fc00b32..92b7045b88b 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -98,6 +98,9 @@ public: DECLARE_DRIVER_INIT(twrldc94a); DECLARE_DRIVER_INIT(vgoalsoc); DECLARE_DRIVER_INIT(twrldc94); + TILE_GET_INFO_MEMBER(VS920A_get_tile_info); + TILE_GET_INFO_MEMBER(MB60553_get_tile_info); + TILEMAP_MAPPER_MEMBER(twc94_scan); }; diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index b8fc9ff6dd4..0ae68b1bd83 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -39,6 +39,7 @@ public: DECLARE_WRITE8_MEMBER(gsword_adpcm_data_w); DECLARE_DRIVER_INIT(gsword); DECLARE_DRIVER_INIT(gsword2); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 3effd99a0bd..2771f40f265 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -22,6 +22,8 @@ public: tilemap_t *m_fg_tilemap; DECLARE_WRITE16_MEMBER(gumbo_bg_videoram_w); DECLARE_WRITE16_MEMBER(gumbo_fg_videoram_w); + TILE_GET_INFO_MEMBER(get_gumbo_bg_tile_info); + TILE_GET_INFO_MEMBER(get_gumbo_fg_tile_info); }; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index afaf99349a9..959cf9ae801 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -35,6 +35,9 @@ public: DECLARE_WRITE8_MEMBER(gundealr_fg_scroll_w); DECLARE_WRITE8_MEMBER(yamyam_fg_scroll_w); DECLARE_WRITE8_MEMBER(gundealr_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILEMAP_MAPPER_MEMBER(gundealr_scan); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 521bb8a7f80..2c93589e431 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -34,6 +34,8 @@ public: DECLARE_WRITE8_MEMBER(gunsmoke_colorram_w); DECLARE_WRITE8_MEMBER(gunsmoke_c804_w); DECLARE_WRITE8_MEMBER(gunsmoke_d806_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index d818380a10b..1dd7b6189c2 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -49,6 +49,7 @@ public: DECLARE_WRITE8_MEMBER(gyruss_filter0_w); DECLARE_WRITE8_MEMBER(gyruss_filter1_w); DECLARE_DRIVER_INIT(gyruss); + TILE_GET_INFO_MEMBER(gyruss_get_tile_info); }; diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index dd0c29eb9dd..d80fe7fa55e 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(hanaawas_inputs_mux_w); DECLARE_WRITE8_MEMBER(hanaawas_videoram_w); DECLARE_WRITE8_MEMBER(hanaawas_colorram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index c8626dea94f..3544a34da42 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -48,6 +48,9 @@ public: DECLARE_WRITE8_MEMBER(hcastle_pf1_control_w); DECLARE_WRITE8_MEMBER(hcastle_pf2_control_w); DECLARE_WRITE8_MEMBER(sound_bank_w); + TILEMAP_MAPPER_MEMBER(tilemap_scan); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 21cd6080210..4a5e176be10 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -19,6 +19,8 @@ public: DECLARE_WRITE8_MEMBER(hexion_gfxrom_select_w); DECLARE_WRITE_LINE_MEMBER(hexion_irq_ack_w); DECLARE_WRITE_LINE_MEMBER(hexion_nmi_ack_w); + TILE_GET_INFO_MEMBER(get_tile_info0); + TILE_GET_INFO_MEMBER(get_tile_info1); }; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 45158c6d5a3..dde1e7b2278 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -23,6 +23,7 @@ public: DECLARE_WRITE8_MEMBER(higemaru_videoram_w); DECLARE_WRITE8_MEMBER(higemaru_colorram_w); DECLARE_WRITE8_MEMBER(higemaru_c800_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index b4e34abaffd..78bc85656bb 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -29,6 +29,7 @@ public: DECLARE_WRITE8_MEMBER(himesiki_bg_ram_w); DECLARE_WRITE8_MEMBER(himesiki_scrollx_w); DECLARE_WRITE8_MEMBER(himesiki_flip_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index 0e6d19af14f..a332aeed642 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -34,6 +34,7 @@ public: DECLARE_READ8_MEMBER(hitme_port_3_r); DECLARE_WRITE8_MEMBER(output_port_0_w); DECLARE_WRITE8_MEMBER(output_port_1_w); + TILE_GET_INFO_MEMBER(get_hitme_tile_info); }; diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index dca6945d858..505d10e3e7e 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -175,6 +175,14 @@ public: void m_set_irq(UINT32 irq_vector); UINT32 m_irq_pending; int m_irq_level; + TILE_GET_INFO_MEMBER(get_hng64_tile0_8x8_info); + TILE_GET_INFO_MEMBER(get_hng64_tile0_16x16_info); + TILE_GET_INFO_MEMBER(get_hng64_tile1_8x8_info); + TILE_GET_INFO_MEMBER(get_hng64_tile1_16x16_info); + TILE_GET_INFO_MEMBER(get_hng64_tile2_8x8_info); + TILE_GET_INFO_MEMBER(get_hng64_tile2_16x16_info); + TILE_GET_INFO_MEMBER(get_hng64_tile3_8x8_info); + TILE_GET_INFO_MEMBER(get_hng64_tile3_16x16_info); }; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index ada51b080a5..41efe94501d 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -27,6 +27,8 @@ public: DECLARE_WRITE8_MEMBER(holeland_pal_offs_w); DECLARE_WRITE8_MEMBER(holeland_scroll_w); DECLARE_WRITE8_MEMBER(holeland_flipscreen_w); + TILE_GET_INFO_MEMBER(holeland_get_tile_info); + TILE_GET_INFO_MEMBER(crzrally_get_tile_info); }; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 9371740906e..2860aedce15 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -81,6 +81,30 @@ public: DECLARE_DRIVER_INIT(jogakuen); DECLARE_DRIVER_INIT(battlcry); DECLARE_DRIVER_INIT(mirderby); + TILE_GET_INFO_MEMBER(mrokumei_get_info0_0); + TILE_GET_INFO_MEMBER(mrokumei_get_info1_0); + TILE_GET_INFO_MEMBER(mrokumei_get_info0_1); + TILE_GET_INFO_MEMBER(mrokumei_get_info1_1); + TILE_GET_INFO_MEMBER(reikaids_get_info0_0); + TILE_GET_INFO_MEMBER(reikaids_get_info1_0); + TILE_GET_INFO_MEMBER(reikaids_get_info0_1); + TILE_GET_INFO_MEMBER(reikaids_get_info1_1); + TILE_GET_INFO_MEMBER(reikaids_get_info0_2); + TILE_GET_INFO_MEMBER(reikaids_get_info1_2); + TILE_GET_INFO_MEMBER(reikaids_get_info0_3); + TILE_GET_INFO_MEMBER(reikaids_get_info1_3); + TILE_GET_INFO_MEMBER(pteacher_get_info0_0); + TILE_GET_INFO_MEMBER(pteacher_get_info1_0); + TILE_GET_INFO_MEMBER(pteacher_get_info0_1); + TILE_GET_INFO_MEMBER(pteacher_get_info1_1); + TILE_GET_INFO_MEMBER(lemnangl_get_info0_0); + TILE_GET_INFO_MEMBER(lemnangl_get_info1_0); + TILE_GET_INFO_MEMBER(lemnangl_get_info0_1); + TILE_GET_INFO_MEMBER(lemnangl_get_info1_1); + TILE_GET_INFO_MEMBER(mirderby_get_info0_0); + TILE_GET_INFO_MEMBER(mirderby_get_info1_0); + TILE_GET_INFO_MEMBER(mirderby_get_info0_1); + TILE_GET_INFO_MEMBER(mirderby_get_info1_1); }; diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index c946029aeb4..71daf6050a8 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -32,6 +32,7 @@ public: DECLARE_WRITE8_MEMBER(pa_w); DECLARE_WRITE8_MEMBER(pb_w); DECLARE_WRITE8_MEMBER(pc_w); + TILE_GET_INFO_MEMBER(get_homerun_tile_info); }; diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index 0436039d88a..7af7682d6cf 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -37,6 +37,8 @@ public: UINT8 m_SN76496_latch; DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(space, offset, m_SN76496_latch); }; + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(roadf_get_bg_tile_info); }; /*----------- defined in video/hyperspt.c -----------*/ diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 5ba855238df..cd3c82b42f1 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -80,6 +80,9 @@ public: void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask ); DECLARE_DRIVER_INIT(magerror); DECLARE_DRIVER_INIT(hyprduel); + TILE_GET_INFO_MEMBER(get_tile_info_0_8bit); + TILE_GET_INFO_MEMBER(get_tile_info_1_8bit); + TILE_GET_INFO_MEMBER(get_tile_info_2_8bit); }; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index dc9c7bec0bc..b8acfceb1fd 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -44,6 +44,8 @@ public: DECLARE_READ16_MEMBER(inufuku_tx_videoram_r); DECLARE_WRITE16_MEMBER(inufuku_tx_videoram_w); DECLARE_CUSTOM_INPUT_MEMBER(soundflag_r); + TILE_GET_INFO_MEMBER(get_inufuku_bg_tile_info); + TILE_GET_INFO_MEMBER(get_inufuku_tx_tile_info); }; diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 30660e42cb4..697784b804d 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -26,6 +26,8 @@ public: DECLARE_WRITE8_MEMBER(port_C_w); DECLARE_DRIVER_INIT(grndtour); DECLARE_DRIVER_INIT(iqblock); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 199707152a0..a4d6928f0ea 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -41,6 +41,8 @@ public: DECLARE_WRITE8_MEMBER(ironhors_flipscreen_w); DECLARE_WRITE8_MEMBER(ironhors_filter_w); DECLARE_READ8_MEMBER(farwest_soundlatch_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(farwest_get_bg_tile_info); }; diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index 31f93b050f6..fcad472a7ea 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -47,6 +47,9 @@ public: DECLARE_DRIVER_INIT(treahunt); DECLARE_DRIVER_INIT(loverboy); DECLARE_DRIVER_INIT(jack); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILEMAP_MAPPER_MEMBER(tilemap_scan_cols_flipy); + TILE_GET_INFO_MEMBER(joinem_get_bg_tile_info); }; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 532781fd2f0..6354464e9c5 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -37,6 +37,7 @@ public: DECLARE_WRITE8_MEMBER(jackal_zram_w); DECLARE_WRITE8_MEMBER(jackal_voram_w); DECLARE_WRITE8_MEMBER(jackal_spriteram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 92c236002e2..78d028a8008 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -37,6 +37,7 @@ public: DECLARE_READ8_MEMBER(jailbrek_speech_r); DECLARE_WRITE8_MEMBER(jailbrek_speech_w); DECLARE_DRIVER_INIT(jailbrek); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 69af2b45056..66594f1b66f 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -51,6 +51,7 @@ public: DECLARE_DRIVER_INIT(chelnovu); DECLARE_DRIVER_INIT(chelnovj); DECLARE_DRIVER_INIT(chelnov); + TILE_GET_INFO_MEMBER(get_fix_tile_info); }; enum { diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 290d49c3648..af5a771ade3 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -42,6 +42,7 @@ public: DECLARE_WRITE8_MEMBER(sound_control_w); DECLARE_DRIVER_INIT(kchampvs); DECLARE_DRIVER_INIT(kchampvs2); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 56e3a8a2305..82c1aa8167d 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -63,6 +63,13 @@ public: DECLARE_WRITE16_MEMBER(kickgoal_snd_w); DECLARE_WRITE16_MEMBER(actionhw_snd_w); DECLARE_DRIVER_INIT(kickgoal); + TILE_GET_INFO_MEMBER(get_kickgoal_fg_tile_info); + TILE_GET_INFO_MEMBER(get_kickgoal_bg_tile_info); + TILE_GET_INFO_MEMBER(get_kickgoal_bg2_tile_info); + TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksfg); + TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksbg); + TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksbg2); + TILEMAP_MAPPER_MEMBER(tilemap_scan_actionhwbg2); }; diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 3bc1412d0d2..a0178164a6f 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -47,6 +47,9 @@ public: DECLARE_WRITE8_MEMBER(kingofb_f800_w); DECLARE_DRIVER_INIT(ringkingw); DECLARE_DRIVER_INIT(ringking3); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(ringking_get_bg_tile_info); }; diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h index 177b3a648a4..3861a147c24 100644 --- a/src/mame/includes/klax.h +++ b/src/mame/includes/klax.h @@ -12,6 +12,7 @@ public: klax_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag) { } DECLARE_WRITE16_MEMBER(interrupt_ack_w); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index 0e53fff9817..82d2e28b116 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -40,6 +40,7 @@ public: DECLARE_READ8_MEMBER(m6803_port1_r); DECLARE_READ8_MEMBER(m6803_port2_r); DECLARE_WRITE8_MEMBER(unused_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 6878c8ea526..70832be0224 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -44,6 +44,11 @@ public: DECLARE_WRITE32_MEMBER(konamigx_t4_psacmap_w); DECLARE_CUSTOM_INPUT_MEMBER(gx_rdport1_3_r); DECLARE_DRIVER_INIT(konamigx); + TILE_GET_INFO_MEMBER(get_gx_psac_tile_info); + TILE_GET_INFO_MEMBER(get_gx_psac3_tile_info); + TILE_GET_INFO_MEMBER(get_gx_psac3_alt_tile_info); + TILE_GET_INFO_MEMBER(get_gx_psac1a_tile_info); + TILE_GET_INFO_MEMBER(get_gx_psac1b_tile_info); }; diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 005e8bbcc27..7c7009917c3 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -36,6 +36,8 @@ public: DECLARE_WRITE8_MEMBER(kopunch_gfxbank_w); DECLARE_INPUT_CHANGED_MEMBER(left_coin_inserted); DECLARE_INPUT_CHANGED_MEMBER(right_coin_inserted); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; /*----------- defined in video/kopunch.c -----------*/ diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 7e3b42fe8f2..658281bc7c9 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE8_MEMBER(dummy1_w); DECLARE_WRITE8_MEMBER(dummy2_w); DECLARE_WRITE8_MEMBER(dummy3_w); + TILE_GET_INFO_MEMBER(get_ksayakyu_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index 5b7ad9dcda5..f39d8092a06 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -53,6 +53,8 @@ public: DECLARE_WRITE8_MEMBER(kyugo_flipscreen_w); DECLARE_DRIVER_INIT(srdmissn); DECLARE_DRIVER_INIT(gyrodine); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 4f05ef9df19..252166ba374 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -36,6 +36,8 @@ public: DECLARE_WRITE8_MEMBER(labyrunr_bankswitch_w); DECLARE_WRITE8_MEMBER(labyrunr_vram1_w); DECLARE_WRITE8_MEMBER(labyrunr_vram2_w); + TILE_GET_INFO_MEMBER(get_tile_info0); + TILE_GET_INFO_MEMBER(get_tile_info1); }; diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index cad95a81aa7..55e1364f191 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -62,6 +62,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(right_coin_inserted); DECLARE_DRIVER_INIT(dorodon); DECLARE_DRIVER_INIT(redclash); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_grid_tile_info); }; diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 54c716be31f..9f2f28316e0 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -52,6 +52,7 @@ public: DECLARE_READ8_MEMBER(ladyfrog_scrlram_r); DECLARE_WRITE8_MEMBER(ladyfrog_scrlram_w); DECLARE_WRITE8_MEMBER(unk_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index d5c545ff820..b11c5c7ebeb 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -77,6 +77,7 @@ public: DECLARE_READ8_MEMBER(zaccaria_port0a_r); DECLARE_WRITE8_MEMBER(zaccaria_port0a_w); DECLARE_WRITE8_MEMBER(zaccaria_port0b_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 069880fb2f0..004afc6a215 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -54,6 +54,9 @@ public: DECLARE_WRITE8_MEMBER(wwjgtin_video_control_w); DECLARE_WRITE8_MEMBER(pinbo_video_control_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(lasso_get_bg_tile_info); + TILE_GET_INFO_MEMBER(wwjgtin_get_track_tile_info); + TILE_GET_INFO_MEMBER(pinbo_get_bg_tile_info); }; diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 49e86518180..16e14f5e1dc 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -48,6 +48,11 @@ public: DECLARE_WRITE16_MEMBER(madgear_scroll1_w); DECLARE_WRITE16_MEMBER(madgear_scroll2_w); DECLARE_WRITE16_MEMBER(lastduel_palette_word_w); + TILE_GET_INFO_MEMBER(ld_get_bg_tile_info); + TILE_GET_INFO_MEMBER(ld_get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_fix_info); }; /*----------- defined in video/lastduel.c -----------*/ diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index 396f602fce0..c2515d2892d 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -37,6 +37,13 @@ public: DECLARE_DRIVER_INIT(legiongfx); DECLARE_DRIVER_INIT(cupsoc); DECLARE_DRIVER_INIT(denjinmk); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_mid_tile_info); + TILE_GET_INFO_MEMBER(get_mid_tile_info_denji); + TILE_GET_INFO_MEMBER(get_mid_tile_info_cupsoc); + TILE_GET_INFO_MEMBER(get_fore_tile_info); + TILE_GET_INFO_MEMBER(get_fore_tile_info_denji); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 8e625ad34b8..f6d408a794e 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -40,6 +40,7 @@ public: DECLARE_WRITE16_MEMBER(lemmings_pixel_0_w); DECLARE_WRITE16_MEMBER(lemmings_pixel_1_w); DECLARE_WRITE16_MEMBER(lemmings_vram_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index f9c2134d844..e155f373d95 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -51,6 +51,11 @@ public: DECLARE_DRIVER_INIT(yellowcb); DECLARE_DRIVER_INIT(liberate); DECLARE_DRIVER_INIT(prosport); + TILEMAP_MAPPER_MEMBER(back_scan); + TILEMAP_MAPPER_MEMBER(fix_scan); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_fix_tile_info); + TILE_GET_INFO_MEMBER(prosport_get_back_tile_info); }; diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index 6d9c6609b55..96d43ad305a 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -76,6 +76,9 @@ public: DECLARE_DRIVER_INIT(bygone); DECLARE_DRIVER_INIT(lkage); DECLARE_DRIVER_INIT(lkageb); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; /*----------- defined in machine/lkage.c -----------*/ diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 588849a88b5..067565cf70f 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -98,6 +98,7 @@ public: DECLARE_READ8_MEMBER(adc_r); DECLARE_WRITE8_MEMBER(sound_vol); DECLARE_WRITE8_MEMBER(ym2203_out_b); + TILE_GET_INFO_MEMBER(get_lockon_tile_info); }; diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index f48bec3e532..2a22a769b61 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -59,6 +59,10 @@ public: DECLARE_DRIVER_INIT(lordgun); DECLARE_DRIVER_INIT(aliencha); DECLARE_DRIVER_INIT(alienchac); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_2); + TILE_GET_INFO_MEMBER(get_tile_info_3); }; diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index 87eb2ae1bfc..d54452833b3 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -35,6 +35,8 @@ public: DECLARE_WRITE8_MEMBER(ym2149_portb_w); DECLARE_WRITE8_MEMBER(lamps_a_w); DECLARE_WRITE8_MEMBER(lamps_b_w); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 2360af6c061..79c41a3a140 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -17,6 +17,7 @@ public: DECLARE_READ8_MEMBER(payout_r); DECLARE_WRITE8_MEMBER(lvcards_videoram_w); DECLARE_WRITE8_MEMBER(lvcards_colorram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 3ee9c50e020..f9c4310776b 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -48,6 +48,11 @@ public: DECLARE_WRITE8_MEMBER(trojan_bg2_scrollx_w); DECLARE_WRITE8_MEMBER(trojan_bg2_image_w); DECLARE_WRITE8_MEMBER(msm5205_w); + TILEMAP_MAPPER_MEMBER(get_bg2_memory_offset); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(lwings_get_bg1_tile_info); + TILE_GET_INFO_MEMBER(trojan_get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 1242fc1599f..01027aea311 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -47,6 +47,7 @@ public: DECLARE_DRIVER_INIT(firebarr); DECLARE_DRIVER_INIT(dsoccr94); DECLARE_DRIVER_INIT(wpksoc); + TILE_GET_INFO_MEMBER(get_pf_tile_info); }; diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index fd09b3ad600..af1ea802cac 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -30,6 +30,7 @@ public: DECLARE_WRITE8_MEMBER(m52_bgcontrol_w); DECLARE_WRITE8_MEMBER(m52_flipscreen_w); DECLARE_WRITE8_MEMBER(alpha1v_flipscreen_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; /*----------- defined in video/m52.c -----------*/ diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index 8ab8c84d86d..b42d25d8581 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -17,6 +17,7 @@ public: int m_flipscreen; DECLARE_WRITE8_MEMBER(m57_videoram_w); DECLARE_WRITE8_MEMBER(m57_flipscreen_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; /*----------- defined in video/m57.c -----------*/ diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index dd688d2753a..feb1621e3a1 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -26,6 +26,8 @@ public: DECLARE_WRITE8_MEMBER(yard_scroll_panel_w); DECLARE_WRITE8_MEMBER(yard_flipscreen_w); DECLARE_DRIVER_INIT(yard85); + TILE_GET_INFO_MEMBER(yard_get_bg_tile_info); + TILEMAP_MAPPER_MEMBER(yard_tilemap_scan_rows); }; /*----------- defined in video/m58.c -----------*/ diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index 4a0e5561a96..fb2a743cf2a 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -62,6 +62,22 @@ public: DECLARE_DRIVER_INIT(spelunk2); DECLARE_DRIVER_INIT(kidniki); DECLARE_DRIVER_INIT(battroad); + TILE_GET_INFO_MEMBER(get_kungfum_bg_tile_info); + TILE_GET_INFO_MEMBER(get_ldrun_bg_tile_info); + TILE_GET_INFO_MEMBER(get_ldrun2_bg_tile_info); + TILE_GET_INFO_MEMBER(get_battroad_bg_tile_info); + TILE_GET_INFO_MEMBER(get_battroad_fg_tile_info); + TILE_GET_INFO_MEMBER(get_ldrun4_bg_tile_info); + TILE_GET_INFO_MEMBER(get_lotlot_bg_tile_info); + TILE_GET_INFO_MEMBER(get_lotlot_fg_tile_info); + TILE_GET_INFO_MEMBER(get_kidniki_bg_tile_info); + TILE_GET_INFO_MEMBER(get_kidniki_fg_tile_info); + TILE_GET_INFO_MEMBER(get_spelunkr_bg_tile_info); + TILE_GET_INFO_MEMBER(get_spelunkr_fg_tile_info); + TILE_GET_INFO_MEMBER(get_spelunk2_bg_tile_info); + TILE_GET_INFO_MEMBER(get_youjyudn_bg_tile_info); + TILE_GET_INFO_MEMBER(get_youjyudn_fg_tile_info); + TILE_GET_INFO_MEMBER(get_horizon_bg_tile_info); }; diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 32ca912dd66..13e61171b4c 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -97,6 +97,12 @@ public: DECLARE_DRIVER_INIT(nspirit); DECLARE_DRIVER_INIT(loht); DECLARE_DRIVER_INIT(imgfight); + TILE_GET_INFO_MEMBER(m72_get_bg_tile_info); + TILE_GET_INFO_MEMBER(m72_get_fg_tile_info); + TILE_GET_INFO_MEMBER(hharry_get_bg_tile_info); + TILE_GET_INFO_MEMBER(rtype2_get_bg_tile_info); + TILE_GET_INFO_MEMBER(rtype2_get_fg_tile_info); + TILEMAP_MAPPER_MEMBER(majtitle_scan_rows); }; diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index cfcd18dee00..2c2f0d23398 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -24,6 +24,18 @@ public: DECLARE_WRITE16_MEMBER(m90_video_w); DECLARE_DRIVER_INIT(bomblord); DECLARE_DRIVER_INIT(quizf1); + TILE_GET_INFO_MEMBER(get_pf1_tile_info); + TILE_GET_INFO_MEMBER(get_pf1w_tile_info); + TILE_GET_INFO_MEMBER(get_pf2_tile_info); + TILE_GET_INFO_MEMBER(get_pf2w_tile_info); + TILE_GET_INFO_MEMBER(bomblord_get_pf1_tile_info); + TILE_GET_INFO_MEMBER(bomblord_get_pf1w_tile_info); + TILE_GET_INFO_MEMBER(bomblord_get_pf2_tile_info); + TILE_GET_INFO_MEMBER(bomblord_get_pf2w_tile_info); + TILE_GET_INFO_MEMBER(dynablsb_get_pf1_tile_info); + TILE_GET_INFO_MEMBER(dynablsb_get_pf1w_tile_info); + TILE_GET_INFO_MEMBER(dynablsb_get_pf2_tile_info); + TILE_GET_INFO_MEMBER(dynablsb_get_pf2w_tile_info); }; diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 0ef026b18db..5954d0e2be3 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -70,6 +70,7 @@ public: DECLARE_DRIVER_INIT(lethalth); DECLARE_DRIVER_INIT(m92); DECLARE_DRIVER_INIT(m92_bank); + TILE_GET_INFO_MEMBER(get_pf_tile_info); }; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 36e5065697a..9186914aca9 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -64,6 +64,10 @@ public: DECLARE_WRITE32_MEMBER(macrossp_text_videoram_w); DECLARE_DRIVER_INIT(quizmoon); DECLARE_DRIVER_INIT(macrossp); + TILE_GET_INFO_MEMBER(get_macrossp_scra_tile_info); + TILE_GET_INFO_MEMBER(get_macrossp_scrb_tile_info); + TILE_GET_INFO_MEMBER(get_macrossp_scrc_tile_info); + TILE_GET_INFO_MEMBER(get_macrossp_text_tile_info); }; /*----------- defined in video/macrossp.c -----------*/ diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index fedb9123b2c..6f3ffdf087d 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -53,6 +53,13 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_WRITE8_MEMBER(madalien_portA_w); DECLARE_WRITE8_MEMBER(madalien_portB_w); + TILEMAP_MAPPER_MEMBER(scan_mode0); + TILEMAP_MAPPER_MEMBER(scan_mode1); + TILEMAP_MAPPER_MEMBER(scan_mode2); + TILEMAP_MAPPER_MEMBER(scan_mode3); + TILE_GET_INFO_MEMBER(get_tile_info_BG_1); + TILE_GET_INFO_MEMBER(get_tile_info_BG_2); + TILE_GET_INFO_MEMBER(get_tile_info_FG); }; diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index a7067cdc2ea..bb70b19bedc 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -22,6 +22,9 @@ public: DECLARE_WRITE8_MEMBER(mainsnk_fgram_w); DECLARE_WRITE8_MEMBER(mainsnk_bgram_w); DECLARE_CUSTOM_INPUT_MEMBER(mainsnk_sound_r); + TILEMAP_MAPPER_MEMBER(marvins_tx_scan_cols); + TILE_GET_INFO_MEMBER(get_tx_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index a1ebfec5d16..28f28cb0200 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -34,6 +34,11 @@ public: DECLARE_WRITE8_MEMBER(grobda_DAC_w); DECLARE_DRIVER_INIT(digdug2); DECLARE_DRIVER_INIT(grobda); + TILEMAP_MAPPER_MEMBER(superpac_tilemap_scan); + TILEMAP_MAPPER_MEMBER(mappy_tilemap_scan); + TILE_GET_INFO_MEMBER(superpac_get_tile_info); + TILE_GET_INFO_MEMBER(phozon_get_tile_info); + TILE_GET_INFO_MEMBER(mappy_get_tile_info); }; diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index 2e6950cab2a..de6c78ba881 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -33,6 +33,7 @@ public: DECLARE_WRITE8_MEMBER(marineb_palette_bank_1_w); DECLARE_WRITE8_MEMBER(marineb_flipscreen_x_w); DECLARE_WRITE8_MEMBER(marineb_flipscreen_y_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index e6c866939fb..447eb41f9aa 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -78,6 +78,7 @@ public: DECLARE_WRITE8_MEMBER(mario_sh_tuneselect_w); DECLARE_WRITE8_MEMBER(mario_sh3_w); DECLARE_WRITE8_MEMBER(mario_z80dma_rdy_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; /*----------- defined in video/mario.c -----------*/ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index 41108a16c2c..1eb05442164 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -23,6 +23,7 @@ public: DECLARE_READ8_MEMBER(markham_e004_r); DECLARE_WRITE8_MEMBER(markham_videoram_w); DECLARE_WRITE8_MEMBER(markham_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 0f93beb2bc2..165c7193271 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -37,6 +37,8 @@ public: DECLARE_WRITE8_MEMBER(mcatadv_sound_bw_w); DECLARE_WRITE16_MEMBER(mcatadv_videoram1_w); DECLARE_WRITE16_MEMBER(mcatadv_videoram2_w); + TILE_GET_INFO_MEMBER(get_mcatadv_tile_info1); + TILE_GET_INFO_MEMBER(get_mcatadv_tile_info2); }; /*----------- defined in video/mcatadv.c -----------*/ diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index b901e9b2b25..e621da695da 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -78,6 +78,9 @@ public: DECLARE_DRIVER_INIT(nflfoot); DECLARE_DRIVER_INIT(journey); DECLARE_DRIVER_INIT(solarfox); + TILE_GET_INFO_MEMBER(mcr_90009_get_tile_info); + TILE_GET_INFO_MEMBER(mcr_90010_get_tile_info); + TILE_GET_INFO_MEMBER(mcr_91490_get_tile_info); }; diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index 49f104a14d3..baafe136458 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -55,6 +55,11 @@ public: DECLARE_DRIVER_INIT(rampage); DECLARE_DRIVER_INIT(spyhunt); DECLARE_DRIVER_INIT(sarge); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(mcrmono_get_bg_tile_info); + TILEMAP_MAPPER_MEMBER(spyhunt_bg_scan); + TILE_GET_INFO_MEMBER(spyhunt_get_bg_tile_info); + TILE_GET_INFO_MEMBER(spyhunt_get_alpha_tile_info); }; diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index bb5c0b80022..c75fae3a16d 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -87,6 +87,9 @@ public: DECLARE_DRIVER_INIT(xenophob); DECLARE_DRIVER_INIT(archrivl); DECLARE_DRIVER_INIT(spyhunt2); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(zwackery_get_bg_tile_info); + TILE_GET_INFO_MEMBER(zwackery_get_fg_tile_info); }; /*----------- defined in machine/mcr68.c -----------*/ diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 0bea4cfc279..ce4c02af3aa 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -42,6 +42,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_DRIVER_INIT(minferno); DECLARE_DRIVER_INIT(gypsyjug); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index bb382365ac8..7d1865ffa03 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -102,6 +102,10 @@ public: DECLARE_DRIVER_INIT(rodland); DECLARE_DRIVER_INIT(edfbl); DECLARE_DRIVER_INIT(stdragona); + TILEMAP_MAPPER_MEMBER(megasys1_scan_8x8); + TILEMAP_MAPPER_MEMBER(megasys1_scan_16x16); + TILE_GET_INFO_MEMBER(megasys1_get_scroll_tile_info_8x8); + TILE_GET_INFO_MEMBER(megasys1_get_scroll_tile_info_16x16); }; diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index d268625b33a..c1fd9339256 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -70,6 +70,8 @@ public: DECLARE_WRITE8_MEMBER(rougien_gfxbankswitch1_w); DECLARE_WRITE8_MEMBER(rougien_gfxbankswitch2_w); DECLARE_READ8_MEMBER(mermaid_collision_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index d43d122d2fc..3372660a132 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -43,6 +43,9 @@ public: DECLARE_WRITE8_MEMBER(metlclsh_bgram_w); DECLARE_WRITE8_MEMBER(metlclsh_fgram_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILEMAP_MAPPER_MEMBER(metlclsh_bgtilemap_scan); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 7bf8a11f2f8..91398221313 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -151,6 +151,9 @@ public: DECLARE_DRIVER_INIT(dharmak); DECLARE_DRIVER_INIT(puzzlet); DECLARE_DRIVER_INIT(metro); + TILE_GET_INFO_MEMBER(metro_k053936_get_tile_info); + TILE_GET_INFO_MEMBER(metro_k053936_gstrik2_get_tile_info); + TILEMAP_MAPPER_MEMBER(tilemap_scan_gstrik2); }; diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 26a2a3dd5ff..b8a5c047cb1 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -38,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(mikie_colorram_w); DECLARE_WRITE8_MEMBER(mikie_palettebank_w); DECLARE_WRITE8_MEMBER(mikie_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 0478a94639a..19138ae2afa 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -96,6 +96,7 @@ public: DECLARE_DRIVER_INIT(pkladies); DECLARE_DRIVER_INIT(blockbl); DECLARE_DRIVER_INIT(dokaben); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index 43f9b9fd6b0..a1a3e2ef77a 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -26,6 +26,7 @@ public: DECLARE_WRITE8_MEMBER(mjkjidai_videoram_w); DECLARE_WRITE8_MEMBER(mjkjidai_ctrl_w); DECLARE_WRITE8_MEMBER(adpcm_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index bbfe380ed80..460d67d87d9 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -29,6 +29,8 @@ public: DECLARE_READ8_MEMBER(gfire2_protection_r); DECLARE_WRITE8_MEMBER(mosaic_fgvideoram_w); DECLARE_WRITE8_MEMBER(mosaic_bgvideoram_w); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index 1d54890c813..3438b630306 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -28,6 +28,8 @@ public: DECLARE_WRITE8_MEMBER(mrdo_scrollx_w); DECLARE_WRITE8_MEMBER(mrdo_scrolly_w); DECLARE_WRITE8_MEMBER(mrdo_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 85da06c5fb5..1ea65b89728 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -22,6 +22,7 @@ public: DECLARE_WRITE8_MEMBER(mrjong_videoram_w); DECLARE_WRITE8_MEMBER(mrjong_colorram_w); DECLARE_WRITE8_MEMBER(mrjong_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index dc813967f86..9a7a8ed4909 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -80,6 +80,10 @@ public: DECLARE_DRIVER_INIT(bnstars); DECLARE_DRIVER_INIT(f1superb); DECLARE_DRIVER_INIT(ss92046_01); + TILE_GET_INFO_MEMBER(get_ms32_tx_tile_info); + TILE_GET_INFO_MEMBER(get_ms32_roz_tile_info); + TILE_GET_INFO_MEMBER(get_ms32_bg_tile_info); + TILE_GET_INFO_MEMBER(get_ms32_extra_tile_info); }; diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index b73472ef181..b3bb8eb2860 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -65,6 +65,9 @@ public: DECLARE_WRITE8_MEMBER(msisaac_bg2_videoram_w); DECLARE_WRITE8_MEMBER(msisaac_fg_videoram_w); DECLARE_WRITE8_MEMBER(sound_control_0_w); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index f5f9974f903..64083dfb449 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -26,6 +26,8 @@ public: DECLARE_WRITE16_MEMBER(mugsmash_videoram1_w); DECLARE_WRITE16_MEMBER(mugsmash_videoram2_w); DECLARE_WRITE16_MEMBER(mugsmash_reg_w); + TILE_GET_INFO_MEMBER(get_mugsmash_tile_info1); + TILE_GET_INFO_MEMBER(get_mugsmash_tile_info2); }; diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index 67553a1aeac..41dcac15b37 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -15,6 +15,7 @@ public: DECLARE_WRITE8_MEMBER(mustache_video_control_w); DECLARE_WRITE8_MEMBER(mustache_scroll_w); DECLARE_DRIVER_INIT(mustache); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index d584a3a2b92..96e14b840b4 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -42,6 +42,8 @@ public: DECLARE_WRITE8_MEMBER(mystston_ay8910_select_w); DECLARE_WRITE8_MEMBER(mystston_video_control_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 86fd6b5fce6..719d4923bc7 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -52,6 +52,8 @@ public: DECLARE_READ16_MEMBER(ddd_053936_tilerom_1_r); DECLARE_READ16_MEMBER(gai_053936_tilerom_2_r); DECLARE_READ16_MEMBER(ddd_053936_tilerom_2_r); + TILE_GET_INFO_MEMBER(get_gai_936_tile_info); + TILE_GET_INFO_MEMBER(get_ult_936_tile_info); }; diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 304162f0f63..c94f749a2af 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -102,6 +102,11 @@ public: DECLARE_DRIVER_INIT(xday2); DECLARE_DRIVER_INIT(exbania); DECLARE_DRIVER_INIT(emeraldj); + TILE_GET_INFO_MEMBER(tilemap_get_info0); + TILE_GET_INFO_MEMBER(tilemap_get_info1); + TILE_GET_INFO_MEMBER(tilemap_get_info2); + TILE_GET_INFO_MEMBER(tilemap_get_info3); + TILE_GET_INFO_MEMBER(roz_get_info); }; diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index a994d69bc5b..3698cbbcb33 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -85,6 +85,12 @@ public: DECLARE_DRIVER_INIT(ws89); DECLARE_DRIVER_INIT(dspirit); DECLARE_DRIVER_INIT(pistoldm); + TILE_GET_INFO_MEMBER(bg_get_info0); + TILE_GET_INFO_MEMBER(bg_get_info1); + TILE_GET_INFO_MEMBER(bg_get_info2); + TILE_GET_INFO_MEMBER(bg_get_info3); + TILE_GET_INFO_MEMBER(fg_get_info4); + TILE_GET_INFO_MEMBER(fg_get_info5); }; diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 6a814cbf644..cba4ec7d6c0 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -249,6 +249,7 @@ public: DECLARE_DRIVER_INIT(alpiner); DECLARE_DRIVER_INIT(ridgeraj); DECLARE_DRIVER_INIT(alpinesa); + TILE_GET_INFO_MEMBER(TextTilemapGetInfo); }; diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index 118da9d4203..ca600df2197 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -45,6 +45,10 @@ public: DECLARE_READ8_MEMBER(rthunder_spriteram_r); DECLARE_WRITE8_MEMBER(rthunder_spriteram_w); DECLARE_DRIVER_INIT(namco86); + TILE_GET_INFO_MEMBER(get_tile_info0); + TILE_GET_INFO_MEMBER(get_tile_info1); + TILE_GET_INFO_MEMBER(get_tile_info2); + TILE_GET_INFO_MEMBER(get_tile_info3); }; diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index ba936ca423f..3600bb3a71a 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -79,6 +79,8 @@ public: DECLARE_WRITE8_MEMBER(salamand_speech_start_w); DECLARE_READ8_MEMBER(nemesis_portA_r); DECLARE_WRITE8_MEMBER(city_sound_bank_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index c524d73dcc6..c0d450e3a25 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -19,6 +19,8 @@ public: DECLARE_WRITE8_MEMBER(news_fgram_w); DECLARE_WRITE8_MEMBER(news_bgram_w); DECLARE_WRITE8_MEMBER(news_bgpic_w); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 49bb927d257..0f6960f77b4 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -56,6 +56,14 @@ public: DECLARE_DRIVER_INIT(mnight); DECLARE_DRIVER_INIT(ninjakd2); DECLARE_DRIVER_INIT(bootleg); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(ninjakd2_get_bg_tile_info); + TILE_GET_INFO_MEMBER(mnight_get_bg_tile_info); + TILEMAP_MAPPER_MEMBER(robokid_bg_scan); + TILEMAP_MAPPER_MEMBER(omegaf_bg_scan); + TILE_GET_INFO_MEMBER(robokid_get_bg0_tile_info); + TILE_GET_INFO_MEMBER(robokid_get_bg1_tile_info); + TILE_GET_INFO_MEMBER(robokid_get_bg2_tile_info); }; diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index e26cf6e47c3..8640dfe539a 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -52,6 +52,7 @@ public: DECLARE_WRITE8_MEMBER(nitedrvr_out1_w); DECLARE_WRITE8_MEMBER(nitedrvr_videoram_w); DECLARE_WRITE8_MEMBER(nitedrvr_hvc_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 250161558f1..f07b301f1fd 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -106,6 +106,15 @@ public: DECLARE_DRIVER_INIT(grdnstrm); DECLARE_DRIVER_INIT(spec2k); DECLARE_DRIVER_INIT(bjtwin); + TILEMAP_MAPPER_MEMBER(afega_tilemap_scan_pages); + TILE_GET_INFO_MEMBER(macross_get_bg0_tile_info); + TILE_GET_INFO_MEMBER(macross_get_bg1_tile_info); + TILE_GET_INFO_MEMBER(macross_get_bg2_tile_info); + TILE_GET_INFO_MEMBER(macross_get_bg3_tile_info); + TILE_GET_INFO_MEMBER(strahl_get_fg_tile_info); + TILE_GET_INFO_MEMBER(macross_get_tx_tile_info); + TILE_GET_INFO_MEMBER(bjtwin_get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_tile_info_0_8bit); }; diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index cd0fdf3929f..5e1d2c52b5d 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -27,6 +27,13 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(ninjakun_io_A002_ctrl_r); DECLARE_DRIVER_INIT(raiders5); DECLARE_DRIVER_INIT(pkunwar); + TILE_GET_INFO_MEMBER(nova2001_get_bg_tile_info); + TILE_GET_INFO_MEMBER(nova2001_get_fg_tile_info); + TILE_GET_INFO_MEMBER(ninjakun_get_bg_tile_info); + TILE_GET_INFO_MEMBER(ninjakun_get_fg_tile_info); + TILE_GET_INFO_MEMBER(pkunwar_get_bg_tile_info); + TILE_GET_INFO_MEMBER(raiders5_get_bg_tile_info); + TILE_GET_INFO_MEMBER(raiders5_get_fg_tile_info); }; diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index fe84a10ae75..c22ca7aa9e5 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -98,6 +98,7 @@ public: DECLARE_DRIVER_INIT(colt); DECLARE_DRIVER_INIT(bronx); DECLARE_DRIVER_INIT(nycaptor); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index f939f40c5fc..03d6de4b6af 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -29,6 +29,7 @@ public: DECLARE_READ16_MEMBER(unknown_verify_r); DECLARE_DRIVER_INIT(offtwall); DECLARE_DRIVER_INIT(offtwalc); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index e85c75e8339..37bf4978b44 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -33,6 +33,7 @@ public: DECLARE_WRITE16_MEMBER(ohmygod_scrolly_w); DECLARE_DRIVER_INIT(ohmygod); DECLARE_DRIVER_INIT(naname); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index 12018c91ff2..c579eb35ff4 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -59,6 +59,8 @@ public: DECLARE_WRITE8_MEMBER(ojankohs_adpcm_reset_w); DECLARE_READ8_MEMBER(ojankohs_ay8910_0_r); DECLARE_READ8_MEMBER(ojankohs_ay8910_1_r); + TILE_GET_INFO_MEMBER(ojankohs_get_tile_info); + TILE_GET_INFO_MEMBER(ojankoy_get_tile_info); }; diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index b0ad6a8f679..edf692f13fd 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -43,6 +43,9 @@ public: DECLARE_WRITE16_MEMBER(oneshot_mid_videoram_w); DECLARE_WRITE16_MEMBER(oneshot_fg_videoram_w); DECLARE_WRITE16_MEMBER(soundbank_w); + TILE_GET_INFO_MEMBER(get_oneshot_bg_tile_info); + TILE_GET_INFO_MEMBER(get_oneshot_mid_tile_info); + TILE_GET_INFO_MEMBER(get_oneshot_fg_tile_info); }; /*----------- defined in video/oneshot.c -----------*/ diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index f72f48c0d8f..d7a8c664035 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -39,6 +39,7 @@ public: device_t *m_discrete; DECLARE_WRITE8_MEMBER(orbit_misc_w); DECLARE_WRITE8_MEMBER(orbit_playfield_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h index a1cc9ad4803..8b8179fede5 100644 --- a/src/mame/includes/othldrby.h +++ b/src/mame/includes/othldrby.h @@ -35,6 +35,9 @@ public: DECLARE_WRITE16_MEMBER(othldrby_vreg_addr_w); DECLARE_WRITE16_MEMBER(othldrby_vreg_w); DECLARE_WRITE16_MEMBER(oki_bankswitch_w); + TILE_GET_INFO_MEMBER(get_tile_info0); + TILE_GET_INFO_MEMBER(get_tile_info1); + TILE_GET_INFO_MEMBER(get_tile_info2); }; diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 9d208715dbf..8339f726a8e 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE8_MEMBER(pacland_scroll0_w); DECLARE_WRITE8_MEMBER(pacland_scroll1_w); DECLARE_WRITE8_MEMBER(pacland_bankswitch_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 87ed6db9375..0ecc08c03a4 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -117,6 +117,11 @@ public: DECLARE_DRIVER_INIT(8bpm); DECLARE_DRIVER_INIT(porky); DECLARE_DRIVER_INIT(mspacman); + TILEMAP_MAPPER_MEMBER(pacman_scan_rows); + TILE_GET_INFO_MEMBER(pacman_get_tile_info); + TILE_GET_INFO_MEMBER(s2650_get_tile_info); + TILEMAP_MAPPER_MEMBER(jrpacman_scan_rows); + TILE_GET_INFO_MEMBER(jrpacman_get_tile_info); }; diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index dd861a6f3a7..74edfe0f84d 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -45,6 +45,7 @@ public: DECLARE_WRITE8_MEMBER(pandoras_flipscreen_w); DECLARE_READ8_MEMBER(pandoras_portA_r); DECLARE_READ8_MEMBER(pandoras_portB_r); + TILE_GET_INFO_MEMBER(get_tile_info0); }; diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 775ffdb28cf..3e504a01bcd 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -45,6 +45,9 @@ public: DECLARE_DRIVER_INIT(torus); DECLARE_DRIVER_INIT(paradise); DECLARE_DRIVER_INIT(tgtball); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_2); }; /*----------- defined in video/paradise.c -----------*/ diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index c4d6708f87e..92090b39411 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -13,6 +13,8 @@ public: required_shared_ptr<UINT16> m_fg_videoram; DECLARE_WRITE16_MEMBER(pass_bg_videoram_w); DECLARE_WRITE16_MEMBER(pass_fg_videoram_w); + TILE_GET_INFO_MEMBER(get_pass_bg_tile_info); + TILE_GET_INFO_MEMBER(get_pass_fg_tile_info); }; diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index 7ed35290dab..76ea12e4f4d 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -46,6 +46,8 @@ public: DECLARE_WRITE8_MEMBER(pbaction_flipscreen_w); DECLARE_DRIVER_INIT(pbactio3); DECLARE_DRIVER_INIT(pbactio4); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 44e3f27b01e..21869d7be40 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -108,6 +108,8 @@ public: DECLARE_DRIVER_INIT(drgw3); DECLARE_DRIVER_INIT(orlegend); DECLARE_DRIVER_INIT(pstar); + TILE_GET_INFO_MEMBER(get_pgm_tx_tilemap_tile_info); + TILE_GET_INFO_MEMBER(get_pgm_bg_tilemap_tile_info); }; diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index a72eb273c9a..d84c76267bc 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -28,6 +28,8 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(player_input_r); DECLARE_CUSTOM_INPUT_MEMBER(pleiads_protection_r); DECLARE_DRIVER_INIT(condor); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index e2f1a4c4d82..a03f5fea454 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -23,6 +23,7 @@ public: DECLARE_WRITE8_MEMBER(pingpong_colorram_w); DECLARE_DRIVER_INIT(cashquiz); DECLARE_DRIVER_INIT(merlinmm); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index 65afb037d51..73c13252730 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -25,6 +25,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(prot_r); DECLARE_DRIVER_INIT(pirates); DECLARE_DRIVER_INIT(genix); + TILE_GET_INFO_MEMBER(get_tx_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index 73cdace8851..8bfcf5939f8 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -46,6 +46,8 @@ public: DECLARE_WRITE8_MEMBER(pitnrun_h_heed_w); DECLARE_WRITE8_MEMBER(pitnrun_v_heed_w); DECLARE_WRITE8_MEMBER(pitnrun_color_select_w); + TILE_GET_INFO_MEMBER(get_tile_info1); + TILE_GET_INFO_MEMBER(get_tile_info2); }; diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 0eedaa79a2f..588b9e6545a 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -107,6 +107,7 @@ public: DECLARE_DRIVER_INIT(pceboard); DECLARE_DRIVER_INIT(pciboard); DECLARE_DRIVER_INIT(pcaboard); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 11718be266c..d6e88a2769b 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -78,6 +78,15 @@ public: DECLARE_DRIVER_INIT(bigtwin); DECLARE_DRIVER_INIT(powerbal); DECLARE_DRIVER_INIT(magicstk); + TILE_GET_INFO_MEMBER(bigtwin_get_tx_tile_info); + TILE_GET_INFO_MEMBER(bigtwin_get_fg_tile_info); + TILE_GET_INFO_MEMBER(wbeachvl_get_tx_tile_info); + TILE_GET_INFO_MEMBER(wbeachvl_get_fg_tile_info); + TILE_GET_INFO_MEMBER(wbeachvl_get_bg_tile_info); + TILE_GET_INFO_MEMBER(hrdtimes_get_tx_tile_info); + TILE_GET_INFO_MEMBER(bigtwinb_get_tx_tile_info); + TILE_GET_INFO_MEMBER(hrdtimes_get_fg_tile_info); + TILE_GET_INFO_MEMBER(hrdtimes_get_bg_tile_info); }; /*----------- defined in video/playmark.c -----------*/ diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index d68966d4a21..65deff9de1d 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -66,6 +66,10 @@ public: DIRECT_UPDATE_MEMBER(plygonet_dsp56k_direct_handler); DECLARE_READ32_MEMBER(polygonet_eeprom_r); DECLARE_DRIVER_INIT(polygonet); + TILE_GET_INFO_MEMBER(ttl_get_tile_info); + TILE_GET_INFO_MEMBER(roz_get_tile_info); + TILEMAP_MAPPER_MEMBER(plygonet_scan); + TILEMAP_MAPPER_MEMBER(plygonet_scan_cols); }; /*----------- defined in video/plygonet.c -----------*/ diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 2c842b714fa..426aaaa4f7f 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -15,6 +15,7 @@ public: DECLARE_WRITE8_MEMBER(pokechmp_videoram_w); DECLARE_WRITE8_MEMBER(pokechmp_flipscreen_w); DECLARE_DRIVER_INIT(pokechmp); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index 192d6dec523..4400bd715ef 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -74,6 +74,8 @@ public: DECLARE_READ8_MEMBER(steering_delta_r); DECLARE_DRIVER_INIT(topracern); DECLARE_DRIVER_INIT(polepos2); + TILE_GET_INFO_MEMBER(bg_get_tile_info); + TILE_GET_INFO_MEMBER(tx_get_tile_info); }; diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index 340d9051097..af83d1bbcd8 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -28,6 +28,7 @@ public: DECLARE_READ8_MEMBER(poolshrk_input_r); DECLARE_READ8_MEMBER(poolshrk_irq_reset_r); DECLARE_DRIVER_INIT(poolshrk); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 4b27f11fe76..995eed7bf37 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -27,6 +27,7 @@ public: DECLARE_WRITE8_MEMBER(pooyan_videoram_w); DECLARE_WRITE8_MEMBER(pooyan_colorram_w); DECLARE_WRITE8_MEMBER(pooyan_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 740ba18a45c..0fe2513117f 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -35,6 +35,7 @@ public: DECLARE_READ8_MEMBER(popeye_portA_r); DECLARE_DRIVER_INIT(skyskipr); DECLARE_DRIVER_INIT(popeye); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index d11db317acf..a325e74515e 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -46,6 +46,10 @@ public: DECLARE_WRITE8_MEMBER(popper_flipscreen_w); DECLARE_WRITE8_MEMBER(popper_e002_w); DECLARE_WRITE8_MEMBER(popper_gfx_bank_w); + TILE_GET_INFO_MEMBER(get_popper_p123_tile_info); + TILE_GET_INFO_MEMBER(get_popper_p0_tile_info); + TILE_GET_INFO_MEMBER(get_popper_ol_p123_tile_info); + TILE_GET_INFO_MEMBER(get_popper_ol_p0_tile_info); }; diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index 4d0618d8c75..7b4290c8f5f 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -18,6 +18,8 @@ public: DECLARE_WRITE8_MEMBER(portrait_negative_scroll_w); DECLARE_WRITE8_MEMBER(portrait_bgvideo_write); DECLARE_WRITE8_MEMBER(portrait_fgvideo_write); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index f9b1acf9e57..1baa033b54e 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -25,6 +25,9 @@ public: DECLARE_WRITE16_MEMBER(powerins_paletteram16_w); DECLARE_WRITE16_MEMBER(powerins_vram_0_w); DECLARE_WRITE16_MEMBER(powerins_vram_1_w); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILEMAP_MAPPER_MEMBER(powerins_get_memory_offset_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); }; diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index daff40ea519..8b21489ed1e 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -23,6 +23,9 @@ public: DECLARE_WRITE16_MEMBER(prehisle_control16_w); DECLARE_WRITE8_MEMBER(D7759_write_port_0_w); DECLARE_WRITE8_MEMBER(D7759_upd_reset_w); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 56fc2a7e1b6..6936037c575 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -83,6 +83,8 @@ public: DECLARE_DRIVER_INIT(tengai); DECLARE_DRIVER_INIT(s1945jn); DECLARE_DRIVER_INIT(gunbird); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); }; diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index 31b23a8bb55..575c72e443d 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -38,6 +38,8 @@ public: DECLARE_WRITE8_MEMBER(psychic5_paged_ram_w); DECLARE_WRITE8_MEMBER(bombsa_paged_ram_w); DECLARE_WRITE8_MEMBER(bombsa_unknown_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index eaa3049cdad..8941aeab1aa 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -51,6 +51,15 @@ public: DECLARE_DRIVER_INIT(spnchotj); DECLARE_DRIVER_INIT(punchout); DECLARE_DRIVER_INIT(spnchout); + TILE_GET_INFO_MEMBER(top_get_info); + TILE_GET_INFO_MEMBER(armwrest_top_get_info); + TILE_GET_INFO_MEMBER(bot_get_info); + TILE_GET_INFO_MEMBER(armwrest_bot_get_info); + TILE_GET_INFO_MEMBER(bs1_get_info); + TILE_GET_INFO_MEMBER(bs2_get_info); + TILE_GET_INFO_MEMBER(armwrest_fg_get_info); + TILEMAP_MAPPER_MEMBER(armwrest_bs1_scan); + TILEMAP_MAPPER_MEMBER(armwrest_bs1_scan_flipx); }; diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index 85759c4ee34..120caae0eac 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -41,6 +41,9 @@ public: DECLARE_WRITE8_MEMBER(pushman_68000_w); DECLARE_WRITE16_MEMBER(pushman_scroll_w); DECLARE_WRITE16_MEMBER(pushman_videoram_w); + TILEMAP_MAPPER_MEMBER(background_scan_rows); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index 93a7698dafb..3587cff481d 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -21,6 +21,8 @@ public: DECLARE_WRITE8_MEMBER(quizdna_bg_xscroll_w); DECLARE_WRITE8_MEMBER(quizdna_screen_ctrl_w); DECLARE_WRITE8_MEMBER(paletteram_xBGR_RRRR_GGGG_BBBB_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index bedac1ec7b2..ac2cb7e7ba2 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -17,6 +17,9 @@ public: DECLARE_WRITE16_MEMBER(quizpani_bg_videoram_w); DECLARE_WRITE16_MEMBER(quizpani_txt_videoram_w); DECLARE_WRITE16_MEMBER(quizpani_tilesbank_w); + TILEMAP_MAPPER_MEMBER(bg_scan); + TILE_GET_INFO_MEMBER(bg_tile_info); + TILE_GET_INFO_MEMBER(txt_tile_info); }; diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index e7d5e34baa7..0abe5f16d43 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -34,6 +34,9 @@ public: DECLARE_DRIVER_INIT(raidenk); DECLARE_DRIVER_INIT(raiden); DECLARE_DRIVER_INIT(raidena); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_fore_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 508b73cf2f8..60c965dff04 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -121,6 +121,10 @@ public: DECLARE_DRIVER_INIT(xsedae); DECLARE_DRIVER_INIT(zeroteam); DECLARE_DRIVER_INIT(raiden2); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_mid_tile_info); + TILE_GET_INFO_MEMBER(get_fore_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index 5b85f9f699e..8b4d0cbe1f6 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -48,6 +48,11 @@ public: DECLARE_WRITE8_MEMBER(rallyx_scrollx_w); DECLARE_WRITE8_MEMBER(rallyx_scrolly_w); DECLARE_WRITE8_MEMBER(tactcian_starson_w); + TILEMAP_MAPPER_MEMBER(fg_tilemap_scan); + TILE_GET_INFO_MEMBER(rallyx_bg_get_tile_info); + TILE_GET_INFO_MEMBER(rallyx_fg_get_tile_info); + TILE_GET_INFO_MEMBER(locomotn_bg_get_tile_info); + TILE_GET_INFO_MEMBER(locomotn_fg_get_tile_info); }; diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index 26f5f1c39d6..53d04be8bdc 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -40,6 +40,9 @@ public: DECLARE_WRITE16_MEMBER(realbrk_vram_1_w); DECLARE_WRITE16_MEMBER(realbrk_vram_2_w); DECLARE_WRITE16_MEMBER(realbrk_vregs_w); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_2); }; diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index c1c8451bf92..a0b545ee7bc 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -21,6 +21,8 @@ public: DECLARE_WRITE16_MEMBER(audio_control_w); DECLARE_WRITE16_MEMBER(audio_volume_w); DECLARE_DRIVER_INIT(relief); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); + TILE_GET_INFO_MEMBER(get_playfield2_tile_info); }; diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index 34faae8cb6c..a0a1b1fb5cd 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -67,6 +67,8 @@ public: DECLARE_DRIVER_INIT(kuniokun); DECLARE_DRIVER_INIT(kuniokunb); DECLARE_DRIVER_INIT(renegade); + TILE_GET_INFO_MEMBER(get_bg_tilemap_info); + TILE_GET_INFO_MEMBER(get_fg_tilemap_info); }; diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 0d439088ff4..87babf9b685 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -56,6 +56,9 @@ public: DECLARE_WRITE8_MEMBER(retofinv_bg_videoram_w); DECLARE_WRITE8_MEMBER(retofinv_fg_videoram_w); DECLARE_WRITE8_MEMBER(retofinv_gfx_ctrl_w); + TILEMAP_MAPPER_MEMBER(tilemap_scan); + TILE_GET_INFO_MEMBER(bg_get_tile_info); + TILE_GET_INFO_MEMBER(fg_get_tile_info); }; diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index 2941641586f..3161aac1743 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(rocnrope_flipscreen_w); DECLARE_DRIVER_INIT(rocnrope); DECLARE_DRIVER_INIT(rocnropk); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; /*----------- defined in video/rocnrope.c -----------*/ diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index ea227ee7c70..733b3016600 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -35,6 +35,8 @@ public: DECLARE_WRITE8_MEMBER(upd_data_w); DECLARE_DRIVER_INIT(rabiolep); DECLARE_DRIVER_INIT(svolley); + TILE_GET_INFO_MEMBER(get_bg0_tile_info); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); }; diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 9207c210cbd..24bf48b21ec 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -18,6 +18,8 @@ public: DECLARE_WRITE8_MEMBER(runaway_video_ram_w); DECLARE_WRITE8_MEMBER(runaway_tile_bank_w); DECLARE_READ8_MEMBER(runaway_pot_r); + TILE_GET_INFO_MEMBER(runaway_get_tile_info); + TILE_GET_INFO_MEMBER(qwak_get_tile_info); }; diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index b961cedf28b..de2c1ca8863 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -47,6 +47,8 @@ public: DECLARE_READ16_MEMBER(rng_ttl_ram_r); DECLARE_WRITE16_MEMBER(rng_ttl_ram_w); DECLARE_WRITE16_MEMBER(rng_936_videoram_w); + TILE_GET_INFO_MEMBER(ttl_get_tile_info); + TILE_GET_INFO_MEMBER(get_rng_936_tile_info); }; diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index 49f3fc61eda..f5903627636 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -32,6 +32,8 @@ public: DECLARE_WRITE8_MEMBER(sauro_scroll_fg_w); DECLARE_WRITE8_MEMBER(adpcm_w); DECLARE_DRIVER_INIT(tecfri); + TILE_GET_INFO_MEMBER(get_tile_info_bg); + TILE_GET_INFO_MEMBER(get_tile_info_fg); }; diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 18f87d216cf..47813fb4de4 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -39,6 +39,7 @@ public: UINT8 m_SN76496_latch; DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(space, offset, m_SN76496_latch); }; + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; /*----------- defined in video/sbasketb.c -----------*/ diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 77f2d2eca5b..02abcf82f36 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -13,6 +13,7 @@ public: DECLARE_WRITE8_MEMBER(sbugger_videoram_w); DECLARE_WRITE8_MEMBER(sbugger_videoram_attr_w); DECLARE_WRITE_LINE_MEMBER(sbugger_interrupt); + TILE_GET_INFO_MEMBER(get_sbugger_tile_info); }; diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index b2056f62d96..838000f7353 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -22,6 +22,7 @@ public: DECLARE_WRITE8_MEMBER(scotrsht_colorram_w); DECLARE_WRITE8_MEMBER(scotrsht_charbank_w); DECLARE_WRITE8_MEMBER(scotrsht_palettebank_w); + TILE_GET_INFO_MEMBER(scotrsht_get_bg_tile_info); }; diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 657d3c3867d..9339619cdf7 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -29,6 +29,9 @@ public: DECLARE_WRITE16_MEMBER(sderby_md_videoram_w); DECLARE_WRITE16_MEMBER(sderby_fg_videoram_w); DECLARE_WRITE16_MEMBER(sderby_scroll_w); + TILE_GET_INFO_MEMBER(get_sderby_tile_info); + TILE_GET_INFO_MEMBER(get_sderby_md_tile_info); + TILE_GET_INFO_MEMBER(get_sderby_fg_tile_info); }; diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index b7d614275dc..b15aa9c668d 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -93,6 +93,9 @@ public: DECLARE_DRIVER_INIT(005); DECLARE_DRIVER_INIT(monster2); DECLARE_DRIVER_INIT(astrob); + TILE_GET_INFO_MEMBER(spaceod_get_tile_info); + TILEMAP_MAPPER_MEMBER(spaceod_scan_rows); + TILE_GET_INFO_MEMBER(bg_get_tile_info); }; diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index e2cca09ee1e..20c91908206 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -170,6 +170,7 @@ public: DECLARE_DRIVER_INIT(radr); DECLARE_DRIVER_INIT(f1lap); DECLARE_DRIVER_INIT(orunners); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 75cd229d245..98a56d0eb92 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -102,6 +102,10 @@ public: DECLARE_DRIVER_INIT(ejanhs); DECLARE_DRIVER_INIT(sys386f2); DECLARE_DRIVER_INIT(rdft2us); + TILE_GET_INFO_MEMBER(get_text_tile_info); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_mid_tile_info); + TILE_GET_INFO_MEMBER(get_fore_tile_info); }; diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index e8d97153f9b..abb013b96cd 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(seicross_colorram_w); DECLARE_READ8_MEMBER(friskyt_portB_r); DECLARE_WRITE8_MEMBER(friskyt_portB_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index 1d4079af798..a1863d58344 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -74,6 +74,11 @@ public: DECLARE_DRIVER_INIT(senjyo); DECLARE_DRIVER_INIT(starfore); DECLARE_DRIVER_INIT(starforc); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(senjyo_bg1_tile_info); + TILE_GET_INFO_MEMBER(starforc_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); + TILE_GET_INFO_MEMBER(get_bg3_tile_info); }; diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index fb2ae28ba31..15e79213865 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -171,6 +171,12 @@ public: DECLARE_DRIVER_INIT(blandia); DECLARE_DRIVER_INIT(kiwame); DECLARE_DRIVER_INIT(eightfrc); + TILE_GET_INFO_MEMBER(twineagl_get_tile_info_0); + TILE_GET_INFO_MEMBER(twineagl_get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); + TILE_GET_INFO_MEMBER(get_tile_info_2); + TILE_GET_INFO_MEMBER(get_tile_info_3); }; /*----------- defined in video/seta.c -----------*/ diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index d5644c27937..59f164c10f7 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -41,6 +41,9 @@ public: DECLARE_WRITE16_MEMBER(sf_gfxctrl_w); DECLARE_WRITE8_MEMBER(msm1_5205_w); DECLARE_WRITE8_MEMBER(msm2_5205_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 83e5d6a3b9d..8732e699ac7 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -38,6 +38,9 @@ public: DECLARE_WRITE16_MEMBER(shadfrce_bg1scrollx_w); DECLARE_WRITE16_MEMBER(shadfrce_bg1scrolly_w); DECLARE_WRITE8_MEMBER(oki_bankswitch_w); + TILE_GET_INFO_MEMBER(get_shadfrce_fgtile_info); + TILE_GET_INFO_MEMBER(get_shadfrce_bg0tile_info); + TILE_GET_INFO_MEMBER(get_shadfrce_bg1tile_info); }; diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index a43e01d0d58..4bd94c9eb6f 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(ay8910_portb_w); DECLARE_DRIVER_INIT(shangkid); DECLARE_DRIVER_INIT(chinhero); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index fda835c040d..607fab84ac0 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -22,6 +22,7 @@ public: DECLARE_WRITE8_MEMBER(shaolins_palettebank_w); DECLARE_WRITE8_MEMBER(shaolins_scroll_w); DECLARE_WRITE8_MEMBER(shaolins_nmi_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 6f3f23aba3c..1f457367034 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -15,6 +15,7 @@ public: DECLARE_WRITE8_MEMBER(sichuan2_videoram_w); DECLARE_WRITE8_MEMBER(sichuan2_bankswitch_w); DECLARE_WRITE8_MEMBER(sichuan2_paletteram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 433692d6ca9..df97c995e00 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -22,6 +22,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_DRIVER_INIT(shootouj); DECLARE_DRIVER_INIT(shootout); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index c88e6ff700d..be18dcc8a14 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -18,6 +18,7 @@ public: DECLARE_WRITE16_MEMBER(latch_w); DECLARE_READ16_MEMBER(leta_r); DECLARE_READ16_MEMBER(special_port0_r); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 39f6c3145fa..aadefee35c0 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -46,6 +46,10 @@ public: DECLARE_DRIVER_INIT(sidearms); DECLARE_DRIVER_INIT(whizz); DECLARE_DRIVER_INIT(turtship); + TILE_GET_INFO_MEMBER(get_sidearms_bg_tile_info); + TILE_GET_INFO_MEMBER(get_philko_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILEMAP_MAPPER_MEMBER(sidearms_tilemap_scan); }; /*----------- defined in video/sidearms.c -----------*/ diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index b09a23bfe62..0e237b8074f 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(sidepckt_flipscreen_w); DECLARE_DRIVER_INIT(sidepckt); DECLARE_DRIVER_INIT(sidepctj); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 6d4aac9f770..a5a9d87d9a8 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -24,6 +24,9 @@ public: DECLARE_WRITE32_MEMBER(silkroad_fgram3_w); DECLARE_WRITE32_MEMBER(silk_6295_bank_w); DECLARE_DRIVER_INIT(silkroad); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_fg2_tile_info); + TILE_GET_INFO_MEMBER(get_fg3_tile_info); }; diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index 5656b8cc642..31b4cf68ec4 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -15,6 +15,8 @@ public: DECLARE_READ16_MEMBER(special_port1_r); DECLARE_WRITE16_MEMBER(skullxbo_mobwr_w); DECLARE_DRIVER_INIT(skullxbo); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index 277ba6b6ca9..c0fb43b9b3b 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -46,6 +46,7 @@ public: DECLARE_WRITE8_MEMBER(skydiver_2000_201F_w); DECLARE_WRITE8_MEMBER(skydiver_sound_enable_w); DECLARE_WRITE8_MEMBER(skydiver_whistle_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 57f33fe8ee1..acdf94d1e8e 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -34,6 +34,9 @@ public: DECLARE_WRITE8_MEMBER(skykid_scroll_y_w); DECLARE_WRITE8_MEMBER(skykid_flipscreen_priority_w); DECLARE_DRIVER_INIT(skykid); + TILEMAP_MAPPER_MEMBER(tx_tilemap_scan); + TILE_GET_INFO_MEMBER(tx_get_tile_info); + TILE_GET_INFO_MEMBER(bg_get_tile_info); }; diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index b0cfe900823..5b22fb3a7df 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -117,6 +117,9 @@ public: DECLARE_DRIVER_INIT(perfrman); DECLARE_DRIVER_INIT(gtstarb2); DECLARE_DRIVER_INIT(tigerh); + TILE_GET_INFO_MEMBER(get_pf_tile_info); + TILE_GET_INFO_MEMBER(get_pf1_tile_info); + TILE_GET_INFO_MEMBER(get_fix_tile_info); }; diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index d24e045b512..2e144c9755a 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -141,6 +141,16 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(countryc_trackball_y); DECLARE_CUSTOM_INPUT_MEMBER(snk_bonus_r); DECLARE_DRIVER_INIT(countryc); + TILEMAP_MAPPER_MEMBER(marvins_tx_scan_cols); + TILE_GET_INFO_MEMBER(marvins_get_tx_tile_info); + TILE_GET_INFO_MEMBER(ikari_get_tx_tile_info); + TILE_GET_INFO_MEMBER(gwar_get_tx_tile_info); + TILE_GET_INFO_MEMBER(marvins_get_fg_tile_info); + TILE_GET_INFO_MEMBER(marvins_get_bg_tile_info); + TILE_GET_INFO_MEMBER(aso_get_bg_tile_info); + TILE_GET_INFO_MEMBER(tnk3_get_bg_tile_info); + TILE_GET_INFO_MEMBER(ikari_get_bg_tile_info); + TILE_GET_INFO_MEMBER(gwar_get_bg_tile_info); }; diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index f1424107282..b6ce8ea613a 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -47,6 +47,10 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(snk6502_music0_r); DECLARE_CUSTOM_INPUT_MEMBER(sasuke_count_r); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(satansat_get_bg_tile_info); + TILE_GET_INFO_MEMBER(satansat_get_fg_tile_info); }; diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index d659a289543..41e9330d4ff 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -39,6 +39,8 @@ public: DECLARE_WRITE8_MEMBER(D7759_write_port_0_w); DECLARE_WRITE8_MEMBER(D7759_upd_reset_w); DECLARE_DRIVER_INIT(searchar); + TILE_GET_INFO_MEMBER(get_pow_tile_info); + TILE_GET_INFO_MEMBER(get_searchar_tile_info); }; diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index f17c20fd6f7..b1bf2c1dbfa 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -22,6 +22,8 @@ public: DECLARE_WRITE8_MEMBER(output_port_1_w); DECLARE_WRITE8_MEMBER(snookr10_videoram_w); DECLARE_WRITE8_MEMBER(snookr10_colorram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(apple10_get_bg_tile_info); }; diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index 688c881db22..8d35e517896 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -27,6 +27,8 @@ public: DECLARE_WRITE8_MEMBER(solomon_videoram2_w); DECLARE_WRITE8_MEMBER(solomon_colorram2_w); DECLARE_WRITE8_MEMBER(solomon_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 5c96a3ccf7c..c8b54c96427 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -33,6 +33,7 @@ public: DECLARE_WRITE8_MEMBER(sonson_colorram_w); DECLARE_WRITE8_MEMBER(sonson_scrollx_w); DECLARE_WRITE8_MEMBER(sonson_flipscreen_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 94a694102aa..58152174922 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -41,6 +41,8 @@ public: DECLARE_WRITE8_MEMBER(spdodgeb_scrollx_lo_w); DECLARE_WRITE8_MEMBER(spdodgeb_ctrl_w); DECLARE_WRITE8_MEMBER(spdodgeb_videoram_w); + TILEMAP_MAPPER_MEMBER(background_scan); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index e47026c87a4..a98f76f805e 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -15,6 +15,8 @@ public: DECLARE_WRITE8_MEMBER(speedbal_coincounter_w); DECLARE_WRITE8_MEMBER(speedbal_foreground_videoram_w); DECLARE_WRITE8_MEMBER(speedbal_background_videoram_w); + TILE_GET_INFO_MEMBER(get_tile_info_bg); + TILE_GET_INFO_MEMBER(get_tile_info_fg); }; diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index 049909d2d9e..77c49abe362 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -19,6 +19,7 @@ public: DECLARE_WRITE8_MEMBER(speedspn_banked_vidram_change); DECLARE_WRITE8_MEMBER(speedspn_global_display_w); DECLARE_WRITE8_MEMBER(oki_banking_w); + TILE_GET_INFO_MEMBER(get_speedspn_tile_info); }; diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index 490db307fae..9a49d7b0884 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -57,6 +57,8 @@ public: DECLARE_DRIVER_INIT(funystrp); DECLARE_DRIVER_INIT(splash); DECLARE_DRIVER_INIT(rebus); + TILE_GET_INFO_MEMBER(get_tile_info_splash_tilemap0); + TILE_GET_INFO_MEMBER(get_tile_info_splash_tilemap1); }; diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index e1a04ce95a4..b3b1db5566e 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -25,6 +25,8 @@ public: DECLARE_WRITE8_MEMBER(sprcros2_bgvideoram_w); DECLARE_WRITE8_MEMBER(sprcros2_bgscrollx_w); DECLARE_WRITE8_MEMBER(sprcros2_bgscrolly_w); + TILE_GET_INFO_MEMBER(get_sprcros2_bgtile_info); + TILE_GET_INFO_MEMBER(get_sprcros2_fgtile_info); }; diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index b09af10cc41..ddca0f2bfcd 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -61,6 +61,7 @@ public: DECLARE_DRIVER_INIT(sprint1); DECLARE_DRIVER_INIT(sprint2); DECLARE_DRIVER_INIT(dominos); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index be0a93f48cd..4b01410ded2 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -34,6 +34,7 @@ public: DECLARE_WRITE8_MEMBER(sprint4_screech_4_w); DECLARE_WRITE8_MEMBER(sprint4_bang_w); DECLARE_WRITE8_MEMBER(sprint4_attract_w); + TILE_GET_INFO_MEMBER(sprint4_tile_info); }; diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 0d39c36bf4f..62f720aa3bd 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -30,6 +30,8 @@ public: DECLARE_WRITE8_MEMBER(sprint8_lockout_w); DECLARE_WRITE8_MEMBER(sprint8_int_reset_w); DECLARE_WRITE8_MEMBER(sprint8_video_ram_w); + TILE_GET_INFO_MEMBER(get_tile_info1); + TILE_GET_INFO_MEMBER(get_tile_info2); }; diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index 8ff45286fc7..9296aa1a0a1 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -23,6 +23,8 @@ public: DECLARE_WRITE8_MEMBER(srumbler_background_w); DECLARE_WRITE8_MEMBER(srumbler_4009_w); DECLARE_WRITE8_MEMBER(srumbler_scroll_w); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 950ef05b8b3..3d55e5c60a3 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -44,6 +44,10 @@ public: DECLARE_WRITE16_MEMBER(sslam_snd_w); DECLARE_DRIVER_INIT(sslam); DECLARE_DRIVER_INIT(powerbls); + TILE_GET_INFO_MEMBER(get_sslam_tx_tile_info); + TILE_GET_INFO_MEMBER(get_sslam_md_tile_info); + TILE_GET_INFO_MEMBER(get_sslam_bg_tile_info); + TILE_GET_INFO_MEMBER(get_powerbls_bg_tile_info); }; diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index 56d91e45c81..1a7258c1da8 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -31,6 +31,8 @@ public: DECLARE_WRITE8_MEMBER(ssozumo_scroll_w); DECLARE_WRITE8_MEMBER(ssozumo_flipscreen_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index 108ea9ba83b..5a09f6dec8c 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -23,6 +23,9 @@ public: DECLARE_WRITE8_MEMBER(ssrj_vram1_w); DECLARE_WRITE8_MEMBER(ssrj_vram2_w); DECLARE_WRITE8_MEMBER(ssrj_vram4_w); + TILE_GET_INFO_MEMBER(get_tile_info1); + TILE_GET_INFO_MEMBER(get_tile_info2); + TILE_GET_INFO_MEMBER(get_tile_info4); }; diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index fdf299844d2..fa57476c9cb 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -120,6 +120,7 @@ public: DECLARE_DRIVER_INIT(jsk); DECLARE_DRIVER_INIT(twineag2); DECLARE_DRIVER_INIT(mslider); + TILE_GET_INFO_MEMBER(get_tile_info_0); }; /*----------- defined in video/ssv.c -----------*/ diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index ff3873769a9..b1a333daa29 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -13,6 +13,7 @@ public: DECLARE_READ16_MEMBER(stadhero_control_r); DECLARE_WRITE16_MEMBER(stadhero_control_w); DECLARE_WRITE16_MEMBER(stadhero_pf1_data_w); + TILE_GET_INFO_MEMBER(get_pf1_tile_info); }; diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index 7b39e47dab8..44e0c701dba 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -75,6 +75,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(collision_latch_r); DECLARE_WRITE8_MEMBER(starshp1_audio_w); DECLARE_WRITE8_MEMBER(starshp1_analog_out_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 7f034b8d1fe..ed2f18b6828 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -37,6 +37,11 @@ public: DECLARE_WRITE8_MEMBER(stfight_vh_latch_w); DECLARE_DRIVER_INIT(stfight); DECLARE_DRIVER_INIT(empcity); + TILEMAP_MAPPER_MEMBER(fg_scan); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILEMAP_MAPPER_MEMBER(bg_scan); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index 0401c70fb9b..6d3b750c034 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -38,6 +38,10 @@ public: DECLARE_WRITE16_MEMBER(oki_bank_w); DECLARE_DRIVER_INIT(twinbrat); DECLARE_DRIVER_INIT(stlforce); + TILE_GET_INFO_MEMBER(get_stlforce_bg_tile_info); + TILE_GET_INFO_MEMBER(get_stlforce_mlow_tile_info); + TILE_GET_INFO_MEMBER(get_stlforce_mhigh_tile_info); + TILE_GET_INFO_MEMBER(get_stlforce_tx_tile_info); }; diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index eca0cfd95c6..329a97afbd3 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -27,6 +27,7 @@ public: DECLARE_WRITE8_MEMBER(strnskil_scrl_ctrl_w); DECLARE_DRIVER_INIT(banbam); DECLARE_DRIVER_INIT(pettanp); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 31872fd0eb2..b03fc3f7ecd 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -88,6 +88,7 @@ public: DECLARE_DRIVER_INIT(brickzn); DECLARE_DRIVER_INIT(hardhead); DECLARE_DRIVER_INIT(suna8); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 1f0cb680cc0..c8b1154393a 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -70,6 +70,8 @@ public: DECLARE_DRIVER_INIT(sqix); DECLARE_DRIVER_INIT(perestro); DECLARE_DRIVER_INIT(sqixa); + TILE_GET_INFO_MEMBER(pb_get_bg_tile_info); + TILE_GET_INFO_MEMBER(sqix_get_bg_tile_info); }; diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index 99441b09afd..d8154a70333 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -19,6 +19,7 @@ public: DECLARE_WRITE8_MEMBER(suprloco_control_w); DECLARE_READ8_MEMBER(suprloco_control_r); DECLARE_DRIVER_INIT(suprloco); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 04fc867404b..ccb2f841eba 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -124,6 +124,8 @@ public: DECLARE_DRIVER_INIT(senknow); DECLARE_DRIVER_INIT(galpani4); DECLARE_DRIVER_INIT(ryouran); + TILE_GET_INFO_MEMBER(get_tilemap_A_tile_info); + TILE_GET_INFO_MEMBER(get_tilemap_B_tile_info); }; diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index 26409f208a9..1e4f4758611 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -36,6 +36,8 @@ public: DECLARE_WRITE8_MEMBER(suprridr_fgram_w); DECLARE_CUSTOM_INPUT_MEMBER(suprridr_control_r); DECLARE_READ8_MEMBER(sound_data_r); + TILE_GET_INFO_MEMBER(get_tile_info); + TILE_GET_INFO_MEMBER(get_tile_info2); }; diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 868000c41e6..f7f3a609b9f 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -44,6 +44,8 @@ public: DECLARE_WRITE16_MEMBER(suprslam_screen_videoram_w); DECLARE_WRITE16_MEMBER(suprslam_bg_videoram_w); DECLARE_WRITE16_MEMBER(suprslam_bank_w); + TILE_GET_INFO_MEMBER(get_suprslam_tile_info); + TILE_GET_INFO_MEMBER(get_suprslam_bg_tile_info); }; diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 1e3aae7a0eb..679f7eb47f1 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -98,6 +98,7 @@ public: DECLARE_DRIVER_INIT(seganinj); DECLARE_DRIVER_INIT(gardia); DECLARE_DRIVER_INIT(spatter); + TILE_GET_INFO_MEMBER(tile_get_info); }; diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 808b5d1aa68..d0ffa7fdd5d 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -173,6 +173,16 @@ public: DECLARE_DRIVER_INIT(tturfbl); DECLARE_DRIVER_INIT(goldnaxeb1); DECLARE_DRIVER_INIT(common); + TILEMAP_MAPPER_MEMBER(sys16_bg_map); + TILEMAP_MAPPER_MEMBER(sys16_text_map); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); + TILE_GET_INFO_MEMBER(get_fg2_tile_info); + TILE_GET_INFO_MEMBER(get_text_tile_info); + TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_infotxt); + TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_info0); + TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_info1); }; /*----------- defined in video/system16.c -----------*/ diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index 0bb4c88490b..38e41a36b61 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -24,6 +24,7 @@ public: DECLARE_WRITE8_MEMBER(tagteam_control_w); DECLARE_WRITE8_MEMBER(tagteam_flipscreen_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index de7208397db..0d4e9a62729 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -34,6 +34,7 @@ public: DECLARE_WRITE16_MEMBER(tail2nos_zoomdata_w); DECLARE_WRITE16_MEMBER(tail2nos_gfxbank_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 9c44b340366..750b76ae29f 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -258,6 +258,16 @@ public: DECLARE_DRIVER_INIT(cleopatr); DECLARE_DRIVER_INIT(scfinals); DECLARE_DRIVER_INIT(pbobbl2x); + TILE_GET_INFO_MEMBER(get_tile_info1); + TILE_GET_INFO_MEMBER(get_tile_info2); + TILE_GET_INFO_MEMBER(get_tile_info3); + TILE_GET_INFO_MEMBER(get_tile_info4); + TILE_GET_INFO_MEMBER(get_tile_info5); + TILE_GET_INFO_MEMBER(get_tile_info6); + TILE_GET_INFO_MEMBER(get_tile_info7); + TILE_GET_INFO_MEMBER(get_tile_info8); + TILE_GET_INFO_MEMBER(get_tile_info_vram); + TILE_GET_INFO_MEMBER(get_tile_info_pixel); }; diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 310e6fcfe43..f731ae78ff0 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -104,6 +104,9 @@ public: DECLARE_WRITE8_MEMBER(champwr_msm5205_volume_w); DECLARE_WRITE8_MEMBER(portA_w); DECLARE_DRIVER_INIT(plottinga); + TILE_GET_INFO_MEMBER(get_bg18_tile_info); + TILE_GET_INFO_MEMBER(get_bg19_tile_info); + TILE_GET_INFO_MEMBER(get_ch1a_tile_info); }; /*----------- defined in video/taito_l.c -----------*/ diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 1515e1ed829..f8c75ec7305 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -156,6 +156,7 @@ public: DECLARE_DRIVER_INIT(dendego2); DECLARE_DRIVER_INIT(dangcurv); DECLARE_DRIVER_INIT(taitojc); + TILE_GET_INFO_MEMBER(taitojc_tile_info); }; diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 6022d19cd39..4001ad8d862 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -55,6 +55,7 @@ public: DECLARE_WRITE8_MEMBER(tank8_attract_w); DECLARE_WRITE8_MEMBER(tank8_motor_w); DECLARE_DRIVER_INIT(decode); + TILE_GET_INFO_MEMBER(tank8_get_tile_info); }; diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 23f11562711..9172b9df5e9 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -26,6 +26,7 @@ public: DECLARE_WRITE8_MEMBER(tankbatt_coin_lockout_w); DECLARE_WRITE8_MEMBER(tankbatt_videoram_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index 89e69226b03..1bce8779b78 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -37,6 +37,8 @@ public: DECLARE_WRITE8_MEMBER(tankbust_yscroll_w); DECLARE_READ8_MEMBER(tankbust_soundlatch_r); DECLARE_READ8_MEMBER(tankbust_soundtimer_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_txt_tile_info); }; diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index 4c1a5ed574c..b9cb6e08dfa 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -27,6 +27,8 @@ public: DECLARE_WRITE16_MEMBER(taotaido_sprite_character_bank_select_w); DECLARE_WRITE16_MEMBER(taotaido_tileregs_w); DECLARE_WRITE16_MEMBER(taotaido_bgvideoram_w); + TILE_GET_INFO_MEMBER(taotaido_bg_tile_info); + TILEMAP_MAPPER_MEMBER(taotaido_tilemap_scan_rows); }; diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index 0df17b2d92a..b04edcb8211 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -17,6 +17,8 @@ public: DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w); DECLARE_WRITE16_MEMBER(targeth_coin_counter_w); DECLARE_WRITE16_MEMBER(targeth_vram_w); + TILE_GET_INFO_MEMBER(get_tile_info_targeth_screen0); + TILE_GET_INFO_MEMBER(get_tile_info_targeth_screen1); }; diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index d2b1aebe83b..f9af3a96357 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -112,6 +112,9 @@ public: DECLARE_DRIVER_INIT(roundup5); DECLARE_DRIVER_INIT(apache3); DECLARE_DRIVER_INIT(cyclwarr); + TILE_GET_INFO_MEMBER(get_text_tile_info); + TILE_GET_INFO_MEMBER(get_tile_info_bigfight_0); + TILE_GET_INFO_MEMBER(get_tile_info_bigfight_1); }; diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 9006e3ddcfa..cab6a639027 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -45,6 +45,9 @@ public: DECLARE_WRITE8_MEMBER(tbowl_bg2xscroll_hi); DECLARE_WRITE8_MEMBER(tbowl_bg2yscroll_lo); DECLARE_WRITE8_MEMBER(tbowl_bg2yscroll_hi); + TILE_GET_INFO_MEMBER(get_tx_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 6ad2001f599..e860020048b 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -53,6 +53,9 @@ public: DECLARE_WRITE8_MEMBER(voice_w); optional_device<namco_c45_road_device> m_c45_road; + TILE_GET_INFO_MEMBER(get_tx_tile_info); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index 0f064bfbb30..ec58bf24fcb 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -41,6 +41,11 @@ public: DECLARE_DRIVER_INIT(rygar); DECLARE_DRIVER_INIT(backfirt); DECLARE_DRIVER_INIT(gemini); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(gemini_get_bg_tile_info); + TILE_GET_INFO_MEMBER(gemini_get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index e7e84867005..93093817cd2 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -43,6 +43,9 @@ public: DECLARE_WRITE16_MEMBER(tecmo16_scroll2_y_w); DECLARE_WRITE16_MEMBER(tecmo16_scroll_char_x_w); DECLARE_WRITE16_MEMBER(tecmo16_scroll_char_y_w); + TILE_GET_INFO_MEMBER(fg_get_tile_info); + TILE_GET_INFO_MEMBER(bg_get_tile_info); + TILE_GET_INFO_MEMBER(tx_get_tile_info); }; diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index a2a0e64815a..a0341240a52 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -73,6 +73,10 @@ public: DECLARE_DRIVER_INIT(tkdensha); DECLARE_DRIVER_INIT(deroon); DECLARE_DRIVER_INIT(tkdensho); + TILE_GET_INFO_MEMBER(get_bg0tile_info); + TILE_GET_INFO_MEMBER(get_bg1tile_info); + TILE_GET_INFO_MEMBER(get_bg2tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index b16f8015c21..c92e37e2284 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -43,6 +43,8 @@ public: DECLARE_WRITE8_MEMBER(tehkanwc_portB_w); DECLARE_WRITE8_MEMBER(msm_reset_w); DECLARE_DRIVER_INIT(teedoff); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 98b50ef7c0c..981ca2311b3 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -31,6 +31,8 @@ public: DECLARE_DRIVER_INIT(amazon); DECLARE_DRIVER_INIT(amatelas); DECLARE_DRIVER_INIT(horekid); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index c268a5a1ace..438fab5502d 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -95,6 +95,13 @@ public: DECLARE_DRIVER_INIT(rockn); DECLARE_DRIVER_INIT(rockn3); DECLARE_DRIVER_INIT(rocknms); + TILE_GET_INFO_MEMBER(get_tile_info_bg); + TILE_GET_INFO_MEMBER(get_tile_info_fg); + TILE_GET_INFO_MEMBER(get_tile_info_rot); + TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_bg); + TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_fg); + TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_rot); + TILE_GET_INFO_MEMBER(stepstag_get_tile_info_fg); }; class stepstag_state : public tetrisp2_state diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 2797f1d2dc6..9ff2b8de7da 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -43,6 +43,9 @@ public: DECLARE_READ8_MEMBER(thedeep_p0_r); DECLARE_WRITE8_MEMBER(thedeep_vram_0_w); DECLARE_WRITE8_MEMBER(thedeep_vram_1_w); + TILEMAP_MAPPER_MEMBER(tilemap_scan_rows_back); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); }; diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index 1d6087ce6b3..d90825561c2 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE8_MEMBER(intrepid_graphics_bank_w); DECLARE_READ8_MEMBER(thepit_input_port_0_r); DECLARE_DRIVER_INIT(rtriv); + TILE_GET_INFO_MEMBER(solid_get_tile_info); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index f472064fbab..e0f0a6797d1 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -17,6 +17,8 @@ public: DECLARE_WRITE16_MEMBER(thoop2_coin_w); DECLARE_READ16_MEMBER(DS5002FP_R); DECLARE_WRITE16_MEMBER(thoop2_vram_w); + TILE_GET_INFO_MEMBER(get_tile_info_thoop2_screen0); + TILE_GET_INFO_MEMBER(get_tile_info_thoop2_screen1); }; diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index 9e20b46c0ed..14a20aa616f 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -18,6 +18,9 @@ public: DECLARE_READ16_MEMBER(thunderj_atarivc_r); DECLARE_WRITE16_MEMBER(thunderj_atarivc_w); DECLARE_DRIVER_INIT(thunderj); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); + TILE_GET_INFO_MEMBER(get_playfield2_tile_info); }; diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 1086dd2b32a..b1353aaec63 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -28,6 +28,8 @@ public: DECLARE_WRITE8_MEMBER(tiamc1_bg_vshift_w); DECLARE_WRITE8_MEMBER(tiamc1_bg_hshift_w); DECLARE_WRITE8_MEMBER(tiamc1_palette_w); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index b3d803d51e9..fe27f1947ed 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -23,6 +23,9 @@ public: DECLARE_WRITE8_MEMBER(msm5205_w); DECLARE_DRIVER_INIT(f1dream); DECLARE_DRIVER_INIT(tigeroad); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILEMAP_MAPPER_MEMBER(tigeroad_tilemap_scan); }; diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index aec9ba328e5..64a7dda4e4f 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -22,6 +22,8 @@ public: DECLARE_WRITE8_MEMBER(timelimt_scroll_x_lsb_w); DECLARE_WRITE8_MEMBER(timelimt_scroll_x_msb_w); DECLARE_WRITE8_MEMBER(timelimt_scroll_y_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 9bf2fc83ff5..44acdeae6fa 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -43,6 +43,8 @@ public: DECLARE_READ8_MEMBER(timeplt_scanline_r); DECLARE_CUSTOM_INPUT_MEMBER(chkun_hopper_status_r); DECLARE_WRITE8_MEMBER(chkun_sound_w); + TILE_GET_INFO_MEMBER(get_tile_info); + TILE_GET_INFO_MEMBER(get_chkun_tile_info); }; diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index d5d33a3b31e..df4f94f0b7a 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -119,6 +119,8 @@ public: DECLARE_DRIVER_INIT(mia); DECLARE_DRIVER_INIT(tmnt); DECLARE_DRIVER_INIT(cuebrick); + TILE_GET_INFO_MEMBER(glfgreat_get_roz_tile_info); + TILE_GET_INFO_MEMBER(prmrsocr_get_roz_tile_info); }; diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 99aa6bce182..061c5615140 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -128,6 +128,10 @@ public: DECLARE_DRIVER_INIT(toaplan1); DECLARE_DRIVER_INIT(demonwld); DECLARE_DRIVER_INIT(vimana); + TILE_GET_INFO_MEMBER(get_pf1_tile_info); + TILE_GET_INFO_MEMBER(get_pf2_tile_info); + TILE_GET_INFO_MEMBER(get_pf3_tile_info); + TILE_GET_INFO_MEMBER(get_pf4_tile_info); }; diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index effed083375..2b3a6936980 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -109,6 +109,7 @@ public: DECLARE_DRIVER_INIT(fixeightbl); DECLARE_DRIVER_INIT(vfive); DECLARE_DRIVER_INIT(batrider); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; /*----------- defined in video/toaplan2.c -----------*/ diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 53ec18b0230..ae30fc43be4 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -34,6 +34,9 @@ public: DECLARE_DRIVER_INIT(tokib); DECLARE_DRIVER_INIT(jujuba); DECLARE_DRIVER_INIT(toki); + TILE_GET_INFO_MEMBER(get_text_tile_info); + TILE_GET_INFO_MEMBER(get_back_tile_info); + TILE_GET_INFO_MEMBER(get_fore_tile_info); }; diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index e0b4097537f..ff883a3001f 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -20,6 +20,8 @@ public: DECLARE_WRITE16_MEMBER(interrupt_scan_w); DECLARE_READ16_MEMBER(special_port1_r); DECLARE_DRIVER_INIT(toobin); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index e6d27d7a387..d5b2584489d 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -44,6 +44,8 @@ public: DECLARE_WRITE8_MEMBER(out_coin0); DECLARE_WRITE8_MEMBER(out_coin1); DECLARE_WRITE8_MEMBER(flip); + TILEMAP_MAPPER_MEMBER(tilemap_scan); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 3a3511970c0..57e8b58d996 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -35,6 +35,8 @@ public: DECLARE_WRITE8_MEMBER(sub_irq_mask_w); DECLARE_WRITE8_MEMBER(tp84_spriteram_w); DECLARE_READ8_MEMBER(tp84_scanline_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 695ed239fd2..d7d4206daee 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -59,6 +59,7 @@ public: UINT8 m_SN76496_latch; DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(space, offset, m_SN76496_latch); }; + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index 213ca911839..c2dc9590a02 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -19,6 +19,7 @@ public: DECLARE_WRITE8_MEMBER(travrusa_flipscreen_w); DECLARE_DRIVER_INIT(shtridra); DECLARE_DRIVER_INIT(motorace); + TILE_GET_INFO_MEMBER(get_tile_info); }; /*----------- defined in video/travrusa.c -----------*/ diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index 115bfc394dc..75ea8857a5b 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -47,6 +47,7 @@ public: DECLARE_READ8_MEMBER(triplhnt_misc_r); DECLARE_READ8_MEMBER(triplhnt_da_latch_r); DECLARE_DRIVER_INIT(triplhnt); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index aa6b42250e3..ec0ac290c95 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -18,6 +18,7 @@ public: DECLARE_WRITE8_MEMBER(trucocl_colorram_w); DECLARE_WRITE8_MEMBER(audio_dac_w); DECLARE_DRIVER_INIT(trucocl); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index 41caac6deac..3c79b196437 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -28,6 +28,10 @@ public: DECLARE_WRITE8_MEMBER(tryout_vram_bankswitch_w); DECLARE_WRITE8_MEMBER(tryout_flipscreen_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILEMAP_MAPPER_MEMBER(get_fg_memory_offset); + TILEMAP_MAPPER_MEMBER(get_bg_memory_offset); }; diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index d48720deb83..1508859cadd 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -52,6 +52,9 @@ public: DECLARE_WRITE8_MEMBER(tsamurai_fg_videoram_w); DECLARE_WRITE8_MEMBER(tsamurai_fg_colorram_w); DECLARE_WRITE8_MEMBER(vsgongf_color_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_vsgongf_tile_info); }; diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 7ff57dd0052..662e10e89c4 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -72,6 +72,16 @@ public: DECLARE_DRIVER_INIT(tumbleb2); DECLARE_DRIVER_INIT(chokchok); DECLARE_DRIVER_INIT(fncywld); + TILEMAP_MAPPER_MEMBER(tumblep_scan); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_fncywld_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_fncywld_bg2_tile_info); + TILE_GET_INFO_MEMBER(get_fncywld_fg_tile_info); + TILE_GET_INFO_MEMBER(pangpang_get_bg1_tile_info); + TILE_GET_INFO_MEMBER(pangpang_get_bg2_tile_info); + TILE_GET_INFO_MEMBER(pangpang_get_fg_tile_info); }; /*----------- defined in video/tumbleb.c -----------*/ diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index ccd545e987f..31d8377bf50 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -21,6 +21,7 @@ public: DECLARE_READ8_MEMBER(dsw2_2r); DECLARE_READ8_MEMBER(dsw2_3r); DECLARE_READ8_MEMBER(dsw2_4r); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 5e7b0e76cf9..8b0e05ef537 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -121,6 +121,7 @@ public: DECLARE_WRITE8_MEMBER(buckrog_i8255_0_w); DECLARE_DRIVER_INIT(buckrog_enc); DECLARE_DRIVER_INIT(turbo_enc); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 8c1c99400ae..ed5eac7e0d6 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -57,6 +57,7 @@ public: DECLARE_DRIVER_INIT(fround); DECLARE_DRIVER_INIT(twin16); DECLARE_DRIVER_INIT(cuebrickj); + TILE_GET_INFO_MEMBER(get_text_tile_info); }; diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 22a244857de..1a63717aac8 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -98,6 +98,9 @@ public: DECLARE_READ8_MEMBER(wardner_sprite_r); DECLARE_WRITE8_MEMBER(wardner_sprite_w); DECLARE_DRIVER_INIT(twincobr); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index fbe954a2cd8..b6fdd71a258 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -35,6 +35,7 @@ public: DECLARE_WRITE8_MEMBER(ultratnk_fire_2_w); DECLARE_WRITE8_MEMBER(ultratnk_attract_w); DECLARE_WRITE8_MEMBER(ultratnk_explosion_w); + TILE_GET_INFO_MEMBER(ultratnk_tile_info); }; diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index 326dc343e38..09701eeae4b 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -34,6 +34,8 @@ public: DECLARE_WRITE32_MEMBER(unico_vram32_w); DECLARE_WRITE16_MEMBER(burglarx_sound_bank_w); DECLARE_WRITE32_MEMBER(zeropnt2_eeprom_w); + TILE_GET_INFO_MEMBER(get_tile_info); + TILE_GET_INFO_MEMBER(get_tile_info32); }; diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index e0b7a9d9ee9..62109c2b541 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -14,6 +14,7 @@ public: DECLARE_WRITE8_MEMBER(lamps2_w); DECLARE_WRITE8_MEMBER(usgames_videoram_w); DECLARE_WRITE8_MEMBER(usgames_charram_w); + TILE_GET_INFO_MEMBER(get_usgames_tile_info); }; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index b4a6d4d9a26..24cc7df4db1 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -41,6 +41,9 @@ public: DECLARE_WRITE8_MEMBER(vastar_bg2videoram_w); DECLARE_READ8_MEMBER(vastar_bg1videoram_r); DECLARE_READ8_MEMBER(vastar_bg2videoram_r); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); + TILE_GET_INFO_MEMBER(get_bg2_tile_info); }; diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index acb2530c435..2a273551022 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -28,6 +28,8 @@ public: DECLARE_WRITE8_MEMBER(vb_videoram_w); DECLARE_READ8_MEMBER(vb_attrib_r); DECLARE_WRITE8_MEMBER(vb_attrib_w); + TILEMAP_MAPPER_MEMBER(background_scan); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 939fae01c38..c4dc48b1678 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -37,6 +37,8 @@ public: DECLARE_WRITE8_MEMBER(videopin_out1_w); DECLARE_WRITE8_MEMBER(videopin_out2_w); DECLARE_WRITE8_MEMBER(videopin_note_dvsr_w); + TILEMAP_MAPPER_MEMBER(get_memory_offset); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index 3659ebff345..042187ac060 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -17,6 +17,8 @@ public: UINT16 m_playfield_yscroll; DECLARE_READ16_MEMBER(port1_r); DECLARE_DRIVER_INIT(vindictr); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 13c781ff7f0..663908a2d82 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -21,6 +21,8 @@ public: DECLARE_WRITE8_MEMBER(vulgus_bgvideoram_w); DECLARE_WRITE8_MEMBER(vulgus_c804_w); DECLARE_WRITE8_MEMBER(vulgus_palette_bank_w); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index f2ef631e58e..4ed68d8dc9b 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -36,6 +36,10 @@ public: DECLARE_DRIVER_INIT(sos); DECLARE_DRIVER_INIT(kaitei); DECLARE_DRIVER_INIT(bombbee); + TILEMAP_MAPPER_MEMBER(tilemap_scan); + TILE_GET_INFO_MEMBER(geebee_get_tile_info); + TILE_GET_INFO_MEMBER(navarone_get_tile_info); + TILE_GET_INFO_MEMBER(warpwarp_get_tile_info); }; diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index be578e253bd..52e571e98c5 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -45,6 +45,11 @@ public: DECLARE_WRITE8_MEMBER(wc90_bgvideoram_w); DECLARE_WRITE8_MEMBER(wc90_fgvideoram_w); DECLARE_WRITE8_MEMBER(wc90_txvideoram_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); + TILE_GET_INFO_MEMBER(track_get_bg_tile_info); + TILE_GET_INFO_MEMBER(track_get_fg_tile_info); }; diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 946b8b2dc3f..ba15e4edc70 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -35,6 +35,9 @@ public: DECLARE_WRITE8_MEMBER(wc90b_fgvideoram_w); DECLARE_WRITE8_MEMBER(wc90b_txvideoram_w); DECLARE_WRITE8_MEMBER(adpcm_control_w); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + TILE_GET_INFO_MEMBER(get_tx_tile_info); }; diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 3c46c377f5e..b34d689571d 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -69,6 +69,9 @@ public: DECLARE_WRITE8_MEMBER(hotchase_3_k007232_w); DECLARE_DRIVER_INIT(wecleman); DECLARE_DRIVER_INIT(hotchase); + TILE_GET_INFO_MEMBER(wecleman_get_txt_tile_info); + TILE_GET_INFO_MEMBER(wecleman_get_bg_tile_info); + TILE_GET_INFO_MEMBER(wecleman_get_fg_tile_info); }; diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 3a2234a6af6..94262a964ee 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -33,6 +33,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(pending_sound_r); DECLARE_DRIVER_INIT(quiz18k); DECLARE_DRIVER_INIT(welltris); + TILE_GET_INFO_MEMBER(get_welltris_tile_info); }; diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index b9eaab153c9..106d70bf1ae 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -61,6 +61,9 @@ public: DECLARE_WRITE16_MEMBER(wgp_piv_ctrl_word_w); DECLARE_DRIVER_INIT(wgp); DECLARE_DRIVER_INIT(wgp2); + TILE_GET_INFO_MEMBER(get_piv0_tile_info); + TILE_GET_INFO_MEMBER(get_piv1_tile_info); + TILE_GET_INFO_MEMBER(get_piv2_tile_info); }; diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index bd3a097caf1..d11d3110e86 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -90,6 +90,7 @@ public: DECLARE_DRIVER_INIT(tshoot); DECLARE_DRIVER_INIT(robotron); DECLARE_DRIVER_INIT(bubbles); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 2faf1f55834..fee79c41330 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -21,6 +21,8 @@ public: DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w); DECLARE_WRITE16_MEMBER(wrally_coin_counter_w); DECLARE_WRITE16_MEMBER(wrally_coin_lockout_w); + TILE_GET_INFO_MEMBER(get_tile_info_wrally_screen0); + TILE_GET_INFO_MEMBER(get_tile_info_wrally_screen1); }; diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 246f0319092..868592b332c 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -22,6 +22,9 @@ public: DECLARE_WRITE16_MEMBER(wwfsstar_fg0_videoram_w); DECLARE_WRITE16_MEMBER(wwfsstar_bg0_videoram_w); DECLARE_CUSTOM_INPUT_MEMBER(wwfsstar_vblank_r); + TILE_GET_INFO_MEMBER(get_fg0_tile_info); + TILEMAP_MAPPER_MEMBER(bg0_scan); + TILE_GET_INFO_MEMBER(get_bg0_tile_info); }; diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h index 575be8fa300..4e719e5b1a0 100644 --- a/src/mame/includes/wwfwfest.h +++ b/src/mame/includes/wwfwfest.h @@ -38,6 +38,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(dsw_3f_r); DECLARE_CUSTOM_INPUT_MEMBER(dsw_c0_r); DECLARE_WRITE8_MEMBER(oki_bankswitch_w); + TILE_GET_INFO_MEMBER(get_fg0_tile_info); + TILE_GET_INFO_MEMBER(get_bg0_tile_info); + TILE_GET_INFO_MEMBER(get_bg1_tile_info); }; diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index 6022e4d39f7..8c15fd3b586 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -62,6 +62,10 @@ public: DECLARE_WRITE8_MEMBER(xain_flipscreen_w); DECLARE_CUSTOM_INPUT_MEMBER(xain_vblank_r); DECLARE_CUSTOM_INPUT_MEMBER(mcu_status_r); + TILEMAP_MAPPER_MEMBER(back_scan); + TILE_GET_INFO_MEMBER(get_bgram0_tile_info); + TILE_GET_INFO_MEMBER(get_bgram1_tile_info); + TILE_GET_INFO_MEMBER(get_char_tile_info); }; diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index b3861d2afd2..e0668151cbb 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -16,6 +16,7 @@ public: DECLARE_WRITE16_MEMBER(eeprom_serial_clock_w); DECLARE_WRITE16_MEMBER(eeprom_data_w); DECLARE_DRIVER_INIT(xorworld); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 28f2c680224..7c7e1056298 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -24,6 +24,8 @@ public: DECLARE_READ8_MEMBER(xxmissio_bgram_r); DECLARE_WRITE8_MEMBER(xxmissio_paletteram_w); DECLARE_CUSTOM_INPUT_MEMBER(xxmissio_status_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index 253e53c08ab..a99497d847f 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -15,6 +15,8 @@ public: UINT16 m_h256; DECLARE_READ16_MEMBER(special_port1_r); DECLARE_DRIVER_INIT(xybots); + TILE_GET_INFO_MEMBER(get_alpha_tile_info); + TILE_GET_INFO_MEMBER(get_playfield_tile_info); }; diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index 54a447c8bce..bda321b957b 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -16,6 +16,7 @@ public: DECLARE_READ8_MEMBER(xyonix_io_r); DECLARE_WRITE8_MEMBER(xyonix_io_w); DECLARE_WRITE8_MEMBER(xyonix_vidram_w); + TILE_GET_INFO_MEMBER(get_xyonix_tile_info); }; diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index 1afad8f69f4..f136939c3ed 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -30,6 +30,7 @@ public: UINT8 m_SN76496_latch; DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(space, offset, m_SN76496_latch); }; + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 2084ff0ec45..2e4ba5d4a7a 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -38,6 +38,9 @@ public: DECLARE_WRITE16_MEMBER(yunsun16_vram_0_w); DECLARE_WRITE16_MEMBER(yunsun16_vram_1_w); DECLARE_DRIVER_INIT(magicbub); + TILEMAP_MAPPER_MEMBER(yunsun16_tilemap_scan_pages); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); }; diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 5c17b5476c5..da96ef385c5 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -34,6 +34,8 @@ public: DECLARE_WRITE8_MEMBER(yunsung8_videoram_w); DECLARE_WRITE8_MEMBER(yunsung8_flipscreen_w); DECLARE_WRITE8_MEMBER(yunsung8_sound_bankswitch_w); + TILE_GET_INFO_MEMBER(get_tile_info_0); + TILE_GET_INFO_MEMBER(get_tile_info_1); }; diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 1b4227c69af..d77de393845 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -18,6 +18,7 @@ public: DECLARE_READ8_MEMBER(zac_s2636_r); DECLARE_WRITE8_MEMBER(zac_s2636_w); DECLARE_READ8_MEMBER(tinvader_port_0_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); }; diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index 1c63431ef46..2d0cc4d7964 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -41,6 +41,7 @@ public: DECLARE_WRITE8_MEMBER(zaccaria_port0b_w); DECLARE_WRITE8_MEMBER(zaccaria_port1b_w); DECLARE_WRITE8_MEMBER(mc1408_data_w); + TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index bd5e579f700..ba6458d58bd 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -59,6 +59,10 @@ public: DECLARE_DRIVER_INIT(futspy); DECLARE_DRIVER_INIT(zaxxonj); DECLARE_DRIVER_INIT(szaxxon); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(zaxxon_get_fg_tile_info); + TILE_GET_INFO_MEMBER(razmataz_get_fg_tile_info); + TILE_GET_INFO_MEMBER(congo_get_fg_tile_info); }; diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index 46ec282dbaa..46a1f9fff21 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -46,4 +46,5 @@ protected: virtual void machine_reset(); virtual void video_start(); + TILE_GET_INFO_MEMBER(get_zerozone_tile_info); }; diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index 9e873817ba0..a741f5f3404 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -64,6 +64,8 @@ protected: virtual void machine_reset(); virtual void video_start(); + TILE_GET_INFO_MEMBER(get_bg_tile_info); + TILE_GET_INFO_MEMBER(get_fg_tile_info); }; class percuss_state : public zodiack_state diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index 96a887b1c6b..ed7a6634223 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -89,33 +89,31 @@ PALETTE_INIT( 1942 ) ***************************************************************************/ -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(_1942_state::get_fg_tile_info) { - _1942_state *state = machine.driver_data<_1942_state>(); int code, color; - code = state->m_fg_videoram[tile_index]; - color = state->m_fg_videoram[tile_index + 0x400]; - SET_TILE_INFO( + code = m_fg_videoram[tile_index]; + color = m_fg_videoram[tile_index + 0x400]; + SET_TILE_INFO_MEMBER( 0, code + ((color & 0x80) << 1), color & 0x3f, 0); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(_1942_state::get_bg_tile_info) { - _1942_state *state = machine.driver_data<_1942_state>(); int code, color; tile_index = (tile_index & 0x0f) | ((tile_index & 0x01f0) << 1); - code = state->m_bg_videoram[tile_index]; - color = state->m_bg_videoram[tile_index + 0x10]; - SET_TILE_INFO( + code = m_bg_videoram[tile_index]; + color = m_bg_videoram[tile_index + 0x10]; + SET_TILE_INFO_MEMBER( 1, code + ((color & 0x80) << 1), - (color & 0x1f) + (0x20 * state->m_palette_bank), + (color & 0x1f) + (0x20 * m_palette_bank), TILE_FLIPYX((color & 0x60) >> 5)); } @@ -128,8 +126,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( 1942 ) { _1942_state *state = machine.driver_data<_1942_state>(); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_COLS, 16, 16, 32, 16); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(_1942_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(_1942_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 32, 16); state->m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index 21dca333dbf..c7bb56318fb 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -165,9 +165,9 @@ WRITE8_MEMBER(_1943_state::c1943_d806_w) m_obj_on = data & 0x40; } -static TILE_GET_INFO( c1943_get_bg2_tile_info ) +TILE_GET_INFO_MEMBER(_1943_state::c1943_get_bg2_tile_info) { - UINT8 *tilerom = machine.root_device().memregion("gfx5")->base() + 0x8000; + UINT8 *tilerom = machine().root_device().memregion("gfx5")->base() + 0x8000; int offs = tile_index * 2; int attr = tilerom[offs + 1]; @@ -175,12 +175,12 @@ static TILE_GET_INFO( c1943_get_bg2_tile_info ) int color = (attr & 0x3c) >> 2; int flags = TILE_FLIPYX((attr & 0xc0) >> 6); - SET_TILE_INFO(2, code, color, flags); + SET_TILE_INFO_MEMBER(2, code, color, flags); } -static TILE_GET_INFO( c1943_get_bg_tile_info ) +TILE_GET_INFO_MEMBER(_1943_state::c1943_get_bg_tile_info) { - UINT8 *tilerom = machine.root_device().memregion("gfx5")->base(); + UINT8 *tilerom = machine().root_device().memregion("gfx5")->base(); int offs = tile_index * 2; int attr = tilerom[offs + 1]; @@ -189,25 +189,24 @@ static TILE_GET_INFO( c1943_get_bg_tile_info ) int flags = TILE_FLIPYX((attr & 0xc0) >> 6); tileinfo.group = color; - SET_TILE_INFO(1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } -static TILE_GET_INFO( c1943_get_fg_tile_info ) +TILE_GET_INFO_MEMBER(_1943_state::c1943_get_fg_tile_info) { - _1943_state *state = machine.driver_data<_1943_state>(); - int attr = state->m_colorram[tile_index]; - int code = state->m_videoram[tile_index] + ((attr & 0xe0) << 3); + int attr = m_colorram[tile_index]; + int code = m_videoram[tile_index] + ((attr & 0xe0) << 3); int color = attr & 0x1f; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START( 1943 ) { _1943_state *state = machine.driver_data<_1943_state>(); - state->m_bg2_tilemap = tilemap_create(machine, c1943_get_bg2_tile_info, TILEMAP_SCAN_COLS, 32, 32, 2048, 8); - state->m_bg_tilemap = tilemap_create(machine, c1943_get_bg_tile_info, TILEMAP_SCAN_COLS, 32, 32, 2048, 8); - state->m_fg_tilemap = tilemap_create(machine, c1943_get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_bg2_tile_info),state), TILEMAP_SCAN_COLS, 32, 32, 2048, 8); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_bg_tile_info),state), TILEMAP_SCAN_COLS, 32, 32, 2048, 8); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); colortable_configure_tilemap_groups(machine.colortable, state->m_bg_tilemap, machine.gfx[1], 0x0f); state->m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c index d9a968c0529..4eec233253e 100644 --- a/src/mame/video/40love.c +++ b/src/mame/video/40love.c @@ -62,11 +62,10 @@ colorram format (2 bytes per one tilemap character line, 8 pixels height): offset 1 xxxx xxxx x scroll (8 LSB bits) */ -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(fortyl_state::get_bg_tile_info) { - fortyl_state *state = machine.driver_data<fortyl_state>(); - int tile_number = state->m_videoram[tile_index]; - int tile_attrib = state->m_colorram[(tile_index / 64) * 2]; + int tile_number = m_videoram[tile_index]; + int tile_attrib = m_colorram[(tile_index / 64) * 2]; int tile_h_bank = (tile_attrib & 0x40) << 3; /* 0x40->0x200 */ int tile_l_bank = (tile_attrib & 0x18) << 3; /* 0x10->0x80, 0x08->0x40 */ @@ -75,7 +74,7 @@ static TILE_GET_INFO( get_bg_tile_info ) code = (code & 0x3f) | tile_l_bank | 0x100; code |= tile_h_bank; - SET_TILE_INFO( 0, + SET_TILE_INFO_MEMBER( 0, code, tile_attrib & 0x07, 0); @@ -110,7 +109,7 @@ VIDEO_START( fortyl ) state->m_tmp_bitmap1 = auto_bitmap_ind16_alloc(machine, 256, 256); state->m_tmp_bitmap2 = auto_bitmap_ind16_alloc(machine, 256, 256); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(fortyl_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); state->m_xoffset = 128; // this never changes diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c index f326874b523..595df668aef 100644 --- a/src/mame/video/4enraya.c +++ b/src/mame/video/4enraya.c @@ -17,12 +17,11 @@ WRITE8_MEMBER(_4enraya_state::fenraya_videoram_w) m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } -static TILE_GET_INFO( get_tile_info ) +TILE_GET_INFO_MEMBER(_4enraya_state::get_tile_info) { - _4enraya_state *state = machine.driver_data<_4enraya_state>(); - int code = state->m_videoram[tile_index * 2] + (state->m_videoram[tile_index * 2 + 1] << 8); - SET_TILE_INFO( + int code = m_videoram[tile_index * 2] + (m_videoram[tile_index * 2 + 1] << 8); + SET_TILE_INFO_MEMBER( 0, code, 0, @@ -33,7 +32,7 @@ VIDEO_START( 4enraya ) { _4enraya_state *state = machine.driver_data<_4enraya_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(_4enraya_state::get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } SCREEN_UPDATE_IND16( 4enraya ) diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index 9bb3ff8375f..354b3bb329e 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -21,15 +21,14 @@ ***************************************************************************/ -static TILE_GET_INFO( get_tile_info ) +TILE_GET_INFO_MEMBER(aeroboto_state::get_tile_info) { - aeroboto_state *state = machine.driver_data<aeroboto_state>(); - UINT8 code = state->m_videoram[tile_index]; - SET_TILE_INFO( + UINT8 code = m_videoram[tile_index]; + SET_TILE_INFO_MEMBER( 0, - code + (state->m_charbank << 8), - state->m_tilecolor[code], - (state->m_tilecolor[code] >= 0x33) ? 0 : TILE_FORCE_LAYER0); + code + (m_charbank << 8), + m_tilecolor[code], + (m_tilecolor[code] >= 0x33) ? 0 : TILE_FORCE_LAYER0); } // transparency should only affect tiles with color 0x33 or higher @@ -44,7 +43,7 @@ VIDEO_START( aeroboto ) { aeroboto_state *state = machine.driver_data<aeroboto_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 64); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aeroboto_state::get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); state->m_bg_tilemap->set_transparent_pen(0); state->m_bg_tilemap->set_scroll_rows(64); diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index 02b4ca1d46e..3c96c84d30f 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -7,72 +7,66 @@ ***************************************************************************/ -static TILE_GET_INFO( get_pspikes_tile_info ) +TILE_GET_INFO_MEMBER(aerofgt_state::get_pspikes_tile_info) { - aerofgt_state *state = machine.driver_data<aerofgt_state>(); - UINT16 code = state->m_bg1videoram[tile_index]; + UINT16 code = m_bg1videoram[tile_index]; int bank = (code & 0x1000) >> 12; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, - (code & 0x0fff) + (state->m_gfxbank[bank] << 12), - ((code & 0xe000) >> 13) + 8 * state->m_charpalettebank, + (code & 0x0fff) + (m_gfxbank[bank] << 12), + ((code & 0xe000) >> 13) + 8 * m_charpalettebank, 0); } -static TILE_GET_INFO( karatblz_bg1_tile_info ) +TILE_GET_INFO_MEMBER(aerofgt_state::karatblz_bg1_tile_info) { - aerofgt_state *state = machine.driver_data<aerofgt_state>(); - UINT16 code = state->m_bg1videoram[tile_index]; - SET_TILE_INFO( + UINT16 code = m_bg1videoram[tile_index]; + SET_TILE_INFO_MEMBER( 0, - (code & 0x1fff) + (state->m_gfxbank[0] << 13), + (code & 0x1fff) + (m_gfxbank[0] << 13), (code & 0xe000) >> 13, 0); } /* also spinlbrk */ -static TILE_GET_INFO( karatblz_bg2_tile_info ) +TILE_GET_INFO_MEMBER(aerofgt_state::karatblz_bg2_tile_info) { - aerofgt_state *state = machine.driver_data<aerofgt_state>(); - UINT16 code = state->m_bg2videoram[tile_index]; - SET_TILE_INFO( + UINT16 code = m_bg2videoram[tile_index]; + SET_TILE_INFO_MEMBER( 1, - (code & 0x1fff) + (state->m_gfxbank[1] << 13), + (code & 0x1fff) + (m_gfxbank[1] << 13), (code & 0xe000) >> 13, 0); } -static TILE_GET_INFO( spinlbrk_bg1_tile_info ) +TILE_GET_INFO_MEMBER(aerofgt_state::spinlbrk_bg1_tile_info) { - aerofgt_state *state = machine.driver_data<aerofgt_state>(); - UINT16 code = state->m_bg1videoram[tile_index]; - SET_TILE_INFO( + UINT16 code = m_bg1videoram[tile_index]; + SET_TILE_INFO_MEMBER( 0, - (code & 0x0fff) + (state->m_gfxbank[0] << 12), + (code & 0x0fff) + (m_gfxbank[0] << 12), (code & 0xf000) >> 12, 0); } -static TILE_GET_INFO( get_bg1_tile_info ) +TILE_GET_INFO_MEMBER(aerofgt_state::get_bg1_tile_info) { - aerofgt_state *state = machine.driver_data<aerofgt_state>(); - UINT16 code = state->m_bg1videoram[tile_index]; + UINT16 code = m_bg1videoram[tile_index]; int bank = (code & 0x1800) >> 11; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, - (code & 0x07ff) + (state->m_gfxbank[bank] << 11), + (code & 0x07ff) + (m_gfxbank[bank] << 11), (code & 0xe000) >> 13, 0); } -static TILE_GET_INFO( get_bg2_tile_info ) +TILE_GET_INFO_MEMBER(aerofgt_state::get_bg2_tile_info) { - aerofgt_state *state = machine.driver_data<aerofgt_state>(); - UINT16 code = state->m_bg2videoram[tile_index]; + UINT16 code = m_bg2videoram[tile_index]; int bank = 4 + ((code & 0x1800) >> 11); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, - (code & 0x07ff) + (state->m_gfxbank[bank] << 11), + (code & 0x07ff) + (m_gfxbank[bank] << 11), (code & 0xe000) >> 13, 0); } @@ -100,7 +94,7 @@ static void aerofgt_register_state_globals( running_machine &machine ) VIDEO_START( pspikes ) { aerofgt_state *state = machine.driver_data<aerofgt_state>(); - state->m_bg1_tilemap = tilemap_create(machine, get_pspikes_tile_info,TILEMAP_SCAN_ROWS,8,8,64,32); + state->m_bg1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),state),TILEMAP_SCAN_ROWS,8,8,64,32); /* no bg2 in this game */ state->m_sprite_gfx = 1; @@ -113,8 +107,8 @@ VIDEO_START( pspikes ) VIDEO_START( karatblz ) { aerofgt_state *state = machine.driver_data<aerofgt_state>(); - state->m_bg1_tilemap = tilemap_create(machine, karatblz_bg1_tile_info,TILEMAP_SCAN_ROWS, 8,8,64,64); - state->m_bg2_tilemap = tilemap_create(machine, karatblz_bg2_tile_info,TILEMAP_SCAN_ROWS,8,8,64,64); + state->m_bg1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg1_tile_info),state),TILEMAP_SCAN_ROWS, 8,8,64,64); + state->m_bg2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg2_tile_info),state),TILEMAP_SCAN_ROWS,8,8,64,64); state->m_bg2_tilemap->set_transparent_pen(15); state->m_spritepalettebank = 0; @@ -128,8 +122,8 @@ VIDEO_START( spinlbrk ) aerofgt_state *state = machine.driver_data<aerofgt_state>(); int i; - state->m_bg1_tilemap = tilemap_create(machine, spinlbrk_bg1_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - state->m_bg2_tilemap = tilemap_create(machine, karatblz_bg2_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + state->m_bg1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::spinlbrk_bg1_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + state->m_bg2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg2_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); state->m_bg2_tilemap->set_transparent_pen(15); @@ -155,8 +149,8 @@ VIDEO_START( spinlbrk ) VIDEO_START( turbofrc ) { aerofgt_state *state = machine.driver_data<aerofgt_state>(); - state->m_bg1_tilemap = tilemap_create(machine, get_bg1_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + state->m_bg1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::get_bg1_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + state->m_bg2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::get_bg2_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); state->m_bg2_tilemap->set_transparent_pen(15); @@ -169,7 +163,7 @@ VIDEO_START( turbofrc ) VIDEO_START( wbbc97 ) { aerofgt_state *state = machine.driver_data<aerofgt_state>(); - state->m_bg1_tilemap = tilemap_create(machine, get_pspikes_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_bg1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); /* no bg2 in this game */ state->m_bg1_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c index 26a9f83e518..4d51bee1fd6 100644 --- a/src/mame/video/airbustr.c +++ b/src/mame/video/airbustr.c @@ -89,32 +89,30 @@ WRITE8_MEMBER(airbustr_state::airbustr_scrollregs_w) m_fg_tilemap->set_scrollx(0, ((m_highbits << 8) & 0x100) + m_fg_scrollx); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(airbustr_state::get_fg_tile_info) { - airbustr_state *state = machine.driver_data<airbustr_state>(); - int attr = state->m_colorram2[tile_index]; - int code = state->m_videoram2[tile_index] + ((attr & 0x0f) << 8); + int attr = m_colorram2[tile_index]; + int code = m_videoram2[tile_index] + ((attr & 0x0f) << 8); int color = attr >> 4; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(airbustr_state::get_bg_tile_info) { - airbustr_state *state = machine.driver_data<airbustr_state>(); - int attr = state->m_colorram[tile_index]; - int code = state->m_videoram[tile_index] + ((attr & 0x0f) << 8); + int attr = m_colorram[tile_index]; + int code = m_videoram[tile_index] + ((attr & 0x0f) << 8); int color = (attr >> 4) + 16; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START( airbustr ) { airbustr_state *state = machine.driver_data<airbustr_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(airbustr_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(airbustr_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); machine.primary_screen->register_screen_bitmap(state->m_sprites_bitmap); state->m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index bda83434d1f..9dfed5bfdb7 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -37,15 +37,14 @@ WRITE16_MEMBER(alpha68k_state::alpha68k_paletteram_w) /******************************************************************************/ -static TILE_GET_INFO( get_tile_info ) +TILE_GET_INFO_MEMBER(alpha68k_state::get_tile_info) { - alpha68k_state *state = machine.driver_data<alpha68k_state>(); - int tile = state->m_videoram[2 * tile_index] & 0xff; - int color = state->m_videoram[2 * tile_index + 1] & 0x0f; + int tile = m_videoram[2 * tile_index] & 0xff; + int color = m_videoram[2 * tile_index + 1] & 0x0f; - tile = tile | (state->m_bank_base << 8); + tile = tile | (m_bank_base << 8); - SET_TILE_INFO(0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } WRITE16_MEMBER(alpha68k_state::alpha68k_videoram_w) @@ -66,7 +65,7 @@ VIDEO_START( alpha68k ) { alpha68k_state *state = machine.driver_data<alpha68k_state>(); - state->m_fix_tilemap = tilemap_create(machine, get_tile_info, TILEMAP_SCAN_COLS, 8, 8, 32, 32); + state->m_fix_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(alpha68k_state::get_tile_info),state), TILEMAP_SCAN_COLS, 8, 8, 32, 32); state->m_fix_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c index faf7754e8c8..a2124b0e1de 100644 --- a/src/mame/video/ampoker2.c +++ b/src/mame/video/ampoker2.c @@ -119,10 +119,9 @@ WRITE8_MEMBER(ampoker2_state::ampoker2_videoram_w) m_bg_tilemap->mark_tile_dirty(offset / 2); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(ampoker2_state::get_bg_tile_info) { - ampoker2_state *state = machine.driver_data<ampoker2_state>(); - UINT8 *videoram = state->m_videoram; + UINT8 *videoram = m_videoram; int offs = tile_index * 2; int attr = videoram[offs + 1]; int code = videoram[offs]; @@ -130,13 +129,12 @@ static TILE_GET_INFO( get_bg_tile_info ) code = code + (256 * (color & 0x03)); /* code = color.bit1 + color.bit0 + code */ color = color >> 1; /* color = color - bit0 (bit1..bit7) */ - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } -static TILE_GET_INFO( s2k_get_bg_tile_info ) +TILE_GET_INFO_MEMBER(ampoker2_state::s2k_get_bg_tile_info) { - ampoker2_state *state = machine.driver_data<ampoker2_state>(); - UINT8 *videoram = state->m_videoram; + UINT8 *videoram = m_videoram; int offs = tile_index * 2; int attr = videoram[offs + 1]; int code = videoram[offs]; @@ -144,20 +142,20 @@ static TILE_GET_INFO( s2k_get_bg_tile_info ) code = code + (256 * (color & 0x0f)); /* the game uses 2 extra bits */ color = color >> 1; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START(ampoker2) { ampoker2_state *state = machine.driver_data<ampoker2_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ampoker2_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } VIDEO_START(sigma2k) { ampoker2_state *state = machine.driver_data<ampoker2_state>(); - state->m_bg_tilemap = tilemap_create(machine, s2k_get_bg_tile_info, TILEMAP_SCAN_ROWS, + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ampoker2_state::s2k_get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index f3ec5d65aef..87c6da4370a 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -42,12 +42,11 @@ WRITE8_MEMBER(amspdwy_state::amspdwy_flipscreen_w) ***************************************************************************/ -static TILE_GET_INFO( get_tile_info ) +TILE_GET_INFO_MEMBER(amspdwy_state::get_tile_info) { - amspdwy_state *state = machine.driver_data<amspdwy_state>(); - UINT8 code = state->m_videoram[tile_index]; - UINT8 color = state->m_colorram[tile_index]; - SET_TILE_INFO( + UINT8 code = m_videoram[tile_index]; + UINT8 color = m_colorram[tile_index]; + SET_TILE_INFO_MEMBER( 0, code + ((color & 0x18)<<5), color & 0x07, @@ -68,7 +67,7 @@ WRITE8_MEMBER(amspdwy_state::amspdwy_colorram_w) /* logical (col,row) -> memory offset */ -static TILEMAP_MAPPER( tilemap_scan_cols_back ) +TILEMAP_MAPPER_MEMBER(amspdwy_state::tilemap_scan_cols_back) { return col * num_rows + (num_rows - row - 1); } @@ -77,7 +76,7 @@ static TILEMAP_MAPPER( tilemap_scan_cols_back ) VIDEO_START( amspdwy ) { amspdwy_state *state = machine.driver_data<amspdwy_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_cols_back, 8, 8, 0x20, 0x20); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(amspdwy_state::get_tile_info),state), tilemap_mapper_delegate(FUNC(amspdwy_state::tilemap_scan_cols_back),state), 8, 8, 0x20, 0x20); } diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 20a19682115..2615e4ddaa6 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -14,13 +14,12 @@ enable / disable tilemap bits might be wrong */ -static TILE_GET_INFO( get_tx_tile_info ) +TILE_GET_INFO_MEMBER(angelkds_state::get_tx_tile_info) { - angelkds_state *state = machine.driver_data<angelkds_state>(); int tileno; - tileno = state->m_txvideoram[tile_index] + (state->m_txbank * 0x100); - SET_TILE_INFO(0, tileno, 0, 0); + tileno = m_txvideoram[tile_index] + (m_txbank * 0x100); + SET_TILE_INFO_MEMBER(0, tileno, 0, 0); } WRITE8_MEMBER(angelkds_state::angelkds_txvideoram_w) @@ -44,15 +43,14 @@ WRITE8_MEMBER(angelkds_state::angelkds_txbank_write) */ -static TILE_GET_INFO( get_bgtop_tile_info ) +TILE_GET_INFO_MEMBER(angelkds_state::get_bgtop_tile_info) { - angelkds_state *state = machine.driver_data<angelkds_state>(); int tileno; - tileno = state->m_bgtopvideoram[tile_index]; + tileno = m_bgtopvideoram[tile_index]; - tileno += state->m_bgtopbank * 0x100 ; - SET_TILE_INFO(1, tileno, 0, 0); + tileno += m_bgtopbank * 0x100 ; + SET_TILE_INFO_MEMBER(1, tileno, 0, 0); } WRITE8_MEMBER(angelkds_state::angelkds_bgtopvideoram_w) @@ -82,15 +80,14 @@ WRITE8_MEMBER(angelkds_state::angelkds_bgtopscroll_write) */ -static TILE_GET_INFO( get_bgbot_tile_info ) +TILE_GET_INFO_MEMBER(angelkds_state::get_bgbot_tile_info) { - angelkds_state *state = machine.driver_data<angelkds_state>(); int tileno; - tileno = state->m_bgbotvideoram[tile_index]; + tileno = m_bgbotvideoram[tile_index]; - tileno += state->m_bgbotbank * 0x100 ; - SET_TILE_INFO(2, tileno, 1, 0); + tileno += m_bgbotbank * 0x100 ; + SET_TILE_INFO_MEMBER(2, tileno, 1, 0); } WRITE8_MEMBER(angelkds_state::angelkds_bgbotvideoram_w) @@ -250,13 +247,13 @@ VIDEO_START( angelkds ) { angelkds_state *state = machine.driver_data<angelkds_state>(); - state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(angelkds_state::get_tx_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_tx_tilemap->set_transparent_pen(0); - state->m_bgbot_tilemap = tilemap_create(machine, get_bgbot_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bgbot_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(angelkds_state::get_bgbot_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bgbot_tilemap->set_transparent_pen(15); - state->m_bgtop_tilemap = tilemap_create(machine, get_bgtop_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bgtop_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(angelkds_state::get_bgtop_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bgtop_tilemap->set_transparent_pen(15); } diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 93ae00ac25d..39a237ecf49 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -100,29 +100,27 @@ PALETTE_INIT( robowres ) ***************************************************************************/ -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(appoooh_state::get_fg_tile_info) { - appoooh_state *state = machine.driver_data<appoooh_state>(); - int code = state->m_fg_videoram[tile_index] + 256 * ((state->m_fg_colorram[tile_index] >> 5) & 7); + int code = m_fg_videoram[tile_index] + 256 * ((m_fg_colorram[tile_index] >> 5) & 7); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, code, - state->m_fg_colorram[tile_index] & 0x0f, - (state->m_fg_colorram[tile_index] & 0x10 ) ? TILEMAP_FLIPX : 0 + m_fg_colorram[tile_index] & 0x0f, + (m_fg_colorram[tile_index] & 0x10 ) ? TILEMAP_FLIPX : 0 ); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(appoooh_state::get_bg_tile_info) { - appoooh_state *state = machine.driver_data<appoooh_state>(); - int code = state->m_bg_videoram[tile_index] + 256 * ((state->m_bg_colorram[tile_index] >> 5) & 7); + int code = m_bg_videoram[tile_index] + 256 * ((m_bg_colorram[tile_index] >> 5) & 7); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, code, - state->m_bg_colorram[tile_index] & 0x0f, - (state->m_bg_colorram[tile_index] & 0x10 ) ? TILEMAP_FLIPX : 0 + m_bg_colorram[tile_index] & 0x0f, + (m_bg_colorram[tile_index] & 0x10 ) ? TILEMAP_FLIPX : 0 ); } @@ -136,8 +134,8 @@ VIDEO_START( appoooh ) { appoooh_state *state = machine.driver_data<appoooh_state>(); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(appoooh_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(appoooh_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_fg_tilemap->set_transparent_pen(0); state->m_fg_tilemap->set_scrolldy(8, 8); diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c index 9660af29c34..2d280ed14bc 100644 --- a/src/mame/video/aquarium.c +++ b/src/mame/video/aquarium.c @@ -86,14 +86,13 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const } /* TXT Layer */ -static TILE_GET_INFO( get_aquarium_txt_tile_info ) +TILE_GET_INFO_MEMBER(aquarium_state::get_aquarium_txt_tile_info) { - aquarium_state *state = machine.driver_data<aquarium_state>(); int tileno, colour; - tileno = (state->m_txt_videoram[tile_index] & 0x0fff); - colour = (state->m_txt_videoram[tile_index] & 0xf000) >> 12; - SET_TILE_INFO(2, tileno, colour, 0); + tileno = (m_txt_videoram[tile_index] & 0x0fff); + colour = (m_txt_videoram[tile_index] & 0xf000) >> 12; + SET_TILE_INFO_MEMBER(2, tileno, colour, 0); } WRITE16_MEMBER(aquarium_state::aquarium_txt_videoram_w) @@ -103,18 +102,17 @@ WRITE16_MEMBER(aquarium_state::aquarium_txt_videoram_w) } /* MID Layer */ -static TILE_GET_INFO( get_aquarium_mid_tile_info ) +TILE_GET_INFO_MEMBER(aquarium_state::get_aquarium_mid_tile_info) { - aquarium_state *state = machine.driver_data<aquarium_state>(); int tileno, colour, flag; - tileno = (state->m_mid_videoram[tile_index * 2] & 0x0fff); - colour = (state->m_mid_videoram[tile_index * 2 + 1] & 0x001f); - flag = TILE_FLIPYX((state->m_mid_videoram[tile_index * 2 + 1] & 0x300) >> 8); + tileno = (m_mid_videoram[tile_index * 2] & 0x0fff); + colour = (m_mid_videoram[tile_index * 2 + 1] & 0x001f); + flag = TILE_FLIPYX((m_mid_videoram[tile_index * 2 + 1] & 0x300) >> 8); - SET_TILE_INFO(1, tileno, colour, flag); + SET_TILE_INFO_MEMBER(1, tileno, colour, flag); - tileinfo.category = (state->m_mid_videoram[tile_index * 2 + 1] & 0x20) >> 5; + tileinfo.category = (m_mid_videoram[tile_index * 2 + 1] & 0x20) >> 5; } WRITE16_MEMBER(aquarium_state::aquarium_mid_videoram_w) @@ -124,18 +122,17 @@ WRITE16_MEMBER(aquarium_state::aquarium_mid_videoram_w) } /* BAK Layer */ -static TILE_GET_INFO( get_aquarium_bak_tile_info ) +TILE_GET_INFO_MEMBER(aquarium_state::get_aquarium_bak_tile_info) { - aquarium_state *state = machine.driver_data<aquarium_state>(); int tileno, colour, flag; - tileno = (state->m_bak_videoram[tile_index * 2] & 0x0fff); - colour = (state->m_bak_videoram[tile_index * 2 + 1] & 0x001f); - flag = TILE_FLIPYX((state->m_bak_videoram[tile_index * 2 + 1] & 0x300) >> 8); + tileno = (m_bak_videoram[tile_index * 2] & 0x0fff); + colour = (m_bak_videoram[tile_index * 2 + 1] & 0x001f); + flag = TILE_FLIPYX((m_bak_videoram[tile_index * 2 + 1] & 0x300) >> 8); - SET_TILE_INFO(3, tileno, colour, flag); + SET_TILE_INFO_MEMBER(3, tileno, colour, flag); - tileinfo.category = (state->m_bak_videoram[tile_index * 2 + 1] & 0x20) >> 5; + tileinfo.category = (m_bak_videoram[tile_index * 2 + 1] & 0x20) >> 5; } WRITE16_MEMBER(aquarium_state::aquarium_bak_videoram_w) @@ -147,9 +144,9 @@ WRITE16_MEMBER(aquarium_state::aquarium_bak_videoram_w) VIDEO_START(aquarium) { aquarium_state *state = machine.driver_data<aquarium_state>(); - state->m_txt_tilemap = tilemap_create(machine, get_aquarium_txt_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - state->m_bak_tilemap = tilemap_create(machine, get_aquarium_bak_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - state->m_mid_tilemap = tilemap_create(machine, get_aquarium_mid_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_txt_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_txt_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + state->m_bak_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_bak_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_mid_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_mid_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); state->m_txt_tilemap->set_transparent_pen(0); state->m_mid_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index bec831b3c58..1b9fe75bcfd 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -122,112 +122,105 @@ BG0 palette intensity ( $C47F, $C4FF ) Callbacks for the tilemap code ***************************************************************************/ -static TILE_GET_INFO( argus_get_tx_tile_info ) +TILE_GET_INFO_MEMBER(argus_state::argus_get_tx_tile_info) { - argus_state *state = machine.driver_data<argus_state>(); UINT8 hi, lo; tile_index <<= 1; - lo = state->m_txram[tile_index]; - hi = state->m_txram[tile_index + 1]; + lo = m_txram[tile_index]; + hi = m_txram[tile_index + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 3, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); } -static TILE_GET_INFO( argus_get_bg0_tile_info ) +TILE_GET_INFO_MEMBER(argus_state::argus_get_bg0_tile_info) { - argus_state *state = machine.driver_data<argus_state>(); UINT8 hi, lo; tile_index <<= 1; - lo = state->m_dummy_bg0ram[tile_index]; - hi = state->m_dummy_bg0ram[tile_index + 1]; + lo = m_dummy_bg0ram[tile_index]; + hi = m_dummy_bg0ram[tile_index + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); } -static TILE_GET_INFO( argus_get_bg1_tile_info ) +TILE_GET_INFO_MEMBER(argus_state::argus_get_bg1_tile_info) { - argus_state *state = machine.driver_data<argus_state>(); UINT8 hi, lo; tile_index <<= 1; - lo = state->m_bg1ram[tile_index]; - hi = state->m_bg1ram[tile_index + 1]; + lo = m_bg1ram[tile_index]; + hi = m_bg1ram[tile_index + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 2, lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); } -static TILE_GET_INFO( valtric_get_tx_tile_info ) +TILE_GET_INFO_MEMBER(argus_state::valtric_get_tx_tile_info) { - argus_state *state = machine.driver_data<argus_state>(); UINT8 hi, lo; tile_index <<= 1; - lo = state->m_txram[tile_index]; - hi = state->m_txram[tile_index + 1]; + lo = m_txram[tile_index]; + hi = m_txram[tile_index + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 2, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); } -static TILE_GET_INFO( valtric_get_bg_tile_info ) +TILE_GET_INFO_MEMBER(argus_state::valtric_get_bg_tile_info) { - argus_state *state = machine.driver_data<argus_state>(); UINT8 hi, lo; tile_index <<= 1; - lo = state->m_bg1ram[tile_index]; - hi = state->m_bg1ram[tile_index + 1]; + lo = m_bg1ram[tile_index]; + hi = m_bg1ram[tile_index + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, ((hi & 0xc0) << 2) | ((hi & 0x20) << 5) | lo, hi & 0x0f, 0); } -static TILE_GET_INFO( butasan_get_tx_tile_info ) +TILE_GET_INFO_MEMBER(argus_state::butasan_get_tx_tile_info) { - argus_state *state = machine.driver_data<argus_state>(); UINT8 hi, lo; tile_index ^= 0x3e0; tile_index <<= 1; - lo = state->m_butasan_txram[tile_index]; - hi = state->m_butasan_txram[tile_index + 1]; + lo = m_butasan_txram[tile_index]; + hi = m_butasan_txram[tile_index + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 3, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); } -static TILE_GET_INFO( butasan_get_bg0_tile_info ) +TILE_GET_INFO_MEMBER(argus_state::butasan_get_bg0_tile_info) { - argus_state *state = machine.driver_data<argus_state>(); UINT8 hi, lo; int attrib; @@ -235,27 +228,26 @@ static TILE_GET_INFO( butasan_get_bg0_tile_info ) attrib ^= 0x0f0; attrib <<= 1; - lo = state->m_butasan_bg0ram[attrib]; - hi = state->m_butasan_bg0ram[attrib + 1]; + lo = m_butasan_bg0ram[attrib]; + hi = m_butasan_bg0ram[attrib + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); } -static TILE_GET_INFO( butasan_get_bg1_tile_info ) +TILE_GET_INFO_MEMBER(argus_state::butasan_get_bg1_tile_info) { - argus_state *state = machine.driver_data<argus_state>(); int attrib, tile; attrib = (tile_index & 0x00f) | ((tile_index & 0x3e0) >> 1) | ((tile_index & 0x010) << 5); attrib ^= 0x0f0; - tile = state->m_butasan_bg1ram[attrib] | ((state->m_butasan_bg1_status & 2) << 7); + tile = m_butasan_bg1ram[attrib] | ((m_butasan_bg1_status & 2) << 7); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 2, tile, (tile & 0x80) >> 7, @@ -279,9 +271,9 @@ VIDEO_START( argus ) { argus_state *state = machine.driver_data<argus_state>(); /* info offset w h col row */ - state->m_bg0_tilemap = tilemap_create(machine, argus_get_bg0_tile_info, TILEMAP_SCAN_COLS, 16, 16, 32, 32); - state->m_bg1_tilemap = tilemap_create(machine, argus_get_bg1_tile_info, TILEMAP_SCAN_COLS, 16, 16, 32, 32); - state->m_tx_tilemap = tilemap_create(machine, argus_get_tx_tile_info, TILEMAP_SCAN_COLS, 8, 8, 32, 32); + state->m_bg0_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg0_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + state->m_bg1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg1_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::argus_get_tx_tile_info),state), TILEMAP_SCAN_COLS, 8, 8, 32, 32); state->m_bg1_tilemap->set_transparent_pen(15); state->m_tx_tilemap->set_transparent_pen(15); @@ -307,8 +299,8 @@ VIDEO_START( valtric ) { argus_state *state = machine.driver_data<argus_state>(); /* info offset w h col row */ - state->m_bg1_tilemap = tilemap_create(machine, valtric_get_bg_tile_info, TILEMAP_SCAN_COLS, 16, 16, 32, 32); - state->m_tx_tilemap = tilemap_create(machine, valtric_get_tx_tile_info, TILEMAP_SCAN_COLS, 8, 8, 32, 32); + state->m_bg1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::valtric_get_bg_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::valtric_get_tx_tile_info),state), TILEMAP_SCAN_COLS, 8, 8, 32, 32); state->m_tx_tilemap->set_transparent_pen(15); @@ -328,9 +320,9 @@ VIDEO_START( butasan ) { argus_state *state = machine.driver_data<argus_state>(); /* info offset w h col row */ - state->m_bg0_tilemap = tilemap_create(machine, butasan_get_bg0_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - state->m_bg1_tilemap = tilemap_create(machine, butasan_get_bg1_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - state->m_tx_tilemap = tilemap_create(machine, butasan_get_tx_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg0_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::butasan_get_bg0_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_bg1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::butasan_get_bg1_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::butasan_get_tx_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bg1_tilemap->set_transparent_pen(15); state->m_tx_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index 59c5dea5776..91aa1420fae 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -149,21 +149,20 @@ WRITE8_MEMBER(arkanoid_state::hexa_d008_w) /* bit 6 - 7 unknown */ } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(arkanoid_state::get_bg_tile_info) { - arkanoid_state *state = machine.driver_data<arkanoid_state>(); int offs = tile_index * 2; - int code = state->m_videoram[offs + 1] + ((state->m_videoram[offs] & 0x07) << 8) + 2048 * state->m_gfxbank; - int color = ((state->m_videoram[offs] & 0xf8) >> 3) + 32 * state->m_palettebank; + int code = m_videoram[offs + 1] + ((m_videoram[offs] & 0x07) << 8) + 2048 * m_gfxbank; + int color = ((m_videoram[offs] & 0xf8) >> 3) + 32 * m_palettebank; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START( arkanoid ) { arkanoid_state *state = machine.driver_data<arkanoid_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(arkanoid_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index 0bcf44062b7..1fdaa7c7fa5 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -14,35 +14,34 @@ ***************************************************************************/ -static TILEMAP_MAPPER( armedf_scan_type1 ) +TILEMAP_MAPPER_MEMBER(armedf_state::armedf_scan_type1) { /* col: 0..63; row: 0..31 */ /* armed formation */ return col * 32 + row; } -static TILEMAP_MAPPER( armedf_scan_type2 ) +TILEMAP_MAPPER_MEMBER(armedf_state::armedf_scan_type2) { /* col: 0..63; row: 0..31 */ return 32 * (31 - row) + (col & 0x1f) + 0x800 * (col / 32); } -static TILEMAP_MAPPER( armedf_scan_type3 ) +TILEMAP_MAPPER_MEMBER(armedf_state::armedf_scan_type3) { /* col: 0..63; row: 0..31 */ /* legion & legiono */ return (col & 0x1f) * 32 + row + 0x800 * (col / 32); } -static TILE_GET_INFO( get_nb1414m4_tx_tile_info ) +TILE_GET_INFO_MEMBER(armedf_state::get_nb1414m4_tx_tile_info) { - armedf_state *state = machine.driver_data<armedf_state>(); - int tile_number = state->m_text_videoram[tile_index] & 0xff; + int tile_number = m_text_videoram[tile_index] & 0xff; int attributes; /* TODO: Armed F doesn't seem to use the NB1414M4! */ - //if (state->m_scroll_type == 1) - // attributes = state->m_text_videoram[tile_index + 0x800] & 0xff; + //if (m_scroll_type == 1) + // attributes = m_text_videoram[tile_index + 0x800] & 0xff; //else { - attributes = state->m_text_videoram[tile_index + 0x400] & 0xff; + attributes = m_text_videoram[tile_index + 0x400] & 0xff; if(tile_index < 0x12) /* don't draw the NB1414M4 params! TODO: could be a better fix */ tile_number = attributes = 0x00; @@ -51,25 +50,24 @@ static TILE_GET_INFO( get_nb1414m4_tx_tile_info ) /* bit 3 controls priority, (0) nb1414m4 has priority over all the other video layers */ tileinfo.category = (attributes & 0x8) >> 3; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, tile_number + 256 * (attributes & 0x3), attributes >> 4, 0); } -static TILE_GET_INFO( get_armedf_tx_tile_info ) +TILE_GET_INFO_MEMBER(armedf_state::get_armedf_tx_tile_info) { - armedf_state *state = machine.driver_data<armedf_state>(); - int tile_number = state->m_text_videoram[tile_index] & 0xff; + int tile_number = m_text_videoram[tile_index] & 0xff; int attributes; /* TODO: Armed F doesn't seem to use the NB1414M4! */ - //if (state->m_scroll_type == 1) - attributes = state->m_text_videoram[tile_index + 0x800] & 0xff; + //if (m_scroll_type == 1) + attributes = m_text_videoram[tile_index + 0x800] & 0xff; //else //{ - // attributes = state->m_text_videoram[tile_index + 0x400] & 0xff; + // attributes = m_text_videoram[tile_index + 0x400] & 0xff; // // if(tile_index < 0x12) /* don't draw the NB1414M4 params! TODO: could be a better fix */ // tile_number = attributes = 0x00; @@ -78,7 +76,7 @@ static TILE_GET_INFO( get_armedf_tx_tile_info ) /* bit 3 controls priority, (0) nb1414m4 has priority over all the other video layers */ tileinfo.category = (attributes & 0x8) >> 3; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, tile_number + 256 * (attributes & 0x3), attributes >> 4, @@ -86,11 +84,10 @@ static TILE_GET_INFO( get_armedf_tx_tile_info ) } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(armedf_state::get_fg_tile_info) { - armedf_state *state = machine.driver_data<armedf_state>(); - int data = state->m_fg_videoram[tile_index]; - SET_TILE_INFO( + int data = m_fg_videoram[tile_index]; + SET_TILE_INFO_MEMBER( 1, data&0x7ff, data>>11, @@ -98,11 +95,10 @@ static TILE_GET_INFO( get_fg_tile_info ) } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(armedf_state::get_bg_tile_info) { - armedf_state *state = machine.driver_data<armedf_state>(); - int data = state->m_bg_videoram[tile_index]; - SET_TILE_INFO( + int data = m_bg_videoram[tile_index]; + SET_TILE_INFO_MEMBER( 2, data & 0x3ff, data >> 11, @@ -123,10 +119,11 @@ VIDEO_START( terraf ) state->m_sprite_offy = (state->m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_COLS, 16, 16, 64, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_COLS, 16, 16, 64, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 64, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_fg_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - state->m_tx_tilemap = tilemap_create(machine, get_nb1414m4_tx_tile_info, (state->m_scroll_type == 2) ? armedf_scan_type3 : armedf_scan_type2, 8, 8, 64, 32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_nb1414m4_tx_tile_info),state), + (state->m_scroll_type == 2) ? tilemap_mapper_delegate(FUNC(armedf_state::armedf_scan_type3),state) : tilemap_mapper_delegate(FUNC(armedf_state::armedf_scan_type2),state), 8, 8, 64, 32); state->m_bg_tilemap->set_transparent_pen(0xf); state->m_fg_tilemap->set_transparent_pen(0xf); @@ -145,10 +142,10 @@ VIDEO_START( armedf ) state->m_sprite_offy = (state->m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_COLS, 16, 16, 64, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_COLS, 16, 16, 64, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 64, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_fg_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - state->m_tx_tilemap = tilemap_create(machine, get_armedf_tx_tile_info, armedf_scan_type1, 8, 8, 64, 32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_armedf_tx_tile_info),state), tilemap_mapper_delegate(FUNC(armedf_state::armedf_scan_type1),state), 8, 8, 64, 32); state->m_bg_tilemap->set_transparent_pen(0xf); state->m_fg_tilemap->set_transparent_pen(0xf); diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c index 96d270bcd51..20f2fe1e8d5 100644 --- a/src/mame/video/ashnojoe.c +++ b/src/mame/video/ashnojoe.c @@ -9,75 +9,69 @@ #include "includes/ashnojoe.h" -static TILE_GET_INFO( get_joe_tile_info ) +TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info) { - ashnojoe_state *state = machine.driver_data<ashnojoe_state>(); - int code = state->m_tileram[tile_index]; + int code = m_tileram[tile_index]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 2, code & 0xfff, ((code >> 12) & 0x0f), 0); } -static TILE_GET_INFO( get_joe_tile_info_2 ) +TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_2) { - ashnojoe_state *state = machine.driver_data<ashnojoe_state>(); - int code = state->m_tileram_2[tile_index * 2]; - int attr = state->m_tileram_2[tile_index * 2 + 1]; + int code = m_tileram_2[tile_index * 2]; + int attr = m_tileram_2[tile_index * 2 + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 4, (code & 0x7fff), ((attr >> 8) & 0x1f) + 0x40, 0); } -static TILE_GET_INFO( get_joe_tile_info_3 ) +TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_3) { - ashnojoe_state *state = machine.driver_data<ashnojoe_state>(); - int code = state->m_tileram_3[tile_index]; + int code = m_tileram_3[tile_index]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, code & 0xfff, ((code >> 12) & 0x0f) + 0x10, 0); } -static TILE_GET_INFO( get_joe_tile_info_4 ) +TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_4) { - ashnojoe_state *state = machine.driver_data<ashnojoe_state>(); - int code = state->m_tileram_4[tile_index]; + int code = m_tileram_4[tile_index]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, code & 0xfff, ((code >> 12) & 0x0f) + 0x60, 0); } -static TILE_GET_INFO( get_joe_tile_info_5 ) +TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_5) { - ashnojoe_state *state = machine.driver_data<ashnojoe_state>(); - int code = state->m_tileram_5[tile_index * 2]; - int attr = state->m_tileram_5[tile_index * 2 + 1]; + int code = m_tileram_5[tile_index * 2]; + int attr = m_tileram_5[tile_index * 2 + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 4, (code & 0x7fff), ((attr >> 8) & 0x1f) + 0x20, 0); } -static TILE_GET_INFO( get_joe_tile_info_6 ) +TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_6) { - ashnojoe_state *state = machine.driver_data<ashnojoe_state>(); - int code = state->m_tileram_6[tile_index * 2]; - int attr = state->m_tileram_6[tile_index * 2 + 1]; + int code = m_tileram_6[tile_index * 2]; + int attr = m_tileram_6[tile_index * 2 + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 3, (code & 0x1fff), ((attr >> 8) & 0x1f) + 0x70, @@ -85,13 +79,12 @@ static TILE_GET_INFO( get_joe_tile_info_6 ) } -static TILE_GET_INFO( get_joe_tile_info_7 ) +TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_7) { - ashnojoe_state *state = machine.driver_data<ashnojoe_state>(); - int code = state->m_tileram_7[tile_index * 2]; - int attr = state->m_tileram_7[tile_index * 2 + 1]; + int code = m_tileram_7[tile_index * 2]; + int attr = m_tileram_7[tile_index * 2 + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 3, (code & 0x1fff), ((attr >> 8) & 0x1f) + 0x70, @@ -200,13 +193,13 @@ VIDEO_START( ashnojoe ) { ashnojoe_state *state = machine.driver_data<ashnojoe_state>(); - state->m_joetilemap = tilemap_create(machine, get_joe_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - state->m_joetilemap2 = tilemap_create(machine, get_joe_tile_info_2, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - state->m_joetilemap3 = tilemap_create(machine, get_joe_tile_info_3, TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - state->m_joetilemap4 = tilemap_create(machine, get_joe_tile_info_4, TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - state->m_joetilemap5 = tilemap_create(machine, get_joe_tile_info_5, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - state->m_joetilemap6 = tilemap_create(machine, get_joe_tile_info_6, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - state->m_joetilemap7 = tilemap_create(machine, get_joe_tile_info_7, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_joetilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_joetilemap2 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_2),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_joetilemap3 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_3),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + state->m_joetilemap4 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_4),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + state->m_joetilemap5 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_5),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_joetilemap6 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_6),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_joetilemap7 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_7),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); state->m_joetilemap->set_transparent_pen(15); state->m_joetilemap2->set_transparent_pen(15); diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index c03486dc5ac..7457ac9246c 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -27,27 +27,24 @@ static void get_tile_info_common( running_machine &machine, tile_data &tileinfo, } -static TILE_GET_INFO( alpha1_get_tile_info ) +TILE_GET_INFO_MEMBER(atarifb_state::alpha1_get_tile_info) { - atarifb_state *state = machine.driver_data<atarifb_state>(); - get_tile_info_common(machine, tileinfo, tile_index, state->m_alphap1_videoram); + get_tile_info_common(machine(), tileinfo, tile_index, m_alphap1_videoram); } -static TILE_GET_INFO( alpha2_get_tile_info ) +TILE_GET_INFO_MEMBER(atarifb_state::alpha2_get_tile_info) { - atarifb_state *state = machine.driver_data<atarifb_state>(); - get_tile_info_common(machine, tileinfo, tile_index, state->m_alphap2_videoram); + get_tile_info_common(machine(), tileinfo, tile_index, m_alphap2_videoram); } -static TILE_GET_INFO( field_get_tile_info ) +TILE_GET_INFO_MEMBER(atarifb_state::field_get_tile_info) { - atarifb_state *state = machine.driver_data<atarifb_state>(); - int code = state->m_field_videoram[tile_index] & 0x3f; - int flipyx = state->m_field_videoram[tile_index] >> 6; + int code = m_field_videoram[tile_index] & 0x3f; + int flipyx = m_field_videoram[tile_index] >> 6; - SET_TILE_INFO(1, code, 0, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(1, code, 0, TILE_FLIPYX(flipyx)); } @@ -94,9 +91,9 @@ VIDEO_START( atarifb ) { atarifb_state *state = machine.driver_data<atarifb_state>(); - state->m_alpha1_tilemap = tilemap_create(machine, alpha1_get_tile_info, TILEMAP_SCAN_COLS, 8, 8, 3, 32); - state->m_alpha2_tilemap = tilemap_create(machine, alpha2_get_tile_info, TILEMAP_SCAN_COLS, 8, 8, 3, 32); - state->m_field_tilemap = tilemap_create(machine, field_get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_alpha1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::alpha1_get_tile_info),state), TILEMAP_SCAN_COLS, 8, 8, 3, 32); + state->m_alpha2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::alpha2_get_tile_info),state), TILEMAP_SCAN_COLS, 8, 8, 3, 32); + state->m_field_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::field_get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/atarig1.c b/src/mame/video/atarig1.c index 4e82336d449..6d8865e9c05 100644 --- a/src/mame/video/atarig1.c +++ b/src/mame/video/atarig1.c @@ -16,24 +16,22 @@ * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(atarig1_state::get_alpha_tile_info) { - atarig1_state *state = machine.driver_data<atarig1_state>(); - UINT16 data = state->m_alpha[tile_index]; + UINT16 data = m_alpha[tile_index]; int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(atarig1_state::get_playfield_tile_info) { - atarig1_state *state = machine.driver_data<atarig1_state>(); - UINT16 data = state->m_playfield[tile_index]; - int code = (state->m_playfield_tile_bank << 12) | (data & 0xfff); + UINT16 data = m_playfield[tile_index]; + int code = (m_playfield_tile_bank << 12) | (data & 0xfff); int color = (data >> 12) & 7; - SET_TILE_INFO(0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } @@ -52,13 +50,13 @@ VIDEO_START( atarig1 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x10); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarig1_state::get_playfield_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,64); /* initialize the motion objects */ state->m_rle = machine.device("rle"); /* initialize the alphanumerics */ - state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarig1_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); state->m_alpha_tilemap->set_transparent_pen(0); /* reset statics */ diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index 7e2f7bcb7c9..1c298021b18 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -31,29 +31,27 @@ * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(atarig42_state::get_alpha_tile_info) { - atarig42_state *state = machine.driver_data<atarig42_state>(); - UINT16 data = state->m_alpha[tile_index]; + UINT16 data = m_alpha[tile_index]; int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(atarig42_state::get_playfield_tile_info) { - atarig42_state *state = machine.driver_data<atarig42_state>(); - UINT16 data = state->m_playfield[tile_index]; - int code = (state->m_playfield_tile_bank << 12) | (data & 0xfff); - int color = (state->m_playfield_base >> 5) + ((state->m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); - SET_TILE_INFO(0, code, color, (data >> 15) & 1); - tileinfo.category = (state->m_playfield_color_bank >> 2) & 7; + UINT16 data = m_playfield[tile_index]; + int code = (m_playfield_tile_bank << 12) | (data & 0xfff); + int color = (m_playfield_base >> 5) + ((m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); + tileinfo.category = (m_playfield_color_bank >> 2) & 7; } -static TILEMAP_MAPPER( atarig42_playfield_scan ) +TILEMAP_MAPPER_MEMBER(atarig42_state::atarig42_playfield_scan) { int bank = 1 - (col / (num_cols / 2)); return bank * (num_rows * num_cols / 2) + row * (num_cols / 2) + (col % (num_cols / 2)); @@ -75,13 +73,13 @@ VIDEO_START( atarig42 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarig42_playfield_scan, 8,8, 128,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarig42_state::get_playfield_tile_info),state), tilemap_mapper_delegate(FUNC(atarig42_state::atarig42_playfield_scan),state), 8,8, 128,64); /* initialize the motion objects */ state->m_rle = machine.device("rle"); /* initialize the alphanumerics */ - state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarig42_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); state->m_alpha_tilemap->set_transparent_pen(0); /* save states */ diff --git a/src/mame/video/atarigt.c b/src/mame/video/atarigt.c index 3bffdf98f98..0c176b29c0a 100644 --- a/src/mame/video/atarigt.c +++ b/src/mame/video/atarigt.c @@ -42,27 +42,25 @@ * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(atarigt_state::get_alpha_tile_info) { - atarigt_state *state = machine.driver_data<atarigt_state>(); - UINT16 data = state->m_alpha32[tile_index / 2] >> (16 * (~tile_index & 1)); + UINT16 data = m_alpha32[tile_index / 2] >> (16 * (~tile_index & 1)); int code = data & 0xfff; int color = (data >> 12) & 0x0f; - SET_TILE_INFO(1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(atarigt_state::get_playfield_tile_info) { - atarigt_state *state = machine.driver_data<atarigt_state>(); - UINT16 data = state->m_playfield32[tile_index / 2] >> (16 * (~tile_index & 1)); - int code = (state->m_playfield_tile_bank << 12) | (data & 0xfff); + UINT16 data = m_playfield32[tile_index / 2] >> (16 * (~tile_index & 1)); + int code = (m_playfield_tile_bank << 12) | (data & 0xfff); int color = (data >> 12) & 7; - SET_TILE_INFO(0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } -static TILEMAP_MAPPER( atarigt_playfield_scan ) +TILEMAP_MAPPER_MEMBER(atarigt_state::atarigt_playfield_scan) { int bank = 1 - (col / (num_cols / 2)); return bank * (num_rows * num_cols / 2) + row * (num_cols / 2) + (col % (num_cols / 2)); @@ -86,13 +84,13 @@ VIDEO_START( atarigt ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigt_playfield_scan, 8,8, 128,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarigt_state::get_playfield_tile_info),state), tilemap_mapper_delegate(FUNC(atarigt_state::atarigt_playfield_scan),state), 8,8, 128,64); /* initialize the motion objects */ state->m_rle = machine.device("rle"); /* initialize the alphanumerics */ - state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarigt_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); /* allocate temp bitmaps */ width = machine.primary_screen->width(); diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c index 3922039da2a..88a287a03b7 100644 --- a/src/mame/video/atarigx2.c +++ b/src/mame/video/atarigx2.c @@ -31,29 +31,27 @@ * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(atarigx2_state::get_alpha_tile_info) { - atarigx2_state *state = machine.driver_data<atarigx2_state>(); - UINT16 data = state->m_alpha32[tile_index / 2] >> (16 * (~tile_index & 1)); + UINT16 data = m_alpha32[tile_index / 2] >> (16 * (~tile_index & 1)); int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(atarigx2_state::get_playfield_tile_info) { - atarigx2_state *state = machine.driver_data<atarigx2_state>(); - UINT16 data = state->m_playfield32[tile_index / 2] >> (16 * (~tile_index & 1)); - int code = (state->m_playfield_tile_bank << 12) | (data & 0xfff); - int color = (state->m_playfield_base >> 5) + ((state->m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); - SET_TILE_INFO(0, code, color, (data >> 15) & 1); - tileinfo.category = (state->m_playfield_color_bank >> 2) & 7; + UINT16 data = m_playfield32[tile_index / 2] >> (16 * (~tile_index & 1)); + int code = (m_playfield_tile_bank << 12) | (data & 0xfff); + int color = (m_playfield_base >> 5) + ((m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); + tileinfo.category = (m_playfield_color_bank >> 2) & 7; } -static TILEMAP_MAPPER( atarigx2_playfield_scan ) +TILEMAP_MAPPER_MEMBER(atarigx2_state::atarigx2_playfield_scan) { int bank = 1 - (col / (num_cols / 2)); return bank * (num_rows * num_cols / 2) + row * (num_cols / 2) + (col % (num_cols / 2)); @@ -75,13 +73,13 @@ VIDEO_START( atarigx2 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigx2_playfield_scan, 8,8, 128,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarigx2_state::get_playfield_tile_info),state), tilemap_mapper_delegate(FUNC(atarigx2_state::atarigx2_playfield_scan),state), 8,8, 128,64); /* initialize the motion objects */ state->m_rle = machine.device("rle"); /* initialize the alphanumerics */ - state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarigx2_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); state->m_alpha_tilemap->set_transparent_pen(0); /* save states */ diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index e5db4fc3702..c2d5e21ef33 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -92,26 +92,24 @@ static int get_bank(running_machine &machine, UINT8 prom1, UINT8 prom2, int bpp) * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(atarisy1_state::get_alpha_tile_info) { - atarisy1_state *state = machine.driver_data<atarisy1_state>(); - UINT16 data = state->m_alpha[tile_index]; + UINT16 data = m_alpha[tile_index]; int code = data & 0x3ff; int color = (data >> 10) & 0x07; int opaque = data & 0x2000; - SET_TILE_INFO(0, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(0, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(atarisy1_state::get_playfield_tile_info) { - atarisy1_state *state = machine.driver_data<atarisy1_state>(); - UINT16 data = state->m_playfield[tile_index]; - UINT16 lookup = state->m_playfield_lookup[((data >> 8) & 0x7f) | (state->m_playfield_tile_bank << 7)]; + UINT16 data = m_playfield[tile_index]; + UINT16 lookup = m_playfield_lookup[((data >> 8) & 0x7f) | (m_playfield_tile_bank << 7)]; int gfxindex = (lookup >> 8) & 15; int code = ((lookup & 0xff) << 8) | (data & 0xff); - int color = 0x20 + (((lookup >> 12) & 15) << state->m_bank_color_shift[gfxindex]); - SET_TILE_INFO(gfxindex, code, color, (data >> 15) & 1); + int color = 0x20 + (((lookup >> 12) & 15) << m_bank_color_shift[gfxindex]); + SET_TILE_INFO_MEMBER(gfxindex, code, color, (data >> 15) & 1); } @@ -171,13 +169,13 @@ VIDEO_START( atarisy1 ) decode_gfx(machine, state->m_playfield_lookup, motable); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarisy1_state::get_playfield_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarisy1_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); state->m_alpha_tilemap->set_transparent_pen(0); /* modify the motion object code lookup */ diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c index b4dd5ae9742..89a8eb41e72 100644 --- a/src/mame/video/atarisy2.c +++ b/src/mame/video/atarisy2.c @@ -27,23 +27,21 @@ static TIMER_CALLBACK( reset_yscroll_callback ); * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(atarisy2_state::get_alpha_tile_info) { - atarisy2_state *state = machine.driver_data<atarisy2_state>(); - UINT16 data = state->m_alpha[tile_index]; + UINT16 data = m_alpha[tile_index]; int code = data & 0x3ff; int color = (data >> 13) & 0x07; - SET_TILE_INFO(2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(atarisy2_state::get_playfield_tile_info) { - atarisy2_state *state = machine.driver_data<atarisy2_state>(); - UINT16 data = state->m_playfield[tile_index]; - int code = state->m_playfield_tile_bank[(data >> 10) & 1] + (data & 0x3ff); + UINT16 data = m_playfield[tile_index]; + int code = m_playfield_tile_bank[(data >> 10) & 1] + (data & 0x3ff); int color = (data >> 11) & 7; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); tileinfo.category = (~data >> 14) & 3; } @@ -100,13 +98,13 @@ VIDEO_START( atarisy2 ) state->m_playfield.set_target(&state->m_vram[0x2000], 0x2000); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, TILEMAP_SCAN_ROWS, 8,8, 128,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarisy2_state::get_playfield_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 128,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,48); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atarisy2_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,48); state->m_alpha_tilemap->set_transparent_pen(0); /* reset the statics */ diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c index 16027657375..289bd684106 100644 --- a/src/mame/video/atetris.c +++ b/src/mame/video/atetris.c @@ -14,14 +14,13 @@ * *************************************/ -static TILE_GET_INFO( get_tile_info ) +TILE_GET_INFO_MEMBER(atetris_state::get_tile_info) { - atetris_state *state = machine.driver_data<atetris_state>(); - UINT8 *videoram = state->m_videoram; + UINT8 *videoram = m_videoram; int code = videoram[tile_index * 2] | ((videoram[tile_index * 2 + 1] & 7) << 8); int color = (videoram[tile_index * 2 + 1] & 0xf0) >> 4; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -52,7 +51,7 @@ VIDEO_START( atetris ) { atetris_state *state = machine.driver_data<atetris_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(atetris_state::get_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); } diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c index 0af83b2ca64..2310c17f246 100644 --- a/src/mame/video/badlands.c +++ b/src/mame/video/badlands.c @@ -16,13 +16,12 @@ * *************************************/ -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(badlands_state::get_playfield_tile_info) { - badlands_state *state = machine.driver_data<badlands_state>(); - UINT16 data = state->m_playfield[tile_index]; - int code = (data & 0x1fff) + ((data & 0x1000) ? (state->m_playfield_tile_bank << 12) : 0); + UINT16 data = m_playfield[tile_index]; + int code = (data & 0x1fff) + ((data & 0x1000) ? (m_playfield_tile_bank << 12) : 0); int color = (data >> 13) & 0x07; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -74,7 +73,7 @@ VIDEO_START( badlands ) badlands_state *state = machine.driver_data<badlands_state>(); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(badlands_state::get_playfield_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c index 3a1d6b2928c..4c92a8ce26e 100644 --- a/src/mame/video/bagman.c +++ b/src/mame/video/bagman.c @@ -89,20 +89,19 @@ WRITE8_MEMBER(bagman_state::bagman_flipscreen_w) } } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(bagman_state::get_bg_tile_info) { - bagman_state *state = machine.driver_data<bagman_state>(); - int gfxbank = (machine.gfx[2] && (state->m_colorram[tile_index] & 0x10)) ? 2 : 0; - int code = state->m_videoram[tile_index] + 8 * (state->m_colorram[tile_index] & 0x20); - int color = state->m_colorram[tile_index] & 0x0f; + int gfxbank = (machine().gfx[2] && (m_colorram[tile_index] & 0x10)) ? 2 : 0; + int code = m_videoram[tile_index] + 8 * (m_colorram[tile_index] & 0x20); + int color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO(gfxbank, code, color, 0); + SET_TILE_INFO_MEMBER(gfxbank, code, color, 0); } VIDEO_START( bagman ) { bagman_state *state = machine.driver_data<bagman_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bagman_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bg_tilemap->set_scrolldy(-1, -1); diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c index 04af6dcf5e3..c74c4246fcc 100644 --- a/src/mame/video/bankp.c +++ b/src/mame/video/bankp.c @@ -132,25 +132,23 @@ WRITE8_MEMBER(bankp_state::bankp_out_w) /* bits 6-7 unknown */ } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(bankp_state::get_bg_tile_info) { - bankp_state *state = machine.driver_data<bankp_state>(); - int code = state->m_videoram2[tile_index] + 256 * (state->m_colorram2[tile_index] & 0x07); - int color = state->m_colorram2[tile_index] >> 4; - int flags = (state->m_colorram2[tile_index] & 0x08) ? TILE_FLIPX : 0; + int code = m_videoram2[tile_index] + 256 * (m_colorram2[tile_index] & 0x07); + int color = m_colorram2[tile_index] >> 4; + int flags = (m_colorram2[tile_index] & 0x08) ? TILE_FLIPX : 0; - SET_TILE_INFO(1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); tileinfo.group = color; } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(bankp_state::get_fg_tile_info) { - bankp_state *state = machine.driver_data<bankp_state>(); - int code = state->m_videoram[tile_index] + 256 * ((state->m_colorram[tile_index] & 3) >> 0); - int color = state->m_colorram[tile_index] >> 3; - int flags = (state->m_colorram[tile_index] & 0x04) ? TILE_FLIPX : 0; + int code = m_videoram[tile_index] + 256 * ((m_colorram[tile_index] & 3) >> 0); + int color = m_colorram[tile_index] >> 3; + int flags = (m_colorram[tile_index] & 0x04) ? TILE_FLIPX : 0; - SET_TILE_INFO(0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); tileinfo.group = color; } @@ -158,8 +156,8 @@ VIDEO_START( bankp ) { bankp_state *state = machine.driver_data<bankp_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bankp_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bankp_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); colortable_configure_tilemap_groups(machine.colortable, state->m_bg_tilemap, machine.gfx[1], 0); colortable_configure_tilemap_groups(machine.colortable, state->m_fg_tilemap, machine.gfx[0], 0); diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index 01a5ffb3de2..e6930cee1cd 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -58,7 +58,7 @@ PALETTE_INIT( baraduke ) ***************************************************************************/ /* convert from 32x32 to 36x28 */ -static TILEMAP_MAPPER( tx_tilemap_scan ) +TILEMAP_MAPPER_MEMBER(baraduke_state::tx_tilemap_scan) { int offs; @@ -72,36 +72,33 @@ static TILEMAP_MAPPER( tx_tilemap_scan ) return offs; } -static TILE_GET_INFO( tx_get_tile_info ) +TILE_GET_INFO_MEMBER(baraduke_state::tx_get_tile_info) { - baraduke_state *state = machine.driver_data<baraduke_state>(); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, - state->m_textram[tile_index], - (state->m_textram[tile_index+0x400] << 2) & 0x1ff, + m_textram[tile_index], + (m_textram[tile_index+0x400] << 2) & 0x1ff, 0); } -static TILE_GET_INFO( get_tile_info0 ) +TILE_GET_INFO_MEMBER(baraduke_state::get_tile_info0) { - baraduke_state *state = machine.driver_data<baraduke_state>(); - int code = state->m_videoram[2*tile_index]; - int attr = state->m_videoram[2*tile_index + 1]; + int code = m_videoram[2*tile_index]; + int attr = m_videoram[2*tile_index + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, code + ((attr & 0x03) << 8), attr, 0); } -static TILE_GET_INFO( get_tile_info1 ) +TILE_GET_INFO_MEMBER(baraduke_state::get_tile_info1) { - baraduke_state *state = machine.driver_data<baraduke_state>(); - int code = state->m_videoram[0x1000 + 2*tile_index]; - int attr = state->m_videoram[0x1000 + 2*tile_index + 1]; + int code = m_videoram[0x1000 + 2*tile_index]; + int attr = m_videoram[0x1000 + 2*tile_index + 1]; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 2, code + ((attr & 0x03) << 8), attr, @@ -119,9 +116,9 @@ static TILE_GET_INFO( get_tile_info1 ) VIDEO_START( baraduke ) { baraduke_state *state = machine.driver_data<baraduke_state>(); - state->m_tx_tilemap = tilemap_create(machine, tx_get_tile_info,tx_tilemap_scan,8,8,36,28); - state->m_bg_tilemap[0] = tilemap_create(machine, get_tile_info0,TILEMAP_SCAN_ROWS,8,8,64,32); - state->m_bg_tilemap[1] = tilemap_create(machine, get_tile_info1,TILEMAP_SCAN_ROWS,8,8,64,32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(baraduke_state::tx_get_tile_info),state),tilemap_mapper_delegate(FUNC(baraduke_state::tx_tilemap_scan),state),8,8,36,28); + state->m_bg_tilemap[0] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(baraduke_state::get_tile_info0),state),TILEMAP_SCAN_ROWS,8,8,64,32); + state->m_bg_tilemap[1] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(baraduke_state::get_tile_info1),state),TILEMAP_SCAN_ROWS,8,8,64,32); state->m_tx_tilemap->set_transparent_pen(3); state->m_bg_tilemap[0]->set_transparent_pen(7); diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c index d59ef66abfa..6953e5270cf 100644 --- a/src/mame/video/batman.c +++ b/src/mame/video/batman.c @@ -16,37 +16,34 @@ * *************************************/ -static TILE_GET_INFO( get_alpha_tile_info ) +TILE_GET_INFO_MEMBER(batman_state::get_alpha_tile_info) { - batman_state *state = machine.driver_data<batman_state>(); - UINT16 data = state->m_alpha[tile_index]; - int code = ((data & 0x400) ? (state->m_alpha_tile_bank * 0x400) : 0) + (data & 0x3ff); + UINT16 data = m_alpha[tile_index]; + int code = ((data & 0x400) ? (m_alpha_tile_bank * 0x400) : 0) + (data & 0x3ff); int color = (data >> 11) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(batman_state::get_playfield_tile_info) { - batman_state *state = machine.driver_data<batman_state>(); - UINT16 data1 = state->m_playfield[tile_index]; - UINT16 data2 = state->m_playfield_upper[tile_index] & 0xff; + UINT16 data1 = m_playfield[tile_index]; + UINT16 data2 = m_playfield_upper[tile_index] & 0xff; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); - SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); tileinfo.category = (data2 >> 4) & 3; } -static TILE_GET_INFO( get_playfield2_tile_info ) +TILE_GET_INFO_MEMBER(batman_state::get_playfield2_tile_info) { - batman_state *state = machine.driver_data<batman_state>(); - UINT16 data1 = state->m_playfield2[tile_index]; - UINT16 data2 = state->m_playfield_upper[tile_index] >> 8; + UINT16 data1 = m_playfield2[tile_index]; + UINT16 data2 = m_playfield_upper[tile_index] >> 8; int code = data1 & 0x7fff; int color = data2 & 0x0f; - SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); tileinfo.category = (data2 >> 4) & 3; } @@ -99,17 +96,17 @@ VIDEO_START( batman ) batman_state *state = machine.driver_data<batman_state>(); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, TILEMAP_SCAN_COLS, 8,8, 64,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(batman_state::get_playfield_tile_info),state), TILEMAP_SCAN_COLS, 8,8, 64,64); /* initialize the second playfield */ - state->m_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, TILEMAP_SCAN_COLS, 8,8, 64,64); + state->m_playfield2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(batman_state::get_playfield2_tile_info),state), TILEMAP_SCAN_COLS, 8,8, 64,64); state->m_playfield2_tilemap->set_transparent_pen(0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + state->m_alpha_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(batman_state::get_alpha_tile_info),state), TILEMAP_SCAN_ROWS, 8,8, 64,32); state->m_alpha_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index 54299ff6a3b..8ab9a5af660 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -92,18 +92,17 @@ WRITE8_MEMBER(battlane_state::battlane_video_ctrl_w) m_video_ctrl = data; } -static TILE_GET_INFO( get_tile_info_bg ) +TILE_GET_INFO_MEMBER(battlane_state::get_tile_info_bg) { - battlane_state *state = machine.driver_data<battlane_state>(); - int code = state->m_tileram[tile_index]; - int attr = state->m_tileram[tile_index + 0x400]; + int code = m_tileram[tile_index]; + int attr = m_tileram[tile_index + 0x400]; int gfxn = (attr & 0x01) + 1; int color = (attr >> 1) & 0x03; - SET_TILE_INFO(gfxn, code, color, 0); + SET_TILE_INFO_MEMBER(gfxn, code, color, 0); } -static TILEMAP_MAPPER( battlane_tilemap_scan_rows_2x2 ) +TILEMAP_MAPPER_MEMBER(battlane_state::battlane_tilemap_scan_rows_2x2) { /* Tilemap Memory Organization @@ -137,7 +136,7 @@ static TILEMAP_MAPPER( battlane_tilemap_scan_rows_2x2 ) VIDEO_START( battlane ) { battlane_state *state = machine.driver_data<battlane_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_tile_info_bg, battlane_tilemap_scan_rows_2x2, 16, 16, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(battlane_state::get_tile_info_bg),state), tilemap_mapper_delegate(FUNC(battlane_state::battlane_tilemap_scan_rows_2x2),state), 16, 16, 32, 32); state->m_screen_bitmap.allocate(32 * 8, 32 * 8); } diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index 249e7cf2c73..74eafd02cc9 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -45,19 +45,18 @@ WRITE8_MEMBER(battlex_state::battlex_flipscreen_w) } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(battlex_state::get_bg_tile_info) { - battlex_state *state = machine.driver_data<battlex_state>(); - int tile = state->m_videoram[tile_index * 2] | (((state->m_videoram[tile_index * 2 + 1] & 0x01)) << 8); - int color = (state->m_videoram[tile_index * 2 + 1] & 0x0e) >> 1; // high bits unused + int tile = m_videoram[tile_index * 2] | (((m_videoram[tile_index * 2 + 1] & 0x01)) << 8); + int color = (m_videoram[tile_index * 2 + 1] & 0x0e) >> 1; // high bits unused - SET_TILE_INFO(0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } VIDEO_START( battlex ) { battlex_state *state = machine.driver_data<battlex_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(battlex_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index 4a473765cbe..5185456d3bf 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -27,28 +27,25 @@ /******************************************************************************/ -static TILE_GET_INFO( get_bbusters_tile_info ) +TILE_GET_INFO_MEMBER(bbusters_state::get_bbusters_tile_info) { - bbusters_state *state = machine.driver_data<bbusters_state>(); - UINT16 tile = state->m_videoram[tile_index]; + UINT16 tile = m_videoram[tile_index]; - SET_TILE_INFO(0,tile&0xfff,tile>>12,0); + SET_TILE_INFO_MEMBER(0,tile&0xfff,tile>>12,0); } -static TILE_GET_INFO( get_pf1_tile_info ) +TILE_GET_INFO_MEMBER(bbusters_state::get_pf1_tile_info) { - bbusters_state *state = machine.driver_data<bbusters_state>(); - UINT16 tile = state->m_pf1_data[tile_index]; + UINT16 tile = m_pf1_data[tile_index]; - SET_TILE_INFO(3,tile&0xfff,tile>>12,0); + SET_TILE_INFO_MEMBER(3,tile&0xfff,tile>>12,0); } -static TILE_GET_INFO( get_pf2_tile_info ) +TILE_GET_INFO_MEMBER(bbusters_state::get_pf2_tile_info) { - bbusters_state *state = machine.driver_data<bbusters_state>(); - UINT16 tile = state->m_pf2_data[tile_index]; + UINT16 tile = m_pf2_data[tile_index]; - SET_TILE_INFO(4,tile&0xfff,tile>>12,0); + SET_TILE_INFO_MEMBER(4,tile&0xfff,tile>>12,0); } WRITE16_MEMBER(bbusters_state::bbusters_video_w) @@ -78,9 +75,9 @@ VIDEO_START( bbuster ) { bbusters_state *state = machine.driver_data<bbusters_state>(); - state->m_fix_tilemap = tilemap_create(machine, get_bbusters_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, TILEMAP_SCAN_COLS, 16, 16, 128, 32); - state->m_pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, TILEMAP_SCAN_COLS, 16, 16, 128, 32); + state->m_fix_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_bbusters_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_pf1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 128, 32); + state->m_pf2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf2_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 128, 32); state->m_pf1_tilemap->set_transparent_pen(15); state->m_fix_tilemap->set_transparent_pen(15); @@ -90,9 +87,9 @@ VIDEO_START( mechatt ) { bbusters_state *state = machine.driver_data<bbusters_state>(); - state->m_fix_tilemap = tilemap_create(machine, get_bbusters_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, TILEMAP_SCAN_COLS, 16, 16, 256, 32); - state->m_pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, TILEMAP_SCAN_COLS, 16, 16, 256, 32); + state->m_fix_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_bbusters_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_pf1_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 256, 32); + state->m_pf2_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf2_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 256, 32); state->m_pf1_tilemap->set_transparent_pen(15); state->m_fix_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index 3ed6e94a1a3..985b7b9a882 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -48,7 +48,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r /* Tilemaps */ -static TILEMAP_MAPPER( bsb_bg_scan ) +TILEMAP_MAPPER_MEMBER(bigstrkb_state::bsb_bg_scan) { int offset; @@ -59,15 +59,14 @@ static TILEMAP_MAPPER( bsb_bg_scan ) return offset; } -static TILE_GET_INFO( get_bsb_tile_info ) +TILE_GET_INFO_MEMBER(bigstrkb_state::get_bsb_tile_info) { - bigstrkb_state *state = machine.driver_data<bigstrkb_state>(); int tileno,col; - tileno = state->m_videoram[tile_index] & 0x0fff; - col= state->m_videoram[tile_index] & 0xf000; + tileno = m_videoram[tile_index] & 0x0fff; + col= m_videoram[tile_index] & 0xf000; - SET_TILE_INFO(0,tileno,col>>12,0); + SET_TILE_INFO_MEMBER(0,tileno,col>>12,0); } WRITE16_MEMBER(bigstrkb_state::bsb_videoram_w) @@ -76,15 +75,14 @@ WRITE16_MEMBER(bigstrkb_state::bsb_videoram_w) m_tilemap->mark_tile_dirty(offset); } -static TILE_GET_INFO( get_bsb_tile2_info ) +TILE_GET_INFO_MEMBER(bigstrkb_state::get_bsb_tile2_info) { - bigstrkb_state *state = machine.driver_data<bigstrkb_state>(); int tileno,col; - tileno = state->m_videoram2[tile_index] & 0x0fff; - col= state->m_videoram2[tile_index] & 0xf000; + tileno = m_videoram2[tile_index] & 0x0fff; + col= m_videoram2[tile_index] & 0xf000; - SET_TILE_INFO(1,tileno,col>>12,0); + SET_TILE_INFO_MEMBER(1,tileno,col>>12,0); } WRITE16_MEMBER(bigstrkb_state::bsb_videoram2_w) @@ -94,15 +92,14 @@ WRITE16_MEMBER(bigstrkb_state::bsb_videoram2_w) } -static TILE_GET_INFO( get_bsb_tile3_info ) +TILE_GET_INFO_MEMBER(bigstrkb_state::get_bsb_tile3_info) { - bigstrkb_state *state = machine.driver_data<bigstrkb_state>(); int tileno,col; - tileno = state->m_videoram3[tile_index] & 0x0fff; - col= state->m_videoram3[tile_index] & 0xf000; + tileno = m_videoram3[tile_index] & 0x0fff; + col= m_videoram3[tile_index] & 0xf000; - SET_TILE_INFO(1,tileno+0x2000,(col>>12)+(0x100/16),0); + SET_TILE_INFO_MEMBER(1,tileno+0x2000,(col>>12)+(0x100/16),0); } WRITE16_MEMBER(bigstrkb_state::bsb_videoram3_w) @@ -116,9 +113,9 @@ WRITE16_MEMBER(bigstrkb_state::bsb_videoram3_w) VIDEO_START(bigstrkb) { bigstrkb_state *state = machine.driver_data<bigstrkb_state>(); - state->m_tilemap = tilemap_create(machine, get_bsb_tile_info,TILEMAP_SCAN_COLS, 8, 8,64,32); - state->m_tilemap2 = tilemap_create(machine, get_bsb_tile2_info,bsb_bg_scan, 16, 16,128,64); - state->m_tilemap3 = tilemap_create(machine, get_bsb_tile3_info,bsb_bg_scan, 16, 16,128,64); + state->m_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile_info),state),TILEMAP_SCAN_COLS, 8, 8,64,32); + state->m_tilemap2 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile2_info),state),tilemap_mapper_delegate(FUNC(bigstrkb_state::bsb_bg_scan),state), 16, 16,128,64); + state->m_tilemap3 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile3_info),state),tilemap_mapper_delegate(FUNC(bigstrkb_state::bsb_bg_scan),state), 16, 16,128,64); state->m_tilemap->set_transparent_pen(15); //state->m_tilemap2->set_transparent_pen(15); diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index 9c0f68e26b4..fa7f88ac9e3 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -33,23 +33,21 @@ ***************************************************************************/ -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(bionicc_state::get_bg_tile_info) { - bionicc_state *state = machine.driver_data<bionicc_state>(); - int attr = state->m_bgvideoram[2 * tile_index + 1]; - SET_TILE_INFO( + int attr = m_bgvideoram[2 * tile_index + 1]; + SET_TILE_INFO_MEMBER( 1, - (state->m_bgvideoram[2 * tile_index] & 0xff) + ((attr & 0x07) << 8), + (m_bgvideoram[2 * tile_index] & 0xff) + ((attr & 0x07) << 8), (attr & 0x18) >> 3, TILE_FLIPXY((attr & 0xc0) >> 6)); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(bionicc_state::get_fg_tile_info) { - bionicc_state *state = machine.driver_data<bionicc_state>(); - int attr = state->m_fgvideoram[2 * tile_index + 1]; + int attr = m_fgvideoram[2 * tile_index + 1]; int flags; if ((attr & 0xc0) == 0xc0) @@ -65,21 +63,20 @@ static TILE_GET_INFO( get_fg_tile_info ) flags = TILE_FLIPXY((attr & 0xc0) >> 6); } - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 2, - (state->m_fgvideoram[2 * tile_index] & 0xff) + ((attr & 0x07) << 8), + (m_fgvideoram[2 * tile_index] & 0xff) + ((attr & 0x07) << 8), (attr & 0x18) >> 3, flags); } -static TILE_GET_INFO( get_tx_tile_info ) +TILE_GET_INFO_MEMBER(bionicc_state::get_tx_tile_info) { - bionicc_state *state = machine.driver_data<bionicc_state>(); - int attr = state->m_txvideoram[tile_index + 0x400]; - SET_TILE_INFO( + int attr = m_txvideoram[tile_index + 0x400]; + SET_TILE_INFO_MEMBER( 0, - (state->m_txvideoram[tile_index] & 0xff) + ((attr & 0x00c0) << 2), + (m_txvideoram[tile_index] & 0xff) + ((attr & 0x00c0) << 2), attr & 0x3f, 0); } @@ -96,9 +93,9 @@ VIDEO_START( bionicc ) { bionicc_state *state = machine.driver_data<bionicc_state>(); - state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_tx_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); state->m_tx_tilemap->set_transparent_pen(3); state->m_fg_tilemap->set_transmask(0, 0xffff, 0x8000); /* split type 0 is completely transparent in front half */ diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index 01559a8a5ed..b5779dfbffe 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -208,25 +208,24 @@ READ8_MEMBER(bking_state::bking_pos_r) } -static TILE_GET_INFO( get_tile_info ) +TILE_GET_INFO_MEMBER(bking_state::get_tile_info) { - bking_state *state = machine.driver_data<bking_state>(); - UINT8 code0 = state->m_playfield_ram[2 * tile_index + 0]; - UINT8 code1 = state->m_playfield_ram[2 * tile_index + 1]; + UINT8 code0 = m_playfield_ram[2 * tile_index + 0]; + UINT8 code1 = m_playfield_ram[2 * tile_index + 1]; int flags = 0; if (code1 & 4) flags |= TILE_FLIPX; if (code1 & 8) flags |= TILE_FLIPY; - SET_TILE_INFO(0, code0 + 256 * code1, state->m_palette_bank, flags); + SET_TILE_INFO_MEMBER(0, code0 + 256 * code1, m_palette_bank, flags); } VIDEO_START( bking ) { bking_state *state = machine.driver_data<bking_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bking_state::get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); machine.primary_screen->register_screen_bitmap(state->m_tmp_bitmap1); machine.primary_screen->register_screen_bitmap(state->m_tmp_bitmap2); diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index 1bb022a7193..891007b2741 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -12,21 +12,20 @@ ***************************************************************************/ -static TILEMAP_MAPPER( bg8x4_scan ) +TILEMAP_MAPPER_MEMBER(blktiger_state::bg8x4_scan) { /* logical (col,row) -> memory offset */ return (col & 0x0f) + ((row & 0x0f) << 4) + ((col & 0x70) << 4) + ((row & 0x30) << 7); } -static TILEMAP_MAPPER( bg4x8_scan ) +TILEMAP_MAPPER_MEMBER(blktiger_state::bg4x8_scan) { /* logical (col,row) -> memory offset */ return (col & 0x0f) + ((row & 0x0f) << 4) + ((col & 0x30) << 4) + ((row & 0x70) << 6); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(blktiger_state::get_bg_tile_info) { - blktiger_state *state = machine.driver_data<blktiger_state>(); /* the tile priority table is a guess compiled by looking at the game. It was not derived from a PROM so it could be wrong. */ static const UINT8 split_table[16] = @@ -36,23 +35,22 @@ static TILE_GET_INFO( get_bg_tile_info ) 0,0,0,0, 0,0,0,0 }; - UINT8 attr = state->m_scroll_ram[2 * tile_index + 1]; + UINT8 attr = m_scroll_ram[2 * tile_index + 1]; int color = (attr & 0x78) >> 3; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, - state->m_scroll_ram[2 * tile_index] + ((attr & 0x07) << 8), + m_scroll_ram[2 * tile_index] + ((attr & 0x07) << 8), color, (attr & 0x80) ? TILE_FLIPX : 0); tileinfo.group = split_table[color]; } -static TILE_GET_INFO( get_tx_tile_info ) +TILE_GET_INFO_MEMBER(blktiger_state::get_tx_tile_info) { - blktiger_state *state = machine.driver_data<blktiger_state>(); - UINT8 attr = state->m_txvideoram[tile_index + 0x400]; - SET_TILE_INFO( + UINT8 attr = m_txvideoram[tile_index + 0x400]; + SET_TILE_INFO_MEMBER( 0, - state->m_txvideoram[tile_index] + ((attr & 0xe0) << 3), + m_txvideoram[tile_index] + ((attr & 0xe0) << 3), attr & 0x1f, 0); } @@ -75,9 +73,9 @@ VIDEO_START( blktiger ) state->m_scroll_ram = auto_alloc_array(machine, UINT8, BGRAM_BANK_SIZE * BGRAM_BANKS); - state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_bg_tilemap8x4 = tilemap_create(machine, get_bg_tile_info, bg8x4_scan, 16, 16, 128, 64); - state->m_bg_tilemap4x8 = tilemap_create(machine, get_bg_tile_info, bg4x8_scan, 16, 16, 64, 128); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(blktiger_state::get_tx_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap8x4 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(blktiger_state::get_bg_tile_info),state), tilemap_mapper_delegate(FUNC(blktiger_state::bg8x4_scan),state), 16, 16, 128, 64); + state->m_bg_tilemap4x8 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(blktiger_state::get_bg_tile_info),state), tilemap_mapper_delegate(FUNC(blktiger_state::bg4x8_scan),state), 16, 16, 64, 128); state->m_tx_tilemap->set_transparent_pen(3); diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index f6bda156d7e..40beb5f8caf 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -70,12 +70,11 @@ WRITE16_MEMBER(blmbycar_state::blmbycar_palette_w) #define DIM_NX (0x40) #define DIM_NY (0x20) -static TILE_GET_INFO( get_tile_info_0 ) +TILE_GET_INFO_MEMBER(blmbycar_state::get_tile_info_0) { - blmbycar_state *state = machine.driver_data<blmbycar_state>(); - UINT16 code = state->m_vram_0[tile_index * 2 + 0]; - UINT16 attr = state->m_vram_0[tile_index * 2 + 1]; - SET_TILE_INFO( + UINT16 code = m_vram_0[tile_index * 2 + 0]; + UINT16 attr = m_vram_0[tile_index * 2 + 1]; + SET_TILE_INFO_MEMBER( 0, code, attr & 0x1f, @@ -84,12 +83,11 @@ static TILE_GET_INFO( get_tile_info_0 ) tileinfo.category = (attr >> 5) & 1; } -static TILE_GET_INFO( get_tile_info_1 ) +TILE_GET_INFO_MEMBER(blmbycar_state::get_tile_info_1) { - blmbycar_state *state = machine.driver_data<blmbycar_state>(); - UINT16 code = state->m_vram_1[tile_index * 2 + 0]; - UINT16 attr = state->m_vram_1[tile_index * 2 + 1]; - SET_TILE_INFO( + UINT16 code = m_vram_1[tile_index * 2 + 0]; + UINT16 attr = m_vram_1[tile_index * 2 + 1]; + SET_TILE_INFO_MEMBER( 0, code, attr & 0x1f, @@ -124,8 +122,8 @@ VIDEO_START( blmbycar ) { blmbycar_state *state = machine.driver_data<blmbycar_state>(); - state->m_tilemap_0 = tilemap_create(machine, get_tile_info_0, TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); - state->m_tilemap_1 = tilemap_create(machine, get_tile_info_1, TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); + state->m_tilemap_0 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(blmbycar_state::get_tile_info_0),state), TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); + state->m_tilemap_1 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(blmbycar_state::get_tile_info_1),state), TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); state->m_tilemap_0->set_scroll_rows(1); state->m_tilemap_0->set_scroll_cols(1); diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c index a78338c1716..eb1f0aa6173 100644 --- a/src/mame/video/blockade.c +++ b/src/mame/video/blockade.c @@ -13,18 +13,17 @@ WRITE8_MEMBER(blockade_state::blockade_videoram_w) } } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(blockade_state::get_bg_tile_info) { - blockade_state *state = machine.driver_data<blockade_state>(); - int code = state->m_videoram[tile_index]; + int code = m_videoram[tile_index]; - SET_TILE_INFO(0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } VIDEO_START( blockade ) { blockade_state *state = machine.driver_data<blockade_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(blockade_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } SCREEN_UPDATE_IND16( blockade ) diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c index 1a70c6b0da1..c8d18dfd22a 100644 --- a/src/mame/video/bloodbro.c +++ b/src/mame/video/bloodbro.c @@ -14,33 +14,30 @@ ***************************************************************************/ -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(bloodbro_state::get_bg_tile_info) { - bloodbro_state *state = machine.driver_data<bloodbro_state>(); - int code = state->m_bgvideoram[tile_index]; - SET_TILE_INFO( + int code = m_bgvideoram[tile_index]; + SET_TILE_INFO_MEMBER( 1, code & 0xfff, (code >> 12), 0); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(bloodbro_state::get_fg_tile_info) { - bloodbro_state *state = machine.driver_data<bloodbro_state>(); - int code = state->m_fgvideoram[tile_index]; - SET_TILE_INFO( + int code = m_fgvideoram[tile_index]; + SET_TILE_INFO_MEMBER( 2, (code & 0xfff)+0x1000, (code >> 12), 0); } -static TILE_GET_INFO( get_tx_tile_info ) +TILE_GET_INFO_MEMBER(bloodbro_state::get_tx_tile_info) { - bloodbro_state *state = machine.driver_data<bloodbro_state>(); - int code = state->m_txvideoram[tile_index]; - SET_TILE_INFO( + int code = m_txvideoram[tile_index]; + SET_TILE_INFO_MEMBER( 0, code & 0xfff, code >> 12, @@ -58,9 +55,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( bloodbro ) { bloodbro_state *state = machine.driver_data<bloodbro_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,TILEMAP_SCAN_ROWS, 16,16,32,16); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,TILEMAP_SCAN_ROWS,16,16,32,16); - state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,TILEMAP_SCAN_ROWS, 8, 8,32,32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bloodbro_state::get_bg_tile_info),state),TILEMAP_SCAN_ROWS, 16,16,32,16); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bloodbro_state::get_fg_tile_info),state),TILEMAP_SCAN_ROWS,16,16,32,16); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bloodbro_state::get_tx_tile_info),state),TILEMAP_SCAN_ROWS, 8, 8,32,32); state->m_fg_tilemap->set_transparent_pen(15); state->m_tx_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c index 87b2b1dc1d4..0c323e7a308 100644 --- a/src/mame/video/blstroid.c +++ b/src/mame/video/blstroid.c @@ -17,13 +17,12 @@ * *************************************/ -static TILE_GET_INFO( get_playfield_tile_info ) +TILE_GET_INFO_MEMBER(blstroid_state::get_playfield_tile_info) { - blstroid_state *state = machine.driver_data<blstroid_state>(); - UINT16 data = state->m_playfield[tile_index]; + UINT16 data = m_playfield[tile_index]; int code = data & 0x1fff; int color = (data >> 13) & 0x07; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -75,7 +74,7 @@ VIDEO_START( blstroid ) blstroid_state *state = machine.driver_data<blstroid_state>(); /* initialize the playfield */ - state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, TILEMAP_SCAN_ROWS, 16,8, 64,64); + state->m_playfield_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(blstroid_state::get_playfield_tile_info),state), TILEMAP_SCAN_ROWS, 16,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index 5a509c051cb..dd2bff62054 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -72,23 +72,22 @@ WRITE8_MEMBER(blueprnt_state::blueprnt_flipscreen_w) } } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(blueprnt_state::get_bg_tile_info) { - blueprnt_state *state = machine.driver_data<blueprnt_state>(); - int attr = state->m_colorram[tile_index]; - int code = state->m_videoram[tile_index] + 256 * state->m_gfx_bank; + int attr = m_colorram[tile_index]; + int code = m_videoram[tile_index] + 256 * m_gfx_bank; int color = attr & 0x7f; tileinfo.category = (attr & 0x80) ? 1 : 0; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START( blueprnt ) { blueprnt_state *state = machine.driver_data<blueprnt_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(blueprnt_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); state->m_bg_tilemap->set_transparent_pen(0); state->m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index 26be053d2b3..0961e89cd5c 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -70,33 +70,31 @@ WRITE8_MEMBER(bogeyman_state::bogeyman_paletteram_w) paletteram_BBGGGRRR_byte_w(space, offset, ~data); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(bogeyman_state::get_bg_tile_info) { - bogeyman_state *state = machine.driver_data<bogeyman_state>(); - int attr = state->m_colorram[tile_index]; - int gfxbank = ((((attr & 0x01) << 8) + state->m_videoram[tile_index]) / 0x80) + 3; - int code = state->m_videoram[tile_index] & 0x7f; + int attr = m_colorram[tile_index]; + int gfxbank = ((((attr & 0x01) << 8) + m_videoram[tile_index]) / 0x80) + 3; + int code = m_videoram[tile_index] & 0x7f; int color = (attr >> 1) & 0x07; - SET_TILE_INFO(gfxbank, code, color, 0); + SET_TILE_INFO_MEMBER(gfxbank, code, color, 0); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(bogeyman_state::get_fg_tile_info) { - bogeyman_state *state = machine.driver_data<bogeyman_state>(); - int attr = state->m_colorram2[tile_index]; - int tile = state->m_videoram2[tile_index] | ((attr & 0x03) << 8); + int attr = m_colorram2[tile_index]; + int tile = m_videoram2[tile_index] | ((attr & 0x03) << 8); int gfxbank = tile / 0x200; int code = tile & 0x1ff; - SET_TILE_INFO(gfxbank, code, state->m_colbank, 0); + SET_TILE_INFO_MEMBER(gfxbank, code, m_colbank, 0); } VIDEO_START( bogeyman ) { bogeyman_state *state = machine.driver_data<bogeyman_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bogeyman_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bogeyman_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index f7d9e277f9f..7e838a19c6d 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -40,34 +40,32 @@ WRITE8_MEMBER(bombjack_state::bombjack_flipscreen_w) } } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(bombjack_state::get_bg_tile_info) { - bombjack_state *state = machine.driver_data<bombjack_state>(); - UINT8 *tilerom = state->memregion("gfx4")->base(); + UINT8 *tilerom = memregion("gfx4")->base(); - int offs = (state->m_background_image & 0x07) * 0x200 + tile_index; - int code = (state->m_background_image & 0x10) ? tilerom[offs] : 0; + int offs = (m_background_image & 0x07) * 0x200 + tile_index; + int code = (m_background_image & 0x10) ? tilerom[offs] : 0; int attr = tilerom[offs + 0x100]; int color = attr & 0x0f; int flags = (attr & 0x80) ? TILE_FLIPY : 0; - SET_TILE_INFO(1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(bombjack_state::get_fg_tile_info) { - bombjack_state *state = machine.driver_data<bombjack_state>(); - int code = state->m_videoram[tile_index] + 16 * (state->m_colorram[tile_index] & 0x10); - int color = state->m_colorram[tile_index] & 0x0f; + int code = m_videoram[tile_index] + 16 * (m_colorram[tile_index] & 0x10); + int color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START( bombjack ) { bombjack_state *state = machine.driver_data<bombjack_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bombjack_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bombjack_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index 7957465e004..a2018877eba 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -71,20 +71,19 @@ PALETTE_INIT( brkthru ) ***************************************************************************/ -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(brkthru_state::get_bg_tile_info) { - brkthru_state *state = machine.driver_data<brkthru_state>(); /* BG RAM format 0 1 ---- -c-- ---- ---- = Color ---- --xx xxxx xxxx = Code */ - int code = (state->m_videoram[tile_index * 2] | ((state->m_videoram[tile_index * 2 + 1]) << 8)) & 0x3ff; + int code = (m_videoram[tile_index * 2] | ((m_videoram[tile_index * 2 + 1]) << 8)) & 0x3ff; int region = 1 + (code >> 7); - int colour = state->m_bgbasecolor + ((state->m_videoram[tile_index * 2 + 1] & 0x04) >> 2); + int colour = m_bgbasecolor + ((m_videoram[tile_index * 2 + 1] & 0x04) >> 2); - SET_TILE_INFO(region, code & 0x7f, colour,0); + SET_TILE_INFO_MEMBER(region, code & 0x7f, colour,0); } WRITE8_MEMBER(brkthru_state::brkthru_bgram_w) @@ -95,11 +94,10 @@ WRITE8_MEMBER(brkthru_state::brkthru_bgram_w) } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(brkthru_state::get_fg_tile_info) { - brkthru_state *state = machine.driver_data<brkthru_state>(); - UINT8 code = state->m_fg_videoram[tile_index]; - SET_TILE_INFO(0, code, 0, 0); + UINT8 code = m_fg_videoram[tile_index]; + SET_TILE_INFO_MEMBER(0, code, 0, 0); } WRITE8_MEMBER(brkthru_state::brkthru_fgram_w) @@ -113,8 +111,8 @@ VIDEO_START( brkthru ) { brkthru_state *state = machine.driver_data<brkthru_state>(); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_COLS, 16, 16, 32, 16); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(brkthru_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(brkthru_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 32, 16); state->m_fg_tilemap->set_transparent_pen(0); state->m_bg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index e882e783951..f101d1ce481 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -15,21 +15,20 @@ WRITE8_MEMBER(bsktball_state::bsktball_videoram_w) m_bg_tilemap->mark_tile_dirty(offset); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(bsktball_state::get_bg_tile_info) { - bsktball_state *state = machine.driver_data<bsktball_state>(); - int attr = state->m_videoram[tile_index]; + int attr = m_videoram[tile_index]; int code = ((attr & 0x0f) << 2) | ((attr & 0x30) >> 4); int color = (attr & 0x40) >> 6; int flags = (attr & 0x80) ? TILE_FLIPX : 0; - SET_TILE_INFO(0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } VIDEO_START( bsktball ) { bsktball_state *state = machine.driver_data<bsktball_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bsktball_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 7d2e0e27d93..8e1cdc29ee5 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -170,27 +170,24 @@ WRITE8_MEMBER(bwing_state::bwing_paletteram_w) //**************************************************************************** // Initializations -static TILE_GET_INFO( get_fgtileinfo ) +TILE_GET_INFO_MEMBER(bwing_state::get_fgtileinfo) { - bwing_state *state = machine.driver_data<bwing_state>(); - tileinfo.pen_data = machine.gfx[2]->get_data(state->m_fgdata[tile_index] & (BW_NTILES - 1)); - tileinfo.palette_base = machine.gfx[2]->colorbase() + ((state->m_fgdata[tile_index] >> 7) << 3); + tileinfo.pen_data = machine().gfx[2]->get_data(m_fgdata[tile_index] & (BW_NTILES - 1)); + tileinfo.palette_base = machine().gfx[2]->colorbase() + ((m_fgdata[tile_index] >> 7) << 3); } -static TILE_GET_INFO( get_bgtileinfo ) +TILE_GET_INFO_MEMBER(bwing_state::get_bgtileinfo) { - bwing_state *state = machine.driver_data<bwing_state>(); - tileinfo.pen_data = machine.gfx[3]->get_data(state->m_bgdata[tile_index] & (BW_NTILES - 1)); - tileinfo.palette_base = machine.gfx[3]->colorbase() + ((state->m_bgdata[tile_index] >> 7) << 3); + tileinfo.pen_data = machine().gfx[3]->get_data(m_bgdata[tile_index] & (BW_NTILES - 1)); + tileinfo.palette_base = machine().gfx[3]->colorbase() + ((m_bgdata[tile_index] >> 7) << 3); } -static TILE_GET_INFO( get_charinfo ) +TILE_GET_INFO_MEMBER(bwing_state::get_charinfo) { - bwing_state *state = machine.driver_data<bwing_state>(); - SET_TILE_INFO(0, state->m_videoram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0); } -static TILEMAP_MAPPER( bwing_scan_cols ) +TILEMAP_MAPPER_MEMBER(bwing_state::bwing_scan_cols) { return ((col << 6) + row); } @@ -202,9 +199,9 @@ VIDEO_START( bwing ) // UINT32 *dwptr; int i; - state->m_charmap = tilemap_create(machine, get_charinfo, TILEMAP_SCAN_COLS, 8, 8, 32, 32); - state->m_fgmap = tilemap_create(machine, get_fgtileinfo, bwing_scan_cols, 16, 16, 64, 64); - state->m_bgmap = tilemap_create(machine, get_bgtileinfo, bwing_scan_cols, 16, 16, 64, 64); + state->m_charmap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bwing_state::get_charinfo),state), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + state->m_fgmap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bwing_state::get_fgtileinfo),state), tilemap_mapper_delegate(FUNC(bwing_state::bwing_scan_cols),state), 16, 16, 64, 64); + state->m_bgmap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(bwing_state::get_bgtileinfo),state), tilemap_mapper_delegate(FUNC(bwing_state::bwing_scan_cols),state), 16, 16, 64, 64); state->m_charmap->set_transparent_pen(0); state->m_fgmap->set_transparent_pen(0); diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index e97cfc7f491..008dc78bc14 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -9,32 +9,30 @@ #include "emu.h" #include "includes/cabal.h" -static TILE_GET_INFO( get_back_tile_info ) +TILE_GET_INFO_MEMBER(cabal_state::get_back_tile_info) { - cabal_state *state = machine.driver_data<cabal_state>(); - int tile = state->m_videoram[tile_index]; + int tile = m_videoram[tile_index]; int color = (tile>>12)&0xf; tile &= 0xfff; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, tile, color, 0); } -static TILE_GET_INFO( get_text_tile_info ) +TILE_GET_INFO_MEMBER(cabal_state::get_text_tile_info) { - cabal_state *state = machine.driver_data<cabal_state>(); - int tile = state->m_colorram[tile_index]; + int tile = m_colorram[tile_index]; int color = (tile>>10); tile &= 0x3ff; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, tile, color, @@ -46,8 +44,8 @@ VIDEO_START( cabal ) { cabal_state *state = machine.driver_data<cabal_state>(); - state->m_background_layer = tilemap_create(machine, get_back_tile_info,TILEMAP_SCAN_ROWS,16,16,16,16); - state->m_text_layer = tilemap_create(machine, get_text_tile_info,TILEMAP_SCAN_ROWS, 8,8,32,32); + state->m_background_layer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cabal_state::get_back_tile_info),state),TILEMAP_SCAN_ROWS,16,16,16,16); + state->m_text_layer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cabal_state::get_text_tile_info),state),TILEMAP_SCAN_ROWS, 8,8,32,32); state->m_text_layer->set_transparent_pen(3); state->m_background_layer->set_transparent_pen(15); diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c index e3531e0f79c..654d61ff331 100644 --- a/src/mame/video/calomega.c +++ b/src/mame/video/calomega.c @@ -29,17 +29,16 @@ WRITE8_MEMBER(calomega_state::calomega_colorram_w) m_bg_tilemap->mark_tile_dirty(offset); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(calomega_state::get_bg_tile_info) { - calomega_state *state = machine.driver_data<calomega_state>(); /* - bits - 7654 3210 --xx xx-- tiles color. ---- --x- tiles bank. xx-- ---x seems unused. */ - int attr = state->m_colorram[tile_index]; - int code = state->m_videoram[tile_index]; + int attr = m_colorram[tile_index]; + int code = m_videoram[tile_index]; int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */ int color = (attr & 0x3c); /* bits 2-3-4-5 for color */ @@ -52,13 +51,13 @@ static TILE_GET_INFO( get_bg_tile_info ) if (attr == 0x32) /* Is the palette wrong? */ color = 0x39; /* 0x39 is the best match */ - SET_TILE_INFO(bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } VIDEO_START( calomega ) { calomega_state *state = machine.driver_data<calomega_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 31); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(calomega_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 31); } SCREEN_UPDATE_IND16( calomega ) diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index 59449048467..1f0d43597b3 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -15,12 +15,11 @@ WRITE8_MEMBER(canyon_state::canyon_videoram_w) } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(canyon_state::get_bg_tile_info) { - canyon_state *state = machine.driver_data<canyon_state>(); - UINT8 code = state->m_videoram[tile_index]; + UINT8 code = m_videoram[tile_index]; - SET_TILE_INFO(0, code & 0x3f, code >> 7, 0); + SET_TILE_INFO_MEMBER(0, code & 0x3f, code >> 7, 0); } @@ -28,7 +27,7 @@ VIDEO_START( canyon ) { canyon_state *state = machine.driver_data<canyon_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(canyon_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index 50d31528ea0..af377fdb521 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -83,14 +83,13 @@ WRITE8_MEMBER(carjmbre_state::carjmbre_videoram_w) -static TILE_GET_INFO( get_carjmbre_tile_info ) +TILE_GET_INFO_MEMBER(carjmbre_state::get_carjmbre_tile_info) { - carjmbre_state *state = machine.driver_data<carjmbre_state>(); - UINT32 tile_number = state->m_videoram[tile_index] & 0xff; - UINT8 attr = state->m_videoram[tile_index + 0x400]; + UINT32 tile_number = m_videoram[tile_index] & 0xff; + UINT8 attr = m_videoram[tile_index + 0x400]; tile_number += (attr & 0x80) << 1; /* bank */ - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, tile_number, attr & 0xf, @@ -101,7 +100,7 @@ VIDEO_START( carjmbre ) { carjmbre_state *state = machine.driver_data<carjmbre_state>(); - state->m_cj_tilemap = tilemap_create(machine, get_carjmbre_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_cj_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(carjmbre_state::get_carjmbre_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->save_item(NAME(state->m_flipscreen)); state->save_item(NAME(state->m_bgcolor)); } diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index 06efdcb74fc..7c46b731331 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -269,16 +269,15 @@ void sailormn_tilebank_w( running_machine &machine, int bank ) } } -static TILE_GET_INFO( sailormn_get_tile_info_2 ) +TILE_GET_INFO_MEMBER(cave_state::sailormn_get_tile_info_2) { - cave_state *state = machine.driver_data<cave_state>(); UINT32 code, color, pri; - if (state->m_tiledim[2]) + if (m_tiledim[2]) { UINT32 tile; tile = (tile_index % (512 / 8)) / 2 + ((tile_index / (512 / 8)) / 2) * (512 / 16); - code = (state->m_vram[2][tile * 2 + 0x0000 / 2] << 16) + state->m_vram[2][tile * 2 + 0x0002 / 2]; + code = (m_vram[2][tile * 2 + 0x0000 / 2] << 16) + m_vram[2][tile * 2 + 0x0002 / 2]; color = (code & 0x3f000000) >> (32 - 8); pri = (code & 0xc0000000) >> (32 - 2); @@ -289,16 +288,16 @@ static TILE_GET_INFO( sailormn_get_tile_info_2 ) } else { - code = (state->m_vram[2][tile_index * 2 + 0x4000 / 2] << 16) + state->m_vram[2][tile_index * 2 + 0x4002 / 2]; + code = (m_vram[2][tile_index * 2 + 0x4000 / 2] << 16) + m_vram[2][tile_index * 2 + 0x4002 / 2]; color = (code & 0x3f000000) >> (32 - 8); pri = (code & 0xc0000000) >> (32 - 2); code = (code & 0x00ffffff); - if ((code < 0x10000) && (state->m_sailormn_tilebank)) + if ((code < 0x10000) && (m_sailormn_tilebank)) code += 0x40000; } - SET_TILE_INFO( 2, code, color, 0 ); + SET_TILE_INFO_MEMBER( 2, code, color, 0 ); tileinfo.category = pri; } @@ -347,10 +346,10 @@ INLINE void vram_8x8_w( address_space *space, ATTR_UNUSED offs_t offset, ATTR_UN } -static TILE_GET_INFO( get_tile_info_0 ) { get_tile_info(machine, tileinfo, tile_index, 0); } -static TILE_GET_INFO( get_tile_info_1 ) { get_tile_info(machine, tileinfo, tile_index, 1); } -static TILE_GET_INFO( get_tile_info_2 ) { get_tile_info(machine, tileinfo, tile_index, 2); } -static TILE_GET_INFO( get_tile_info_3 ) { get_tile_info(machine, tileinfo, tile_index, 3); } +TILE_GET_INFO_MEMBER(cave_state::get_tile_info_0){ get_tile_info(machine(), tileinfo, tile_index, 0); } +TILE_GET_INFO_MEMBER(cave_state::get_tile_info_1){ get_tile_info(machine(), tileinfo, tile_index, 1); } +TILE_GET_INFO_MEMBER(cave_state::get_tile_info_2){ get_tile_info(machine(), tileinfo, tile_index, 2); } +TILE_GET_INFO_MEMBER(cave_state::get_tile_info_3){ get_tile_info(machine(), tileinfo, tile_index, 3); } WRITE16_MEMBER(cave_state::cave_vram_0_w){ vram_w(&space, offset, data, mem_mask, 0); } WRITE16_MEMBER(cave_state::cave_vram_1_w){ vram_w(&space, offset, data, mem_mask, 1); } @@ -398,7 +397,7 @@ static void cave_vh_start( running_machine &machine, int num ) switch (num) { case 4: - state->m_tilemap[3] = tilemap_create(machine, get_tile_info_3, TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); + state->m_tilemap[3] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_3),state), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); state->m_tilemap[3]->set_transparent_pen(0); state->m_tilemap[3]->set_scroll_rows(1); state->m_tilemap[3]->set_scroll_cols(1); @@ -406,7 +405,7 @@ static void cave_vh_start( running_machine &machine, int num ) state->save_item(NAME(state->m_old_tiledim[3])); case 3: - state->m_tilemap[2] = tilemap_create(machine, get_tile_info_2, TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); + state->m_tilemap[2] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_2),state), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); state->m_tilemap[2]->set_transparent_pen(0); state->m_tilemap[2]->set_scroll_rows(1); state->m_tilemap[2]->set_scroll_cols(1); @@ -414,7 +413,7 @@ static void cave_vh_start( running_machine &machine, int num ) state->save_item(NAME(state->m_old_tiledim[2])); case 2: - state->m_tilemap[1] = tilemap_create(machine, get_tile_info_1, TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); + state->m_tilemap[1] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_1),state), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); state->m_tilemap[1]->set_transparent_pen(0); state->m_tilemap[1]->set_scroll_rows(1); state->m_tilemap[1]->set_scroll_cols(1); @@ -422,7 +421,7 @@ static void cave_vh_start( running_machine &machine, int num ) state->save_item(NAME(state->m_old_tiledim[1])); case 1: - state->m_tilemap[0] = tilemap_create(machine, get_tile_info_0, TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); + state->m_tilemap[0] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_0),state), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); state->m_tilemap[0]->set_transparent_pen(0); state->m_tilemap[0]->set_scroll_rows(1); state->m_tilemap[0]->set_scroll_cols(1); @@ -472,7 +471,7 @@ VIDEO_START( sailormn_3_layers ) cave_vh_start(machine, 2); /* Layer 2 (8x8) needs to be handled differently */ - state->m_tilemap[2] = tilemap_create(machine, sailormn_get_tile_info_2, TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8 ); + state->m_tilemap[2] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::sailormn_get_tile_info_2),state), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8 ); state->m_tilemap[2]->set_transparent_pen(0); state->m_tilemap[2]->set_scroll_rows(1); diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index fc18a2b972e..a1dc46cec65 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -8,24 +8,22 @@ ***************************************************************************/ -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(cbasebal_state::get_bg_tile_info) { - cbasebal_state *state = machine.driver_data<cbasebal_state>(); - UINT8 attr = state->m_scrollram[2 * tile_index + 1]; - SET_TILE_INFO( + UINT8 attr = m_scrollram[2 * tile_index + 1]; + SET_TILE_INFO_MEMBER( 1, - state->m_scrollram[2 * tile_index] + ((attr & 0x07) << 8) + 0x800 * state->m_tilebank, + m_scrollram[2 * tile_index] + ((attr & 0x07) << 8) + 0x800 * m_tilebank, (attr & 0xf0) >> 4, (attr & 0x08) ? TILE_FLIPX : 0); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(cbasebal_state::get_fg_tile_info) { - cbasebal_state *state = machine.driver_data<cbasebal_state>(); - UINT8 attr = state->m_textram[tile_index + 0x800]; - SET_TILE_INFO( + UINT8 attr = m_textram[tile_index + 0x800]; + SET_TILE_INFO_MEMBER( 0, - state->m_textram[tile_index] + ((attr & 0xf0) << 4), + m_textram[tile_index] + ((attr & 0xf0) << 4), attr & 0x07, (attr & 0x08) ? TILE_FLIPX : 0); } @@ -45,8 +43,8 @@ VIDEO_START( cbasebal ) state->m_textram = auto_alloc_array(machine, UINT8, 0x1000); state->m_scrollram = auto_alloc_array(machine, UINT8, 0x1000); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cbasebal_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cbasebal_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); state->m_fg_tilemap->set_transparent_pen(3); diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index b6ad7f8f047..999009a993d 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -344,61 +344,57 @@ WRITE8_MEMBER(cclimber_state::cannonb_flip_screen_w) } -static TILE_GET_INFO( cclimber_get_pf_tile_info ) +TILE_GET_INFO_MEMBER(cclimber_state::cclimber_get_pf_tile_info) { - cclimber_state *state = machine.driver_data<cclimber_state>(); int code, color; - int flags = TILE_FLIPYX(state->m_colorram[tile_index] >> 6); + int flags = TILE_FLIPYX(m_colorram[tile_index] >> 6); /* vertical flipping flips two adjacent characters */ if (flags & 0x02) tile_index = tile_index ^ 0x20; - code = ((state->m_colorram[tile_index] & 0x10) << 5) | - ((state->m_colorram[tile_index] & 0x20) << 3) | - state->m_videoram[tile_index]; + code = ((m_colorram[tile_index] & 0x10) << 5) | + ((m_colorram[tile_index] & 0x20) << 3) | + m_videoram[tile_index]; - color = state->m_colorram[tile_index] & 0x0f; + color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO(0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } -static TILE_GET_INFO( swimmer_get_pf_tile_info ) +TILE_GET_INFO_MEMBER(cclimber_state::swimmer_get_pf_tile_info) { - cclimber_state *state = machine.driver_data<cclimber_state>(); int code, color; - int flags = TILE_FLIPYX(state->m_colorram[tile_index] >> 6); + int flags = TILE_FLIPYX(m_colorram[tile_index] >> 6); /* vertical flipping flips two adjacent characters */ if (flags & 0x02) tile_index = tile_index ^ 0x20; - code = ((state->m_colorram[tile_index] & 0x10) << 4) | state->m_videoram[tile_index]; - color = ((*state->m_swimmer_palettebank & 0x01) << 4) | (state->m_colorram[tile_index] & 0x0f); + code = ((m_colorram[tile_index] & 0x10) << 4) | m_videoram[tile_index]; + color = ((*m_swimmer_palettebank & 0x01) << 4) | (m_colorram[tile_index] & 0x0f); - SET_TILE_INFO(0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } -static TILE_GET_INFO( toprollr_get_pf_tile_info ) +TILE_GET_INFO_MEMBER(cclimber_state::toprollr_get_pf_tile_info) { - cclimber_state *state = machine.driver_data<cclimber_state>(); int code, attr, color; - attr = tile_index & 0x10 ? state->m_colorram[tile_index & ~0x20] : state->m_colorram[tile_index]; - code = ((attr & 0x30) << 4) | state->m_videoram[tile_index]; + attr = tile_index & 0x10 ? m_colorram[tile_index & ~0x20] : m_colorram[tile_index]; + code = ((attr & 0x30) << 4) | m_videoram[tile_index]; color = attr & 0x0f; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } -static TILE_GET_INFO( cclimber_get_bs_tile_info ) +TILE_GET_INFO_MEMBER(cclimber_state::cclimber_get_bs_tile_info) { - cclimber_state *state = machine.driver_data<cclimber_state>(); int code, color; /* only the lower right is visible */ @@ -407,16 +403,15 @@ static TILE_GET_INFO( cclimber_get_bs_tile_info ) /* the address doesn't use A4 of the coordinates, giving a 16x16 map */ tile_index = ((tile_index & 0x1e0) >> 1) | (tile_index & 0x0f); - code = ((state->m_bigsprite_control[1] & 0x08) << 5) | state->m_bigsprite_videoram[tile_index]; - color = state->m_bigsprite_control[1] & 0x07; + code = ((m_bigsprite_control[1] & 0x08) << 5) | m_bigsprite_videoram[tile_index]; + color = m_bigsprite_control[1] & 0x07; - SET_TILE_INFO(2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } -static TILE_GET_INFO( toprollr_get_bs_tile_info ) +TILE_GET_INFO_MEMBER(cclimber_state::toprollr_get_bs_tile_info) { - cclimber_state *state = machine.driver_data<cclimber_state>(); int code, color; /* only the lower right is visible */ @@ -425,31 +420,30 @@ static TILE_GET_INFO( toprollr_get_bs_tile_info ) /* the address doesn't use A4 of the coordinates, giving a 16x16 map */ tile_index = ((tile_index & 0x1e0) >> 1) | (tile_index & 0x0f); - code = ((state->m_bigsprite_control[1] & 0x18) << 5) | state->m_bigsprite_videoram[tile_index]; - color = state->m_bigsprite_control[1] & 0x07; + code = ((m_bigsprite_control[1] & 0x18) << 5) | m_bigsprite_videoram[tile_index]; + color = m_bigsprite_control[1] & 0x07; - SET_TILE_INFO(2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } -static TILE_GET_INFO( toproller_get_bg_tile_info ) +TILE_GET_INFO_MEMBER(cclimber_state::toproller_get_bg_tile_info) { - cclimber_state *state = machine.driver_data<cclimber_state>(); - int code = ((state->m_toprollr_bg_coloram[tile_index] & 0x40) << 2) | state->m_toprollr_bg_videoram[tile_index]; - int color = state->m_toprollr_bg_coloram[tile_index] & 0x0f; + int code = ((m_toprollr_bg_coloram[tile_index] & 0x40) << 2) | m_toprollr_bg_videoram[tile_index]; + int color = m_toprollr_bg_coloram[tile_index] & 0x0f; - SET_TILE_INFO(3, code, color, TILE_FLIPX); + SET_TILE_INFO_MEMBER(3, code, color, TILE_FLIPX); } VIDEO_START( cclimber ) { cclimber_state *state = machine.driver_data<cclimber_state>(); - state->m_pf_tilemap = tilemap_create(machine, cclimber_get_pf_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_pf_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_pf_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_pf_tilemap->set_transparent_pen(0); state->m_pf_tilemap->set_scroll_cols(32); - state->m_bs_tilemap = tilemap_create(machine, cclimber_get_bs_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bs_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_bs_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bs_tilemap->set_scroll_cols(1); state->m_bs_tilemap->set_scroll_rows(1); state->m_bs_tilemap->set_transmask(0, 0x01, 0); /* pen 0 is transaprent */ @@ -460,11 +454,11 @@ VIDEO_START( cclimber ) VIDEO_START( swimmer ) { cclimber_state *state = machine.driver_data<cclimber_state>(); - state->m_pf_tilemap = tilemap_create(machine, swimmer_get_pf_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_pf_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::swimmer_get_pf_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_pf_tilemap->set_transparent_pen(0); state->m_pf_tilemap->set_scroll_cols(32); - state->m_bs_tilemap = tilemap_create(machine, cclimber_get_bs_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bs_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_bs_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bs_tilemap->set_scroll_cols(1); state->m_bs_tilemap->set_scroll_rows(1); state->m_bs_tilemap->set_transmask(0, 0x01, 0); /* pen 0 is transaprent */ @@ -475,13 +469,13 @@ VIDEO_START( swimmer ) VIDEO_START( toprollr ) { cclimber_state *state = machine.driver_data<cclimber_state>(); - state->m_pf_tilemap = tilemap_create(machine, toprollr_get_pf_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_pf_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::toprollr_get_pf_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_pf_tilemap->set_transparent_pen(0); - state->m_toproller_bg_tilemap = tilemap_create(machine, toproller_get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_toproller_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::toproller_get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_toproller_bg_tilemap->set_scroll_rows(1); - state->m_bs_tilemap = tilemap_create(machine, toprollr_get_bs_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bs_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::toprollr_get_bs_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bs_tilemap->set_scroll_cols(1); state->m_bs_tilemap->set_scroll_rows(1); state->m_bs_tilemap->set_transmask(0, 0x01, 0); /* pen 0 is transaprent */ diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index 6a051c7c2e2..ba1502268b2 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -14,49 +14,45 @@ * *************************************/ -static TILE_GET_INFO( centiped_get_tile_info ) +TILE_GET_INFO_MEMBER(centiped_state::centiped_get_tile_info) { - centiped_state *state = machine.driver_data<centiped_state>(); - UINT8 *videoram = state->m_videoram; + UINT8 *videoram = m_videoram; int data = videoram[tile_index]; - SET_TILE_INFO(0, (data & 0x3f) + 0x40, 0, TILE_FLIPYX(data >> 6)); + SET_TILE_INFO_MEMBER(0, (data & 0x3f) + 0x40, 0, TILE_FLIPYX(data >> 6)); } -static TILE_GET_INFO( warlords_get_tile_info ) +TILE_GET_INFO_MEMBER(centiped_state::warlords_get_tile_info) { - centiped_state *state = machine.driver_data<centiped_state>(); - UINT8 *videoram = state->m_videoram; + UINT8 *videoram = m_videoram; int data = videoram[tile_index]; - int color = ((tile_index & 0x10) >> 4) | ((tile_index & 0x200) >> 8) | (state->m_flipscreen >> 5); + int color = ((tile_index & 0x10) >> 4) | ((tile_index & 0x200) >> 8) | (m_flipscreen >> 5); - SET_TILE_INFO(0, data & 0x3f, color, TILE_FLIPYX(data >> 6)); + SET_TILE_INFO_MEMBER(0, data & 0x3f, color, TILE_FLIPYX(data >> 6)); } -static TILE_GET_INFO( milliped_get_tile_info ) +TILE_GET_INFO_MEMBER(centiped_state::milliped_get_tile_info) { - centiped_state *state = machine.driver_data<centiped_state>(); - UINT8 *videoram = state->m_videoram; + UINT8 *videoram = m_videoram; int data = videoram[tile_index]; - int bank = ((data >> 6) & 1) | (state->m_gfx_bank << 1); + int bank = ((data >> 6) & 1) | (m_gfx_bank << 1); int color = (data >> 6) & 3; /* Flip both x and y if flipscreen is non-zero */ - int flip_tiles = (state->m_flipscreen) ? 0x03 : 0; + int flip_tiles = (m_flipscreen) ? 0x03 : 0; - SET_TILE_INFO(0, (data & 0x3f) + 0x40 + (bank * 0x80), color, TILE_FLIPYX(flip_tiles)); + SET_TILE_INFO_MEMBER(0, (data & 0x3f) + 0x40 + (bank * 0x80), color, TILE_FLIPYX(flip_tiles)); } -static TILE_GET_INFO( bullsdrt_get_tile_info ) +TILE_GET_INFO_MEMBER(centiped_state::bullsdrt_get_tile_info) { - centiped_state *state = machine.driver_data<centiped_state>(); - UINT8 *videoram = state->m_videoram; + UINT8 *videoram = m_videoram; int data = videoram[tile_index]; - int bank = state->m_bullsdrt_tiles_bankram[tile_index & 0x1f] & 0x0f; + int bank = m_bullsdrt_tiles_bankram[tile_index & 0x1f] & 0x0f; - SET_TILE_INFO(0, (data & 0x3f) + 0x40 * bank, 0, TILE_FLIPYX(data >> 6)); + SET_TILE_INFO_MEMBER(0, (data & 0x3f) + 0x40 * bank, 0, TILE_FLIPYX(data >> 6)); } @@ -103,7 +99,7 @@ VIDEO_START( centiped ) init_penmask(machine); centiped_state *state = machine.driver_data<centiped_state>(); - state->m_bg_tilemap = tilemap_create(machine, centiped_get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(centiped_state::centiped_get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -112,7 +108,7 @@ VIDEO_START( warlords ) init_common(machine); centiped_state *state = machine.driver_data<centiped_state>(); - state->m_bg_tilemap = tilemap_create(machine, warlords_get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(centiped_state::warlords_get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -122,7 +118,7 @@ VIDEO_START( milliped ) init_penmask(machine); centiped_state *state = machine.driver_data<centiped_state>(); - state->m_bg_tilemap = tilemap_create(machine, milliped_get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(centiped_state::milliped_get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -132,7 +128,7 @@ VIDEO_START( bullsdrt ) init_penmask(machine); centiped_state *state = machine.driver_data<centiped_state>(); - state->m_bg_tilemap = tilemap_create(machine, bullsdrt_get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(centiped_state::bullsdrt_get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index 5feb787145b..2a1857e964e 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -128,22 +128,21 @@ WRITE8_MEMBER(chaknpop_state::chaknpop_attrram_w) * I'm not sure how to handle attributes about color */ -static TILE_GET_INFO( chaknpop_get_tx_tile_info ) +TILE_GET_INFO_MEMBER(chaknpop_state::chaknpop_get_tx_tile_info) { - chaknpop_state *state = machine.driver_data<chaknpop_state>(); - int tile = state->m_tx_ram[tile_index]; - int tile_h_bank = (state->m_gfxmode & GFX_TX_BANK2) << 2; /* 0x00-0xff -> 0x200-0x2ff */ - int color = state->m_attr_ram[TX_COLOR2]; + int tile = m_tx_ram[tile_index]; + int tile_h_bank = (m_gfxmode & GFX_TX_BANK2) << 2; /* 0x00-0xff -> 0x200-0x2ff */ + int color = m_attr_ram[TX_COLOR2]; if (tile == 0x74) - color = state->m_attr_ram[TX_COLOR1]; + color = m_attr_ram[TX_COLOR1]; - if (state->m_gfxmode & GFX_TX_BANK1 && tile >= 0xc0) + if (m_gfxmode & GFX_TX_BANK1 && tile >= 0xc0) tile += 0xc0; /* 0xc0-0xff -> 0x180-0x1bf */ tile |= tile_h_bank; - SET_TILE_INFO(1, tile, color, 0); + SET_TILE_INFO_MEMBER(1, tile, color, 0); } @@ -157,7 +156,7 @@ VIDEO_START( chaknpop ) UINT8 *RAM = state->memregion("maincpu")->base(); /* info offset type w h col row */ - state->m_tx_tilemap = tilemap_create(machine, chaknpop_get_tx_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(chaknpop_state::chaknpop_get_tx_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_vram1 = &RAM[0x10000]; state->m_vram2 = &RAM[0x12000]; diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index 402b4e2190d..7706299aa19 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -129,22 +129,20 @@ PALETTE_INIT( exctsccr ) -static TILE_GET_INFO( champbas_get_bg_tile_info ) +TILE_GET_INFO_MEMBER(champbas_state::champbas_get_bg_tile_info) { - champbas_state *state = machine.driver_data<champbas_state>(); - int code = state->m_bg_videoram[tile_index] | (state->m_gfx_bank << 8); - int color = (state->m_bg_videoram[tile_index + 0x400] & 0x1f) | 0x20; + int code = m_bg_videoram[tile_index] | (m_gfx_bank << 8); + int color = (m_bg_videoram[tile_index + 0x400] & 0x1f) | 0x20; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } -static TILE_GET_INFO( exctsccr_get_bg_tile_info ) +TILE_GET_INFO_MEMBER(champbas_state::exctsccr_get_bg_tile_info) { - champbas_state *state = machine.driver_data<champbas_state>(); - int code = state->m_bg_videoram[tile_index] | (state->m_gfx_bank << 8); - int color = state->m_bg_videoram[tile_index + 0x400] & 0x0f; + int code = m_bg_videoram[tile_index] | (m_gfx_bank << 8); + int color = m_bg_videoram[tile_index + 0x400] & 0x0f; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -152,13 +150,13 @@ static TILE_GET_INFO( exctsccr_get_bg_tile_info ) VIDEO_START( champbas ) { champbas_state *state = machine.driver_data<champbas_state>(); - state->m_bg_tilemap = tilemap_create(machine, champbas_get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(champbas_state::champbas_get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } VIDEO_START( exctsccr ) { champbas_state *state = machine.driver_data<champbas_state>(); - state->m_bg_tilemap = tilemap_create(machine, exctsccr_get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(champbas_state::exctsccr_get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index 7a701419705..05379e3430c 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -63,15 +63,14 @@ WRITE8_MEMBER(cheekyms_state::cheekyms_port_80_w) -static TILE_GET_INFO( cheekyms_get_tile_info ) +TILE_GET_INFO_MEMBER(cheekyms_state::cheekyms_get_tile_info) { - cheekyms_state *state = machine.driver_data<cheekyms_state>(); int color; int x = tile_index & 0x1f; int y = tile_index >> 5; - int code = state->m_videoram[tile_index]; - int palette = (*state->m_port_80 >> 2) & 0x10; + int code = m_videoram[tile_index]; + int palette = (*m_port_80 >> 2) & 0x10; if (x >= 0x1e) { @@ -90,7 +89,7 @@ static TILE_GET_INFO( cheekyms_get_tile_info ) color = palette | (x >> 1); } - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START( cheekyms ) @@ -102,7 +101,7 @@ VIDEO_START( cheekyms ) height = machine.primary_screen->height(); state->m_bitmap_buffer = auto_bitmap_ind16_alloc(machine, width, height); - state->m_cm_tilemap = tilemap_create(machine, cheekyms_get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_cm_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cheekyms_state::cheekyms_get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_cm_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c index e1519681d73..40b72ab9625 100644 --- a/src/mame/video/circus.c +++ b/src/mame/video/circus.c @@ -27,18 +27,17 @@ WRITE8_MEMBER(circus_state::circus_clown_y_w) m_clown_y = 240 - data; } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(circus_state::get_bg_tile_info) { - circus_state *state = machine.driver_data<circus_state>(); - int code = state->m_videoram[tile_index]; + int code = m_videoram[tile_index]; - SET_TILE_INFO(0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } VIDEO_START( circus ) { circus_state *state = machine.driver_data<circus_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(circus_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } static void draw_line( bitmap_ind16 &bitmap, const rectangle &cliprect, int x1, int y1, int x2, int y2, int dotted ) diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c index ebf005d185f..c4cecd9bae2 100644 --- a/src/mame/video/circusc.c +++ b/src/mame/video/circusc.c @@ -99,14 +99,13 @@ PALETTE_INIT( circusc ) ***************************************************************************/ -static TILE_GET_INFO( get_tile_info ) +TILE_GET_INFO_MEMBER(circusc_state::get_tile_info) { - circusc_state *state = machine.driver_data<circusc_state>(); - UINT8 attr = state->m_colorram[tile_index]; + UINT8 attr = m_colorram[tile_index]; tileinfo.category = (attr & 0x10) >> 4; - SET_TILE_INFO(0, - state->m_videoram[tile_index] + ((attr & 0x20) << 3), + SET_TILE_INFO_MEMBER(0, + m_videoram[tile_index] + ((attr & 0x20) << 3), attr & 0x0f, TILE_FLIPYX((attr & 0xc0) >> 6)); } @@ -122,7 +121,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( circusc ) { circusc_state *state = machine.driver_data<circusc_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(circusc_state::get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bg_tilemap->set_scroll_cols(32); } diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index db997efe787..4d67260697d 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -153,34 +153,32 @@ WRITE16_MEMBER(cischeat_state::cischeat_scrollram_0_w){ scrollram_w(&space, offs WRITE16_MEMBER(cischeat_state::cischeat_scrollram_1_w){ scrollram_w(&space, offset, data, mem_mask, 1); } WRITE16_MEMBER(cischeat_state::cischeat_scrollram_2_w){ scrollram_w(&space, offset, data, mem_mask, 2); } -static TILEMAP_MAPPER( cischeat_scan_8x8 ) +TILEMAP_MAPPER_MEMBER(cischeat_state::cischeat_scan_8x8) { return (col * TILES_PER_PAGE_Y) + (row / TILES_PER_PAGE_Y) * TILES_PER_PAGE * (num_cols / TILES_PER_PAGE_X) + (row % TILES_PER_PAGE_Y); } -static TILEMAP_MAPPER( cischeat_scan_16x16 ) +TILEMAP_MAPPER_MEMBER(cischeat_state::cischeat_scan_16x16) { return ( ((col / 2) * (TILES_PER_PAGE_Y / 2)) + ((row / 2) / (TILES_PER_PAGE_Y / 2)) * (TILES_PER_PAGE / 4) * (num_cols / TILES_PER_PAGE_X) + ((row / 2) % (TILES_PER_PAGE_Y / 2)) )*4 + (row&1) + (col&1)*2; } -static TILE_GET_INFO( cischeat_get_scroll_tile_info_8x8 ) +TILE_GET_INFO_MEMBER(cischeat_state::cischeat_get_scroll_tile_info_8x8) { - cischeat_state *state = machine.driver_data<cischeat_state>(); int tmap = (FPTR)param; - UINT16 code = state->m_scrollram[tmap][tile_index]; - SET_TILE_INFO(tmap, (code & 0xfff), code >> (16 - state->m_bits_per_color_code), 0); + UINT16 code = m_scrollram[tmap][tile_index]; + SET_TILE_INFO_MEMBER(tmap, (code & 0xfff), code >> (16 - m_bits_per_color_code), 0); } -static TILE_GET_INFO( cischeat_get_scroll_tile_info_16x16 ) +TILE_GET_INFO_MEMBER(cischeat_state::cischeat_get_scroll_tile_info_16x16) { - cischeat_state *state = machine.driver_data<cischeat_state>(); int tmap = (FPTR)param; - UINT16 code = state->m_scrollram[tmap][tile_index/4]; - SET_TILE_INFO(tmap, (code & 0xfff) * 4 + (tile_index & 3), code >> (16 - state->m_bits_per_color_code), 0); + UINT16 code = m_scrollram[tmap][tile_index/4]; + SET_TILE_INFO_MEMBER(tmap, (code & 0xfff) * 4 + (tile_index & 3), code >> (16 - m_bits_per_color_code), 0); } static void create_tilemaps(running_machine &machine) @@ -191,23 +189,23 @@ static void create_tilemaps(running_machine &machine) for (layer = 0; layer < 3; layer++) { /* 16x16 tilemaps */ - state->m_tilemap[layer][0][0] = tilemap_create(machine, cischeat_get_scroll_tile_info_16x16, cischeat_scan_16x16, + state->m_tilemap[layer][0][0] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),state), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),state), 8,8, TILES_PER_PAGE_X * 16, TILES_PER_PAGE_Y * 2); - state->m_tilemap[layer][0][1] = tilemap_create(machine, cischeat_get_scroll_tile_info_16x16, cischeat_scan_16x16, + state->m_tilemap[layer][0][1] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),state), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),state), 8,8, TILES_PER_PAGE_X * 8, TILES_PER_PAGE_Y * 4); - state->m_tilemap[layer][0][2] = tilemap_create(machine, cischeat_get_scroll_tile_info_16x16, cischeat_scan_16x16, + state->m_tilemap[layer][0][2] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),state), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),state), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 8); - state->m_tilemap[layer][0][3] = tilemap_create(machine, cischeat_get_scroll_tile_info_16x16, cischeat_scan_16x16, + state->m_tilemap[layer][0][3] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),state), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),state), 8,8, TILES_PER_PAGE_X * 2, TILES_PER_PAGE_Y * 16); /* 8x8 tilemaps */ - state->m_tilemap[layer][1][0] = tilemap_create(machine, cischeat_get_scroll_tile_info_8x8, cischeat_scan_8x8, + state->m_tilemap[layer][1][0] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),state), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),state), 8,8, TILES_PER_PAGE_X * 8, TILES_PER_PAGE_Y * 1); - state->m_tilemap[layer][1][1] = tilemap_create(machine, cischeat_get_scroll_tile_info_8x8, cischeat_scan_8x8, + state->m_tilemap[layer][1][1] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),state), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),state), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 2); - state->m_tilemap[layer][1][2] = tilemap_create(machine, cischeat_get_scroll_tile_info_8x8, cischeat_scan_8x8, + state->m_tilemap[layer][1][2] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),state), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),state), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 2); - state->m_tilemap[layer][1][3] = tilemap_create(machine, cischeat_get_scroll_tile_info_8x8, cischeat_scan_8x8, + state->m_tilemap[layer][1][3] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),state), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),state), 8,8, TILES_PER_PAGE_X * 2, TILES_PER_PAGE_Y * 4); /* set user data and transparency */ diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index e6ae3fb87fd..a4ad20cf81e 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -16,31 +16,29 @@ ***************************************************************************/ -static TILEMAP_MAPPER( citycon_scan ) +TILEMAP_MAPPER_MEMBER(citycon_state::citycon_scan) { /* logical (col,row) -> memory offset */ return (col & 0x1f) + ((row & 0x1f) << 5) + ((col & 0x60) << 5); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(citycon_state::get_fg_tile_info) { - citycon_state *state = machine.driver_data<citycon_state>(); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, - state->m_videoram[tile_index], + m_videoram[tile_index], (tile_index & 0x03e0) >> 5, /* color depends on scanline only */ 0); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(citycon_state::get_bg_tile_info) { - citycon_state *state = machine.driver_data<citycon_state>(); - UINT8 *rom = state->memregion("gfx4")->base(); - int code = rom[0x1000 * state->m_bg_image + tile_index]; - SET_TILE_INFO( - 3 + state->m_bg_image, + UINT8 *rom = memregion("gfx4")->base(); + int code = rom[0x1000 * m_bg_image + tile_index]; + SET_TILE_INFO_MEMBER( + 3 + m_bg_image, code, - rom[0xc000 + 0x100 * state->m_bg_image + code], + rom[0xc000 + 0x100 * m_bg_image + code], 0); } @@ -55,8 +53,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( citycon ) { citycon_state *state = machine.driver_data<citycon_state>(); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, citycon_scan, 8, 8, 128, 32); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, citycon_scan, 8, 8, 128, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(citycon_state::get_fg_tile_info),state), tilemap_mapper_delegate(FUNC(citycon_state::citycon_scan),state), 8, 8, 128, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(citycon_state::get_bg_tile_info),state), tilemap_mapper_delegate(FUNC(citycon_state::citycon_scan),state), 8, 8, 128, 32); state->m_fg_tilemap->set_transparent_pen(0); state->m_fg_tilemap->set_scroll_rows(32); diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index 4fb6b8eec00..305e5ba755f 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -153,20 +153,19 @@ WRITE8_MEMBER(cloak_state::cloak_flipscreen_w) flip_screen_set(data & 0x80); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(cloak_state::get_bg_tile_info) { - cloak_state *state = machine.driver_data<cloak_state>(); - UINT8 *videoram = state->m_videoram; + UINT8 *videoram = m_videoram; int code = videoram[tile_index]; - SET_TILE_INFO(0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } VIDEO_START( cloak ) { cloak_state *state = machine.driver_data<cloak_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cloak_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_bitmap_videoram1 = auto_alloc_array(machine, UINT8, 256*256); state->m_bitmap_videoram2 = auto_alloc_array(machine, UINT8, 256*256); diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c index ef2945c210a..17c97a6c9bd 100644 --- a/src/mame/video/clshroad.c +++ b/src/mame/video/clshroad.c @@ -104,28 +104,26 @@ Offset: ***************************************************************************/ -static TILE_GET_INFO( get_tile_info_0a ) +TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_0a) { - clshroad_state *state = machine.driver_data<clshroad_state>(); UINT8 code; tile_index = (tile_index & 0x1f) + (tile_index & ~0x1f)*2; - code = state->m_vram_0[ tile_index * 2 + 0x40 ]; -// color = state->m_vram_0[ tile_index * 2 + 0x41 ]; - SET_TILE_INFO( + code = m_vram_0[ tile_index * 2 + 0x40 ]; +// color = m_vram_0[ tile_index * 2 + 0x41 ]; + SET_TILE_INFO_MEMBER( 1, code, 0, 0); } -static TILE_GET_INFO( get_tile_info_0b ) +TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_0b) { - clshroad_state *state = machine.driver_data<clshroad_state>(); UINT8 code; tile_index = (tile_index & 0x1f) + (tile_index & ~0x1f)*2; - code = state->m_vram_0[ tile_index * 2 + 0x00 ]; -// color = state->m_vram_0[ tile_index * 2 + 0x01 ]; - SET_TILE_INFO( + code = m_vram_0[ tile_index * 2 + 0x00 ]; +// color = m_vram_0[ tile_index * 2 + 0x01 ]; + SET_TILE_INFO_MEMBER( 1, code, 0, @@ -160,7 +158,7 @@ Offset: ***************************************************************************/ /* logical (col,row) -> memory offset */ -static TILEMAP_MAPPER( tilemap_scan_rows_extra ) +TILEMAP_MAPPER_MEMBER(clshroad_state::tilemap_scan_rows_extra) { // The leftmost columns come from the bottom rows if (col <= 0x01) return row + (col + 0x1e) * 0x20; @@ -176,25 +174,23 @@ static TILEMAP_MAPPER( tilemap_scan_rows_extra ) return (col-2) + row * 0x20; } -static TILE_GET_INFO( get_tile_info_fb1 ) +TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_fb1) { - clshroad_state *state = machine.driver_data<clshroad_state>(); - UINT8 code = state->m_vram_1[ tile_index + 0x000 ]; - UINT8 color = state->m_vram_1[ tile_index + 0x400 ] & 0x3f; + UINT8 code = m_vram_1[ tile_index + 0x000 ]; + UINT8 color = m_vram_1[ tile_index + 0x400 ] & 0x3f; tileinfo.group = color; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 2, code, color, 0); } -static TILE_GET_INFO( get_tile_info_1 ) +TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_1) { - clshroad_state *state = machine.driver_data<clshroad_state>(); - UINT8 code = state->m_vram_1[ tile_index + 0x000 ]; - UINT8 color = state->m_vram_1[ tile_index + 0x400 ]; - SET_TILE_INFO( + UINT8 code = m_vram_1[ tile_index + 0x000 ]; + UINT8 color = m_vram_1[ tile_index + 0x400 ]; + SET_TILE_INFO_MEMBER( 2, code + ((color & 0xf0)<<4), color & 0x0f, @@ -212,10 +208,10 @@ VIDEO_START( firebatl ) { clshroad_state *state = machine.driver_data<clshroad_state>(); /* These 2 use the graphics and scroll value */ - state->m_tilemap_0a = tilemap_create(machine, get_tile_info_0a,TILEMAP_SCAN_ROWS,16,16,0x20,0x10); - state->m_tilemap_0b = tilemap_create(machine, get_tile_info_0b,TILEMAP_SCAN_ROWS,16,16,0x20,0x10); + state->m_tilemap_0a = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),state),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); + state->m_tilemap_0b = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0b),state),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); /* Text (No scrolling) */ - state->m_tilemap_1 = tilemap_create(machine, get_tile_info_fb1,tilemap_scan_rows_extra,8,8,0x24,0x20); + state->m_tilemap_1 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_fb1),state),tilemap_mapper_delegate(FUNC(clshroad_state::tilemap_scan_rows_extra),state),8,8,0x24,0x20); state->m_tilemap_0a->set_scroll_rows(1); state->m_tilemap_0b->set_scroll_rows(1); @@ -236,10 +232,10 @@ VIDEO_START( clshroad ) { clshroad_state *state = machine.driver_data<clshroad_state>(); /* These 2 use the graphics and scroll value */ - state->m_tilemap_0a = tilemap_create(machine, get_tile_info_0a,TILEMAP_SCAN_ROWS,16,16,0x20,0x10); - state->m_tilemap_0b = tilemap_create(machine, get_tile_info_0b,TILEMAP_SCAN_ROWS,16,16,0x20,0x10); + state->m_tilemap_0a = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),state),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); + state->m_tilemap_0b = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0b),state),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); /* Text (No scrolling) */ - state->m_tilemap_1 = tilemap_create(machine, get_tile_info_1,tilemap_scan_rows_extra,8,8,0x24,0x20); + state->m_tilemap_1 = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_1),state),tilemap_mapper_delegate(FUNC(clshroad_state::tilemap_scan_rows_extra),state),8,8,0x24,0x20); state->m_tilemap_0a->set_scroll_rows(1); state->m_tilemap_0b->set_scroll_rows(1); diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index 8f969924385..1526fd3ebc7 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -113,12 +113,11 @@ static void set_pens( running_machine &machine ) ***************************************************************************/ -static TILE_GET_INFO( get_tile_info0 ) +TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info0) { - combatsc_state *state = machine.driver_data<combatsc_state>(); - UINT8 ctrl_6 = k007121_ctrlram_r(state->m_k007121_1, 6); - UINT8 attributes = state->m_page[0][tile_index]; - int bank = 4 * ((state->m_vreg & 0x0f) - 1); + UINT8 ctrl_6 = k007121_ctrlram_r(m_k007121_1, 6); + UINT8 attributes = m_page[0][tile_index]; + int bank = 4 * ((m_vreg & 0x0f) - 1); int number, color; if (bank < 0) @@ -138,9 +137,9 @@ static TILE_GET_INFO( get_tile_info0 ) color = ((ctrl_6 & 0x10) * 2 + 16) + (attributes & 0x0f); - number = state->m_page[0][tile_index + 0x400] + 256 * bank; + number = m_page[0][tile_index + 0x400] + 256 * bank; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, number, color, @@ -148,12 +147,11 @@ static TILE_GET_INFO( get_tile_info0 ) tileinfo.category = (attributes & 0x40) >> 6; } -static TILE_GET_INFO( get_tile_info1 ) +TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info1) { - combatsc_state *state = machine.driver_data<combatsc_state>(); - UINT8 ctrl_6 = k007121_ctrlram_r(state->m_k007121_2, 6); - UINT8 attributes = state->m_page[1][tile_index]; - int bank = 4 * ((state->m_vreg >> 4) - 1); + UINT8 ctrl_6 = k007121_ctrlram_r(m_k007121_2, 6); + UINT8 attributes = m_page[1][tile_index]; + int bank = 4 * ((m_vreg >> 4) - 1); int number, color; if (bank < 0) @@ -173,9 +171,9 @@ static TILE_GET_INFO( get_tile_info1 ) color = ((ctrl_6 & 0x10) * 2 + 16 + 4 * 16) + (attributes & 0x0f); - number = state->m_page[1][tile_index + 0x400] + 256 * bank; + number = m_page[1][tile_index + 0x400] + 256 * bank; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, number, color, @@ -183,14 +181,13 @@ static TILE_GET_INFO( get_tile_info1 ) tileinfo.category = (attributes & 0x40) >> 6; } -static TILE_GET_INFO( get_text_info ) +TILE_GET_INFO_MEMBER(combatsc_state::get_text_info) { - combatsc_state *state = machine.driver_data<combatsc_state>(); - UINT8 attributes = state->m_page[0][tile_index + 0x800]; - int number = state->m_page[0][tile_index + 0xc00]; + UINT8 attributes = m_page[0][tile_index + 0x800]; + int number = m_page[0][tile_index + 0xc00]; int color = 16 + (attributes & 0x0f); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, number, color, @@ -198,11 +195,10 @@ static TILE_GET_INFO( get_text_info ) } -static TILE_GET_INFO( get_tile_info0_bootleg ) +TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info0_bootleg) { - combatsc_state *state = machine.driver_data<combatsc_state>(); - UINT8 attributes = state->m_page[0][tile_index]; - int bank = 4 * ((state->m_vreg & 0x0f) - 1); + UINT8 attributes = m_page[0][tile_index]; + int bank = 4 * ((m_vreg & 0x0f) - 1); int number, pal, color; if (bank < 0) @@ -222,20 +218,19 @@ static TILE_GET_INFO( get_tile_info0_bootleg ) pal = (bank == 0 || bank >= 0x1c || (attributes & 0x40)) ? 1 : 3; color = pal*16;// + (attributes & 0x0f); - number = state->m_page[0][tile_index + 0x400] + 256 * bank; + number = m_page[0][tile_index + 0x400] + 256 * bank; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, number, color, 0); } -static TILE_GET_INFO( get_tile_info1_bootleg ) +TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info1_bootleg) { - combatsc_state *state = machine.driver_data<combatsc_state>(); - UINT8 attributes = state->m_page[1][tile_index]; - int bank = 4*((state->m_vreg >> 4) - 1); + UINT8 attributes = m_page[1][tile_index]; + int bank = 4*((m_vreg >> 4) - 1); int number, pal, color; if (bank < 0) @@ -255,23 +250,22 @@ static TILE_GET_INFO( get_tile_info1_bootleg ) pal = (bank == 0 || bank >= 0x1c || (attributes & 0x40)) ? 5 : 7; color = pal * 16;// + (attributes & 0x0f); - number = state->m_page[1][tile_index + 0x400] + 256 * bank; + number = m_page[1][tile_index + 0x400] + 256 * bank; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, number, color, 0); } -static TILE_GET_INFO( get_text_info_bootleg ) +TILE_GET_INFO_MEMBER(combatsc_state::get_text_info_bootleg) { - combatsc_state *state = machine.driver_data<combatsc_state>(); -// UINT8 attributes = state->m_page[0][tile_index + 0x800]; - int number = state->m_page[0][tile_index + 0xc00]; +// UINT8 attributes = m_page[0][tile_index + 0x800]; + int number = m_page[0][tile_index + 0xc00]; int color = 16;// + (attributes & 0x0f); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, number, color, @@ -288,9 +282,9 @@ VIDEO_START( combatsc ) { combatsc_state *state = machine.driver_data<combatsc_state>(); - state->m_bg_tilemap[0] = tilemap_create(machine, get_tile_info0, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_bg_tilemap[1] = tilemap_create(machine, get_tile_info1, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_textlayer = tilemap_create(machine, get_text_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap[0] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap[1] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_textlayer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_text_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_spriteram[0] = auto_alloc_array_clear(machine, UINT8, 0x800); state->m_spriteram[1] = auto_alloc_array_clear(machine, UINT8, 0x800); @@ -309,9 +303,9 @@ VIDEO_START( combatscb ) { combatsc_state *state = machine.driver_data<combatsc_state>(); - state->m_bg_tilemap[0] = tilemap_create(machine, get_tile_info0_bootleg, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_bg_tilemap[1] = tilemap_create(machine, get_tile_info1_bootleg, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_textlayer = tilemap_create(machine, get_text_info_bootleg, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap[0] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0_bootleg),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap[1] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1_bootleg),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_textlayer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_text_info_bootleg),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_spriteram[0] = auto_alloc_array_clear(machine, UINT8, 0x800); state->m_spriteram[1] = auto_alloc_array_clear(machine, UINT8, 0x800); diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index 34f9fc96ba7..ee1db6ab7e3 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -66,34 +66,32 @@ WRITE8_MEMBER(commando_state::commando_c804_w) flip_screen_set(data & 0x80); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(commando_state::get_bg_tile_info) { - commando_state *state = machine.driver_data<commando_state>(); - int attr = state->m_colorram[tile_index]; - int code = state->m_videoram[tile_index] + ((attr & 0xc0) << 2); + int attr = m_colorram[tile_index]; + int code = m_videoram[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - SET_TILE_INFO(1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(commando_state::get_fg_tile_info) { - commando_state *state = machine.driver_data<commando_state>(); - int attr = state->m_colorram2[tile_index]; - int code = state->m_videoram2[tile_index] + ((attr & 0xc0) << 2); + int attr = m_colorram2[tile_index]; + int code = m_videoram2[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - SET_TILE_INFO(0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } VIDEO_START( commando ) { commando_state *state = machine.driver_data<commando_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_COLS, 16, 16, 32, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(commando_state::get_bg_tile_info),state), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(commando_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_fg_tilemap->set_transparent_pen(3); } diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c index 2b114cdcb0f..38b7660a258 100644 --- a/src/mame/video/compgolf.c +++ b/src/mame/video/compgolf.c @@ -46,34 +46,32 @@ WRITE8_MEMBER(compgolf_state::compgolf_back_w) m_bg_tilemap->mark_tile_dirty(offset / 2); } -static TILE_GET_INFO( get_text_info ) +TILE_GET_INFO_MEMBER(compgolf_state::get_text_info) { - compgolf_state *state = machine.driver_data<compgolf_state>(); tile_index <<= 1; - SET_TILE_INFO(2, state->m_videoram[tile_index + 1] | (state->m_videoram[tile_index] << 8), state->m_videoram[tile_index] >> 2, 0); + SET_TILE_INFO_MEMBER(2, m_videoram[tile_index + 1] | (m_videoram[tile_index] << 8), m_videoram[tile_index] >> 2, 0); } -static TILEMAP_MAPPER( back_scan ) +TILEMAP_MAPPER_MEMBER(compgolf_state::back_scan) { /* logical (col,row) -> memory offset */ return (col & 0x0f) + ((row & 0x0f) << 4) + ((col & 0x10) << 4) + ((row & 0x10) << 5); } -static TILE_GET_INFO( get_back_info ) +TILE_GET_INFO_MEMBER(compgolf_state::get_back_info) { - compgolf_state *state = machine.driver_data<compgolf_state>(); - int attr = state->m_bg_ram[tile_index * 2]; - int code = state->m_bg_ram[tile_index * 2 + 1] + ((attr & 1) << 8); + int attr = m_bg_ram[tile_index * 2]; + int code = m_bg_ram[tile_index * 2 + 1] + ((attr & 1) << 8); int color = (attr & 0x3e) >> 1; - SET_TILE_INFO(1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } VIDEO_START( compgolf ) { compgolf_state *state = machine.driver_data<compgolf_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_back_info, back_scan, 16, 16, 32, 32); - state->m_text_tilemap = tilemap_create(machine, get_text_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(compgolf_state::get_back_info),state), tilemap_mapper_delegate(FUNC(compgolf_state::back_scan),state), 16, 16, 32, 32); + state->m_text_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(compgolf_state::get_text_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_text_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index f6822b65369..23b91e7f36f 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -76,14 +76,13 @@ static void set_pens( running_machine &machine ) ***************************************************************************/ -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(contra_state::get_fg_tile_info) { - contra_state *state = machine.driver_data<contra_state>(); - UINT8 ctrl_3 = k007121_ctrlram_r(state->m_k007121_1, 3); - UINT8 ctrl_4 = k007121_ctrlram_r(state->m_k007121_1, 4); - UINT8 ctrl_5 = k007121_ctrlram_r(state->m_k007121_1, 5); - UINT8 ctrl_6 = k007121_ctrlram_r(state->m_k007121_1, 6); - int attr = state->m_fg_cram[tile_index]; + UINT8 ctrl_3 = k007121_ctrlram_r(m_k007121_1, 3); + UINT8 ctrl_4 = k007121_ctrlram_r(m_k007121_1, 4); + UINT8 ctrl_5 = k007121_ctrlram_r(m_k007121_1, 5); + UINT8 ctrl_6 = k007121_ctrlram_r(m_k007121_1, 6); + int attr = m_fg_cram[tile_index]; int bit0 = (ctrl_5 >> 0) & 0x03; int bit1 = (ctrl_5 >> 2) & 0x03; int bit2 = (ctrl_5 >> 4) & 0x03; @@ -98,21 +97,20 @@ static TILE_GET_INFO( get_fg_tile_info ) bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, - state->m_fg_vram[tile_index] + bank * 256, + m_fg_vram[tile_index] + bank * 256, ((ctrl_6 & 0x30) * 2 + 16) + (attr & 7), 0); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(contra_state::get_bg_tile_info) { - contra_state *state = machine.driver_data<contra_state>(); - UINT8 ctrl_3 = k007121_ctrlram_r(state->m_k007121_2, 3); - UINT8 ctrl_4 = k007121_ctrlram_r(state->m_k007121_2, 4); - UINT8 ctrl_5 = k007121_ctrlram_r(state->m_k007121_2, 5); - UINT8 ctrl_6 = k007121_ctrlram_r(state->m_k007121_2, 6); - int attr = state->m_bg_cram[tile_index]; + UINT8 ctrl_3 = k007121_ctrlram_r(m_k007121_2, 3); + UINT8 ctrl_4 = k007121_ctrlram_r(m_k007121_2, 4); + UINT8 ctrl_5 = k007121_ctrlram_r(m_k007121_2, 5); + UINT8 ctrl_6 = k007121_ctrlram_r(m_k007121_2, 6); + int attr = m_bg_cram[tile_index]; int bit0 = (ctrl_5 >> 0) & 0x03; int bit1 = (ctrl_5 >> 2) & 0x03; int bit2 = (ctrl_5 >> 4) & 0x03; @@ -128,19 +126,18 @@ static TILE_GET_INFO( get_bg_tile_info ) // 2009-12 FP: TO BE VERIFIED - old code used ctrl4 from chip 0?!? bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 1, - state->m_bg_vram[tile_index] + bank * 256, + m_bg_vram[tile_index] + bank * 256, ((ctrl_6 & 0x30) * 2 + 16) + (attr & 7), 0); } -static TILE_GET_INFO( get_tx_tile_info ) +TILE_GET_INFO_MEMBER(contra_state::get_tx_tile_info) { - contra_state *state = machine.driver_data<contra_state>(); - UINT8 ctrl_5 = k007121_ctrlram_r(state->m_k007121_1, 5); - UINT8 ctrl_6 = k007121_ctrlram_r(state->m_k007121_1, 6); - int attr = state->m_tx_cram[tile_index]; + UINT8 ctrl_5 = k007121_ctrlram_r(m_k007121_1, 5); + UINT8 ctrl_6 = k007121_ctrlram_r(m_k007121_1, 6); + int attr = m_tx_cram[tile_index]; int bit0 = (ctrl_5 >> 0) & 0x03; int bit1 = (ctrl_5 >> 2) & 0x03; int bit2 = (ctrl_5 >> 4) & 0x03; @@ -151,9 +148,9 @@ static TILE_GET_INFO( get_tx_tile_info ) ((attr >> (bit2 )) & 0x08) | ((attr >> (bit3 - 1)) & 0x10); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 0, - state->m_tx_vram[tile_index] + bank * 256, + m_tx_vram[tile_index] + bank * 256, ((ctrl_6 & 0x30) * 2 + 16) + (attr & 7), 0); } @@ -169,9 +166,9 @@ VIDEO_START( contra ) { contra_state *state = machine.driver_data<contra_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_tx_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_tx_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_buffered_spriteram = auto_alloc_array(machine, UINT8, 0x800); state->m_buffered_spriteram_2 = auto_alloc_array(machine, UINT8, 0x800); diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c index ca596a2427e..33fd523b73e 100644 --- a/src/mame/video/cop01.c +++ b/src/mame/video/cop01.c @@ -61,11 +61,10 @@ PALETTE_INIT( cop01 ) ***************************************************************************/ -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(cop01_state::get_bg_tile_info) { - cop01_state *state = machine.driver_data<cop01_state>(); - int tile = state->m_bgvideoram[tile_index]; - int attr = state->m_bgvideoram[tile_index + 0x800]; + int tile = m_bgvideoram[tile_index]; + int attr = m_bgvideoram[tile_index + 0x800]; int pri = (attr & 0x80) >> 7; /* kludge: priority is not actually pen based, but color based. Since the @@ -81,15 +80,14 @@ static TILE_GET_INFO( get_bg_tile_info ) if (attr & 0x10) pri = 0; - SET_TILE_INFO(1, tile + ((attr & 0x03) << 8), (attr & 0x1c) >> 2, 0); + SET_TILE_INFO_MEMBER(1, tile + ((attr & 0x03) << 8), (attr & 0x1c) >> 2, 0); tileinfo.group = pri; } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(cop01_state::get_fg_tile_info) { - cop01_state *state = machine.driver_data<cop01_state>(); - int tile = state->m_fgvideoram[tile_index]; - SET_TILE_INFO(0, tile, 0, 0); + int tile = m_fgvideoram[tile_index]; + SET_TILE_INFO_MEMBER(0, tile, 0, 0); } @@ -103,8 +101,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( cop01 ) { cop01_state *state = machine.driver_data<cop01_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cop01_state::get_bg_tile_info),state),TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + state->m_fg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cop01_state::get_fg_tile_info),state),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); state->m_fg_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index 27033ce7bf3..827f03ccf0f 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -1973,39 +1973,38 @@ static int gfxrom_bank_mapper( running_machine &machine, int type, int code ) ***************************************************************************/ -static TILEMAP_MAPPER( tilemap0_scan ) +TILEMAP_MAPPER_MEMBER(cps_state::tilemap0_scan) { /* logical (col,row) -> memory offset */ return (row & 0x1f) + ((col & 0x3f) << 5) + ((row & 0x20) << 6); } -static TILEMAP_MAPPER( tilemap1_scan ) +TILEMAP_MAPPER_MEMBER(cps_state::tilemap1_scan) { /* logical (col,row) -> memory offset */ return (row & 0x0f) + ((col & 0x3f) << 4) + ((row & 0x30) << 6); } -static TILEMAP_MAPPER( tilemap2_scan ) +TILEMAP_MAPPER_MEMBER(cps_state::tilemap2_scan) { /* logical (col,row) -> memory offset */ return (row & 0x07) + ((col & 0x3f) << 3) + ((row & 0x38) << 6); } -static TILE_GET_INFO( get_tile0_info ) +TILE_GET_INFO_MEMBER(cps_state::get_tile0_info) { - cps_state *state = machine.driver_data<cps_state>(); - int code = state->m_scroll1[2 * tile_index]; - int attr = state->m_scroll1[2 * tile_index + 1]; + int code = m_scroll1[2 * tile_index]; + int attr = m_scroll1[2 * tile_index + 1]; int gfxset; - code = gfxrom_bank_mapper(machine, GFXTYPE_SCROLL1, code); + code = gfxrom_bank_mapper(machine(), GFXTYPE_SCROLL1, code); /* allows us to reproduce a problem seen with a ffight board where USA and Japanese roms have been mixed to be reproduced (ffightub) -- it looks like each column should alternate between the left and right side of the 16x16 tiles */ gfxset = (tile_index & 0x20) >> 5; - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( gfxset, code, (attr & 0x1f) + 0x20, @@ -2013,20 +2012,19 @@ static TILE_GET_INFO( get_tile0_info ) tileinfo.group = (attr & 0x0180) >> 7; // for out of range tiles, switch to fully transparent data - // (but still call SET_TILE_INFO, otherwise problems might occur on boot e.g. unsquad) + // (but still call SET_TILE_INFO_MEMBER, otherwise problems might occur on boot e.g. unsquad) if (code == -1) - tileinfo.pen_data = state->m_empty_tile; + tileinfo.pen_data = m_empty_tile; } -static TILE_GET_INFO( get_tile1_info ) +TILE_GET_INFO_MEMBER(cps_state::get_tile1_info) { - cps_state *state = machine.driver_data<cps_state>(); - int code = state->m_scroll2[2 * tile_index]; - int attr = state->m_scroll2[2 * tile_index + 1]; + int code = m_scroll2[2 * tile_index]; + int attr = m_scroll2[2 * tile_index + 1]; - code = gfxrom_bank_mapper(machine, GFXTYPE_SCROLL2, code); + code = gfxrom_bank_mapper(machine(), GFXTYPE_SCROLL2, code); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 2, code, (attr & 0x1f) + 0x40, @@ -2035,18 +2033,17 @@ static TILE_GET_INFO( get_tile1_info ) // for out of range tiles, switch to fully transparent data if (code == -1) - tileinfo.pen_data = state->m_empty_tile; + tileinfo.pen_data = m_empty_tile; } -static TILE_GET_INFO( get_tile2_info ) +TILE_GET_INFO_MEMBER(cps_state::get_tile2_info) { - cps_state *state = machine.driver_data<cps_state>(); - int code = state->m_scroll3[2 * tile_index] & 0x3fff; - int attr = state->m_scroll3[2 * tile_index + 1]; + int code = m_scroll3[2 * tile_index] & 0x3fff; + int attr = m_scroll3[2 * tile_index + 1]; - code = gfxrom_bank_mapper(machine, GFXTYPE_SCROLL3, code); + code = gfxrom_bank_mapper(machine(), GFXTYPE_SCROLL3, code); - SET_TILE_INFO( + SET_TILE_INFO_MEMBER( 3, code, (attr & 0x1f) + 0x60, @@ -2054,9 +2051,9 @@ static TILE_GET_INFO( get_tile2_info ) tileinfo.group = (attr & 0x0180) >> 7; // for out of range tiles, switch to fully transparent data - // (but still call SET_TILE_INFO, otherwise problems might occur on boot e.g. unsquad) + // (but still call SET_TILE_INFO_MEMBER, otherwise problems might occur on boot e.g. unsquad) if (code == -1) - tileinfo.pen_data = state->m_empty_tile; + tileinfo.pen_data = m_empty_tile; } @@ -2099,9 +2096,9 @@ static VIDEO_START( cps ) state->m_stars_rom_size = 0x2000; /* first 0x4000 of gfx ROM are used, but 0x0000-0x1fff is == 0x2000-0x3fff */ /* create tilemaps */ - state->m_bg_tilemap[0] = tilemap_create(machine, get_tile0_info, tilemap0_scan, 8, 8, 64, 64); - state->m_bg_tilemap[1] = tilemap_create(machine, get_tile1_info, tilemap1_scan, 16, 16, 64, 64); - state->m_bg_tilemap[2] = tilemap_create(machine, get_tile2_info, tilemap2_scan, 32, 32, 64, 64); + state->m_bg_tilemap[0] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cps_state::get_tile0_info),state), tilemap_mapper_delegate(FUNC(cps_state::tilemap0_scan),state), 8, 8, 64, 64); + state->m_bg_tilemap[1] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cps_state::get_tile1_info),state), tilemap_mapper_delegate(FUNC(cps_state::tilemap1_scan),state), 16, 16, 64, 64); + state->m_bg_tilemap[2] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(cps_state::get_tile2_info),state), tilemap_mapper_delegate(FUNC(cps_state::tilemap2_scan),state), 32, 32, 64, 64); /* create empty tiles */ memset(state->m_empty_tile, 0x0f, sizeof(state->m_empty_tile)); diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c index c8b952ecd5f..31a833cae8f 100644 --- a/src/mame/video/crbaloon.c +++ b/src/mame/video/crbaloon.c @@ -59,19 +59,18 @@ WRITE8_MEMBER(crbaloon_state::crbaloon_colorram_w) m_bg_tilemap->mark_tile_dirty(offset); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(crbaloon_state::get_bg_tile_info) { - crbaloon_state *state = machine.driver_data<crbaloon_state>(); - int code = state->m_videoram[tile_index]; - int color = state->m_colorram[tile_index] & 0x0f; + int code = m_videoram[tile_index]; + int color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START( crbaloon ) { crbaloon_state *state = machine.driver_data<crbaloon_state>(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS_FLIP_XY, 8, 8, 32, 32); + state->m_bg_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(crbaloon_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS_FLIP_XY, 8, 8, 32, 32); state->save_item(NAME(state->m_collision_address)); state->save_item(NAME(state->m_collision_address_clear)); diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c index a62fe534018..403e40c6c31 100644 --- a/src/mame/video/crospang.c +++ b/src/mame/video/crospang.c @@ -88,32 +88,30 @@ WRITE16_MEMBER(crospang_state::crospang_bg_videoram_w) m_bg_layer->mark_tile_dirty(offset); } -static TILE_GET_INFO( get_bg_tile_info ) +TILE_GET_INFO_MEMBER(crospang_state::get_bg_tile_info) { - crospang_state *state = machine.driver_data<crospang_state>(); - int data = state->m_bg_videoram[tile_index]; + int data = m_bg_videoram[tile_index]; int tile = data & 0xfff; int color = (data >> 12) & 0x0f; - SET_TILE_INFO(1, tile + state->m_bestri_tilebank * 0x1000, color + 0x20, 0); + SET_TILE_INFO_MEMBER(1, tile + m_bestri_tilebank * 0x1000, color + 0x20, 0); } -static TILE_GET_INFO( get_fg_tile_info ) +TILE_GET_INFO_MEMBER(crospang_state::get_fg_tile_info) { - crospang_state *state = machine.driver_data<crospang_state>(); - int data = state->m_fg_videoram[tile_index]; + int data = m_fg_videoram[tile_index]; int tile = data & 0xfff; int color = (data >> 12) & 0x0f; - SET_TILE_INFO(1, tile + state->m_bestri_tilebank * 0x1000, color + 0x10, 0); + SET_TILE_INFO_MEMBER(1, tile + m_bestri_tilebank * 0x1000, color + 0x10, 0); } VIDEO_START( crospang ) { crospang_state *state = machine.driver_data<crospang_state>(); - state->m_bg_layer = tilemap_create(machine, get_bg_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - state->m_fg_layer = tilemap_create(machine, get_fg_tile_info, TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_bg_layer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(crospang_state::get_bg_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + state->m_fg_layer = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(crospang_state::get_fg_tile_info),state), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); state->m_fg_layer->set_transparent_pen(0); } diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index f2d740ae14e..de753b0e5a2 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -9,20 +9,18 @@ ***************************************************************************/ -static TILE_GET_INFO( get_tile_info1 ) +TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info1) { - crshrace_state *state = machine.driver_data<crshrace_state>(); - int code = state->m_videoram1[tile_index]; + int code = m_videoram1[tile_index]; - SET_TILE_INFO(1, (code & 0xfff) + (state->m_roz_bank << 12), code >> 12, 0); + SET_TILE_INFO_MEMBER(1, (code & 0xfff) + (m_roz_bank << 12), code >> 12, 0); } -static TILE_GET_INFO( get_tile_info2 ) +TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info2) { - crshrace_state *state = machine.driver_data<crshrace_state>(); - int code = state->m_videoram2[tile_index]; + int code = m_videoram2[tile_index]; - SET_TILE_INFO(0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } |