diff --git a/src/emu/machine/tc009xlvc.c b/src/emu/machine/tc009xlvc.c index 848557f99e6..784937a5e21 100644 --- a/src/emu/machine/tc009xlvc.c +++ b/src/emu/machine/tc009xlvc.c @@ -214,9 +214,7 @@ TILE_GET_INFO_MEMBER(tc0091lvc_device::get_bg0_tile_info) | ((m_vregs[(attr & 0xc) >> 2]) << 10); // | (state->m_horshoes_gfxbank << 12); - SET_TILE_INFO_MEMBER( - *m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr & 0xf0) >> 4, 0); @@ -230,9 +228,7 @@ TILE_GET_INFO_MEMBER(tc0091lvc_device::get_bg1_tile_info) | ((m_vregs[(attr & 0xc) >> 2]) << 10); // | (state->m_horshoes_gfxbank << 12); - SET_TILE_INFO_MEMBER( - *m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr & 0xf0) >> 4, 0); @@ -244,9 +240,7 @@ TILE_GET_INFO_MEMBER(tc0091lvc_device::get_tx_tile_info) UINT16 code = m_tvram[2 * tile_index] | ((attr & 0x07) << 8); - SET_TILE_INFO_MEMBER( - *m_gfxdecode, - m_gfx_index, + SET_TILE_INFO_MEMBER(m_gfx_index, code, (attr & 0xf0) >> 4, 0); @@ -282,9 +276,9 @@ void tc0091lvc_device::device_start() m_tvram = m_pcg_ram + 0xa000; m_sprram = m_pcg_ram + 0xb000; - tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0091lvc_device::get_tx_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); - bg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0091lvc_device::get_bg0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); - bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0091lvc_device::get_bg1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0091lvc_device::get_tx_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0091lvc_device::get_bg0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0091lvc_device::get_bg1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); tx_tilemap->set_transparent_pen(0); bg0_tilemap->set_transparent_pen(0); diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index b5afa332377..b4cfc80b958 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -343,7 +343,7 @@ tilemap_t::tilemap_t() // init - initialize the tilemap //------------------------------------------------- -tilemap_t &tilemap_t::init(tilemap_manager &manager, tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows) +tilemap_t &tilemap_t::init(tilemap_manager &manager, gfxdecode_device &decoder, tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows) { // populate managers and devices m_manager = &manager; @@ -401,8 +401,9 @@ tilemap_t &tilemap_t::init(tilemap_manager &manager, tilemap_get_info_delegate t // create the initial mappings mappings_create(); - // set up the default pen mask + // set up the default tile data memset(&m_tileinfo, 0, sizeof(m_tileinfo)); + m_tileinfo.decoder = &decoder; m_tileinfo.pen_mask = 0xff; m_tileinfo.gfxnum = 0xff; @@ -1497,18 +1498,18 @@ static const struct { FUNC(tilemap_t::scan_cols_flip_xy) } }; -tilemap_t &tilemap_manager::create(tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows, tilemap_t *allocated) +tilemap_t &tilemap_manager::create(gfxdecode_device &decoder, tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows, tilemap_t *allocated) { if (allocated == NULL) allocated = auto_alloc(machine(), tilemap_t); - return m_tilemap_list.append(allocated->init(*this, tile_get_info, mapper, tilewidth, tileheight, cols, rows)); + return m_tilemap_list.append(allocated->init(*this, decoder, tile_get_info, mapper, tilewidth, tileheight, cols, rows)); } -tilemap_t &tilemap_manager::create(tilemap_get_info_delegate tile_get_info, tilemap_standard_mapper mapper, int tilewidth, int tileheight, int cols, int rows, tilemap_t *allocated) +tilemap_t &tilemap_manager::create(gfxdecode_device &decoder, tilemap_get_info_delegate tile_get_info, tilemap_standard_mapper mapper, int tilewidth, int tileheight, int cols, int rows, tilemap_t *allocated) { if (allocated == NULL) allocated = auto_alloc(machine(), tilemap_t); - return m_tilemap_list.append(allocated->init(*this, tile_get_info, tilemap_mapper_delegate(s_standard_mappers[mapper].func, s_standard_mappers[mapper].name, machine().driver_data()), tilewidth, tileheight, cols, rows)); + return m_tilemap_list.append(allocated->init(*this, decoder, tile_get_info, tilemap_mapper_delegate(s_standard_mappers[mapper].func, s_standard_mappers[mapper].name, machine().driver_data()), tilewidth, tileheight, cols, rows)); } @@ -1550,6 +1551,7 @@ const device_type TILEMAP = &device_creator; tilemap_device::tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TILEMAP, "Tilemap", tag, owner, clock, "tilemap", __FILE__), + m_gfxdecode(*this), m_standard_mapper(TILEMAP_STANDARD_COUNT), m_tile_width(8), m_tile_height(8), @@ -1561,6 +1563,17 @@ tilemap_device::tilemap_device(const machine_config &mconfig, const char *tag, d } +//------------------------------------------------- +// static_set_gfxdecode_tag: Set the tag of the +// gfx decoder +//------------------------------------------------- + +void tilemap_device::static_set_gfxdecode_tag(device_t &device, const char *tag) +{ + downcast(device).m_gfxdecode.set_tag(tag); +} + + //------------------------------------------------- // static_set_bytes_per_entry: Set the // transparent pen @@ -1723,9 +1736,9 @@ void tilemap_device::device_start() // allocate the tilemap if (m_standard_mapper == TILEMAP_STANDARD_COUNT) - machine().tilemap().create(m_get_info, m_mapper, m_tile_width, m_tile_height, m_num_columns, m_num_rows, this); + machine().tilemap().create(m_gfxdecode, m_get_info, m_mapper, m_tile_width, m_tile_height, m_num_columns, m_num_rows, this); else - machine().tilemap().create(m_get_info, m_standard_mapper, m_tile_width, m_tile_height, m_num_columns, m_num_rows, this); + machine().tilemap().create(m_gfxdecode, m_get_info, m_standard_mapper, m_tile_width, m_tile_height, m_num_columns, m_num_rows, this); // find the memory, if present const memory_share *share = memshare(tag()); diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index 4c0b0061d8d..3e6fbf9026b 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -359,6 +359,8 @@ enum tilemap_standard_mapper // primitives #define MCFG_TILEMAP_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, TILEMAP, 0) +#define MCFG_TILEMAP_GFXDECODE(_gfxtag) \ + tilemap_device::static_set_gfxdecode_tag(*device, "^" _gfxtag); #define MCFG_TILEMAP_BYTES_PER_ENTRY(_bpe) \ tilemap_device::static_set_bytes_per_entry(*device, _bpe); #define MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \ @@ -377,27 +379,31 @@ enum tilemap_standard_mapper tilemap_device::static_set_transparent_pen(*device, _pen); // common cases -#define MCFG_TILEMAP_ADD_STANDARD(_tag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows) \ +#define MCFG_TILEMAP_ADD_STANDARD(_tag, _gfxtag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows) \ MCFG_TILEMAP_ADD(_tag) \ + MCFG_TILEMAP_GFXDECODE(_gfxtag) \ MCFG_TILEMAP_BYTES_PER_ENTRY(_bytes_per_entry) \ MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \ MCFG_TILEMAP_LAYOUT_STANDARD(_mapper, _columns, _rows) \ MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight) -#define MCFG_TILEMAP_ADD_CUSTOM(_tag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows) \ +#define MCFG_TILEMAP_ADD_CUSTOM(_tag, _gfxtag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows) \ MCFG_TILEMAP_ADD(_tag) \ + MCFG_TILEMAP_GFXDECODE(_gfxtag) \ MCFG_TILEMAP_BYTES_PER_ENTRY(_bytes_per_entry) \ MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \ MCFG_TILEMAP_LAYOUT_CB_DRIVER(_class, _mapper, _columns, _rows) \ MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight) -#define MCFG_TILEMAP_ADD_STANDARD_TRANSPEN(_tag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows, _transpen) \ +#define MCFG_TILEMAP_ADD_STANDARD_TRANSPEN(_tag, _gfxtag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows, _transpen) \ MCFG_TILEMAP_ADD(_tag) \ + MCFG_TILEMAP_GFXDECODE(_gfxtag) \ MCFG_TILEMAP_BYTES_PER_ENTRY(_bytes_per_entry) \ MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \ MCFG_TILEMAP_LAYOUT_STANDARD(_mapper, _columns, _rows) \ MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight) \ MCFG_TILEMAP_TRANSPARENT_PEN(_transpen) -#define MCFG_TILEMAP_ADD_CUSTOM_TRANSPEN(_tag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows, _transpen) \ +#define MCFG_TILEMAP_ADD_CUSTOM_TRANSPEN(_tag, _gfxtag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows, _transpen) \ MCFG_TILEMAP_ADD(_tag) \ + MCFG_TILEMAP_GFXDECODE(_gfxtag) \ MCFG_TILEMAP_BYTES_PER_ENTRY(_bytes_per_entry) \ MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \ MCFG_TILEMAP_LAYOUT_CB_DRIVER(_columns, _mapper, _rows, _class) \ @@ -423,6 +429,7 @@ typedef UINT32 tilemap_memory_index; // tile_data is filled in by the get_tile_info callback struct tile_data { + gfxdecode_device *decoder; // set in tilemap_t::init() const UINT8 * pen_data; // required const UINT8 * mask_data; // required pen_t palette_base; // defaults to 0 @@ -430,13 +437,11 @@ struct tile_data UINT8 group; // defaults to 0; range from 0..TILEMAP_NUM_GROUPS UINT8 flags; // defaults to 0; one or more of TILE_* flags above UINT8 pen_mask; // defaults to 0xff; mask to apply to pen_data while rendering the tile - UINT8 gfxnum; // defaults to 0xff; specify index of machine.gfx for auto-invalidation on dirty - gfxdecode_device *decoder; + UINT8 gfxnum; // defaults to 0xff; specify index of gfx for auto-invalidation on dirty - void set(gfxdecode_device &_decoder, int _gfxnum, int rawcode, int rawcolor, int _flags) + void set(int _gfxnum, int rawcode, int rawcolor, int _flags) { - decoder = &_decoder; - gfx_element *gfx = _decoder.gfx(_gfxnum); + gfx_element *gfx = decoder->gfx(_gfxnum); int code = rawcode % gfx->elements(); pen_data = gfx->get_data(code); palette_base = gfx->colorbase() + gfx->granularity() * rawcolor; @@ -480,7 +485,7 @@ protected: tilemap_t(); virtual ~tilemap_t(); - tilemap_t &init(tilemap_manager &manager, tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows); + tilemap_t &init(tilemap_manager &manager, gfxdecode_device &decoder, tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows); public: // getters @@ -677,8 +682,8 @@ public: running_machine &machine() const { return m_machine; } // tilemap creation - tilemap_t &create(tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows, tilemap_t *allocated = NULL); - tilemap_t &create(tilemap_get_info_delegate tile_get_info, tilemap_standard_mapper mapper, int tilewidth, int tileheight, int cols, int rows, tilemap_t *allocated = NULL); + tilemap_t &create(gfxdecode_device &decoder, tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, int tilewidth, int tileheight, int cols, int rows, tilemap_t *allocated = NULL); + tilemap_t &create(gfxdecode_device &decoder, tilemap_get_info_delegate tile_get_info, tilemap_standard_mapper mapper, int tilewidth, int tileheight, int cols, int rows, tilemap_t *allocated = NULL); // tilemap list information tilemap_t *find(int index) { return m_tilemap_list.find(index); } @@ -712,6 +717,7 @@ public: tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_bytes_per_entry(device_t &device, int bpe); static void static_set_info_callback(device_t &device, tilemap_get_info_delegate tile_get_info); static void static_set_layout(device_t &device, tilemap_standard_mapper mapper, int columns, int rows); @@ -735,6 +741,9 @@ protected: virtual void device_start(); private: + // devices + required_device m_gfxdecode; + // configuration state tilemap_get_info_delegate m_get_info; tilemap_standard_mapper m_standard_mapper; @@ -765,7 +774,7 @@ private: #define TILEMAP_MAPPER_MEMBER(_name) tilemap_memory_index _name(UINT32 col, UINT32 row, UINT32 num_cols, UINT32 num_rows) // useful macro inside of a TILE_GET_INFO callback to set tile information -#define SET_TILE_INFO_MEMBER(DECODER,GFX,CODE,COLOR,FLAGS) tileinfo.set(DECODER, GFX, CODE, COLOR, FLAGS) +#define SET_TILE_INFO_MEMBER(GFX,CODE,COLOR,FLAGS) tileinfo.set(GFX, CODE, COLOR, FLAGS) // Macros for setting tile attributes in the TILE_GET_INFO callback: // TILE_FLIP_YX assumes that flipy is in bit 1 and flipx is in bit 0 diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 08287b4f905..3ca5b13fc03 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -97,12 +97,12 @@ WRITE16_MEMBER(k3_state::k3_bgram_w) TILE_GET_INFO_MEMBER(k3_state::get_k3_bg_tile_info) { int tileno = m_bgram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, 0, 0); + SET_TILE_INFO_MEMBER(1, tileno, 0, 0); } void k3_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k3_state::get_k3_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k3_state::get_k3_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 64); } void k3_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/3x3puzzl.c b/src/mame/drivers/3x3puzzl.c index 9cdaa25d35c..1bd269a167b 100644 --- a/src/mame/drivers/3x3puzzl.c +++ b/src/mame/drivers/3x3puzzl.c @@ -103,8 +103,7 @@ protected: TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile1_info) { UINT16 code = m_videoram1_buffer[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, 0, 0); @@ -113,8 +112,7 @@ TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile1_info) TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile2_info) { UINT16 code = m_videoram2_buffer[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, 1, 0); @@ -123,8 +121,7 @@ TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile2_info) TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile3_info) { UINT16 code = m_videoram3_buffer[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, 2, 0); @@ -172,9 +169,9 @@ WRITE16_MEMBER(_3x3puzzle_state::tilemap1_scrolly_w) void _3x3puzzle_state::video_start() { - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_3x3puzzle_state::get_tile1_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_3x3puzzle_state::get_tile2_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_3x3puzzle_state::get_tile3_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_3x3puzzle_state::get_tile1_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_3x3puzzle_state::get_tile2_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_3x3puzzle_state::get_tile3_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tilemap2->set_transparent_pen(0); m_tilemap3->set_transparent_pen(0); } diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c index 36fffd9cb6c..348d4c0a263 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -538,13 +538,13 @@ TILE_GET_INFO_MEMBER(_5clown_state::get_fclown_tile_info) int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */ int color = (attr & 0x3c) >> 2 | ((attr & 0x80) >> 3); /* bits 2-3-4-5-7 for color */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void _5clown_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_5clown_state::get_fclown_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_5clown_state::get_fclown_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index fc48b9d5631..a4ba86f5ea4 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -121,8 +121,7 @@ TILEMAP_MAPPER_MEMBER(acommand_state::bg_scan) TILE_GET_INFO_MEMBER(acommand_state::ac_get_bg_tile_info) { int code = m_ac_bgvram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0xfff, (code & 0xf000) >> 12, 0); @@ -131,8 +130,7 @@ TILE_GET_INFO_MEMBER(acommand_state::ac_get_bg_tile_info) TILE_GET_INFO_MEMBER(acommand_state::ac_get_tx_tile_info) { int code = m_ac_txvram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0xfff, (code & 0xf000) >> 12, 0); @@ -198,8 +196,8 @@ void acommand_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec void acommand_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(acommand_state::ac_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,512,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(acommand_state::ac_get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(acommand_state::bg_scan),this),16,16,256,16); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(acommand_state::ac_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,512,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(acommand_state::ac_get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(acommand_state::bg_scan),this),16,16,256,16); m_ac_vregs = auto_alloc_array(machine(), UINT16, 0x80/2); diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 66186f60130..c16a9b53f2b 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -88,8 +88,7 @@ TILE_GET_INFO_MEMBER(albazg_state::y_get_bg_tile_info) int code = m_videoram[tile_index]; int color = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((color & 0xf8) << 3), color & 0x7, 0); @@ -98,7 +97,7 @@ TILE_GET_INFO_MEMBER(albazg_state::y_get_bg_tile_info) void albazg_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(albazg_state::y_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(albazg_state::y_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 albazg_state::screen_update_yumefuda(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c index 867f925e565..7cd912aef3d 100644 --- a/src/mame/drivers/atarig1.c +++ b/src/mame/drivers/atarig1.c @@ -438,8 +438,8 @@ static MACHINE_CONFIG_START( atarig1, atarig1_state ) MCFG_PALETTE_ADD("palette", 1280) /* initialize the playfield */ - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, atarig1_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, atarig1_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, atarig1_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, atarig1_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c index 147b346c880..26a2468cb56 100644 --- a/src/mame/drivers/atarig42.c +++ b/src/mame/drivers/atarig42.c @@ -547,8 +547,8 @@ static MACHINE_CONFIG_START( atarig42, atarig42_state ) MCFG_GFXDECODE_ADD("gfxdecode", atarig42) MCFG_PALETTE_ADD("palette", 2048) - MCFG_TILEMAP_ADD_CUSTOM("playfield", 2, atarig42_state, get_playfield_tile_info, 8,8, atarig42_playfield_scan, 128,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, atarig42_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_CUSTOM("playfield", "gfxdecode", 2, atarig42_state, get_playfield_tile_info, 8,8, atarig42_playfield_scan, 128,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, atarig42_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index b7e984bcb62..80ff83f125d 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -833,8 +833,8 @@ static MACHINE_CONFIG_START( atarigt, atarigt_state ) MCFG_GFXDECODE_ADD("gfxdecode", atarigt) MCFG_PALETTE_ADD("palette", 32768) - MCFG_TILEMAP_ADD_CUSTOM("playfield", 2, atarigt_state, get_playfield_tile_info, 8,8, atarigt_playfield_scan, 128,64) - MCFG_TILEMAP_ADD_STANDARD("alpha", 2, atarigt_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64, 32) + MCFG_TILEMAP_ADD_CUSTOM("playfield", "gfxdecode", 2, atarigt_state, get_playfield_tile_info, 8,8, atarigt_playfield_scan, 128,64) + MCFG_TILEMAP_ADD_STANDARD("alpha", "gfxdecode", 2, atarigt_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64, 32) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index 8a4a03e880c..695969c7c5b 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -1465,8 +1465,8 @@ static MACHINE_CONFIG_START( atarigx2, atarigx2_state ) MCFG_GFXDECODE_ADD("gfxdecode", atarigx2) MCFG_PALETTE_ADD("palette", 2048) - MCFG_TILEMAP_ADD_CUSTOM("playfield", 2, atarigx2_state, get_playfield_tile_info, 8,8, atarigx2_playfield_scan, 128,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, atarigx2_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_CUSTOM("playfield", "gfxdecode", 2, atarigx2_state, get_playfield_tile_info, 8,8, atarigx2_playfield_scan, 128,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, atarigx2_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index a8dacfd88b8..d8e33833277 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -732,8 +732,8 @@ static MACHINE_CONFIG_START( atarisy1, atarisy1_state ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(IIIIRRRRGGGGBBBB) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, atarisy1_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, atarisy1_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, atarisy1_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, atarisy1_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", atarisy1_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index d33812940e8..7418519f305 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -1238,8 +1238,8 @@ static MACHINE_CONFIG_START( atarisy2, atarisy2_state ) MCFG_GFXDECODE_ADD("gfxdecode", atarisy2) MCFG_PALETTE_ADD("palette", 256) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, atarisy2_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 128,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, atarisy2_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,48, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, atarisy2_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 128,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, atarisy2_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,48, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", atarisy2_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c index a579c8f8592..ce2ee15b023 100644 --- a/src/mame/drivers/avt.c +++ b/src/mame/drivers/avt.c @@ -500,13 +500,13 @@ TILE_GET_INFO_MEMBER(avt_state::get_bg_tile_info) int code = m_videoram[tile_index] | ((attr & 1) << 8); int color = (attr & 0xf0)>>4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void avt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(avt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 28, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(avt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 28, 32); } diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 46a42ba334a..6caf7672ebc 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -512,7 +512,7 @@ static MACHINE_CONFIG_START( badlands, badlands_state ) MCFG_GFXDECODE_ADD("gfxdecode", badlands) MCFG_PALETTE_ADD("palette", 256) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, badlands_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,32) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, badlands_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,32) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", badlands_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") @@ -715,7 +715,7 @@ static MACHINE_CONFIG_START( badlandsb, badlands_state ) MCFG_GFXDECODE_ADD("gfxdecode", badlandsb) MCFG_PALETTE_ADD("palette", 256) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, badlands_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,32) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, badlands_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,32) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", badlands_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index 919ba13192d..0a6dc0be35f 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -210,9 +210,9 @@ static MACHINE_CONFIG_START( batman, batman_state ) MCFG_PALETTE_ADD("palette", 2048) MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(atarigen_state, scanline_int_write_line)) - MCFG_ATARI_VAD_PLAYFIELD(batman_state, get_playfield_tile_info) - MCFG_ATARI_VAD_PLAYFIELD2(batman_state, get_playfield2_tile_info) - MCFG_ATARI_VAD_ALPHA(batman_state, get_alpha_tile_info) + MCFG_ATARI_VAD_PLAYFIELD(batman_state, "gfxdecode", get_playfield_tile_info) + MCFG_ATARI_VAD_PLAYFIELD2(batman_state, "gfxdecode", get_playfield2_tile_info) + MCFG_ATARI_VAD_ALPHA(batman_state, "gfxdecode", get_alpha_tile_info) MCFG_ATARI_VAD_MOB(batman_state::s_mob_config, "gfxdecode") MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index e3d7d2a2fed..bcc84d8d9c7 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -74,8 +74,7 @@ TILE_GET_INFO_MEMBER(bestleag_state::get_tx_tile_info) { int code = m_txram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x0fff)|0x8000, (code & 0xf000) >> 12, 0); @@ -85,8 +84,7 @@ TILE_GET_INFO_MEMBER(bestleag_state::get_bg_tile_info) { int code = m_bgram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code & 0x0fff), (code & 0xf000) >> 12, 0); @@ -96,8 +94,7 @@ TILE_GET_INFO_MEMBER(bestleag_state::get_fg_tile_info) { int code = m_fgram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code & 0x0fff)|0x1000, ((code & 0xf000) >> 12)|0x10, 0); @@ -116,9 +113,9 @@ TILEMAP_MAPPER_MEMBER(bestleag_state::bsb_bg_scan) void bestleag_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bestleag_state::get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,256, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bestleag_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(bestleag_state::bsb_bg_scan),this),16,16,128, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bestleag_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(bestleag_state::bsb_bg_scan),this),16,16,128, 64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bestleag_state::get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,256, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bestleag_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(bestleag_state::bsb_bg_scan),this),16,16,128, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bestleag_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(bestleag_state::bsb_bg_scan),this),16,16,128, 64); m_tx_tilemap->set_transparent_pen(15); m_fg_tilemap->set_transparent_pen(15); diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index 3b5be0743e6..07e399d3f5e 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -165,7 +165,7 @@ public: int flipyx = (ram[tile_index*2+1] & 0xc000)>>14; \ int col = (ram[tile_index*2] & 0x00ff); \ if (rgn==1) col >>=4; \ - SET_TILE_INFO_MEMBER(m_gfxdecode, 1-rgn, tileno, col, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(1-rgn, tileno, col, TILE_FLIPYX(flipyx)); TILE_GET_INFO_MEMBER(blackt96_state::get_bg0_tile_info){ GET_INFO(m_spriteram0); } TILE_GET_INFO_MEMBER(blackt96_state::get_bg1_tile_info){ GET_INFO(m_spriteram1); } @@ -187,14 +187,14 @@ WRITE16_MEMBER(blackt96_state::bg_videoram7_w) { COMBINE_DATA(&m_spriteram7[offs void blackt96_state::video_start() { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg_tilemap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg3_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg_tilemap[4] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg4_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg_tilemap[5] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg5_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg_tilemap[6] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg6_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg_tilemap[7] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg7_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blackt96_state::get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blackt96_state::get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blackt96_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg_tilemap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blackt96_state::get_bg3_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg_tilemap[4] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blackt96_state::get_bg4_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg_tilemap[5] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blackt96_state::get_bg5_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg_tilemap[6] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blackt96_state::get_bg6_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg_tilemap[7] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blackt96_state::get_bg7_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_spriteram[0] = m_spriteram0; m_spriteram[1] = m_spriteram1; diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c index 1fe9f1c50bd..4597c496f7f 100644 --- a/src/mame/drivers/blitz.c +++ b/src/mame/drivers/blitz.c @@ -355,13 +355,13 @@ TILE_GET_INFO_MEMBER(blitz_state::get_bg_tile_info) int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */ int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void blitz_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blitz_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blitz_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 blitz_state::screen_update_megadpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index e7521cb1ed0..ee9224334ac 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -187,7 +187,7 @@ static MACHINE_CONFIG_START( blstroid, blstroid_state ) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, blstroid_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, blstroid_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", blstroid_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 6ab8f03edd2..bec9dd7c075 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -166,7 +166,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_tx0_tile_info) tileno = m_ms32_tx0_ram[tile_index *2+0] & 0x0000ffff; colour = m_ms32_tx0_ram[tile_index *2+1] & 0x0000000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3,tileno,colour,0); + SET_TILE_INFO_MEMBER(3,tileno,colour,0); } TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_tx1_tile_info) @@ -176,7 +176,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_tx1_tile_info) tileno = m_ms32_tx1_ram[tile_index *2+0] & 0x0000ffff; colour = m_ms32_tx1_ram[tile_index *2+1] & 0x0000000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 7,tileno,colour,0); + SET_TILE_INFO_MEMBER(7,tileno,colour,0); } WRITE32_MEMBER(bnstars_state::ms32_tx0_ram_w) @@ -200,7 +200,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_bg0_tile_info) tileno = m_ms32_bg0_ram[tile_index *2+0] & 0x0000ffff; colour = m_ms32_bg0_ram[tile_index *2+1] & 0x0000000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,tileno,colour,0); + SET_TILE_INFO_MEMBER(2,tileno,colour,0); } TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_bg1_tile_info) @@ -210,7 +210,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_bg1_tile_info) tileno = m_ms32_bg1_ram[tile_index *2+0] & 0x0000ffff; colour = m_ms32_bg1_ram[tile_index *2+1] & 0x0000000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 6,tileno,colour,0); + SET_TILE_INFO_MEMBER(6,tileno,colour,0); } WRITE32_MEMBER(bnstars_state::ms32_bg0_ram_w) @@ -319,7 +319,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_roz0_tile_info) tileno = m_ms32_roz0_ram[tile_index *2+0] & 0x0000ffff; colour = m_ms32_roz0_ram[tile_index *2+1] & 0x0000000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno,colour,0); + SET_TILE_INFO_MEMBER(1,tileno,colour,0); } TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_roz1_tile_info) @@ -329,7 +329,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_roz1_tile_info) tileno = m_ms32_roz1_ram[tile_index *2+0] & 0x0000ffff; colour = m_ms32_roz1_ram[tile_index *2+1] & 0x0000000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 5,tileno,colour,0); + SET_TILE_INFO_MEMBER(5,tileno,colour,0); } WRITE32_MEMBER(bnstars_state::ms32_roz0_ram_w) @@ -498,18 +498,18 @@ void bnstars_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co void bnstars_state::video_start() { - m_ms32_tx_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_tx0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,64); - m_ms32_tx_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_tx1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,64); + m_ms32_tx_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_tx0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,64); + m_ms32_tx_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_tx1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,64); m_ms32_tx_tilemap[0]->set_transparent_pen(0); m_ms32_tx_tilemap[1]->set_transparent_pen(0); - m_ms32_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_bg0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,64); - m_ms32_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_bg1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,64); + m_ms32_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_bg0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,64); + m_ms32_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_bg1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,64); m_ms32_bg_tilemap[0]->set_transparent_pen(0); m_ms32_bg_tilemap[1]->set_transparent_pen(0); - m_ms32_roz_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_roz0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,128,128); - m_ms32_roz_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_roz1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,128,128); + m_ms32_roz_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_roz0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,128,128); + m_ms32_roz_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bnstars_state::get_ms32_roz1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,128,128); m_ms32_roz_tilemap[0]->set_transparent_pen(0); m_ms32_roz_tilemap[1]->set_transparent_pen(0); diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index 909885f4aaa..dfebe7b14db 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -89,14 +89,14 @@ WRITE8_MEMBER(cabaret_state::bg_tile_w) TILE_GET_INFO_MEMBER(cabaret_state::get_bg_tile_info) { int code = m_bg_tile_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code & 0xff, 0, 0); + SET_TILE_INFO_MEMBER(1, code & 0xff, 0, 0); } TILE_GET_INFO_MEMBER(cabaret_state::get_fg_tile_info) { int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8); int tile = code & 0x1fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0); + SET_TILE_INFO_MEMBER(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0); } WRITE8_MEMBER(cabaret_state::fg_tile_w) @@ -113,8 +113,8 @@ WRITE8_MEMBER(cabaret_state::fg_color_w) void cabaret_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cabaret_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cabaret_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cabaret_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cabaret_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(64); } diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index b5ec68ae743..e9499d86ffe 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -136,7 +136,7 @@ TILE_GET_INFO_MEMBER(calorie_state::get_bg_tile_info) int color = src[bg_base + tile_index + 0x100] & 0x0f; int flag = src[bg_base + tile_index + 0x100] & 0x40 ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flag); + SET_TILE_INFO_MEMBER(1, code, color, flag); } TILE_GET_INFO_MEMBER(calorie_state::get_fg_tile_info) @@ -144,14 +144,14 @@ TILE_GET_INFO_MEMBER(calorie_state::get_fg_tile_info) int code = ((m_fg_ram[tile_index + 0x400] & 0x30) << 4) | m_fg_ram[tile_index]; int color = m_fg_ram[tile_index + 0x400] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, TILE_FLIPYX((m_fg_ram[tile_index + 0x400] & 0xc0) >> 6)); + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((m_fg_ram[tile_index + 0x400] & 0xc0) >> 6)); } void calorie_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(calorie_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(calorie_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(calorie_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(calorie_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c index c14c5d70ca4..e56a9ebaf64 100644 --- a/src/mame/drivers/caswin.c +++ b/src/mame/drivers/caswin.c @@ -106,8 +106,7 @@ TILE_GET_INFO_MEMBER(caswin_state::get_sc0_tile_info) int tile = (m_sc0_vram[tile_index] | ((m_sc0_attr[tile_index] & 0x70)<<4)) & 0x7ff; int colour = m_sc0_attr[tile_index] & 0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, colour, 0); @@ -115,7 +114,7 @@ TILE_GET_INFO_MEMBER(caswin_state::get_sc0_tile_info) void caswin_state::video_start() { - m_sc0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(caswin_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_sc0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(caswin_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); } UINT32 caswin_state::screen_update_vvillage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index 665ba5f2e23..950fa6bce88 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -479,8 +479,7 @@ TILE_GET_INFO_MEMBER(cb2001_state::get_cb2001_reel1_tile_info) int colour = 0;//= (cb2001_out_c&0x7) + 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code+0x800, colour, 0); @@ -497,8 +496,7 @@ TILE_GET_INFO_MEMBER(cb2001_state::get_cb2001_reel2_tile_info) int colour = 0;//(cb2001_out_c&0x7) + 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code+0x800, colour, 0); @@ -515,8 +513,7 @@ TILE_GET_INFO_MEMBER(cb2001_state::get_cb2001_reel3_tile_info) code &=0xff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code+0x800, colour, 0); @@ -525,9 +522,9 @@ TILE_GET_INFO_MEMBER(cb2001_state::get_cb2001_reel3_tile_info) void cb2001_state::video_start() { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cb2001_state::get_cb2001_reel1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cb2001_state::get_cb2001_reel2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cb2001_state::get_cb2001_reel3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cb2001_state::get_cb2001_reel1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cb2001_state::get_cb2001_reel2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cb2001_state::get_cb2001_reel3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); m_reel2_tilemap->set_scroll_cols(64); diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index aea0c83f302..4f09d6fa0f0 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(cball_state::get_tile_info) { UINT8 code = m_video_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, code >> 7, 0); + SET_TILE_INFO_MEMBER(0, code, code >> 7, 0); } @@ -70,7 +70,7 @@ WRITE8_MEMBER(cball_state::cball_vram_w) void cball_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cball_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cball_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index ec55121a6f5..bb3fbf7808c 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -149,7 +149,7 @@ TILE_GET_INFO_MEMBER(chanbara_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 1) << 8); int color = (m_colorram[tile_index] >> 1) & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(chanbara_state::get_bg2_tile_info) @@ -157,13 +157,13 @@ TILE_GET_INFO_MEMBER(chanbara_state::get_bg2_tile_info) int code = m_videoram2[tile_index]; int color = (m_colorram2[tile_index] >> 1) & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } void chanbara_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(chanbara_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS,8, 8, 32, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(chanbara_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS,16, 16, 16, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(chanbara_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS,8, 8, 32, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(chanbara_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS,16, 16, 16, 32); m_bg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/chance32.c b/src/mame/drivers/chance32.c index b4a652a6792..84cb7c73f43 100644 --- a/src/mame/drivers/chance32.c +++ b/src/mame/drivers/chance32.c @@ -72,8 +72,7 @@ TILE_GET_INFO_MEMBER(chance32_state::get_fg_tile_info) { int code = (m_fgram[tile_index * 2 + 1] << 8) | m_fgram[tile_index * 2]; int flip = (~code >> 12)&1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0x0fff, code >> 13, TILE_FLIPYX(flip<<1)|flip); @@ -83,8 +82,7 @@ TILE_GET_INFO_MEMBER(chance32_state::get_bg_tile_info) { int code = (m_bgram[tile_index * 2 +1] << 8) | m_bgram[tile_index * 2]; int flip = (~code >> 12)&1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0x0fff, code >> 13, TILE_FLIPYX(flip<<1|flip)); @@ -93,10 +91,10 @@ TILE_GET_INFO_MEMBER(chance32_state::get_bg_tile_info) void chance32_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(chance32_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 35, 29); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(chance32_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 35, 29); m_fg_tilemap->set_transparent_pen(0); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(chance32_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 35, 29); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(chance32_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 35, 29); m_fg_tilemap->set_flip(TILE_FLIPX|TILE_FLIPY); m_bg_tilemap->set_flip(TILE_FLIPX|TILE_FLIPY); diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index e2f105748a2..01384bc8859 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -113,8 +113,8 @@ public: VIDEO_START_MEMBER(chinagat_state,chinagat) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(chinagat_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(chinagat_state::background_scan),this), 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(chinagat_state::get_fg_16color_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(chinagat_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(chinagat_state::background_scan),this), 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(chinagat_state::get_fg_16color_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_scrolldy(-8, -8); diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 89c8f9a1eca..36d69d95b6a 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -139,7 +139,7 @@ TILE_GET_INFO_MEMBER(cntsteer_state::get_bg_tile_info) { int code = m_videoram2[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code + m_bg_bank, m_bg_color_bank, 0); + SET_TILE_INFO_MEMBER(2, code + m_bg_bank, m_bg_color_bank, 0); } TILE_GET_INFO_MEMBER(cntsteer_state::get_fg_tile_info) @@ -149,13 +149,13 @@ TILE_GET_INFO_MEMBER(cntsteer_state::get_fg_tile_info) code |= (attr & 0x01) << 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0x30 + ((attr & 0x78) >> 3), 0); + SET_TILE_INFO_MEMBER(0, code, 0x30 + ((attr & 0x78) >> 3), 0); } VIDEO_START_MEMBER(cntsteer_state,cntsteer) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cntsteer_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cntsteer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); @@ -164,8 +164,8 @@ VIDEO_START_MEMBER(cntsteer_state,cntsteer) VIDEO_START_MEMBER(cntsteer_state,zerotrgt) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cntsteer_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cntsteer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index d7336c5735c..618653d9499 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -1103,12 +1103,12 @@ TILE_GET_INFO_MEMBER(coinmstr_state::get_bg_tile_info) tile |= (m_attr_ram3[tile_index + 0x0240] & 0x03) << (6+4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } void coinmstr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(coinmstr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 46, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(coinmstr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 46, 32); } UINT32 coinmstr_state::screen_update_coinmstr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 079bd86dd69..54050b0b800 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -155,7 +155,7 @@ TILE_GET_INFO_MEMBER(cshooter_state::get_cstx_tile_info) int attr = (m_txram[tile_index*2+1]); int color = attr & 0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, (code << 1) | ((attr & 0x20) >> 5), color, 0); + SET_TILE_INFO_MEMBER(0, (code << 1) | ((attr & 0x20) >> 5), color, 0); } WRITE8_MEMBER(cshooter_state::cshooter_txram_w) @@ -166,7 +166,7 @@ WRITE8_MEMBER(cshooter_state::cshooter_txram_w) void cshooter_state::video_start() { - m_txtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cshooter_state::get_cstx_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); + m_txtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cshooter_state::get_cstx_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); m_txtilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/cswat.c b/src/mame/drivers/cswat.c index 2fb4c99ccfd..53dd244ddcd 100644 --- a/src/mame/drivers/cswat.c +++ b/src/mame/drivers/cswat.c @@ -85,12 +85,12 @@ TILE_GET_INFO_MEMBER(cswat_state::get_tile_info) int code = m_videoram[tile_index] | (attr << 8 & 0x300); int flags = TILE_FLIPYX(attr >> 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void cswat_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cswat_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(cswat_state::tilemap_scan_rows),this), 8, 8, 36, 28); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cswat_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(cswat_state::tilemap_scan_rows),this), 8, 8, 36, 28); } UINT32 cswat_state::screen_update_cswat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 91ae9dd37bf..b5c1c824bf2 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -72,27 +72,27 @@ TILE_GET_INFO_MEMBER(cultures_state::get_bg1_tile_info) { UINT8 *region = memregion("gfx3")->base() + 0x200000 + 0x80000 * m_bg1_bank; int code = region[tile_index * 2] + (region[tile_index * 2 + 1] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, code >> 12, 0); + SET_TILE_INFO_MEMBER(2, code, code >> 12, 0); } TILE_GET_INFO_MEMBER(cultures_state::get_bg2_tile_info) { UINT8 *region = memregion("gfx2")->base() + 0x200000 + 0x80000 * m_bg2_bank; int code = region[tile_index * 2] + (region[tile_index * 2 + 1] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, code >> 12, 0); + SET_TILE_INFO_MEMBER(1, code, code >> 12, 0); } TILE_GET_INFO_MEMBER(cultures_state::get_bg0_tile_info) { int code = m_bg0_videoram[tile_index * 2] + (m_bg0_videoram[tile_index * 2 + 1] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, code >> 12, 0); + SET_TILE_INFO_MEMBER(0, code, code >> 12, 0); } void cultures_state::video_start() { - m_bg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cultures_state::get_bg0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 128); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cultures_state::get_bg1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 512, 512); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cultures_state::get_bg2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 512, 512); + m_bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cultures_state::get_bg0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 128); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cultures_state::get_bg1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 512, 512); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cultures_state::get_bg2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 512, 512); m_bg1_tilemap->set_transparent_pen(0); m_bg0_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index ffee4ee32ef..a4d1c4a2c1c 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -412,13 +412,13 @@ static MACHINE_CONFIG_START( cyberbal, cyberbal_state ) MCFG_GFXDECODE_ADD("gfxdecode", interleaved) MCFG_PALETTE_ADD("palette", 4096) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, cyberbal_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, cyberbal_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, cyberbal_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, cyberbal_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "lscreen", cyberbal_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") - MCFG_TILEMAP_ADD_STANDARD("playfield2", 2, cyberbal_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha2", 2, cyberbal_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield2", "gfxdecode", 2, cyberbal_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha2", "gfxdecode", 2, cyberbal_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob2", "rscreen", cyberbal_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") @@ -477,8 +477,8 @@ static MACHINE_CONFIG_START( cyberbal2p, cyberbal_state ) MCFG_GFXDECODE_ADD("gfxdecode", cyberbal) MCFG_PALETTE_ADD("palette", 2048) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, cyberbal_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, cyberbal_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, cyberbal_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, cyberbal_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", cyberbal_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index 63f18b2f2d1..bdab94422ac 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -249,8 +249,7 @@ TILE_GET_INFO_MEMBER(cybertnk_state::get_tilemap0_tile_info) int pal = (code & 0xe000) >> 13; pal |=(code & 0x1c00) >> 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0x1fff, pal, 0); @@ -262,8 +261,7 @@ TILE_GET_INFO_MEMBER(cybertnk_state::get_tilemap1_tile_info) int pal = (code & 0xe000) >> 13; pal |=(code & 0x1c00) >> 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0x1fff, pal, 0); @@ -275,8 +273,7 @@ TILE_GET_INFO_MEMBER(cybertnk_state::get_tilemap2_tile_info) int pal = (code & 0xe000) >> 13; pal |=(code & 0x1c00) >> 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code & 0x1fff, pal, 0); @@ -284,13 +281,13 @@ TILE_GET_INFO_MEMBER(cybertnk_state::get_tilemap2_tile_info) void cybertnk_state::video_start() { - m_tilemap0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cybertnk_state::get_tilemap0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,32); + m_tilemap0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cybertnk_state::get_tilemap0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,32); m_tilemap0_tilemap->set_transparent_pen(0); - m_tilemap1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cybertnk_state::get_tilemap1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,32); + m_tilemap1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cybertnk_state::get_tilemap1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,32); m_tilemap1_tilemap->set_transparent_pen(0); - m_tilemap2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cybertnk_state::get_tilemap2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,32); + m_tilemap2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cybertnk_state::get_tilemap2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,32); m_tilemap2_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index f8744dfbee5..b51bc303a2f 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -61,8 +61,7 @@ TILE_GET_INFO_MEMBER(d9final_state::get_sc0_tile_info) int tile = ((m_hi_vram[tile_index] & 0x3f)<<8) | m_lo_vram[tile_index]; int color = m_cram[tile_index] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -70,7 +69,7 @@ TILE_GET_INFO_MEMBER(d9final_state::get_sc0_tile_info) void d9final_state::video_start() { - m_sc0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(d9final_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_sc0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(d9final_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); } UINT32 d9final_state::screen_update_d9final(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index b78ce6bbce2..f50dbfc7a5e 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -104,18 +104,18 @@ public: TILE_GET_INFO_MEMBER(dacholer_state::get_bg_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, m_bgvideoram[tile_index] + m_bg_bank * 0x100, 0, 0); + SET_TILE_INFO_MEMBER(1, m_bgvideoram[tile_index] + m_bg_bank * 0x100, 0, 0); } TILE_GET_INFO_MEMBER(dacholer_state::get_fg_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_fgvideoram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, m_fgvideoram[tile_index], 0, 0); } void dacholer_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dacholer_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dacholer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dacholer_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dacholer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 43413658de7..79c943eedfb 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -385,12 +385,12 @@ TILE_GET_INFO_MEMBER(ddayjlc_state::get_tile_info_bg) int color = (m_bgram[tile_index + 0x400] & 0x7); color |= (m_bgram[tile_index + 0x400] & 0x40) >> 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } void ddayjlc_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddayjlc_state::get_tile_info_bg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ddayjlc_state::get_tile_info_bg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 ddayjlc_state::screen_update_ddayjlc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 5a1a2108019..a719f3246bd 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -182,8 +182,7 @@ WRITE16_MEMBER(ddealer_state::ddealer_flipscreen_w) TILE_GET_INFO_MEMBER(ddealer_state::get_back_tile_info) { int code = m_back_vram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0xfff, code >> 12, 0); @@ -192,7 +191,7 @@ TILE_GET_INFO_MEMBER(ddealer_state::get_back_tile_info) void ddealer_state::video_start() { m_flipscreen = 0; - m_back_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddealer_state::get_back_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); + m_back_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ddealer_state::get_back_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); } void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UINT16* bottom, bitmap_ind16 &bitmap, const rectangle &cliprect, int flipy) diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index c53a87c3a1b..89a57b67cd5 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -342,8 +342,7 @@ TILE_GET_INFO_MEMBER(dmndrby_state::get_dmndrby_tile_info) int flipx = (attr&0x40)>>6; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, col, TILE_FLIPYX(flipx) ); @@ -353,7 +352,7 @@ TILE_GET_INFO_MEMBER(dmndrby_state::get_dmndrby_tile_info) void dmndrby_state::video_start() { m_racetrack_tilemap_rom = memregion("user1")->base(); - m_racetrack_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dmndrby_state::get_dmndrby_tile_info),this),TILEMAP_SCAN_ROWS,16,16, 16, 512); + m_racetrack_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dmndrby_state::get_dmndrby_tile_info),this),TILEMAP_SCAN_ROWS,16,16, 16, 512); m_racetrack_tilemap->mark_all_dirty(); } diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index d2e155506e2..4fbe5e855be 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -250,7 +250,7 @@ TILE_GET_INFO_MEMBER(dreamwld_state::get_dreamwld_bg_tile_info) tileno = (tile_index & 1) ? (m_bg_videoram[tile_index >> 1] & 0xffff) : ((m_bg_videoram[tile_index >> 1] >> 16) & 0xffff); colour = tileno >> 13; tileno &= 0x1fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno + m_tilebank[0] * 0x2000, 0x80 + colour, 0); + SET_TILE_INFO_MEMBER(1, tileno + m_tilebank[0] * 0x2000, 0x80 + colour, 0); } @@ -267,13 +267,13 @@ TILE_GET_INFO_MEMBER(dreamwld_state::get_dreamwld_bg2_tile_info) tileno = (tile_index & 1) ? (m_bg2_videoram[tile_index >> 1] & 0xffff) : ((m_bg2_videoram[tile_index >> 1] >> 16) & 0xffff); colour = tileno >> 13; tileno &= 0x1fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno + m_tilebank[1] * 0x2000, 0xc0 + colour, 0); + SET_TILE_INFO_MEMBER(1, tileno + m_tilebank[1] * 0x2000, 0xc0 + colour, 0); } void dreamwld_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dreamwld_state::get_dreamwld_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 64,32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dreamwld_state::get_dreamwld_bg2_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dreamwld_state::get_dreamwld_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 64,32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dreamwld_state::get_dreamwld_bg2_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 64,32); m_bg2_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_rows(256); // line scrolling diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 47c9608a4d5..1eea73c4788 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(drtomy_state::get_tile_info_fg) { int code = m_videoram_fg[tile_index] & 0xfff; int color = (m_videoram_fg[tile_index] & 0xf000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } @@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(drtomy_state::get_tile_info_bg) { int code = m_videoram_bg[tile_index] & 0xfff; int color = (m_videoram_bg[tile_index] & 0xf000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } @@ -132,8 +132,8 @@ void drtomy_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect void drtomy_state::video_start() { - m_tilemap_bg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drtomy_state::get_tile_info_bg),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tilemap_fg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drtomy_state::get_tile_info_fg),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap_bg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(drtomy_state::get_tile_info_bg),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap_fg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(drtomy_state::get_tile_info_fg),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap_fg->set_transparent_pen(0); } diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 5048bbe7c50..0020489090b 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -335,12 +335,12 @@ TILE_GET_INFO_MEMBER(drw80pkr_state::get_bg_tile_info) int color = m_color_ram[tile_index]; int code = m_video_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void drw80pkr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drw80pkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 24, 27); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(drw80pkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 24, 27); } UINT32 drw80pkr_state::screen_update_drw80pkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index e33395fd04e..673622208a1 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -143,19 +143,19 @@ TILE_GET_INFO_MEMBER(dunhuang_state::get_tile_info) { UINT16 code = m_videoram[tile_index]; UINT8 color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(dunhuang_state::get_tile_info2) { UINT16 code = m_videoram2[tile_index]; UINT8 color = m_colorram2[tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } void dunhuang_state::video_start() { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dunhuang_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 0x40,0x20); - m_tmap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dunhuang_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8,32, 0x40,0x8); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dunhuang_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 0x40,0x20); + m_tmap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dunhuang_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8,32, 0x40,0x8); m_tmap->set_transparent_pen(0); m_tmap2->set_transparent_pen(0); diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index ea4f774ec02..1d09f5cec43 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -205,14 +205,14 @@ GFXDECODE_END TILE_GET_INFO_MEMBER(dynadice_state::get_tile_info) { int code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, 0); + SET_TILE_INFO_MEMBER(1, code, 0, 0); } void dynadice_state::video_start() { /* pacman - style videoram layout */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dynadice_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_top_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dynadice_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 2, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dynadice_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_top_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dynadice_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 2, 32); m_bg_tilemap->set_scrollx(0, -16); } diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index fff58e83eef..3fdd1ac4316 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -146,7 +146,7 @@ TILE_GET_INFO_MEMBER(egghunt_state::get_bg_tile_info) // code += 0; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, colour, 0); + SET_TILE_INFO_MEMBER(0, code, colour, 0); } READ8_MEMBER(egghunt_state::egghunt_bgram_r) @@ -183,7 +183,7 @@ WRITE8_MEMBER(egghunt_state::egghunt_atram_w) void egghunt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(egghunt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(egghunt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); save_item(NAME(m_bgram)); save_item(NAME(m_spram)); diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c index f0458731e8b..73ba384e9d0 100644 --- a/src/mame/drivers/eprom.c +++ b/src/mame/drivers/eprom.c @@ -399,8 +399,8 @@ static MACHINE_CONFIG_START( eprom, eprom_state ) MCFG_GFXDECODE_ADD("gfxdecode", eprom) MCFG_PALETTE_ADD("palette", 2048) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, eprom_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, eprom_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, eprom_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, eprom_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", eprom_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") @@ -440,8 +440,8 @@ static MACHINE_CONFIG_START( klaxp, eprom_state ) MCFG_GFXDECODE_ADD("gfxdecode", eprom) MCFG_PALETTE_ADD("palette", 2048) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, eprom_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, eprom_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, eprom_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, eprom_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", eprom_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") @@ -480,8 +480,8 @@ static MACHINE_CONFIG_START( guts, eprom_state ) MCFG_GFXDECODE_ADD("gfxdecode", guts) MCFG_PALETTE_ADD("palette", 2048) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, eprom_state, guts_get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, eprom_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, eprom_state, guts_get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, eprom_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", eprom_state::s_guts_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 975b805a49b..1d093997c2f 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -208,7 +208,7 @@ void ettrivia_state::get_tile_info(tile_data &tileinfo, int tile_index, UINT8 *v code += m_gfx_bank * 0x100; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfx_code,code,color,0); + SET_TILE_INFO_MEMBER(gfx_code,code,color,0); } TILE_GET_INFO_MEMBER(ettrivia_state::get_tile_info_bg) @@ -260,8 +260,8 @@ PALETTE_INIT_MEMBER(ettrivia_state, ettrivia) void ettrivia_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ettrivia_state::get_tile_info_bg),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ettrivia_state::get_tile_info_fg),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ettrivia_state::get_tile_info_bg),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ettrivia_state::get_tile_info_fg),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 20b02f0fec8..b975bb7b785 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -209,7 +209,7 @@ WRITE8_MEMBER(firefox_state::firefox_disc_data_w) TILE_GET_INFO_MEMBER(firefox_state::bgtile_get_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_tileram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, m_tileram[tile_index], 0, 0); } @@ -222,7 +222,7 @@ WRITE8_MEMBER(firefox_state::tileram_w) void firefox_state::video_start() { - m_bgtiles = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firefox_state::bgtile_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,64); + m_bgtiles = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firefox_state::bgtile_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,64); m_bgtiles->set_transparent_pen(0); m_bgtiles->set_scrolldy(m_screen->visible_area().min_y, 0); } diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 4bbdc7f8ce6..b8facd822d0 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -109,13 +109,13 @@ TILE_GET_INFO_MEMBER(flyball_state::flyball_get_tile_info) code += 64; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, flags); + SET_TILE_INFO_MEMBER(0, code, 0, flags); } void flyball_state::video_start() { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flyball_state::flyball_get_tile_info),this), tilemap_mapper_delegate(FUNC(flyball_state::flyball_get_memory_offset),this), 8, 16, 32, 16); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flyball_state::flyball_get_tile_info),this), tilemap_mapper_delegate(FUNC(flyball_state::flyball_get_memory_offset),this), 8, 16, 32, 16); } diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index c4a9f971e84..b70327da47b 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -369,7 +369,7 @@ static MACHINE_CONFIG_START( foodf, foodf_state ) MCFG_GFXDECODE_ADD("gfxdecode", foodf) MCFG_PALETTE_ADD("palette", 256) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("playfield", 2, foodf_state, get_playfield_tile_info, 8,8, SCAN_COLS, 32,32, 0) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("playfield", "gfxdecode", 2, foodf_state, get_playfield_tile_info, 8,8, SCAN_COLS, 32,32, 0) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 256, 259, 0, 224) diff --git a/src/mame/drivers/fresh.c b/src/mame/drivers/fresh.c index 90ba01a62db..e9ed6bc6fc9 100644 --- a/src/mame/drivers/fresh.c +++ b/src/mame/drivers/fresh.c @@ -105,7 +105,7 @@ TILE_GET_INFO_MEMBER(fresh_state::get_fresh_bg_tile_info) int tileno, pal; tileno = m_bg_videoram[tile_index]; pal = m_attr_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, pal, 0); + SET_TILE_INFO_MEMBER(1, tileno, pal, 0); } @@ -127,7 +127,7 @@ TILE_GET_INFO_MEMBER(fresh_state::get_fresh_bg_2_tile_info) int tileno, pal; tileno = m_bg_2_videoram[tile_index]; pal = m_attr_2_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, pal, 0); + SET_TILE_INFO_MEMBER(0, tileno, pal, 0); } @@ -148,8 +148,8 @@ WRITE16_MEMBER(fresh_state::fresh_attr_2_videoram_w) void fresh_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fresh_state::get_fresh_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 512); - m_bg_2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fresh_state::get_fresh_bg_2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 512); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fresh_state::get_fresh_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 512); + m_bg_2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fresh_state::get_fresh_bg_2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 512); m_bg_tilemap->set_transparent_pen(255); } diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index 603ebb55667..a1fbf61ee8d 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -114,31 +114,31 @@ public: TILE_GET_INFO_MEMBER(galaxi_state::get_bg1_tile_info) { UINT16 code = m_bg1_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0x10 + (code >> 12), 0); + SET_TILE_INFO_MEMBER(0, code, 0x10 + (code >> 12), 0); } TILE_GET_INFO_MEMBER(galaxi_state::get_bg2_tile_info) { UINT16 code = m_bg2_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0x10 + (code >> 12), 0); + SET_TILE_INFO_MEMBER(0, code, 0x10 + (code >> 12), 0); } TILE_GET_INFO_MEMBER(galaxi_state::get_bg3_tile_info) { UINT16 code = m_bg3_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, (code >> 12), 0); + SET_TILE_INFO_MEMBER(0, code, (code >> 12), 0); } TILE_GET_INFO_MEMBER(galaxi_state::get_bg4_tile_info) { UINT16 code = m_bg4_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, (code >> 12), 0); + SET_TILE_INFO_MEMBER(0, code, (code >> 12), 0); } TILE_GET_INFO_MEMBER(galaxi_state::get_fg_tile_info) { UINT16 code = m_fg_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0x20 + (code >> 12), 0); + SET_TILE_INFO_MEMBER(1, code, 0x20 + (code >> 12), 0); } WRITE16_MEMBER(galaxi_state::galaxi_bg1_w) @@ -173,12 +173,12 @@ WRITE16_MEMBER(galaxi_state::galaxi_fg_w) void galaxi_state::video_start() { - m_bg1_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxi_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); - m_bg2_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxi_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); - m_bg3_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxi_state::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); - m_bg4_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxi_state::get_bg4_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); + m_bg1_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxi_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); + m_bg2_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxi_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); + m_bg3_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxi_state::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); + m_bg4_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxi_state::get_bg4_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); - m_fg_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxi_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20); + m_fg_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxi_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20); m_bg1_tmap->set_transparent_pen(0); m_bg2_tmap->set_transparent_pen(0); diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index bd11e7bd986..a0827a8f360 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -513,8 +513,8 @@ static MACHINE_CONFIG_START( gauntlet, gauntlet_state ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(IIIIRRRRGGGGBBBB) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, gauntlet_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, gauntlet_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, gauntlet_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, gauntlet_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", gauntlet_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/gluck2.c b/src/mame/drivers/gluck2.c index d0347161be6..c15c8b92c16 100644 --- a/src/mame/drivers/gluck2.c +++ b/src/mame/drivers/gluck2.c @@ -255,13 +255,13 @@ TILE_GET_INFO_MEMBER(gluck2_state::get_gluck2_tile_info) int bank = ((attr & 0xc0) >> 5 ) + ((attr & 0x02) >> 1 ); /* bits 1-6-7 handle the gfx banks */ int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 handle the color */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void gluck2_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gluck2_state::get_gluck2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gluck2_state::get_gluck2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index ad54bcb8c38..06e87a2d4a5 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -1123,7 +1123,7 @@ TILE_GET_INFO_MEMBER(goldnpkr_state::get_bg_tile_info) int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */ int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } TILE_GET_INFO_MEMBER(goldnpkr_state::wcrdxtnd_get_bg_tile_info) @@ -1141,17 +1141,17 @@ TILE_GET_INFO_MEMBER(goldnpkr_state::wcrdxtnd_get_bg_tile_info) int bank = (attr & 0x03) + ((attr & 0xc0) >> 4); /* bits 0, 1, 6 & 7 switch the gfx banks */ int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void goldnpkr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldnpkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldnpkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } VIDEO_START_MEMBER(goldnpkr_state,wcrdxtnd) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldnpkr_state::wcrdxtnd_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldnpkr_state::wcrdxtnd_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 goldnpkr_state::screen_update_goldnpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index a1176fb1e4f..862a3cd7541 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(good_state::get_fg_tile_info) { int tileno = m_fg_tilemapram[tile_index * 2]; int attr = m_fg_tilemapram[tile_index * 2 + 1] & 0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, attr, 0); + SET_TILE_INFO_MEMBER(0, tileno, attr, 0); } WRITE16_MEMBER(good_state::bg_tilemapram_w) @@ -88,15 +88,15 @@ TILE_GET_INFO_MEMBER(good_state::get_bg_tile_info) { int tileno = m_bg_tilemapram[tile_index * 2]; int attr = m_bg_tilemapram[tile_index * 2 + 1] & 0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, attr, 0); + SET_TILE_INFO_MEMBER(1, tileno, attr, 0); } void good_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(good_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(good_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(good_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(good_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap->set_transparent_pen(0xf); } diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c index 809ae471c83..4a788869c7e 100644 --- a/src/mame/drivers/goodejan.c +++ b/src/mame/drivers/goodejan.c @@ -256,28 +256,28 @@ TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc0_tile_info ) int tile = m_sc0_vram[tile_index] & 0xfff; int color = (m_sc0_vram[tile_index] >> 12) & 0x0f; tile+=(m_seibucrtc_sc0bank<<12); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color, 0); + SET_TILE_INFO_MEMBER(1, tile, color, 0); } TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc2_tile_info ) { int tile = m_sc2_vram[tile_index] & 0xfff; int color = (m_sc2_vram[tile_index] >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tile, color, 0); + SET_TILE_INFO_MEMBER(2, tile, color, 0); } TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc1_tile_info ) { int tile = m_sc1_vram[tile_index] & 0xfff; int color = (m_sc1_vram[tile_index] >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tile, color, 0); + SET_TILE_INFO_MEMBER(3, tile, color, 0); } TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc3_tile_info ) { int tile = m_sc3_vram[tile_index] & 0xfff; int color = (m_sc3_vram[tile_index] >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4, tile, color, 0); + SET_TILE_INFO_MEMBER(4, tile, color, 0); } void goodejan_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int pri) @@ -322,10 +322,10 @@ void goodejan_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap void goodejan_state::video_start() { - m_sc0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goodejan_state::seibucrtc_sc0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_sc2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goodejan_state::seibucrtc_sc2_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_sc1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goodejan_state::seibucrtc_sc1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_sc3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goodejan_state::seibucrtc_sc3_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_sc0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goodejan_state::seibucrtc_sc0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_sc2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goodejan_state::seibucrtc_sc2_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_sc1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goodejan_state::seibucrtc_sc1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_sc3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goodejan_state::seibucrtc_sc3_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_sc2_tilemap->set_transparent_pen(15); m_sc1_tilemap->set_transparent_pen(15); diff --git a/src/mame/drivers/headonb.c b/src/mame/drivers/headonb.c index 51491bc3fcd..65d60c2dabb 100644 --- a/src/mame/drivers/headonb.c +++ b/src/mame/drivers/headonb.c @@ -64,12 +64,12 @@ public: TILE_GET_INFO_MEMBER(headonb_state::get_headonb_tile_info) { UINT8 code = m_video_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void headonb_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(headonb_state::get_headonb_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(headonb_state::get_headonb_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 headonb_state::screen_update_headonb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index d7babf8a7ad..76b9b983414 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(hitme_state::get_hitme_tile_info) { /* the code is the low 6 bits */ UINT8 code = m_videoram[tile_index] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } @@ -55,13 +55,13 @@ WRITE8_MEMBER(hitme_state::hitme_vidram_w) void hitme_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hitme_state::get_hitme_tile_info),this), TILEMAP_SCAN_ROWS, 8, 10, 40, 19); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hitme_state::get_hitme_tile_info),this), TILEMAP_SCAN_ROWS, 8, 10, 40, 19); } VIDEO_START_MEMBER(hitme_state,barricad) { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hitme_state::get_hitme_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 24); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hitme_state::get_hitme_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 24); } diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 294bed8c93e..19cba1ba59b 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -174,12 +174,12 @@ TILE_GET_INFO_MEMBER(hvyunit_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((attr & 0x0f) << 8); int color = (attr >> 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } void hvyunit_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hvyunit_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hvyunit_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); } UINT32 hvyunit_state::screen_update_hvyunit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index bfc0d661727..4aa63aaf15d 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -118,8 +118,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_jingbell_reel1_tile_info) { int code = m_gp98_reel1_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code)+(((tile_index+1)&0x3)*0x100), (code & 0x80) ? 0xc : 0, 0); @@ -130,8 +129,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_gp98_reel1_tile_info) { int code = m_gp98_reel1_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code*4)+(tile_index&0x3), 0, 0); @@ -148,8 +146,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_jingbell_reel2_tile_info) { int code = m_gp98_reel2_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code)+(((tile_index+1)&0x3)*0x100), (code & 0x80) ? 0xc : 0, 0); @@ -159,8 +156,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_gp98_reel2_tile_info) { int code = m_gp98_reel2_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code*4)+(tile_index&0x3), 0, 0); @@ -178,8 +174,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_jingbell_reel3_tile_info) { int code = m_gp98_reel3_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code)+(((tile_index+1)&0x3)*0x100), (code & 0x80) ? 0xc : 0, 0); @@ -189,8 +184,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_gp98_reel3_tile_info) { int code = m_gp98_reel3_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code*4)+(tile_index&0x3), 0, 0); @@ -208,8 +202,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_jingbell_reel4_tile_info) { int code = m_gp98_reel4_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code)+(((tile_index+1)&0x3)*0x100), (code & 0x80) ? 0xc : 0, 0); @@ -219,8 +212,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_gp98_reel4_tile_info) { int code = m_gp98_reel4_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code*4)+(tile_index&0x3), 0, 0); @@ -242,7 +234,7 @@ WRITE8_MEMBER(igs009_state::bg_scroll_w) TILE_GET_INFO_MEMBER(igs009_state::get_fg_tile_info) { int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, (4*(code >> 14)+3), 0); + SET_TILE_INFO_MEMBER(1, code, (4*(code >> 14)+3), 0); } WRITE8_MEMBER(igs009_state::fg_tile_w) @@ -259,13 +251,13 @@ WRITE8_MEMBER(igs009_state::fg_color_w) void igs009_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80,0x20); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80,0x20); m_fg_tilemap->set_transparent_pen(0); - m_gp98_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_jingbell_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); - m_gp98_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_jingbell_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); - m_gp98_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_jingbell_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); - m_gp98_reel4_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_jingbell_reel4_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); + m_gp98_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_jingbell_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); + m_gp98_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_jingbell_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); + m_gp98_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_jingbell_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); + m_gp98_reel4_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_jingbell_reel4_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); m_gp98_reel1_tilemap->set_scroll_cols(128); m_gp98_reel2_tilemap->set_scroll_cols(128); @@ -276,13 +268,13 @@ void igs009_state::video_start() VIDEO_START_MEMBER(igs009_state,gp98) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80,0x20); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80,0x20); m_fg_tilemap->set_transparent_pen(0); - m_gp98_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_gp98_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); - m_gp98_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_gp98_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); - m_gp98_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_gp98_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); - m_gp98_reel4_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs009_state::get_gp98_reel4_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); + m_gp98_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_gp98_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); + m_gp98_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_gp98_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); + m_gp98_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_gp98_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); + m_gp98_reel4_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_gp98_reel4_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 128, 8); m_gp98_reel1_tilemap->set_scroll_cols(128); m_gp98_reel2_tilemap->set_scroll_cols(128); diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 336f6a0bc71..010858256ec 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -228,13 +228,13 @@ TILE_GET_INFO_MEMBER(igs017_state::get_fg_tile_info) { int code = m_fg_videoram[tile_index*4+0] + (m_fg_videoram[tile_index*4+1] << 8); int attr = m_fg_videoram[tile_index*4+2] + (m_fg_videoram[tile_index*4+3] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, COLOR(attr), TILE_FLIPXY( attr >> 5 )); + SET_TILE_INFO_MEMBER(0, code, COLOR(attr), TILE_FLIPXY( attr >> 5 )); } TILE_GET_INFO_MEMBER(igs017_state::get_bg_tile_info) { int code = m_bg_videoram[tile_index*4+0] + (m_bg_videoram[tile_index*4+1] << 8); int attr = m_bg_videoram[tile_index*4+2] + (m_bg_videoram[tile_index*4+3] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, COLOR(attr)+8, TILE_FLIPXY( attr >> 5 )); + SET_TILE_INFO_MEMBER(0, code, COLOR(attr)+8, TILE_FLIPXY( attr >> 5 )); } WRITE8_MEMBER(igs017_state::fg_w) @@ -306,8 +306,8 @@ void igs017_state::expand_sprites() void igs017_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs017_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs017_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs017_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs017_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fg_tilemap->set_transparent_pen(0xf); m_bg_tilemap->set_transparent_pen(0xf); diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index e005f8ffac8..237410fb335 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -153,7 +153,7 @@ TILE_GET_INFO_MEMBER(igs_m027_state::get_tx_tilemap_tile_info) tileno = m_igs_tx_videoram[tile_index] & 0xffff; colour = (m_igs_tx_videoram[tile_index]>>0x10) & 0xffff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour,0); + SET_TILE_INFO_MEMBER(0,tileno,colour,0); } /* BG Layer */ @@ -172,7 +172,7 @@ TILE_GET_INFO_MEMBER(igs_m027_state::get_bg_tilemap_tile_info) tileno = m_igs_bg_videoram[tile_index] & 0xffff; colour = (m_igs_bg_videoram[tile_index]>>0x10) & 0xffff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour,0); + SET_TILE_INFO_MEMBER(0,tileno,colour,0); } @@ -191,10 +191,10 @@ WRITE32_MEMBER(igs_m027_state::igs_palette32_w) void igs_m027_state::video_start() { - m_igs_tx_tilemap= &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs_m027_state::get_tx_tilemap_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_igs_tx_tilemap= &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs_m027_state::get_tx_tilemap_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_igs_tx_tilemap->set_transparent_pen(15); - m_igs_bg_tilemap= &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs_m027_state::get_bg_tilemap_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); - //m_igs_bg_tilemap= &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igs_m027_state::get_bg_tilemap_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_igs_bg_tilemap= &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs_m027_state::get_bg_tilemap_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + //m_igs_bg_tilemap= &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igs_m027_state::get_bg_tilemap_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); //m_igs_bg_tilemap->set_transparent_pen(15); logerror("Video START OK!\n"); } diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index 10ff8524721..dbf76e229eb 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -169,14 +169,14 @@ WRITE8_MEMBER(igspoker_state::igs_irqack_w) TILE_GET_INFO_MEMBER(igspoker_state::get_bg_tile_info) { int code = m_bg_tile_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1 + (tile_index & 3), code, 0, 0); + SET_TILE_INFO_MEMBER(1 + (tile_index & 3), code, 0, 0); } TILE_GET_INFO_MEMBER(igspoker_state::get_fg_tile_info) { int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8); int tile = code & 0x1fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0); + SET_TILE_INFO_MEMBER(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0); } WRITE8_MEMBER(igspoker_state::bg_tile_w) @@ -199,8 +199,8 @@ WRITE8_MEMBER(igspoker_state::fg_color_w) void igspoker_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igspoker_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igspoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igspoker_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igspoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8); m_fg_tilemap->set_transparent_pen(0); } @@ -219,7 +219,7 @@ UINT32 igspoker_state::screen_update_igs_video(screen_device &screen, bitmap_ind VIDEO_START_MEMBER(igspoker_state,cpokerpk) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igspoker_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igspoker_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } UINT32 igspoker_state::screen_update_cpokerpk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index 20d2e1d47ba..745f60d1f93 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -128,7 +128,7 @@ TILE_GET_INFO_MEMBER(jackie_state::get_fg_tile_info) { int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8); int tile = code & 0x1fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0); + SET_TILE_INFO_MEMBER(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0); } WRITE8_MEMBER(jackie_state::fg_tile_w) @@ -161,7 +161,7 @@ WRITE8_MEMBER(jackie_state::jackie_reel1_ram_w) TILE_GET_INFO_MEMBER(jackie_state::get_jackie_reel1_tile_info) { int code = m_reel1_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, 0); + SET_TILE_INFO_MEMBER(1, code, 0, 0); } @@ -175,7 +175,7 @@ WRITE8_MEMBER(jackie_state::jackie_reel2_ram_w) TILE_GET_INFO_MEMBER(jackie_state::get_jackie_reel2_tile_info) { int code = m_reel2_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, 0); + SET_TILE_INFO_MEMBER(1, code, 0, 0); } @@ -188,20 +188,20 @@ WRITE8_MEMBER(jackie_state::jackie_reel3_ram_w) TILE_GET_INFO_MEMBER(jackie_state::get_jackie_reel3_tile_info) { int code = m_reel3_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, 0); + SET_TILE_INFO_MEMBER(1, code, 0, 0); } void jackie_state::video_start() { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jackie_state::get_jackie_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jackie_state::get_jackie_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jackie_state::get_jackie_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jackie_state::get_jackie_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jackie_state::get_jackie_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jackie_state::get_jackie_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); m_reel2_tilemap->set_scroll_cols(64); m_reel3_tilemap->set_scroll_cols(64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jackie_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jackie_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index 6bc754c54d4..d6383aa23fb 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -279,8 +279,7 @@ TILEMAP_MAPPER_MEMBER(jalmah_state::range3_8x8) TILE_GET_INFO_MEMBER(jalmah_state::get_sc0_tile_info) { int code = m_sc0_vram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, (code & 0xfff) + ((m_sc0bank & 3) << 12), code >> 12, 0); @@ -289,8 +288,7 @@ TILE_GET_INFO_MEMBER(jalmah_state::get_sc0_tile_info) TILE_GET_INFO_MEMBER(jalmah_state::get_sc1_tile_info) { int code = m_sc1_vram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code & 0xfff, code >> 12, 0); @@ -299,8 +297,7 @@ TILE_GET_INFO_MEMBER(jalmah_state::get_sc1_tile_info) TILE_GET_INFO_MEMBER(jalmah_state::get_sc2_tile_info) { int code = m_sc2_vram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0xfff, code >> 12, 0); @@ -309,8 +306,7 @@ TILE_GET_INFO_MEMBER(jalmah_state::get_sc2_tile_info) TILE_GET_INFO_MEMBER(jalmah_state::get_sc3_tile_info) { int code = m_sc3_vram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0xfff, code >> 12, 0); @@ -318,25 +314,25 @@ TILE_GET_INFO_MEMBER(jalmah_state::get_sc3_tile_info) void jalmah_state::video_start() { - m_sc0_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); - m_sc0_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range1_16x16),this),16,16,128,64); - m_sc0_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_16x16),this),16,16,64,128); - m_sc0_tilemap_3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range3_16x16),this),16,16,32,256); + m_sc0_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); + m_sc0_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range1_16x16),this),16,16,128,64); + m_sc0_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_16x16),this),16,16,64,128); + m_sc0_tilemap_3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range3_16x16),this),16,16,32,256); - m_sc1_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc1_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); - m_sc1_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc1_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range1_16x16),this),16,16,128,64); - m_sc1_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc1_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_16x16),this),16,16,64,128); - m_sc1_tilemap_3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc1_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range3_16x16),this),16,16,32,256); + m_sc1_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc1_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); + m_sc1_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc1_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range1_16x16),this),16,16,128,64); + m_sc1_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc1_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_16x16),this),16,16,64,128); + m_sc1_tilemap_3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc1_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range3_16x16),this),16,16,32,256); - m_sc2_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc2_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); - m_sc2_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc2_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range1_16x16),this),16,16,128,64); - m_sc2_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc2_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_16x16),this),16,16,64,128); - m_sc2_tilemap_3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc2_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range3_16x16),this),16,16,32,256); + m_sc2_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc2_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); + m_sc2_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc2_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range1_16x16),this),16,16,128,64); + m_sc2_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc2_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_16x16),this),16,16,64,128); + m_sc2_tilemap_3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc2_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range3_16x16),this),16,16,32,256); - m_sc3_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),TILEMAP_SCAN_COLS,8,8,256,32); - //m_sc3_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),TILEMAP_SCAN_COLS,8,8,256,32); - m_sc3_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_8x8),this),8,8,128,64); - m_sc3_tilemap_3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range3_8x8),this),8,8,64,128); + m_sc3_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),TILEMAP_SCAN_COLS,8,8,256,32); + //m_sc3_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),TILEMAP_SCAN_COLS,8,8,256,32); + m_sc3_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_8x8),this),8,8,128,64); + m_sc3_tilemap_3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range3_8x8),this),8,8,64,128); m_jm_scrollram = auto_alloc_array(machine(), UINT16, 0x80/2); m_jm_vregs = auto_alloc_array(machine(), UINT16, 0x40/2); @@ -364,8 +360,8 @@ void jalmah_state::video_start() VIDEO_START_MEMBER(jalmah_state,urashima) { - m_sc0_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); - m_sc3_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_8x8),this),8,8,128,64); + m_sc0_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); + m_sc3_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_8x8),this),8,8,128,64); m_jm_scrollram = auto_alloc_array(machine(), UINT16, 0x80/2); m_jm_vregs = auto_alloc_array(machine(), UINT16, 0x40/2); diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c index be3ca948281..c3717d81193 100644 --- a/src/mame/drivers/jclub2.c +++ b/src/mame/drivers/jclub2.c @@ -167,14 +167,14 @@ TILE_GET_INFO_MEMBER(darkhors_state::get_tile_info_0) { UINT16 tile = m_tmapram[tile_index] >> 16; UINT16 color = m_tmapram[tile_index] & 0xffff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile/2, (color & 0x200) ? (color & 0x1ff) : ((color & 0x0ff) * 4) , 0); + SET_TILE_INFO_MEMBER(0, tile/2, (color & 0x200) ? (color & 0x1ff) : ((color & 0x0ff) * 4) , 0); } TILE_GET_INFO_MEMBER(darkhors_state::get_tile_info_1) { UINT16 tile = m_tmapram2[tile_index] >> 16; UINT16 color = m_tmapram2[tile_index] & 0xffff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile/2, (color & 0x200) ? (color & 0x1ff) : ((color & 0x0ff) * 4) , 0); + SET_TILE_INFO_MEMBER(0, tile/2, (color & 0x200) ? (color & 0x1ff) : ((color & 0x0ff) * 4) , 0); } WRITE32_MEMBER(darkhors_state::darkhors_tmapram_w) @@ -224,8 +224,8 @@ void darkhors_state::draw_sprites_darkhors(bitmap_ind16 &bitmap, const rectangle VIDEO_START_MEMBER(darkhors_state,darkhors) { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40); - m_tmap2= &machine().tilemap().create(tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40); + m_tmap2= &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40); m_tmap->set_transparent_pen(0); m_tmap2->set_transparent_pen(0); diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index ac4141be6a3..e933a0d0cef 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -155,13 +155,13 @@ TILE_GET_INFO_MEMBER(jokrwild_state::get_bg_tile_info) int code = m_videoram[tile_index] | ((attr & 0xc0) << 2); int color = (attr & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code , color , 0); + SET_TILE_INFO_MEMBER(0, code , color , 0); } void jokrwild_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jokrwild_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 24, 26); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jokrwild_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 24, 26); } diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index ceb01360cc7..4dda51d8cc0 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -452,12 +452,12 @@ TILE_GET_INFO_MEMBER(jollyjgr_state::get_bg_tile_info) { int color = m_colorram[((tile_index & 0x1f) << 1) | 1] & 7; int region = (m_tilemap_bank & 0x20) ? 2 : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, region, m_videoram[tile_index], color, 0); + SET_TILE_INFO_MEMBER(region, m_videoram[tile_index], color, 0); } void jollyjgr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jollyjgr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jollyjgr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c index 2106e6c9e40..3b2019d7753 100644 --- a/src/mame/drivers/jubilee.c +++ b/src/mame/drivers/jubilee.c @@ -258,13 +258,13 @@ TILE_GET_INFO_MEMBER(jubilee_state::get_bg_tile_info) int bank = (attr & 0x03); int color = 0; /* fixed colors: one rom for each R, G and B. */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void jubilee_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jubilee_state::get_bg_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jubilee_state::get_bg_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scrolldx(8, 0); /* guess */ } diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index c93c942bf8f..ccd21ba0dee 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -151,8 +151,7 @@ TILE_GET_INFO_MEMBER(kingdrby_state::get_sc0_tile_info) tile&=0x1ff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, color|0x40, 0); @@ -168,8 +167,7 @@ TILE_GET_INFO_MEMBER(kingdrby_state::get_sc1_tile_info) //0x13 // - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, color|0x40, 0); @@ -179,9 +177,9 @@ TILE_GET_INFO_MEMBER(kingdrby_state::get_sc1_tile_info) void kingdrby_state::video_start() { - m_sc0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kingdrby_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,24); - m_sc1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kingdrby_state::get_sc1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,24); - m_sc0w_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kingdrby_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_sc0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kingdrby_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,24); + m_sc1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kingdrby_state::get_sc1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,24); + m_sc0w_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kingdrby_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_sc1_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c index 0849f4f90ad..6c51359094d 100644 --- a/src/mame/drivers/klax.c +++ b/src/mame/drivers/klax.c @@ -171,7 +171,7 @@ static MACHINE_CONFIG_START( klax, klax_state ) MCFG_GFXDECODE_ADD("gfxdecode", klax) MCFG_PALETTE_ADD("palette", 512) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, klax_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,32) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, klax_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,32) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", klax_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index 7cd43ba39d1..15c8447aabd 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -79,8 +79,7 @@ public: TILE_GET_INFO_MEMBER(koftball_state::get_t1_tile_info) { int data = m_bmc_1_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, data, 0, 0); @@ -89,8 +88,7 @@ TILE_GET_INFO_MEMBER(koftball_state::get_t1_tile_info) TILE_GET_INFO_MEMBER(koftball_state::get_t2_tile_info) { int data = m_bmc_2_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, data, 0, 0); @@ -98,8 +96,8 @@ TILE_GET_INFO_MEMBER(koftball_state::get_t2_tile_info) void koftball_state::video_start() { - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(koftball_state::get_t1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(koftball_state::get_t2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(koftball_state::get_t1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(koftball_state::get_t2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_tilemap_1->set_transparent_pen(0); } diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index f919b0df6da..3f32d60e3be 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(koikoi_state::get_tile_info) int color = (m_videoram[tile_index + 0x400] & 0x1f); int flip = (m_videoram[tile_index + 0x400] & 0x80) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flip); + SET_TILE_INFO_MEMBER(0, code, color, flip); } PALETTE_INIT_MEMBER(koikoi_state, koikoi) @@ -141,7 +141,7 @@ PALETTE_INIT_MEMBER(koikoi_state, koikoi) void koikoi_state::video_start() { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(koikoi_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(koikoi_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 koikoi_state::screen_update_koikoi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 8d4a9b77eae..8f7bcfc0247 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -476,12 +476,12 @@ GFXDECODE_END TILE_GET_INFO_MEMBER(laserbat_state::get_tile_info) { // wrong color index! - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_videoram[tile_index], m_colorram[tile_index] & 0x7f, 0); + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], m_colorram[tile_index] & 0x7f, 0); } void laserbat_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(laserbat_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(laserbat_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); save_item(NAME(m_videoram)); save_item(NAME(m_colorram)); diff --git a/src/mame/drivers/lbeach.c b/src/mame/drivers/lbeach.c index dc380957419..54573be26aa 100644 --- a/src/mame/drivers/lbeach.c +++ b/src/mame/drivers/lbeach.c @@ -120,21 +120,21 @@ TILE_GET_INFO_MEMBER(lbeach_state::get_bg_tile_info) // d6,d7: color UINT8 code = m_bg_vram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code & 0x1f, code >> 6 & 3, 0); + SET_TILE_INFO_MEMBER(1, code & 0x1f, code >> 6 & 3, 0); } TILE_GET_INFO_MEMBER(lbeach_state::get_fg_tile_info) { UINT8 code = m_fg_vram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void lbeach_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lbeach_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lbeach_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lbeach_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lbeach_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_screen->register_screen_bitmap(m_colmap_car); diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index bf5f52601a4..af3b4b1c358 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -293,21 +293,21 @@ TILE_GET_INFO_MEMBER(limenko_state::get_bg_tile_info) { int tile = m_bg_videoram[tile_index] & 0x7ffff; int color = (m_bg_videoram[tile_index]>>28) & 0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } TILE_GET_INFO_MEMBER(limenko_state::get_md_tile_info) { int tile = m_md_videoram[tile_index] & 0x7ffff; int color = (m_md_videoram[tile_index]>>28) & 0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } TILE_GET_INFO_MEMBER(limenko_state::get_fg_tile_info) { int tile = m_fg_videoram[tile_index] & 0x7ffff; int color = (m_fg_videoram[tile_index]>>28) & 0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } static void draw_single_sprite(bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx, @@ -491,9 +491,9 @@ void limenko_state::copy_sprites(bitmap_ind16 &bitmap, bitmap_ind16 &sprites_bit void limenko_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(limenko_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); - m_md_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(limenko_state::get_md_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(limenko_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(limenko_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_md_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(limenko_state::get_md_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(limenko_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_md_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 4a3058dc7ed..f7d771fcc42 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -219,13 +219,13 @@ TILE_GET_INFO_MEMBER(looping_state::get_tile_info) { int tile_number = m_videoram[tile_index]; int color = m_colorram[(tile_index & 0x1f) * 2 + 1] & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile_number, color, 0); + SET_TILE_INFO_MEMBER(0, tile_number, color, 0); } void looping_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(looping_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(looping_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); m_bg_tilemap->set_scroll_cols(0x20); } diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 1f5bfe69806..e5ab2f2f298 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -53,12 +53,12 @@ TILE_GET_INFO_MEMBER(ltcasino_state::get_ltcasino_tile_info) tileno += (colour & 0x80) << 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,0,0); + SET_TILE_INFO_MEMBER(0,tileno,0,0); } void ltcasino_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ltcasino_state::get_ltcasino_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,64,32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ltcasino_state::get_ltcasino_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,64,32); } diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index 4339462676a..b8c8094404d 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -184,8 +184,7 @@ TILE_GET_INFO_MEMBER(luckgrln_state::get_luckgrln_reel1_tile_info) code |= (attr & 0xe0)<<3; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, col, 0); @@ -214,8 +213,7 @@ TILE_GET_INFO_MEMBER(luckgrln_state::get_luckgrln_reel2_tile_info) code |= (attr & 0xe0)<<3; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, col, 0); @@ -242,8 +240,7 @@ TILE_GET_INFO_MEMBER(luckgrln_state::get_luckgrln_reel3_tile_info) code |= (attr & 0xe0)<<3; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, col, 0); @@ -270,8 +267,7 @@ TILE_GET_INFO_MEMBER(luckgrln_state::get_luckgrln_reel4_tile_info) code |= (attr & 0xe0)<<3; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, col, 0); @@ -279,10 +275,10 @@ TILE_GET_INFO_MEMBER(luckgrln_state::get_luckgrln_reel4_tile_info) void luckgrln_state::video_start() { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(luckgrln_state::get_luckgrln_reel1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(luckgrln_state::get_luckgrln_reel2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(luckgrln_state::get_luckgrln_reel3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel4_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(luckgrln_state::get_luckgrln_reel4_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(luckgrln_state::get_luckgrln_reel1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(luckgrln_state::get_luckgrln_reel2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(luckgrln_state::get_luckgrln_reel3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel4_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(luckgrln_state::get_luckgrln_reel4_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); m_reel2_tilemap->set_scroll_cols(64); diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index 0cc6501079c..9a9a2d7787f 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -127,8 +127,7 @@ TILE_GET_INFO_MEMBER(m14_state::m14_get_tile_info) /* colorram & 0xf0 used but unknown purpose*/ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, 0); @@ -136,7 +135,7 @@ TILE_GET_INFO_MEMBER(m14_state::m14_get_tile_info) void m14_state::video_start() { - m_m14_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m14_state::m14_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_m14_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m14_state::m14_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 m14_state::screen_update_m14(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 70d42bd4a84..2c821d0c5ff 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -307,20 +307,20 @@ TILE_GET_INFO_MEMBER(m63_state::get_bg_tile_info) int code = m_videoram[tile_index] | ((attr & 0x30) << 4); int color = (attr & 0x0f) + (m_pal_bank << 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } TILE_GET_INFO_MEMBER(m63_state::get_fg_tile_info) { int code = m_videoram2[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, m_fg_flag); + SET_TILE_INFO_MEMBER(0, code, 0, m_fg_flag); } VIDEO_START_MEMBER(m63_state,m63) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m63_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m63_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m63_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m63_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index acea0fd20b7..bcf47639d57 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -163,46 +163,33 @@ WRITE16_MEMBER(magic10_state::paletteram_w) TILE_GET_INFO_MEMBER(magic10_state::get_layer0_tile_info) { - SET_TILE_INFO_MEMBER - ( - m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_layer0_videoram[tile_index * 2], m_layer0_videoram[tile_index * 2 + 1] & 0x0f, - TILE_FLIPYX((m_layer0_videoram[tile_index * 2 + 1] & 0xc0) >> 6) - ); + TILE_FLIPYX((m_layer0_videoram[tile_index * 2 + 1] & 0xc0) >> 6)); } TILE_GET_INFO_MEMBER(magic10_state::get_layer1_tile_info) { - SET_TILE_INFO_MEMBER - ( - m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_layer1_videoram[tile_index * 2], m_layer1_videoram[tile_index * 2 + 1] & 0x0f, - TILE_FLIPYX((m_layer1_videoram[tile_index * 2 + 1] & 0xc0) >> 6) - ); + TILE_FLIPYX((m_layer1_videoram[tile_index * 2 + 1] & 0xc0) >> 6)); } TILE_GET_INFO_MEMBER(magic10_state::get_layer2_tile_info) { - SET_TILE_INFO_MEMBER - ( - m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_layer2_videoram[tile_index * 2], - m_layer2_videoram[tile_index * 2 + 1] & 0x0f, - 0 - ); + m_layer2_videoram[tile_index * 2 + 1] & 0x0f,0); } void magic10_state::video_start() { - m_layer0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(magic10_state::get_layer0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_layer1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(magic10_state::get_layer1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_layer2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(magic10_state::get_layer2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_layer0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magic10_state::get_layer0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_layer1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magic10_state::get_layer1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_layer2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magic10_state::get_layer2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_layer1_tilemap->set_transparent_pen(0); m_layer2_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 143a05698ea..ac96e353a50 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -514,12 +514,12 @@ TILE_GET_INFO_MEMBER(magicfly_state::get_magicfly_tile_info) m_colorram[0] = m_colorram[0] | ((m_colorram[0] & 0x08) << 4); /* only for 1st offset */ //m_colorram[tile_index] = attr | ((attr & 0x08) << 4); /* for the whole color RAM */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void magicfly_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(magicfly_state::get_magicfly_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magicfly_state::get_magicfly_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29); } @@ -545,12 +545,12 @@ TILE_GET_INFO_MEMBER(magicfly_state::get_7mezzo_tile_info) m_colorram[0] = m_colorram[0] | ((m_colorram[0] & 0x04) << 5); /* only for 1st offset */ //m_colorram[tile_index] = attr | ((attr & 0x04) << 5); /* for the whole color RAM */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } VIDEO_START_MEMBER(magicfly_state,7mezzo) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(magicfly_state::get_7mezzo_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magicfly_state::get_7mezzo_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29); } diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c index cc2698d9c43..60ff32339ae 100644 --- a/src/mame/drivers/majorpkr.c +++ b/src/mame/drivers/majorpkr.c @@ -511,8 +511,7 @@ TILE_GET_INFO_MEMBER(majorpkr_state::bg_get_tile_info) { int code = m_videoram[0x800 + 2 * tile_index] + (m_videoram[0x800 + 2 * tile_index + 1] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x1fff), code >> 13, 0); @@ -522,8 +521,7 @@ TILE_GET_INFO_MEMBER(majorpkr_state::fg_get_tile_info) { int code = m_videoram[2 * tile_index] + (m_videoram[2 * tile_index + 1] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code & 0x07ff), code >> 13, (code & (1 << 12)) ? (TILE_FLIPX|TILE_FLIPY) : 0); @@ -532,8 +530,8 @@ TILE_GET_INFO_MEMBER(majorpkr_state::fg_get_tile_info) void majorpkr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(majorpkr_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 36, 28); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(majorpkr_state::fg_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 36, 28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(majorpkr_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 36, 28); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(majorpkr_state::fg_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 36, 28); m_fg_tilemap->set_transparent_pen(0); m_generic_paletteram_8.allocate(4 * 0x800); diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index c14b0eded7b..d82823e7e22 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -493,12 +493,12 @@ TILE_GET_INFO_MEMBER(marinedt_state::get_tile_info) int color = 0; int flags = TILE_FLIPX; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void marinedt_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(marinedt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(marinedt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(0); m_tx_tilemap->set_scrolldx(0, 4*8); diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 9556e35a007..1a8f93c4610 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -64,12 +64,12 @@ TILE_GET_INFO_MEMBER(mayumi_state::get_tile_info) int code = m_videoram[tile_index] + (m_videoram[tile_index + 0x800] & 0x1f) * 0x100; int col = (m_videoram[tile_index + 0x1000] >> 3) & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, col, 0); + SET_TILE_INFO_MEMBER(0, code, col, 0); } void mayumi_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mayumi_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mayumi_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } WRITE8_MEMBER(mayumi_state::mayumi_videoram_w) diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 99fd892d0b3..66d7204e3f6 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(mgolf_state::get_tile_info) { UINT8 code = m_video_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, code >> 7, 0); + SET_TILE_INFO_MEMBER(0, code, code >> 7, 0); } @@ -78,7 +78,7 @@ WRITE8_MEMBER(mgolf_state::mgolf_vram_w) void mgolf_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mgolf_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mgolf_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index c723a107786..bed037c9a13 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -99,14 +99,14 @@ public: TILE_GET_INFO_MEMBER(midas_state::get_tile_info) { UINT16 code = m_gfxram[ tile_index + 0x7000 ]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code & 0xfff, (code >> 12) & 0xf, TILE_FLIPXY( 0 )); + SET_TILE_INFO_MEMBER(1, code & 0xfff, (code >> 12) & 0xf, TILE_FLIPXY( 0 )); } void midas_state::video_start() { m_gfxram = auto_alloc_array(machine(), UINT16, 0x20000/2); - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(midas_state::get_tile_info),this), TILEMAP_SCAN_COLS,8,8,0x80,0x20); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(midas_state::get_tile_info),this), TILEMAP_SCAN_COLS,8,8,0x80,0x20); m_tmap->set_transparent_pen(0); } diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index 1eb4596580d..116b72c936c 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -171,8 +171,7 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc0_tile_info) int tile = data >> 14; int color = (m_sc0_vram[tile_index*2+1] & 0x1f)+0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -184,8 +183,7 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc1_tile_info) int tile = data >> 14; int color = (m_sc1_vram[tile_index*2+1] & 0x1f)+0x10; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -197,8 +195,7 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc2_tile_info) int tile = data >> 14; int color = (m_sc2_vram[tile_index*2+1] & 0x1f)+0x20; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -210,8 +207,7 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc3_tile_info) int tile = data >> 14; int color = (m_sc3_vram[tile_index*2+1] & 0x1f)+0x30; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -219,10 +215,10 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc3_tile_info) void mil4000_state::video_start() { - m_sc0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mil4000_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_sc1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mil4000_state::get_sc1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_sc2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mil4000_state::get_sc2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_sc3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mil4000_state::get_sc3_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_sc0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mil4000_state::get_sc0_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_sc1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mil4000_state::get_sc1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_sc2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mil4000_state::get_sc2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_sc3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mil4000_state::get_sc3_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_sc1_tilemap->set_transparent_pen(0); m_sc2_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index dbc4ee5f2e9..141d3b42be1 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -208,12 +208,12 @@ TILE_GET_INFO_MEMBER(miniboy7_state::get_bg_tile_info) if (bank == 1) /* temporary hack to point to the 3rd gfx bank */ bank = 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void miniboy7_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(miniboy7_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 37, 37); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(miniboy7_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 37, 37); } UINT32 miniboy7_state::screen_update_miniboy7(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index fa3f6f27392..610ee1d685e 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -75,8 +75,7 @@ TILE_GET_INFO_MEMBER(mogura_state::get_mogura_tile_info) int code = m_tileram[tile_index]; int attr = m_tileram[tile_index + 0x800]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr >> 1) & 7, 0); @@ -86,7 +85,7 @@ TILE_GET_INFO_MEMBER(mogura_state::get_mogura_tile_info) void mogura_state::video_start() { m_gfxdecode->gfx(0)->set_source(m_gfxram); - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mogura_state::get_mogura_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mogura_state::get_mogura_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } UINT32 mogura_state::screen_update_mogura(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 2307c4ceef7..e348b4c4ee5 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -100,13 +100,13 @@ TILE_GET_INFO_MEMBER(mole_state::get_bg_tile_info) { UINT16 code = m_tileram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, (code & 0x200) ? 1 : 0, code & 0x1ff, 0, 0); + SET_TILE_INFO_MEMBER((code & 0x200) ? 1 : 0, code & 0x1ff, 0, 0); } void mole_state::video_start() { memset(m_tileram, 0, sizeof(m_tileram)); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mole_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 40, 25); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mole_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 40, 25); save_item(NAME(m_tileram)); } diff --git a/src/mame/drivers/mpu12wbk.c b/src/mame/drivers/mpu12wbk.c index 1a08a9311cb..a832ff5de70 100644 --- a/src/mame/drivers/mpu12wbk.c +++ b/src/mame/drivers/mpu12wbk.c @@ -268,14 +268,14 @@ TILE_GET_INFO_MEMBER(mpu12wbk_state::get_bg_tile_info) // int code = m_videoram[tile_index] | ((attr & 0xc0) << 2); // int color = (attr & 0x0f); -// SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, 0 ,0 ,0); +// SET_TILE_INFO_MEMBER(0, code, color, 0); + SET_TILE_INFO_MEMBER(0, 0 ,0 ,0); } void mpu12wbk_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mpu12wbk_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mpu12wbk_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index 164f67628ab..f6fc9f04a64 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -188,8 +188,7 @@ TILE_GET_INFO_MEMBER(igrosoft_gamble_state::get_igrosoft_gamble_tile_info) tileinfo.category = (attr&0x100)>>8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code&0x1fff, attr&0x7, 0); @@ -199,8 +198,7 @@ TILE_GET_INFO_MEMBER(igrosoft_gamble_state::get_igrosoft_gamble_reel_tile_info) { int code = m_vid[tile_index*2+0x2000] | (m_vid[tile_index*2+0x2001] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code&0x1fff)+0x2000, (code>>14)+0x8, 0); @@ -211,10 +209,10 @@ void igrosoft_gamble_state::video_start() memset(m_vid,0x00,sizeof(m_vid)); save_item(NAME(m_vid)); - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igrosoft_gamble_state::get_igrosoft_gamble_tile_info),this),TILEMAP_SCAN_ROWS,16,16, 64, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igrosoft_gamble_state::get_igrosoft_gamble_tile_info),this),TILEMAP_SCAN_ROWS,16,16, 64, 32); m_tilemap->set_transparent_pen(255); - m_reel_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(igrosoft_gamble_state::get_igrosoft_gamble_reel_tile_info),this),TILEMAP_SCAN_ROWS,16,16, 64, 64); + m_reel_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(igrosoft_gamble_state::get_igrosoft_gamble_reel_tile_info),this),TILEMAP_SCAN_ROWS,16,16, 64, 64); m_reel_tilemap->set_transparent_pen(255); m_reel_tilemap->set_scroll_cols(64); } diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 249d53099d3..3ae4a05effc 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -367,7 +367,7 @@ TILE_GET_INFO_MEMBER(mwarr_state::get_bg_tile_info) int tileno = m_bg_videoram[tile_index] & 0x1fff; int colour = (m_bg_videoram[tile_index] & 0xe000) >> 13; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4, tileno, colour, 0); + SET_TILE_INFO_MEMBER(4, tileno, colour, 0); } TILE_GET_INFO_MEMBER(mwarr_state::get_mlow_tile_info) @@ -375,7 +375,7 @@ TILE_GET_INFO_MEMBER(mwarr_state::get_mlow_tile_info) int tileno = m_mlow_videoram[tile_index] & 0x1fff; int colour = (m_mlow_videoram[tile_index] & 0xe000) >> 13; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tileno, colour, 0); + SET_TILE_INFO_MEMBER(3, tileno, colour, 0); } TILE_GET_INFO_MEMBER(mwarr_state::get_mhigh_tile_info) @@ -383,7 +383,7 @@ TILE_GET_INFO_MEMBER(mwarr_state::get_mhigh_tile_info) int tileno = m_mhigh_videoram[tile_index] & 0x1fff; int colour = (m_mhigh_videoram[tile_index] & 0xe000) >> 13; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tileno, colour, 0); + SET_TILE_INFO_MEMBER(2, tileno, colour, 0); } TILE_GET_INFO_MEMBER(mwarr_state::get_tx_tile_info) @@ -391,15 +391,15 @@ TILE_GET_INFO_MEMBER(mwarr_state::get_tx_tile_info) int tileno = m_tx_videoram[tile_index] & 0x1fff; int colour = (m_tx_videoram[tile_index] & 0xe000) >> 13; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, colour, 0); + SET_TILE_INFO_MEMBER(1, tileno, colour, 0); } void mwarr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mwarr_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); - m_mlow_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mwarr_state::get_mlow_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); - m_mhigh_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mwarr_state::get_mhigh_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mwarr_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mwarr_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); + m_mlow_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mwarr_state::get_mlow_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); + m_mhigh_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mwarr_state::get_mhigh_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mwarr_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_mlow_tilemap->set_transparent_pen(0); m_mhigh_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c index f9209dee483..ebae58bf318 100644 --- a/src/mame/drivers/namcoic.c +++ b/src/mame/drivers/namcoic.c @@ -48,7 +48,7 @@ inline void namcos2_shared_state::namcoic_get_tile_info(tile_data &tileinfo,int int tile, mask; mTilemapInfo.cb( machine(), vram[tile_index], &tile, &mask ); tileinfo.mask_data = mTilemapInfo.maskBaseAddr+mask*8; - SET_TILE_INFO_MEMBER(m_gfxdecode, mTilemapInfo.gfxbank,tile,0,0); + SET_TILE_INFO_MEMBER(mTilemapInfo.gfxbank,tile,0,0); } /* get_tile_info */ TILE_GET_INFO_MEMBER( namcos2_shared_state::get_tile_info0 ) { namcoic_get_tile_info(tileinfo,tile_index,&mTilemapInfo.videoram[0x0000]); } @@ -68,14 +68,14 @@ void namcos2_shared_state::namco_tilemap_init( int gfxbank, void *maskBaseAddr, mTilemapInfo.videoram = auto_alloc_array(machine(), UINT16, 0x10000 ); /* four scrolling tilemaps */ - mTilemapInfo.tmap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info0),this),TILEMAP_SCAN_ROWS,8,8,64,64); - mTilemapInfo.tmap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,8,8,64,64); - mTilemapInfo.tmap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,64,64); - mTilemapInfo.tmap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info3),this),TILEMAP_SCAN_ROWS,8,8,64,64); + mTilemapInfo.tmap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info0),this),TILEMAP_SCAN_ROWS,8,8,64,64); + mTilemapInfo.tmap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,8,8,64,64); + mTilemapInfo.tmap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,64,64); + mTilemapInfo.tmap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info3),this),TILEMAP_SCAN_ROWS,8,8,64,64); /* two non-scrolling tilemaps */ - mTilemapInfo.tmap[4] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info4),this),TILEMAP_SCAN_ROWS,8,8,36,28); - mTilemapInfo.tmap[5] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info5),this),TILEMAP_SCAN_ROWS,8,8,36,28); + mTilemapInfo.tmap[4] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info4),this),TILEMAP_SCAN_ROWS,8,8,36,28); + mTilemapInfo.tmap[5] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_shared_state::get_tile_info5),this),TILEMAP_SCAN_ROWS,8,8,36,28); /* define offsets for scrolling */ for( i=0; i<4; i++ ) @@ -1014,7 +1014,7 @@ void namcos2_shared_state::c169_roz_get_info(tile_data &tileinfo, int tile_index tile &= 0x3fff; // cap mask offset break; } - SET_TILE_INFO_MEMBER(m_gfxdecode, m_c169_roz_gfxbank, mangle, 0/*color*/, 0/*flag*/); + SET_TILE_INFO_MEMBER(m_c169_roz_gfxbank, mangle, 0/*color*/, 0/*flag*/); tileinfo.mask_data = m_c169_roz_mask + 32*tile; } @@ -1043,13 +1043,13 @@ void namcos2_shared_state::c169_roz_init(int gfxbank, const char *maskregion) m_c169_roz_gfxbank = gfxbank; m_c169_roz_mask = memregion(maskregion)->base(); - m_c169_roz_tilemap[0] = &machine().tilemap().create( + m_c169_roz_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_shared_state::c169_roz_get_info0), this), tilemap_mapper_delegate(FUNC(namcos2_shared_state::c169_roz_mapper), this), 16,16, 256,256); - m_c169_roz_tilemap[1] = &machine().tilemap().create( + m_c169_roz_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_shared_state::c169_roz_get_info1), this), tilemap_mapper_delegate(FUNC(namcos2_shared_state::c169_roz_mapper), this), 16,16, @@ -1446,7 +1446,7 @@ void namco_c45_road_device::device_start() m_gfxdecode->set_gfx(0, auto_alloc(machine(), gfx_element(machine(), s_tile_layout, 0x10000 + (UINT8 *)&m_ram[0], 0x3f, 0xf00))); // create a tilemap for the road - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namco_c45_road_device::get_road_info), this), + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namco_c45_road_device::get_road_info), this), TILEMAP_SCAN_ROWS, ROAD_TILE_SIZE, ROAD_TILE_SIZE, ROAD_COLS, ROAD_ROWS); } @@ -1484,7 +1484,7 @@ TILE_GET_INFO_MEMBER( namco_c45_road_device::get_road_info ) UINT16 data = m_ram[tile_index]; int tile = data & 0x3ff; int color = data >> 10; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } //------------------------------------------------- diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 19de76f98a1..b78f9c584ef 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -2138,7 +2138,7 @@ TILE_GET_INFO_MEMBER(namcos23_state::TextTilemapGetInfo) * ----.xx--.----.---- flip * ----.--xx.xxxx.xxxx code */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, data&0x03ff, data>>12, TILE_FLIPYX((data&0x0c00)>>10)); + SET_TILE_INFO_MEMBER(0, data&0x03ff, data>>12, TILE_FLIPYX((data&0x0c00)>>10)); } WRITE32_MEMBER(namcos23_state::s23_textram_w) @@ -2161,7 +2161,7 @@ WRITE32_MEMBER(namcos23_state::s23_textchar_w) VIDEO_START_MEMBER(namcos23_state,s23) { m_gfxdecode->gfx(0)->set_source(reinterpret_cast(m_charram.target())); - m_bgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos23_state::TextTilemapGetInfo),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_bgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos23_state::TextTilemapGetInfo),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_bgtilemap->set_transparent_pen(0xf); m_bgtilemap->set_scrolldx(860, 860); m_render.polymgr = poly_alloc(machine(), 10000, sizeof(namcos23_render_data), 0); diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 4c238036d49..2bd93d02995 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -850,13 +850,13 @@ static INPUT_PORTS_START( wondstck ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 ) INPUT_PORTS_END -TILE_GET_INFO_MEMBER(nmg5_state::fg_get_tile_info){ SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_fg_videoram[tile_index] | (m_gfx_bank << 16), 0, 0);} -TILE_GET_INFO_MEMBER(nmg5_state::bg_get_tile_info){ SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_bg_videoram[tile_index] | (m_gfx_bank << 16), 1, 0);} +TILE_GET_INFO_MEMBER(nmg5_state::fg_get_tile_info){ SET_TILE_INFO_MEMBER(0, m_fg_videoram[tile_index] | (m_gfx_bank << 16), 0, 0);} +TILE_GET_INFO_MEMBER(nmg5_state::bg_get_tile_info){ SET_TILE_INFO_MEMBER(0, m_bg_videoram[tile_index] | (m_gfx_bank << 16), 1, 0);} void nmg5_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmg5_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmg5_state::fg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmg5_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmg5_state::fg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c index 696ef232361..cfca71cc43e 100644 --- a/src/mame/drivers/nsmpoker.c +++ b/src/mame/drivers/nsmpoker.c @@ -124,13 +124,13 @@ TILE_GET_INFO_MEMBER(nsmpoker_state::get_bg_tile_info) // int bank = (attr & 0x08) >> 3; // int color = (attr & 0x03); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0 /* bank */, code, 0 /* color */, 0); + SET_TILE_INFO_MEMBER(0 /* bank */, code, 0 /* color */, 0); } void nsmpoker_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nsmpoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nsmpoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c index bfa0752e231..762597469d4 100644 --- a/src/mame/drivers/offtwall.c +++ b/src/mame/drivers/offtwall.c @@ -372,7 +372,7 @@ static MACHINE_CONFIG_START( offtwall, offtwall_state ) MCFG_PALETTE_ADD("palette", 2048) MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(atarigen_state, scanline_int_write_line)) - MCFG_ATARI_VAD_PLAYFIELD(offtwall_state, get_playfield_tile_info) + MCFG_ATARI_VAD_PLAYFIELD(offtwall_state, "gfxdecode", get_playfield_tile_info) MCFG_ATARI_VAD_MOB(offtwall_state::s_mob_config, "gfxdecode") MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 413074609ab..420136efe01 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -167,12 +167,12 @@ TILE_GET_INFO_MEMBER(olibochu_state::get_bg_tile_info) int color = (attr & 0x1f) + 0x20; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void olibochu_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(olibochu_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(olibochu_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void olibochu_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index e204a3cb424..f2a7c6ffbef 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -102,12 +102,12 @@ TILE_GET_INFO_MEMBER(onetwo_state::get_fg_tile_info) code &= 0x7fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void onetwo_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(onetwo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(onetwo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } UINT32 onetwo_state::screen_update_onetwo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index a840964ed9b..fc3da104f74 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -197,8 +197,7 @@ TILE_GET_INFO_MEMBER(panicr_state::get_bgtile_info) code=memregion("user1")->base()[tile_index]; attr=memregion("user2")->base()[tile_index]; code+=((attr&7)<<8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, (attr & 0xf0) >> 4, 0); @@ -213,8 +212,7 @@ TILE_GET_INFO_MEMBER(panicr_state::get_infotile_info_2) code=memregion("user1")->base()[tile_index]; attr=memregion("user2")->base()[tile_index]; code+=((attr&7)<<8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, code, 0, 0); @@ -231,8 +229,7 @@ TILE_GET_INFO_MEMBER(panicr_state::get_txttile_info) tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((attr & 8) << 5), color, 0); @@ -241,10 +238,10 @@ TILE_GET_INFO_MEMBER(panicr_state::get_txttile_info) void panicr_state::video_start() { - m_bgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(panicr_state::get_bgtile_info),this),TILEMAP_SCAN_ROWS,16,16,1024,16 ); - m_infotilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(panicr_state::get_infotile_info_2),this),TILEMAP_SCAN_ROWS,16,16,1024,16 ); + m_bgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(panicr_state::get_bgtile_info),this),TILEMAP_SCAN_ROWS,16,16,1024,16 ); + m_infotilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(panicr_state::get_infotile_info_2),this),TILEMAP_SCAN_ROWS,16,16,1024,16 ); - m_txttilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(panicr_state::get_txttile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); + m_txttilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(panicr_state::get_txttile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); m_palette->configure_tilemap_groups(*m_txttilemap, *m_gfxdecode->gfx(0), 0); } diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index f432b3acc8d..ae48971a91e 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -980,12 +980,12 @@ TILE_GET_INFO_MEMBER(peplus_state::get_bg_tile_info) color += 0x10; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void peplus_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(peplus_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 40, 25); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(peplus_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 40, 25); m_palette_ram = auto_alloc_array(machine(), UINT8, 0x3000); memset(m_palette_ram, 0, 0x3000); m_palette_ram2 = auto_alloc_array(machine(), UINT8, 0x3000); diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 36f9c128be2..cb88cb6e474 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -115,8 +115,7 @@ public: TILE_GET_INFO_MEMBER(pipeline_state::get_tile_info) { int code = m_vram2[tile_index]+m_vram2[tile_index+0x800]*256; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, 0, 0); @@ -126,21 +125,17 @@ TILE_GET_INFO_MEMBER(pipeline_state::get_tile_info2) { int code =m_vram1[tile_index]+((m_vram1[tile_index+0x800]>>4))*256; int color=((m_vram1[tile_index+0x800])&0xf); - SET_TILE_INFO_MEMBER - ( - m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, color, - 0 - ); + 0); } void pipeline_state::video_start() { m_palram=auto_alloc_array(machine(), UINT8, 0x1000); - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pipeline_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pipeline_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pipeline_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pipeline_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); m_tilemap2->set_transparent_pen(0); } diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 788388dc620..44b22feb844 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -204,7 +204,7 @@ TILE_GET_INFO_MEMBER(pkscram_state::get_bg_tile_info) int tile = m_pkscramble_bgtilemap_ram[tile_index*2]; int color = m_pkscramble_bgtilemap_ram[tile_index*2 + 1] & 0x7f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } TILE_GET_INFO_MEMBER(pkscram_state::get_md_tile_info) @@ -212,7 +212,7 @@ TILE_GET_INFO_MEMBER(pkscram_state::get_md_tile_info) int tile = m_pkscramble_mdtilemap_ram[tile_index*2]; int color = m_pkscramble_mdtilemap_ram[tile_index*2 + 1] & 0x7f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } TILE_GET_INFO_MEMBER(pkscram_state::get_fg_tile_info) @@ -220,7 +220,7 @@ TILE_GET_INFO_MEMBER(pkscram_state::get_fg_tile_info) int tile = m_pkscramble_fgtilemap_ram[tile_index*2]; int color = m_pkscramble_fgtilemap_ram[tile_index*2 + 1] & 0x7f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } TIMER_DEVICE_CALLBACK_MEMBER(pkscram_state::scanline_callback) @@ -243,9 +243,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(pkscram_state::scanline_callback) void pkscram_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pkscram_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); - m_md_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pkscram_state::get_md_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pkscram_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pkscram_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_md_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pkscram_state::get_md_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pkscram_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); m_md_tilemap->set_transparent_pen(15); m_fg_tilemap->set_transparent_pen(15); diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c index c6e597950ec..07aa0bc4f59 100644 --- a/src/mame/drivers/popobear.c +++ b/src/mame/drivers/popobear.c @@ -180,7 +180,7 @@ TILE_GET_INFO_MEMBER(popobear_state::get_popobear_bg0_tile_info) int base = tilemap_base[0]; int tileno = m_vram[base/2 + tile_index]; int flipyx = (tileno>>14); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx)); } TILE_GET_INFO_MEMBER(popobear_state::get_popobear_bg1_tile_info) @@ -188,7 +188,7 @@ TILE_GET_INFO_MEMBER(popobear_state::get_popobear_bg1_tile_info) int base = tilemap_base[1]; int tileno = m_vram[base/2 + tile_index]; int flipyx = (tileno>>14); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx)); } TILE_GET_INFO_MEMBER(popobear_state::get_popobear_bg2_tile_info) @@ -196,7 +196,7 @@ TILE_GET_INFO_MEMBER(popobear_state::get_popobear_bg2_tile_info) int base = tilemap_base[2]; int tileno = m_vram[base/2 + tile_index]; int flipyx = (tileno>>14); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx)); } TILE_GET_INFO_MEMBER(popobear_state::get_popobear_bg3_tile_info) @@ -204,7 +204,7 @@ TILE_GET_INFO_MEMBER(popobear_state::get_popobear_bg3_tile_info) int base = tilemap_base[3]; int tileno = m_vram[base/2 + tile_index]; int flipyx = (tileno>>14); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx)); } @@ -226,10 +226,10 @@ void popobear_state::video_start() /* create the char set (gfx will then be updated dynamically from RAM) */ m_gfxdecode->set_gfx(m_gfx_index, auto_alloc(machine(), gfx_element(machine(), popobear_char_layout, (UINT8 *)m_vram_rearranged, m_palette->entries() / 16, 0))); - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popobear_state::get_popobear_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popobear_state::get_popobear_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); - m_bg_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popobear_state::get_popobear_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); - m_bg_tilemap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popobear_state::get_popobear_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popobear_state::get_popobear_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popobear_state::get_popobear_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_bg_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popobear_state::get_popobear_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_bg_tilemap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popobear_state::get_popobear_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); m_bg_tilemap[0]->set_transparent_pen(0); m_bg_tilemap[1]->set_transparent_pen(0); diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 75854ffb80f..83e7baea50c 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -394,7 +394,7 @@ TILE_GET_INFO_MEMBER(powerbal_state::powerbal_get_bg_tile_info) if (m_videoram1[tile_index] & 0x800) code |= 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, colr >> 12, 0); + SET_TILE_INFO_MEMBER(1, code, colr >> 12, 0); } void powerbal_state::draw_sprites_powerbal(bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -427,7 +427,7 @@ void powerbal_state::draw_sprites_powerbal(bitmap_ind16 &bitmap, const rectangle VIDEO_START_MEMBER(powerbal_state,powerbal) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(powerbal_state::powerbal_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(powerbal_state::powerbal_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_xoffset = -20; diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 785523b365a..fd3a718be11 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -335,8 +335,7 @@ GFXDECODE_END TILE_GET_INFO_MEMBER(ppmast93_state::get_ppmast93_bg_tile_info) { int code = (m_bgram[tile_index*2+1] << 8) | m_bgram[tile_index*2]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0x0fff, (code & 0xf000) >> 12, 0); @@ -345,8 +344,7 @@ TILE_GET_INFO_MEMBER(ppmast93_state::get_ppmast93_bg_tile_info) TILE_GET_INFO_MEMBER(ppmast93_state::get_ppmast93_fg_tile_info) { int code = (m_fgram[tile_index*2+1] << 8) | m_fgram[tile_index*2]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x0fff)+0x1000, (code & 0xf000) >> 12, 0); @@ -354,8 +352,8 @@ TILE_GET_INFO_MEMBER(ppmast93_state::get_ppmast93_fg_tile_info) void ppmast93_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ppmast93_state::get_ppmast93_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ppmast93_state::get_ppmast93_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ppmast93_state::get_ppmast93_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ppmast93_state::get_ppmast93_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index 446efdf503c..e58f0af51d9 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -147,7 +147,7 @@ TILE_GET_INFO_MEMBER(pturn_state::get_pturn_tile_info) tileno=tile_lookup[tileno>>4]|(tileno&0xf)|(m_fgbank<<8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,m_fgpalette,0); + SET_TILE_INFO_MEMBER(0,tileno,m_fgpalette,0); } @@ -161,14 +161,14 @@ TILE_GET_INFO_MEMBER(pturn_state::get_pturn_bg_tile_info) { palno=25; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno+m_bgbank*256,palno,0); + SET_TILE_INFO_MEMBER(1,tileno+m_bgbank*256,palno,0); } void pturn_state::video_start() { - m_fgmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pturn_state::get_pturn_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,32,32); + m_fgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pturn_state::get_pturn_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,32,32); m_fgmap->set_transparent_pen(0); - m_bgmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pturn_state::get_pturn_bg_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,32,32*8); + m_bgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pturn_state::get_pturn_bg_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,32,32*8); m_bgmap->set_transparent_pen(0); } diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index 6788793f42f..568f1ee9442 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -82,7 +82,7 @@ TILE_GET_INFO_MEMBER(pzletime_state::get_mid_tile_info) int tileno = m_mid_videoram[tile_index] & 0x0fff; int colour = m_mid_videoram[tile_index] & 0xf000; colour = colour >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tileno, colour, 0); + SET_TILE_INFO_MEMBER(2, tileno, colour, 0); } TILE_GET_INFO_MEMBER(pzletime_state::get_txt_tile_info) @@ -91,15 +91,15 @@ TILE_GET_INFO_MEMBER(pzletime_state::get_txt_tile_info) int colour = m_txt_videoram[tile_index] & 0xf000; colour = colour >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, 0); + SET_TILE_INFO_MEMBER(0, tileno, colour, 0); tileinfo.category = BIT(colour, 3); } void pzletime_state::video_start() { - m_mid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pzletime_state::get_mid_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); - m_txt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pzletime_state::get_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_mid_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pzletime_state::get_mid_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); + m_txt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pzletime_state::get_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_mid_tilemap->set_transparent_pen(0); m_txt_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index 0f01f6e6502..24d56022735 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -133,14 +133,14 @@ public: TILE_GET_INFO_MEMBER(quizpun2_state::get_bg_tile_info) { UINT16 code = m_bg_ram[ tile_index * 2 ] + m_bg_ram[ tile_index * 2 + 1 ] * 256; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } TILE_GET_INFO_MEMBER(quizpun2_state::get_fg_tile_info) { UINT16 code = m_fg_ram[ tile_index * 4 ] + m_fg_ram[ tile_index * 4 + 1 ] * 256; UINT8 color = m_fg_ram[ tile_index * 4 + 2 ]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color & 0x0f, 0); + SET_TILE_INFO_MEMBER(1, code, color & 0x0f, 0); } WRITE8_MEMBER(quizpun2_state::bg_ram_w) @@ -157,8 +157,8 @@ WRITE8_MEMBER(quizpun2_state::fg_ram_w) void quizpun2_state::video_start() { - m_bg_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(quizpun2_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS,8,16,0x20,0x20); - m_fg_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(quizpun2_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,8,16,0x20,0x20); + m_bg_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizpun2_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS,8,16,0x20,0x20); + m_fg_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizpun2_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,8,16,0x20,0x20); m_bg_tmap->set_transparent_pen(0); m_fg_tmap->set_transparent_pen(0); diff --git a/src/mame/drivers/quizshow.c b/src/mame/drivers/quizshow.c index 933d0b37a33..9f8026f9591 100644 --- a/src/mame/drivers/quizshow.c +++ b/src/mame/drivers/quizshow.c @@ -109,12 +109,12 @@ TILE_GET_INFO_MEMBER(quizshow_state::get_tile_info) // d6: blink, d7: invert UINT8 color = (code & (m_blink_state | 0x80)) >> 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x3f, color, 0); + SET_TILE_INFO_MEMBER(0, code & 0x3f, color, 0); } void quizshow_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(quizshow_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 16, 32, 16); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizshow_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 16, 32, 16); } UINT32 quizshow_state::screen_update_quizshow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index bdca4021f38..c3b62acfa9f 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -90,7 +90,7 @@ TILE_GET_INFO_MEMBER(r2dx_v33_state::get_bg_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tile + 0x0000,color,0); + SET_TILE_INFO_MEMBER(1,tile + 0x0000,color,0); } TILE_GET_INFO_MEMBER(r2dx_v33_state::get_md_tile_info) @@ -100,7 +100,7 @@ TILE_GET_INFO_MEMBER(r2dx_v33_state::get_md_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,tile + 0x2000,color,0); + SET_TILE_INFO_MEMBER(2,tile + 0x2000,color,0); } TILE_GET_INFO_MEMBER(r2dx_v33_state::get_fg_tile_info) @@ -110,7 +110,7 @@ TILE_GET_INFO_MEMBER(r2dx_v33_state::get_fg_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3,tile + 0x1000,color,0); + SET_TILE_INFO_MEMBER(3,tile + 0x1000,color,0); } TILE_GET_INFO_MEMBER(r2dx_v33_state::get_tx_tile_info) @@ -120,7 +120,7 @@ TILE_GET_INFO_MEMBER(r2dx_v33_state::get_tx_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4,tile,color,0); + SET_TILE_INFO_MEMBER(4,tile,color,0); } /* copied from Legionnaire */ @@ -211,10 +211,10 @@ void r2dx_v33_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect void r2dx_v33_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(r2dx_v33_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); - m_md_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(r2dx_v33_state::get_md_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(r2dx_v33_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(r2dx_v33_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS,8, 8, 64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(r2dx_v33_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); + m_md_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(r2dx_v33_state::get_md_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(r2dx_v33_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(r2dx_v33_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS,8, 8, 64,32); m_bg_tilemap->set_transparent_pen(15); m_md_tilemap->set_transparent_pen(15); diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index af7efc38e37..412151bce06 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -210,7 +210,7 @@ void rabbit_state::get_rabbit_tilemap_info(tile_data &tileinfo, int tile_index, colour &= 0x0f; colour += 0x20; tileinfo.group = 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 6+tilesize,tileno,colour,TILE_FLIPXY(flipxy)); + SET_TILE_INFO_MEMBER(6+tilesize,tileno,colour,TILE_FLIPXY(flipxy)); } else { @@ -218,7 +218,7 @@ void rabbit_state::get_rabbit_tilemap_info(tile_data &tileinfo, int tile_index, if (cmask) colour&=0x3f; // see health bars colour += 0x200; tileinfo.group = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4+tilesize,tileno,colour,TILE_FLIPXY(flipxy)); + SET_TILE_INFO_MEMBER(4+tilesize,tileno,colour,TILE_FLIPXY(flipxy)); } } @@ -411,10 +411,10 @@ void rabbit_state::video_start() m_tilemap_ram[2] = auto_alloc_array_clear(machine(), UINT32, 0x20000/4); m_tilemap_ram[3] = auto_alloc_array_clear(machine(), UINT32, 0x20000/4); - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rabbit_state::get_rabbit_tilemap0_tile_info),this),TILEMAP_SCAN_ROWS,16, 16, 128,32); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rabbit_state::get_rabbit_tilemap1_tile_info),this),TILEMAP_SCAN_ROWS,16, 16, 128,32); - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rabbit_state::get_rabbit_tilemap2_tile_info),this),TILEMAP_SCAN_ROWS,16, 16, 128,32); - m_tilemap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rabbit_state::get_rabbit_tilemap3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 128,32); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rabbit_state::get_rabbit_tilemap0_tile_info),this),TILEMAP_SCAN_ROWS,16, 16, 128,32); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rabbit_state::get_rabbit_tilemap1_tile_info),this),TILEMAP_SCAN_ROWS,16, 16, 128,32); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rabbit_state::get_rabbit_tilemap2_tile_info),this),TILEMAP_SCAN_ROWS,16, 16, 128,32); + m_tilemap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rabbit_state::get_rabbit_tilemap3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 128,32); /* the tilemaps mix 4bpp and 8bbp tiles, we split these into 2 groups, and set a different transpen for each group */ m_tilemap[0]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 1cfce13ffaa..294124100c0 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -955,7 +955,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_back_tile_info) tile = (tile & 0xfff) | (bg_bank << 12); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tile+0x0000,color,0); + SET_TILE_INFO_MEMBER(1,tile+0x0000,color,0); } TILE_GET_INFO_MEMBER(raiden2_state::get_mid_tile_info) @@ -965,7 +965,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_mid_tile_info) tile = (tile & 0xfff) | (mid_bank << 12); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tile,color,0); + SET_TILE_INFO_MEMBER(1,tile,color,0); } TILE_GET_INFO_MEMBER(raiden2_state::get_fore_tile_info) @@ -975,7 +975,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_fore_tile_info) tile = (tile & 0xfff) | (fg_bank << 12); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tile,color,0); + SET_TILE_INFO_MEMBER(1,tile,color,0); } TILE_GET_INFO_MEMBER(raiden2_state::get_text_tile_info) @@ -985,7 +985,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_text_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } /* VIDEO START (move to video file) */ @@ -993,10 +993,10 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_text_tile_info) VIDEO_START_MEMBER(raiden2_state,raiden2) { - text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden2_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64,32 ); - background_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden2_state::get_back_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); - midground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden2_state::get_mid_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); - foreground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden2_state::get_fore_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); + text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden2_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64,32 ); + background_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden2_state::get_back_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); + midground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden2_state::get_mid_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); + foreground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden2_state::get_fore_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); midground_layer->set_transparent_pen(15); foreground_layer->set_transparent_pen(15); diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index 484903f5612..0e5ba61ee8c 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -275,8 +275,8 @@ static MACHINE_CONFIG_START( relief, relief_state ) MCFG_PALETTE_ADD("palette", 2048) MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(atarigen_state, scanline_int_write_line)) - MCFG_ATARI_VAD_PLAYFIELD(relief_state, get_playfield_tile_info) - MCFG_ATARI_VAD_PLAYFIELD2(relief_state, get_playfield2_tile_info) + MCFG_ATARI_VAD_PLAYFIELD(relief_state, "gfxdecode", get_playfield_tile_info) + MCFG_ATARI_VAD_PLAYFIELD2(relief_state, "gfxdecode", get_playfield2_tile_info) MCFG_ATARI_VAD_MOB(relief_state::s_mob_config, "gfxdecode") MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 17acd3e92e1..02064d6a8ea 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -88,12 +88,12 @@ TILE_GET_INFO_MEMBER(rmhaihai_state::get_bg_tile_info) int code = m_videoram[tile_index] + (m_gfxbank << 12) + ((attr & 0x07) << 8) + ((attr & 0x80) << 4); int color = (m_gfxbank << 5) + (attr >> 3); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void rmhaihai_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rmhaihai_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rmhaihai_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index 5c9c70c8bac..ddd286b7a9c 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -175,7 +175,7 @@ TILE_GET_INFO_MEMBER(safarir_state::get_bg_tile_info) color |= (tile_index & 0xc0) ? 1 : 0; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x7f, color, 0); + SET_TILE_INFO_MEMBER(0, code & 0x7f, color, 0); } @@ -192,14 +192,14 @@ TILE_GET_INFO_MEMBER(safarir_state::get_fg_tile_info) flags = ((tile_index & 0x1f) >= 0x03) ? 0 : TILE_FORCE_LAYER0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code & 0x7f, color, flags); + SET_TILE_INFO_MEMBER(1, code & 0x7f, color, flags); } void safarir_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(safarir_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(safarir_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(safarir_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(safarir_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/sanremo.c b/src/mame/drivers/sanremo.c index 1f565cae981..488553c0f85 100644 --- a/src/mame/drivers/sanremo.c +++ b/src/mame/drivers/sanremo.c @@ -146,12 +146,12 @@ TILE_GET_INFO_MEMBER(sanremo_state::get_sanremo_tile_info) int code = m_videoram[tile_index]; int bank = m_attrram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code + bank * 256, 0, 0); + SET_TILE_INFO_MEMBER(0, code + bank * 256, 0, 0); } void sanremo_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sanremo_state::get_sanremo_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 48, 40); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sanremo_state::get_sanremo_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 48, 40); } diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index 249f2b2fe81..8f170c92841 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -84,7 +84,7 @@ TILE_GET_INFO_MEMBER(sbowling_state::get_sb_tile_info) UINT8 *rom = memregion("user1")->base(); int tileno = rom[tile_index + m_bgmap * 1024]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, 0, 0); + SET_TILE_INFO_MEMBER(0, tileno, 0, 0); } static void plot_pixel_sbw(bitmap_ind16 *tmpbitmap, int x, int y, int col, int flip) @@ -131,7 +131,7 @@ UINT32 sbowling_state::screen_update_sbowling(screen_device &screen, bitmap_ind1 void sbowling_state::video_start() { m_tmpbitmap = auto_bitmap_ind16_alloc(machine(),32*8,32*8); - m_sb_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sbowling_state::get_sb_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_sb_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sbowling_state::get_sb_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } WRITE8_MEMBER(sbowling_state::pix_shift_w) diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index c874b9a35ad..a81b50771db 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -313,13 +313,13 @@ TILE_GET_INFO_MEMBER(sbrkout_state::get_bg_tile_info) { UINT8 *videoram = m_videoram; int code = (videoram[tile_index] & 0x80) ? videoram[tile_index] : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void sbrkout_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sbrkout_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sbrkout_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c index 885b38ae388..33bc0b3466a 100644 --- a/src/mame/drivers/seabattl.c +++ b/src/mame/drivers/seabattl.c @@ -134,7 +134,7 @@ TILE_GET_INFO_MEMBER(seabattl_state::get_bg_tile_info) int code = m_videoram[tile_index]; int color = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, (color & 0x7), 0); + SET_TILE_INFO_MEMBER(1, code, (color & 0x7), 0); } WRITE8_MEMBER(seabattl_state::seabattl_videoram_w) @@ -232,7 +232,7 @@ UINT32 seabattl_state::screen_update_seabattl(screen_device &screen, bitmap_ind1 void seabattl_state::video_start() { m_screen->register_screen_bitmap(m_collision_bg); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seabattl_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seabattl_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scrolldx(-12, 0); } diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c index 82c93a42f23..fe593455206 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -220,28 +220,28 @@ TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc0_tile_info ) int tile = m_sc0_vram[tile_index] & 0xfff; int color = (m_sc0_vram[tile_index] >> 12) & 0x0f; // tile+=(m_seibucrtc_sc0bank<<12); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color, 0); + SET_TILE_INFO_MEMBER(1, tile, color, 0); } TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc2_tile_info ) { int tile = m_sc2_vram[tile_index] & 0xfff; int color = (m_sc2_vram[tile_index] >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tile, color, 0); + SET_TILE_INFO_MEMBER(2, tile, color, 0); } TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc1_tile_info ) { int tile = m_sc1_vram[tile_index] & 0xfff; int color = (m_sc1_vram[tile_index] >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tile, color, 0); + SET_TILE_INFO_MEMBER(3, tile, color, 0); } TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc3_tile_info ) { int tile = m_sc3_vram[tile_index] & 0xfff; int color = (m_sc3_vram[tile_index] >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4, tile, color, 0); + SET_TILE_INFO_MEMBER(4, tile, color, 0); } void sengokmj_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int pri) @@ -286,10 +286,10 @@ void sengokmj_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap void sengokmj_state::video_start() { - m_sc0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sengokmj_state::seibucrtc_sc0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_sc2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sengokmj_state::seibucrtc_sc2_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_sc1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sengokmj_state::seibucrtc_sc1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_sc3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sengokmj_state::seibucrtc_sc3_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_sc0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sengokmj_state::seibucrtc_sc0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_sc2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sengokmj_state::seibucrtc_sc2_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_sc1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sengokmj_state::seibucrtc_sc1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_sc3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sengokmj_state::seibucrtc_sc3_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_sc2_tilemap->set_transparent_pen(15); m_sc1_tilemap->set_transparent_pen(15); diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index e5651310233..dcd938b2ad5 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -785,8 +785,7 @@ TILE_GET_INFO_MEMBER(sfbonus_state::get_sfbonus_tile_info) int flipx = (m_tilemap_ram[(tile_index*2)+1] & 0x80)>>7; int flipy = (m_tilemap_ram[(tile_index*2)+1] & 0x40)>>5; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, 0, TILE_FLIPYX(flipx | flipy)); @@ -800,8 +799,7 @@ TILE_GET_INFO_MEMBER(sfbonus_state::get_sfbonus_reel_tile_info) int priority = (m_reel_ram[(tile_index*2)+1] & 0x40)>>6; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, priority, // colour aboused as priority TILE_FLIPYX(flipx | flipy)); @@ -815,8 +813,7 @@ TILE_GET_INFO_MEMBER(sfbonus_state::get_sfbonus_reel2_tile_info) int priority = (m_reel2_ram[(tile_index*2)+1] & 0x40)>>6; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, priority, // colour abused as priority TILE_FLIPYX(flipx | flipy)); @@ -830,8 +827,7 @@ TILE_GET_INFO_MEMBER(sfbonus_state::get_sfbonus_reel3_tile_info) int priority = (m_reel3_ram[(tile_index*2)+1] & 0x40)>>6; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, priority, // colour abused as priority TILE_FLIPYX(flipx | flipy)); @@ -845,8 +841,7 @@ TILE_GET_INFO_MEMBER(sfbonus_state::get_sfbonus_reel4_tile_info) int priority = (m_reel4_ram[(tile_index*2)+1] & 0x40)>>6; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, priority, // colour abused as priority TILE_FLIPYX(flipx | flipy)); @@ -908,11 +903,11 @@ void sfbonus_state::video_start() { m_temp_reel_bitmap = auto_bitmap_ind16_alloc(machine(),1024,512); - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 128, 64); - m_reel_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_reel_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 16); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 16); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 16); - m_reel4_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_reel4_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 16); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 128, 64); + m_reel_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_reel_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 16); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 16); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 16); + m_reel4_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sfbonus_state::get_sfbonus_reel4_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 16); m_tilemap->set_transparent_pen(0); m_reel_tilemap->set_transparent_pen(255); diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c index eea602c2328..e635e9a44ac 100644 --- a/src/mame/drivers/shuuz.c +++ b/src/mame/drivers/shuuz.c @@ -236,7 +236,7 @@ static MACHINE_CONFIG_START( shuuz, shuuz_state ) MCFG_PALETTE_ADD("palette", 1024) MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(atarigen_state, scanline_int_write_line)) - MCFG_ATARI_VAD_PLAYFIELD(shuuz_state, get_playfield_tile_info) + MCFG_ATARI_VAD_PLAYFIELD(shuuz_state, "gfxdecode", get_playfield_tile_info) MCFG_ATARI_VAD_MOB(shuuz_state::s_mob_config, "gfxdecode") MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/silvmil.c b/src/mame/drivers/silvmil.c index 2627fe0e8ad..1aa027bd3d4 100644 --- a/src/mame/drivers/silvmil.c +++ b/src/mame/drivers/silvmil.c @@ -126,7 +126,7 @@ TILE_GET_INFO_MEMBER(silvmil_state::get_bg_tile_info) int color = (data >> 12) & 0x0f; int bank = m_silvmil_tilebank[(data&0xc00)>>10]*0x400; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile + bank, color + 0x20, 0); + SET_TILE_INFO_MEMBER(1, tile + bank, color + 0x20, 0); } TILE_GET_INFO_MEMBER(silvmil_state::get_fg_tile_info) @@ -136,7 +136,7 @@ TILE_GET_INFO_MEMBER(silvmil_state::get_fg_tile_info) int color = (data >> 12) & 0x0f; int bank = m_silvmil_tilebank[(data&0xc00)>>10]*0x400; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile + bank, color + 0x10, 0); + SET_TILE_INFO_MEMBER(1, tile + bank, color + 0x10, 0); } TILEMAP_MAPPER_MEMBER(silvmil_state::deco16_scan_rows) @@ -147,8 +147,8 @@ TILEMAP_MAPPER_MEMBER(silvmil_state::deco16_scan_rows) void silvmil_state::video_start() { - m_bg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(silvmil_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(silvmil_state::deco16_scan_rows),this), 16, 16, 64, 32); - m_fg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(silvmil_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(silvmil_state::deco16_scan_rows),this), 16, 16, 64, 32); + m_bg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(silvmil_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(silvmil_state::deco16_scan_rows),this), 16, 16, 64, 32); + m_fg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(silvmil_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(silvmil_state::deco16_scan_rows),this), 16, 16, 64, 32); m_fg_layer->set_transparent_pen(0); } diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c index c20722386e9..c0ae0d3348b 100644 --- a/src/mame/drivers/skullxbo.c +++ b/src/mame/drivers/skullxbo.c @@ -237,8 +237,8 @@ static MACHINE_CONFIG_START( skullxbo, skullxbo_state ) MCFG_GFXDECODE_ADD("gfxdecode", skullxbo) MCFG_PALETTE_ADD("palette", 2048) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, skullxbo_state, get_playfield_tile_info, 16,8, SCAN_COLS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, skullxbo_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, skullxbo_state, get_playfield_tile_info, 16,8, SCAN_COLS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, skullxbo_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", skullxbo_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 9626772e361..3e23973f74e 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -78,7 +78,7 @@ TILE_GET_INFO_MEMBER(skyarmy_state::get_skyarmy_tile_info) int code = m_videoram[tile_index]; int attr = BITSWAP8(m_colorram[tile_index], 7, 6, 5, 4, 3, 0, 1, 2) & 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, attr, 0); + SET_TILE_INFO_MEMBER(0, code, attr, 0); } WRITE8_MEMBER(skyarmy_state::skyarmy_videoram_w) @@ -124,7 +124,7 @@ PALETTE_INIT_MEMBER(skyarmy_state, skyarmy) void skyarmy_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skyarmy_state::get_skyarmy_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skyarmy_state::get_skyarmy_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tilemap->set_scroll_cols(32); } diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index addae78d9da..5db90f06cf9 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -192,7 +192,7 @@ WRITE8_MEMBER(skylncr_state::skylncr_colorram_w) TILE_GET_INFO_MEMBER(skylncr_state::get_tile_info) { UINT16 code = m_videoram[ tile_index ] + (m_colorram[ tile_index ] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, TILE_FLIPYX( 0 )); + SET_TILE_INFO_MEMBER(0, code, 0, TILE_FLIPYX( 0 )); } TILE_GET_INFO_MEMBER(skylncr_state::get_reel_1_tile_info) @@ -201,36 +201,36 @@ TILE_GET_INFO_MEMBER(skylncr_state::get_reel_1_tile_info) UINT16 code = m_reeltiles_1_ram[ tile_index ] + (m_reeltileshigh_1_ram[ tile_index ] << 8); // if (code > 0x200) // bank = 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, 0, TILE_FLIPYX( 0 )); + SET_TILE_INFO_MEMBER(bank, code, 0, TILE_FLIPYX( 0 )); } TILE_GET_INFO_MEMBER(skylncr_state::get_reel_2_tile_info) { UINT16 code = m_reeltiles_2_ram[ tile_index ] + (m_reeltileshigh_2_ram[ tile_index ] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, TILE_FLIPYX( 0 )); + SET_TILE_INFO_MEMBER(1, code, 0, TILE_FLIPYX( 0 )); } TILE_GET_INFO_MEMBER(skylncr_state::get_reel_3_tile_info) { UINT16 code = m_reeltiles_3_ram[ tile_index ] + (m_reeltileshigh_3_ram[ tile_index ] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, TILE_FLIPYX( 0 )); + SET_TILE_INFO_MEMBER(1, code, 0, TILE_FLIPYX( 0 )); } TILE_GET_INFO_MEMBER(skylncr_state::get_reel_4_tile_info) { UINT16 code = m_reeltiles_4_ram[ tile_index ] + (m_reeltileshigh_4_ram[ tile_index ] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, TILE_FLIPYX( 0 )); + SET_TILE_INFO_MEMBER(1, code, 0, TILE_FLIPYX( 0 )); } void skylncr_state::video_start() { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skylncr_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20 ); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skylncr_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20 ); - m_reel_1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); - m_reel_2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); - m_reel_3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); - m_reel_4_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_4_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); + m_reel_1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); + m_reel_2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); + m_reel_3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); + m_reel_4_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_4_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); m_reel_2_tilemap->set_scroll_cols(0x40); m_reel_3_tilemap->set_scroll_cols(0x40); diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index f7bf08ec740..49eb99e52b9 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -79,13 +79,13 @@ WRITE8_MEMBER(spoker_state::bg_tile_w) TILE_GET_INFO_MEMBER(spoker_state::get_bg_tile_info) { int code = m_bg_tile_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1 + (tile_index & 3), code & 0xff, 0, 0); + SET_TILE_INFO_MEMBER(1 + (tile_index & 3), code & 0xff, 0, 0); } TILE_GET_INFO_MEMBER(spoker_state::get_fg_tile_info) { int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, (4*(code >> 14)+3), 0); + SET_TILE_INFO_MEMBER(0, code, (4*(code >> 14)+3), 0); } WRITE8_MEMBER(spoker_state::fg_tile_w) @@ -102,8 +102,8 @@ WRITE8_MEMBER(spoker_state::fg_color_w) void spoker_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 128, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spoker_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 128, 8); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spoker_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index 7828aca839a..d8740694835 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -135,8 +135,7 @@ TILE_GET_INFO_MEMBER(spool99_state::get_spool99_tile_info) int code = ((m_vram[tile_index*2+1]<<8) | (m_vram[tile_index*2+0])); int color = m_cram[tile_index*2+0]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0x3fff, color & 0x1f, 0); @@ -144,7 +143,7 @@ TILE_GET_INFO_MEMBER(spool99_state::get_spool99_tile_info) void spool99_state::video_start() { - m_sc0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spool99_state::get_spool99_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_sc0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spool99_state::get_spool99_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } UINT32 spool99_state::screen_update_spool99(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/sshot.c b/src/mame/drivers/sshot.c index 423204a2fb6..013becbde53 100644 --- a/src/mame/drivers/sshot.c +++ b/src/mame/drivers/sshot.c @@ -197,12 +197,12 @@ public: TILE_GET_INFO_MEMBER(supershot_state::get_supershot_text_tile_info) { UINT8 code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void supershot_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supershot_state::get_supershot_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supershot_state::get_supershot_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 supershot_state::screen_update_supershot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index 0809a44230a..e5d35eb0ef2 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -140,7 +140,7 @@ TILE_GET_INFO_MEMBER(statriv2_state::horizontal_tile_info) int code = videoram[0x400+tile_index]; int attr = videoram[tile_index] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, attr, 0); + SET_TILE_INFO_MEMBER(0, code, attr, 0); } TILE_GET_INFO_MEMBER(statriv2_state::vertical_tile_info) @@ -149,7 +149,7 @@ TILE_GET_INFO_MEMBER(statriv2_state::vertical_tile_info) int code = videoram[0x400+tile_index]; int attr = videoram[tile_index] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, ((code & 0x7f) << 1) | ((code & 0x80) >> 7), attr, 0); + SET_TILE_INFO_MEMBER(0, ((code & 0x7f) << 1) | ((code & 0x80) >> 7), attr, 0); } @@ -173,12 +173,12 @@ PALETTE_INIT_MEMBER(statriv2_state, statriv2) void statriv2_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(statriv2_state::horizontal_tile_info),this) ,TILEMAP_SCAN_ROWS, 8,15, 64,16); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(statriv2_state::horizontal_tile_info),this) ,TILEMAP_SCAN_ROWS, 8,15, 64,16); } VIDEO_START_MEMBER(statriv2_state,vertical) { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(statriv2_state::vertical_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(statriv2_state::vertical_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); } diff --git a/src/mame/drivers/stuntair.c b/src/mame/drivers/stuntair.c index ac29e2fea7e..96f322562b9 100644 --- a/src/mame/drivers/stuntair.c +++ b/src/mame/drivers/stuntair.c @@ -171,7 +171,7 @@ TILE_GET_INFO_MEMBER(stuntair_state::get_stuntair_fg_tile_info) // where does the FG palette come from? it's a 1bpp layer.. - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno&0x7f, 0, opaque?TILE_FORCE_LAYER0 : TILE_FORCE_LAYER1); + SET_TILE_INFO_MEMBER(0, tileno&0x7f, 0, opaque?TILE_FORCE_LAYER0 : TILE_FORCE_LAYER1); } TILE_GET_INFO_MEMBER(stuntair_state::get_stuntair_bg_tile_info) @@ -180,16 +180,16 @@ TILE_GET_INFO_MEMBER(stuntair_state::get_stuntair_bg_tile_info) tileno |= (m_bgattrram[tile_index] & 0x08)<<5; int colour = (m_bgattrram[tile_index] & 0x07); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, colour, 0); + SET_TILE_INFO_MEMBER(1, tileno, colour, 0); } void stuntair_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stuntair_state::get_stuntair_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stuntair_state::get_stuntair_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stuntair_state::get_stuntair_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stuntair_state::get_stuntair_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 44e103a7930..e4201cbae75 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -365,20 +365,20 @@ TILE_GET_INFO_MEMBER(subsino_state::get_tile_info) UINT16 color = (code >> 8) & 0x0f; code = ((code & 0xf000) >> 4) + ((code & 0xff) >> 0); code += m_tiles_offset; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(subsino_state::get_stisub_tile_info) { UINT16 code = m_videoram[ tile_index ] + (m_colorram[ tile_index ] << 8); code&= 0x3fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } VIDEO_START_MEMBER(subsino_state,subsino) { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(subsino_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 0x40,0x20 ); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 0x40,0x20 ); m_tmap->set_transparent_pen(0 ); m_tiles_offset = 0; } @@ -396,8 +396,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_subsino_reel1_tile_info) int code = m_reel1_ram[tile_index]; int colour = (m_out_c&0x7) + 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, colour, 0); @@ -408,8 +407,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_stisub_reel1_tile_info) int code = m_reel1_ram[tile_index]; int attr = m_reel1_attr[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code | (attr << 8), 0, 0); @@ -427,8 +425,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_subsino_reel2_tile_info) int code = m_reel2_ram[tile_index]; int colour = (m_out_c&0x7) + 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, colour, 0); @@ -439,8 +436,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_stisub_reel2_tile_info) int code = m_reel2_ram[tile_index]; int attr = m_reel2_attr[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code | (attr << 8), 0, 0); @@ -457,8 +453,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_subsino_reel3_tile_info) int code = m_reel3_ram[tile_index]; int colour = (m_out_c&0x7) + 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, colour, 0); @@ -469,8 +464,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_stisub_reel3_tile_info) int code = m_reel3_ram[tile_index]; int attr = m_reel3_attr[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code | (attr << 8), 0, 0); @@ -481,9 +475,9 @@ VIDEO_START_MEMBER(subsino_state,subsino_reels) { VIDEO_START_CALL_MEMBER( subsino ); - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(subsino_state::get_subsino_reel1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(subsino_state::get_subsino_reel2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(subsino_state::get_subsino_reel3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_subsino_reel1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_subsino_reel2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_subsino_reel3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); m_reel2_tilemap->set_scroll_cols(64); @@ -493,12 +487,12 @@ VIDEO_START_MEMBER(subsino_state,subsino_reels) VIDEO_START_MEMBER(subsino_state,stisub) { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(subsino_state::get_stisub_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 0x40,0x20 ); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_stisub_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 0x40,0x20 ); m_tmap->set_transparent_pen(0 ); - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(subsino_state::get_stisub_reel1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(subsino_state::get_stisub_reel2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(subsino_state::get_stisub_reel3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_stisub_reel1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_stisub_reel2_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_stisub_reel3_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); m_reel2_tilemap->set_scroll_cols(64); diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c index 50edaa05411..3be3431ffa0 100644 --- a/src/mame/drivers/subsino2.c +++ b/src/mame/drivers/subsino2.c @@ -194,7 +194,7 @@ inline void subsino2_state::ss9601_get_tile_info(layer_t *l, tile_data &tileinfo case TILE_8x32: addr = tile_index & (~0x180); offs = (tile_index/0x80) & 3; break; case TILE_64x32: addr = tile_index & (~0x187); offs = ((tile_index/0x80) & 3) + (tile_index & 7) * 4; break; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, (l->videorams[VRAM_HI][addr] << 8) + l->videorams[VRAM_LO][addr] + offs, 0, 0); + SET_TILE_INFO_MEMBER(0, (l->videorams[VRAM_HI][addr] << 8) + l->videorams[VRAM_LO][addr] + offs, 0, 0); } // Layer 0 @@ -590,7 +590,10 @@ VIDEO_START_MEMBER(subsino2_state,subsino2) { layer_t *l = &m_layers[i]; - l->tmap = &machine().tilemap().create(i ? tilemap_get_info_delegate(FUNC(subsino2_state::ss9601_get_tile_info_1),this) : tilemap_get_info_delegate(FUNC(subsino2_state::ss9601_get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8,8, 0x80,0x40); + l->tmap = &machine().tilemap().create(m_gfxdecode, i ? + tilemap_get_info_delegate(FUNC(subsino2_state::ss9601_get_tile_info_1),this) : + tilemap_get_info_delegate(FUNC(subsino2_state::ss9601_get_tile_info_0),this), + TILEMAP_SCAN_ROWS, 8,8, 0x80,0x40); l->tmap->set_transparent_pen(0); diff --git a/src/mame/drivers/supercrd.c b/src/mame/drivers/supercrd.c index cbb793dbf88..5392d693e9a 100644 --- a/src/mame/drivers/supercrd.c +++ b/src/mame/drivers/supercrd.c @@ -260,13 +260,13 @@ TILE_GET_INFO_MEMBER(supercrd_state::get_bg_tile_info) int code = attr & 0xfff; int color = m_colorram[offs] >> 4; // 4 bits for color. - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(supercrd_state, supercrd) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supercrd_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 29); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supercrd_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 29); } diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 763e6c08d4f..6f4f7a07230 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -65,12 +65,12 @@ TILE_GET_INFO_MEMBER(superdq_state::get_tile_info) { int tile = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, m_color_bank, 0); + SET_TILE_INFO_MEMBER(0, tile, m_color_bank, 0); } void superdq_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(superdq_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(superdq_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 superdq_state::screen_update_superdq(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c index 07e9192e05b..6417f7f41f6 100644 --- a/src/mame/drivers/superwng.c +++ b/src/mame/drivers/superwng.c @@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(superwng_state::get_bg_tile_info) int flipx=(attr&0x80) ? TILE_FLIPX : 0; int flipy=(attr&0x80) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, attr & 0xf, flipx|flipy); + SET_TILE_INFO_MEMBER(0, code, attr & 0xf, flipx|flipy); } TILE_GET_INFO_MEMBER(superwng_state::get_fg_tile_info) @@ -108,13 +108,13 @@ TILE_GET_INFO_MEMBER(superwng_state::get_fg_tile_info) int flipx=(attr&0x80) ? TILE_FLIPX : 0; int flipy=(attr&0x80) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, attr & 0xf, flipx|flipy); + SET_TILE_INFO_MEMBER(0, code, attr & 0xf, flipx|flipy); } void superwng_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(superwng_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(superwng_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(superwng_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(superwng_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scrollx(0, 64); } diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 4f7c691a273..9cf9125b656 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -88,8 +88,7 @@ TILE_GET_INFO_MEMBER(suprgolf_state::get_tile_info) int code = m_videoram[tile_index*2]+256*(m_videoram[tile_index*2+1]); int color = m_videoram[tile_index*2+0x800] & 0x7f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, 0); @@ -97,7 +96,7 @@ TILE_GET_INFO_MEMBER(suprgolf_state::get_tile_info) void suprgolf_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprgolf_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprgolf_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); m_paletteram = auto_alloc_array(machine(), UINT8, 0x1000); m_bg_vram = auto_alloc_array(machine(), UINT8, 0x2000*0x20); m_bg_fb = auto_alloc_array(machine(), UINT16, 0x2000*0x20); diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index 15a0ee0b097..2d3e2584806 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -56,8 +56,7 @@ TILE_GET_INFO_MEMBER(tattack_state::get_tile_info) color>>=1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, 0); @@ -72,7 +71,7 @@ UINT32 tattack_state::screen_update_tattack(screen_device &screen, bitmap_ind16 void tattack_state::video_start() { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tattack_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tattack_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); } static ADDRESS_MAP_START( mem, AS_PROGRAM, 8, tattack_state ) diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index 0eefdeeb3e1..35cb4f69dc2 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -267,9 +267,9 @@ static MACHINE_CONFIG_START( thunderj, thunderj_state ) MCFG_PALETTE_ADD("palette", 2048) MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(atarigen_state, scanline_int_write_line)) - MCFG_ATARI_VAD_PLAYFIELD(thunderj_state, get_playfield_tile_info) - MCFG_ATARI_VAD_PLAYFIELD2(thunderj_state, get_playfield2_tile_info) - MCFG_ATARI_VAD_ALPHA(thunderj_state, get_alpha_tile_info) + MCFG_ATARI_VAD_PLAYFIELD(thunderj_state, "gfxdecode", get_playfield_tile_info) + MCFG_ATARI_VAD_PLAYFIELD2(thunderj_state, "gfxdecode", get_playfield2_tile_info) + MCFG_ATARI_VAD_ALPHA(thunderj_state, "gfxdecode", get_alpha_tile_info) MCFG_ATARI_VAD_MOB(thunderj_state::s_mob_config, "gfxdecode") MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/tmspoker.c b/src/mame/drivers/tmspoker.c index e57f50136ef..fffa3b5ddd4 100644 --- a/src/mame/drivers/tmspoker.c +++ b/src/mame/drivers/tmspoker.c @@ -262,12 +262,12 @@ TILE_GET_INFO_MEMBER(tmspoker_state::get_bg_tile_info) */ int code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0 /* bank */, code, 0 /* color */, 0); + SET_TILE_INFO_MEMBER(0 /* bank */, code, 0 /* color */, 0); } void tmspoker_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tmspoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tmspoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 tmspoker_state::screen_update_tmspoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c index 4e65ff2e20c..e63b330a00f 100644 --- a/src/mame/drivers/toobin.c +++ b/src/mame/drivers/toobin.c @@ -206,8 +206,8 @@ static MACHINE_CONFIG_START( toobin, toobin_state ) MCFG_WATCHDOG_VBLANK_INIT(8) /* video hardware */ - MCFG_TILEMAP_ADD_STANDARD("playfield", 4, toobin_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 128,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, toobin_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,48, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 4, toobin_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 128,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, toobin_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,48, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", toobin_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index ede9a92ad19..68da02c8dee 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -308,14 +308,14 @@ TILE_GET_INFO_MEMBER(trvmadns_state::get_bg_tile_info) //0x20? tile transparent pen 1? //0x40? tile transparent pen 1? - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,flag); + SET_TILE_INFO_MEMBER(0,tile,color,flag); tileinfo.category = (attr & 0x20)>>5; } void trvmadns_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(trvmadns_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(trvmadns_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); // fg_tilemap->set_transparent_pen(1); diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c index b53e6c8cc93..0ac6fcb7675 100644 --- a/src/mame/drivers/umipoker.c +++ b/src/mame/drivers/umipoker.c @@ -83,8 +83,7 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_0) int tile = m_vram_0[tile_index*2+0]; int color = m_vram_0[tile_index*2+1] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -95,8 +94,7 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_1) int tile = m_vram_1[tile_index*2+0]; int color = m_vram_1[tile_index*2+1] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -107,8 +105,7 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_2) int tile = m_vram_2[tile_index*2+0]; int color = m_vram_2[tile_index*2+1] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -119,8 +116,7 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_3) int tile = m_vram_3[tile_index*2+0]; int color = m_vram_3[tile_index*2+1] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -128,10 +124,10 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_3) void umipoker_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_0),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_1),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_2),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_tilemap_3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_3),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_0),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_1),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_2),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_tilemap_3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_3),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_tilemap_0->set_transparent_pen(0); m_tilemap_1->set_transparent_pen(0); diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index 18ab48e062f..4f49bc8a9fb 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -515,18 +515,18 @@ TILE_GET_INFO_MEMBER(videopkr_state::get_bg_tile_info) int attr = m_color_ram[offs] + ioport("IN2")->read(); /* Color Switch Action */ int code = m_video_ram[offs]; int color = attr; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void videopkr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(videopkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(videopkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } VIDEO_START_MEMBER(videopkr_state,vidadcba) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(videopkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(videopkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); } diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c index dde8dd6f5b3..a920c7704f7 100644 --- a/src/mame/drivers/vindictr.c +++ b/src/mame/drivers/vindictr.c @@ -192,8 +192,8 @@ static MACHINE_CONFIG_START( vindictr, vindictr_state ) MCFG_GFXDECODE_ADD("gfxdecode", vindictr) MCFG_PALETTE_ADD("palette", 2048*8) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, vindictr_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, vindictr_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, vindictr_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, vindictr_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", vindictr_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/vlc.c b/src/mame/drivers/vlc.c index cb2aa7ff8e2..52adf17fa46 100644 --- a/src/mame/drivers/vlc.c +++ b/src/mame/drivers/vlc.c @@ -286,7 +286,7 @@ static TILE_GET_INFO_MEMBER( nevada_state::get_bg_tile_info ) int bank = (attr & 0x02) >> 1; int color = (attr & 0x3c) >> 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } */ diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 84820a6eb49..3c46e8b12b6 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -113,12 +113,12 @@ TILE_GET_INFO_MEMBER(vroulet_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void vroulet_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(vroulet_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(vroulet_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index 22255637cff..cf1e4dfa1f0 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -151,12 +151,12 @@ WRITE8_MEMBER(wallc_state::wallc_videoram_w) TILE_GET_INFO_MEMBER(wallc_state::get_bg_tile_info) { UINT8 *videoram = m_videoram; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, videoram[tile_index] + 0x100, 1, 0); + SET_TILE_INFO_MEMBER(0, videoram[tile_index] + 0x100, 1, 0); } void wallc_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wallc_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wallc_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); } UINT32 wallc_state::screen_update_wallc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/warpsped.c b/src/mame/drivers/warpsped.c index 7a0c788de7a..2842beb373b 100644 --- a/src/mame/drivers/warpsped.c +++ b/src/mame/drivers/warpsped.c @@ -121,7 +121,7 @@ WRITE8_MEMBER(warpspeed_state::warpspeed_hardware_w) TILE_GET_INFO_MEMBER(warpspeed_state::get_warpspeed_text_tile_info) { UINT8 code = m_videoram[tile_index] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } TILE_GET_INFO_MEMBER(warpspeed_state::get_warpspeed_starfield_tile_info) @@ -131,7 +131,7 @@ TILE_GET_INFO_MEMBER(warpspeed_state::get_warpspeed_starfield_tile_info) { code = memregion("starfield")->base()[tile_index >> 1] & 0x3f; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, 0); + SET_TILE_INFO_MEMBER(1, code, 0, 0); } WRITE8_MEMBER(warpspeed_state::warpspeed_vidram_w) @@ -142,9 +142,9 @@ WRITE8_MEMBER(warpspeed_state::warpspeed_vidram_w) void warpspeed_state::video_start() { - m_text_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(warpspeed_state::get_warpspeed_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_text_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(warpspeed_state::get_warpspeed_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_text_tilemap->set_transparent_pen(0); - m_starfield_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(warpspeed_state::get_warpspeed_starfield_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_starfield_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(warpspeed_state::get_warpspeed_starfield_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_starfield_tilemap->mark_all_dirty(); } diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index 746f9a05816..889dfc800c5 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -65,12 +65,12 @@ TILE_GET_INFO_MEMBER(wink_state::get_bg_tile_info) code |= 0x100; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void wink_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wink_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wink_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 wink_state::screen_update_wink(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 533c32bd280..3d9e0ab325c 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -304,8 +304,7 @@ TILE_GET_INFO_MEMBER(witch_state::get_gfx0b_tile_info) code=0; } - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, //tiles beyond 0x7ff only for sprites? color & 0x0f, 0); @@ -323,8 +322,7 @@ TILE_GET_INFO_MEMBER(witch_state::get_gfx0a_tile_info) code=0; } - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code,//tiles beyond 0x7ff only for sprites? color & 0x0f, 0); @@ -335,8 +333,7 @@ TILE_GET_INFO_MEMBER(witch_state::get_gfx1_tile_info) int code = m_gfx1_vram[tile_index]; int color = m_gfx1_cram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code | ((color & 0xf0) << 4), (color>>0) & 0x0f, 0); @@ -756,9 +753,9 @@ GFXDECODE_END void witch_state::video_start() { - m_gfx0a_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(witch_state::get_gfx0a_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); - m_gfx0b_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(witch_state::get_gfx0b_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); - m_gfx1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(witch_state::get_gfx1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_gfx0a_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(witch_state::get_gfx0a_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_gfx0b_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(witch_state::get_gfx0b_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_gfx1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(witch_state::get_gfx1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_gfx0a_tilemap->set_transparent_pen(0); m_gfx0b_tilemap->set_transparent_pen(0); diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c index 696cbe8ed26..40ad550d0d2 100644 --- a/src/mame/drivers/xybots.c +++ b/src/mame/drivers/xybots.c @@ -194,8 +194,8 @@ static MACHINE_CONFIG_START( xybots, xybots_state ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(IIIIRRRRGGGGBBBB) - MCFG_TILEMAP_ADD_STANDARD("playfield", 2, xybots_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,32) - MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, xybots_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, xybots_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,32) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, xybots_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "screen", xybots_state::s_mob_config) MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode") diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 3e953366ca5..0b23c42f79b 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -45,36 +45,40 @@ MCFG_DEVICE_ADD(_tag, ATARI_VAD, 0) \ MCFG_VIDEO_SET_SCREEN(_screen) \ devcb = &atari_vad_device::static_set_scanline_int_cb(*device, DEVCB2_##_intcb); -#define MCFG_ATARI_VAD_PLAYFIELD(_class, _getinfo) \ + +#define MCFG_ATARI_VAD_PLAYFIELD(_class, _gfxtag, _getinfo) \ { astring fulltag(device->tag(), ":playfield"); device_t *device; \ MCFG_TILEMAP_ADD(fulltag) \ + MCFG_TILEMAP_GFXDECODE("^" _gfxtag) \ MCFG_TILEMAP_BYTES_PER_ENTRY(2) \ MCFG_TILEMAP_INFO_CB_DEVICE(DEVICE_SELF_OWNER, _class, _getinfo) \ MCFG_TILEMAP_TILE_SIZE(8,8) \ MCFG_TILEMAP_LAYOUT_STANDARD(SCAN_COLS, 64,64) } -#define MCFG_ATARI_VAD_PLAYFIELD2(_class, _getinfo) \ +#define MCFG_ATARI_VAD_PLAYFIELD2(_class, _gfxtag, _getinfo) \ { astring fulltag(device->tag(), ":playfield2"); device_t *device; \ MCFG_TILEMAP_ADD(fulltag) \ + MCFG_TILEMAP_GFXDECODE("^" _gfxtag) \ MCFG_TILEMAP_BYTES_PER_ENTRY(2) \ MCFG_TILEMAP_INFO_CB_DEVICE(DEVICE_SELF_OWNER, _class, _getinfo) \ MCFG_TILEMAP_TILE_SIZE(8,8) \ MCFG_TILEMAP_LAYOUT_STANDARD(SCAN_COLS, 64,64) \ MCFG_TILEMAP_TRANSPARENT_PEN(0) } -#define MCFG_ATARI_VAD_ALPHA(_class, _getinfo) \ +#define MCFG_ATARI_VAD_ALPHA(_class, _gfxtag, _getinfo) \ { astring fulltag(device->tag(), ":alpha"); device_t *device; \ MCFG_TILEMAP_ADD(fulltag) \ + MCFG_TILEMAP_GFXDECODE("^" _gfxtag) \ MCFG_TILEMAP_BYTES_PER_ENTRY(2) \ MCFG_TILEMAP_INFO_CB_DEVICE(DEVICE_SELF_OWNER, _class, _getinfo) \ MCFG_TILEMAP_TILE_SIZE(8,8) \ MCFG_TILEMAP_LAYOUT_STANDARD(SCAN_ROWS, 64,32) \ MCFG_TILEMAP_TRANSPARENT_PEN(0) } -#define MCFG_ATARI_VAD_MOB(_config, _gfxdecode) \ +#define MCFG_ATARI_VAD_MOB(_config, _gfxtag) \ { astring fulltag(device->tag(), ":mob"); device_t *device; \ MCFG_ATARI_MOTION_OBJECTS_ADD(fulltag, "^^screen", _config) \ - MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("^" _gfxdecode) } + MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("^" _gfxtag) } diff --git a/src/mame/machine/megacd.c b/src/mame/machine/megacd.c index 43bf1efcfc0..5ca24fff605 100644 --- a/src/mame/machine/megacd.c +++ b/src/mame/machine/megacd.c @@ -858,14 +858,14 @@ TILE_GET_INFO_MEMBER( sega_segacd_device::get_stampmap_16x16_1x1_tile_info ) { int tile_region, tileno; SCD_GET_TILE_INFO_16x16_1x1(tile_region,tileno,(int)tile_index); - SET_TILE_INFO_MEMBER(*m_gfxdecode, tile_region, tileno, 0, 0); + SET_TILE_INFO_MEMBER(tile_region, tileno, 0, 0); } TILE_GET_INFO_MEMBER( sega_segacd_device::get_stampmap_32x32_1x1_tile_info ) { int tile_region, tileno; SCD_GET_TILE_INFO_32x32_1x1(tile_region,tileno,(int)tile_index); - SET_TILE_INFO_MEMBER(*m_gfxdecode, tile_region, tileno, 0, 0); + SET_TILE_INFO_MEMBER(tile_region, tileno, 0, 0); } @@ -873,14 +873,14 @@ TILE_GET_INFO_MEMBER( sega_segacd_device::get_stampmap_16x16_16x16_tile_info ) { int tile_region, tileno; SCD_GET_TILE_INFO_16x16_16x16(tile_region,tileno,(int)tile_index); - SET_TILE_INFO_MEMBER(*m_gfxdecode, tile_region, tileno, 0, 0); + SET_TILE_INFO_MEMBER(tile_region, tileno, 0, 0); } TILE_GET_INFO_MEMBER( sega_segacd_device::get_stampmap_32x32_16x16_tile_info ) { int tile_region, tileno; SCD_GET_TILE_INFO_32x32_16x16(tile_region,tileno,(int)tile_index); - SET_TILE_INFO_MEMBER(*m_gfxdecode, tile_region, tileno, 0, 0); + SET_TILE_INFO_MEMBER(tile_region, tileno, 0, 0); } // non-tilemap functions to get a pixel from a 'tilemap' based on the above, but looking up each pixel, as to avoid the heavy cache bitmap @@ -1628,10 +1628,10 @@ void sega_segacd_device::device_start() m_gfxdecode->set_gfx(14, auto_alloc(machine(), gfx_element(machine(), sega_32x32_r10_f1_layout, (UINT8 *)segacd_dataram, 0, 0))); m_gfxdecode->set_gfx(15, auto_alloc(machine(), gfx_element(machine(), sega_32x32_r01_f1_layout, (UINT8 *)segacd_dataram, 0, 0))); - segacd_stampmap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sega_segacd_device::get_stampmap_16x16_1x1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - segacd_stampmap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sega_segacd_device::get_stampmap_32x32_1x1_tile_info),this), TILEMAP_SCAN_ROWS, 32, 32, 8, 8); - segacd_stampmap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sega_segacd_device::get_stampmap_16x16_16x16_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 256); // 128kb! - segacd_stampmap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sega_segacd_device::get_stampmap_32x32_16x16_tile_info),this), TILEMAP_SCAN_ROWS, 32, 32, 128, 128); // 32kb! + segacd_stampmap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sega_segacd_device::get_stampmap_16x16_1x1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + segacd_stampmap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sega_segacd_device::get_stampmap_32x32_1x1_tile_info),this), TILEMAP_SCAN_ROWS, 32, 32, 8, 8); + segacd_stampmap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sega_segacd_device::get_stampmap_16x16_16x16_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 256); // 128kb! + segacd_stampmap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sega_segacd_device::get_stampmap_32x32_16x16_tile_info),this), TILEMAP_SCAN_ROWS, 32, 32, 128, 128); // 32kb! // todo register save state stuff } diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index d610149e22c..04622921bf8 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -118,8 +118,7 @@ TILE_GET_INFO_MEMBER(_1942_state::get_fg_tile_info) code = m_fg_videoram[tile_index]; color = m_fg_videoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((color & 0x80) << 1), color & 0x3f, 0); @@ -133,8 +132,7 @@ TILE_GET_INFO_MEMBER(_1942_state::get_bg_tile_info) code = m_bg_videoram[tile_index]; color = m_bg_videoram[tile_index + 0x10]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code + ((color & 0x80) << 1), (color & 0x1f) + (0x20 * m_palette_bank), TILE_FLIPYX((color & 0x60) >> 5)); @@ -148,16 +146,16 @@ TILE_GET_INFO_MEMBER(_1942_state::get_bg_tile_info) ***************************************************************************/ void _1942_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_1942_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_1942_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_1942_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_1942_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 16); m_fg_tilemap->set_transparent_pen(0); } void _1942_state::video_start_c1942p() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_1942_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_1942_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_1942_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_1942_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 16); m_fg_tilemap->set_transparent_pen(3); } diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index 8dcb2a3ca1b..fcb77f08bb2 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -168,7 +168,7 @@ TILE_GET_INFO_MEMBER(_1943_state::c1943_get_bg2_tile_info) int color = (attr & 0x3c) >> 2; int flags = TILE_FLIPYX((attr & 0xc0) >> 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, flags); + SET_TILE_INFO_MEMBER(2, code, color, flags); } TILE_GET_INFO_MEMBER(_1943_state::c1943_get_bg_tile_info) @@ -182,7 +182,7 @@ TILE_GET_INFO_MEMBER(_1943_state::c1943_get_bg_tile_info) int flags = TILE_FLIPYX((attr & 0xc0) >> 6); tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(_1943_state::c1943_get_fg_tile_info) @@ -191,14 +191,14 @@ TILE_GET_INFO_MEMBER(_1943_state::c1943_get_fg_tile_info) int code = m_videoram[tile_index] + ((attr & 0xe0) << 3); int color = attr & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void _1943_state::video_start() { - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 2048, 8); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 2048, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 2048, 8); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 2048, 8); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_1943_state::c1943_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(1), 0x0f); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c index cd0803f6a89..a3171bb0d36 100644 --- a/src/mame/video/40love.c +++ b/src/mame/video/40love.c @@ -74,7 +74,7 @@ TILE_GET_INFO_MEMBER(fortyl_state::get_bg_tile_info) code = (code & 0x3f) | tile_l_bank | 0x100; code |= tile_h_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, code, tile_attrib & 0x07, 0); @@ -107,7 +107,7 @@ void fortyl_state::video_start() m_tmp_bitmap1 = auto_bitmap_ind16_alloc(machine(), 256, 256); m_tmp_bitmap2 = auto_bitmap_ind16_alloc(machine(), 256, 256); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fortyl_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fortyl_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_xoffset = 128; // this never changes diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c index 45fbb36a7cc..9377ed92ec4 100644 --- a/src/mame/video/4enraya.c +++ b/src/mame/video/4enraya.c @@ -19,8 +19,7 @@ WRITE8_MEMBER(_4enraya_state::fenraya_videoram_w) TILE_GET_INFO_MEMBER(_4enraya_state::get_tile_info) { int code = m_videoram[tile_index * 2] + (m_videoram[tile_index * 2 + 1] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, 0, 0); @@ -28,7 +27,7 @@ TILE_GET_INFO_MEMBER(_4enraya_state::get_tile_info) void _4enraya_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_4enraya_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(_4enraya_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 _4enraya_state::screen_update_4enraya(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index 7f53e0dbd4d..cb60ded650b 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -24,8 +24,7 @@ TILE_GET_INFO_MEMBER(aeroboto_state::get_tile_info) { UINT8 code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + (m_charbank << 8), m_tilecolor[code], (m_tilecolor[code] >= 0x33) ? 0 : TILE_FORCE_LAYER0); @@ -41,7 +40,7 @@ TILE_GET_INFO_MEMBER(aeroboto_state::get_tile_info) void aeroboto_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aeroboto_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aeroboto_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_rows(64); diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index 28419fed06a..71197053b87 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -11,8 +11,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::get_pspikes_tile_info) { UINT16 code = m_bg1videoram[tile_index]; int bank = (code & 0x1000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x0fff) + (m_gfxbank[bank] << 12), ((code & 0xe000) >> 13) + 8 * m_charpalettebank, 0); @@ -21,8 +20,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::get_pspikes_tile_info) TILE_GET_INFO_MEMBER(aerofgt_state::karatblz_bg1_tile_info) { UINT16 code = m_bg1videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x1fff) + (m_gfxbank[0] << 13), (code & 0xe000) >> 13, 0); @@ -32,8 +30,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::karatblz_bg1_tile_info) TILE_GET_INFO_MEMBER(aerofgt_state::karatblz_bg2_tile_info) { UINT16 code = m_bg2videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code & 0x1fff) + (m_gfxbank[1] << 13), (code & 0xe000) >> 13, 0); @@ -42,8 +39,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::karatblz_bg2_tile_info) TILE_GET_INFO_MEMBER(aerofgt_state::spinlbrk_bg1_tile_info) { UINT16 code = m_bg1videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x0fff) + (m_gfxbank[0] << 12), (code & 0xf000) >> 12, 0); @@ -53,8 +49,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::get_bg1_tile_info) { UINT16 code = m_bg1videoram[tile_index]; int bank = (code & 0x1800) >> 11; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x07ff) + (m_gfxbank[bank] << 11), (code & 0xe000) >> 13, 0); @@ -64,8 +59,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::get_bg2_tile_info) { UINT16 code = m_bg2videoram[tile_index]; int bank = 4 + ((code & 0x1800) >> 11); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code & 0x07ff) + (m_gfxbank[bank] << 11), (code & 0xe000) >> 13, 0); @@ -94,7 +88,7 @@ void aerofgt_state::aerofgt_register_state_globals( ) VIDEO_START_MEMBER(aerofgt_state,pspikes) { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); /* no bg2 in this game */ m_sprite_gfx = 1; @@ -106,8 +100,8 @@ VIDEO_START_MEMBER(aerofgt_state,pspikes) VIDEO_START_MEMBER(aerofgt_state,karatblz) { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg1_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,64); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg1_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,64); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_bg2_tilemap->set_transparent_pen(15); m_spritepalettebank = 0; @@ -118,8 +112,8 @@ VIDEO_START_MEMBER(aerofgt_state,karatblz) VIDEO_START_MEMBER(aerofgt_state,spinlbrk) { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::spinlbrk_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::spinlbrk_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_bg2_tilemap->set_transparent_pen(15); @@ -136,8 +130,8 @@ VIDEO_START_MEMBER(aerofgt_state,spinlbrk) VIDEO_START_MEMBER(aerofgt_state,turbofrc) { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_bg2_tilemap->set_transparent_pen(15); @@ -413,7 +407,7 @@ UINT32 aerofgt_state::screen_update_aerofgt(screen_device &screen, bitmap_ind16 // BOOTLEG VIDEO_START_MEMBER(aerofgt_state,wbbc97) { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); /* no bg2 in this game */ m_bg1_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c index cae15c09ecf..d6284608c83 100644 --- a/src/mame/video/airbustr.c +++ b/src/mame/video/airbustr.c @@ -95,7 +95,7 @@ TILE_GET_INFO_MEMBER(airbustr_state::get_fg_tile_info) int code = m_videoram2[tile_index] + ((attr & 0x0f) << 8); int color = attr >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(airbustr_state::get_bg_tile_info) @@ -104,13 +104,13 @@ TILE_GET_INFO_MEMBER(airbustr_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((attr & 0x0f) << 8); int color = (attr >> 4) + 16; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void airbustr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(airbustr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(airbustr_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(airbustr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(airbustr_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_screen->register_screen_bitmap(m_sprites_bitmap); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index b7a976b2588..5cade5528b1 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(alpha68k_state::get_tile_info) tile = tile | (m_bank_base << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } WRITE16_MEMBER(alpha68k_state::alpha68k_videoram_w) @@ -61,7 +61,7 @@ WRITE16_MEMBER(alpha68k_state::alpha68k_videoram_w) VIDEO_START_MEMBER(alpha68k_state,alpha68k) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(alpha68k_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(alpha68k_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c index 5e9d2376f31..6969ca40c85 100644 --- a/src/mame/video/ampoker2.c +++ b/src/mame/video/ampoker2.c @@ -129,7 +129,7 @@ TILE_GET_INFO_MEMBER(ampoker2_state::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_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(ampoker2_state::s2k_get_bg_tile_info) @@ -142,18 +142,18 @@ TILE_GET_INFO_MEMBER(ampoker2_state::s2k_get_bg_tile_info) code = code + (256 * (color & 0x0f)); /* the game uses 2 extra bits */ color = color >> 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void ampoker2_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ampoker2_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ampoker2_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } VIDEO_START_MEMBER(ampoker2_state,sigma2k) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ampoker2_state::s2k_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ampoker2_state::s2k_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index 66307d0796a..3471ad66173 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -44,8 +44,7 @@ TILE_GET_INFO_MEMBER(amspdwy_state::get_tile_info) { UINT8 code = m_videoram[tile_index]; UINT8 color = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((color & 0x18)<<5), color & 0x07, 0); @@ -73,7 +72,7 @@ TILEMAP_MAPPER_MEMBER(amspdwy_state::tilemap_scan_cols_back) void amspdwy_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(amspdwy_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(amspdwy_state::tilemap_scan_cols_back),this), 8, 8, 0x20, 0x20); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(amspdwy_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(amspdwy_state::tilemap_scan_cols_back),this), 8, 8, 0x20, 0x20); } diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 29d2e346a9b..eb5ac0d525c 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -19,7 +19,7 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_tx_tile_info) int tileno; tileno = m_txvideoram[tile_index] + (m_txbank * 0x100); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, 0, 0); + SET_TILE_INFO_MEMBER(0, tileno, 0, 0); } WRITE8_MEMBER(angelkds_state::angelkds_txvideoram_w) @@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_bgtop_tile_info) tileno = m_bgtopvideoram[tile_index]; tileno += m_bgtopbank * 0x100 ; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, 0, 0); + SET_TILE_INFO_MEMBER(1, tileno, 0, 0); } WRITE8_MEMBER(angelkds_state::angelkds_bgtopvideoram_w) @@ -82,7 +82,7 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_bgbot_tile_info) tileno = m_bgbotvideoram[tile_index]; tileno += m_bgbotbank * 0x100 ; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tileno, 1, 0); + SET_TILE_INFO_MEMBER(2, tileno, 1, 0); } WRITE8_MEMBER(angelkds_state::angelkds_bgbotvideoram_w) @@ -235,13 +235,13 @@ WRITE8_MEMBER(angelkds_state::angelkds_paletteram_w) void angelkds_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(angelkds_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(angelkds_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(0); - m_bgbot_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(angelkds_state::get_bgbot_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bgbot_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(angelkds_state::get_bgbot_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bgbot_tilemap->set_transparent_pen(15); - m_bgtop_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(angelkds_state::get_bgtop_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bgtop_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(angelkds_state::get_bgtop_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bgtop_tilemap->set_transparent_pen(15); } diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 81634f72a32..441f3fae504 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -104,8 +104,7 @@ TILE_GET_INFO_MEMBER(appoooh_state::get_fg_tile_info) { int code = m_fg_videoram[tile_index] + 256 * ((m_fg_colorram[tile_index] >> 5) & 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, m_fg_colorram[tile_index] & 0x0f, (m_fg_colorram[tile_index] & 0x10 ) ? TILEMAP_FLIPX : 0 @@ -116,8 +115,7 @@ TILE_GET_INFO_MEMBER(appoooh_state::get_bg_tile_info) { int code = m_bg_videoram[tile_index] + 256 * ((m_bg_colorram[tile_index] >> 5) & 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, m_bg_colorram[tile_index] & 0x0f, (m_bg_colorram[tile_index] & 0x10 ) ? TILEMAP_FLIPX : 0 @@ -132,8 +130,8 @@ TILE_GET_INFO_MEMBER(appoooh_state::get_bg_tile_info) VIDEO_START_MEMBER(appoooh_state,appoooh) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(appoooh_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(appoooh_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(appoooh_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(appoooh_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_scrolldy(8, 8); diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c index d6fbdff5391..c8c46db0e38 100644 --- a/src/mame/video/aquarium.c +++ b/src/mame/video/aquarium.c @@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(aquarium_state::get_aquarium_txt_tile_info) tileno = (m_txt_videoram[tile_index] & 0x0fff); colour = (m_txt_videoram[tile_index] & 0xf000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tileno, colour, 0); + SET_TILE_INFO_MEMBER(2, tileno, colour, 0); } WRITE16_MEMBER(aquarium_state::aquarium_txt_videoram_w) @@ -109,7 +109,7 @@ TILE_GET_INFO_MEMBER(aquarium_state::get_aquarium_mid_tile_info) colour = (m_mid_videoram[tile_index * 2 + 1] & 0x001f); flag = TILE_FLIPYX((m_mid_videoram[tile_index * 2 + 1] & 0x300) >> 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, colour, flag); + SET_TILE_INFO_MEMBER(1, tileno, colour, flag); tileinfo.category = (m_mid_videoram[tile_index * 2 + 1] & 0x20) >> 5; } @@ -129,7 +129,7 @@ TILE_GET_INFO_MEMBER(aquarium_state::get_aquarium_bak_tile_info) colour = (m_bak_videoram[tile_index * 2 + 1] & 0x001f); flag = TILE_FLIPYX((m_bak_videoram[tile_index * 2 + 1] & 0x300) >> 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tileno, colour, flag); + SET_TILE_INFO_MEMBER(3, tileno, colour, flag); tileinfo.category = (m_bak_videoram[tile_index * 2 + 1] & 0x20) >> 5; } @@ -142,9 +142,9 @@ WRITE16_MEMBER(aquarium_state::aquarium_bak_videoram_w) void aquarium_state::video_start() { - m_txt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_bak_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_bak_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_mid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_mid_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_txt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bak_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_bak_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_mid_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aquarium_state::get_aquarium_mid_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_txt_tilemap->set_transparent_pen(0); m_mid_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index fea8396a378..5d0e548d47b 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -131,8 +131,7 @@ TILE_GET_INFO_MEMBER(argus_state::argus_get_tx_tile_info) lo = m_txram[tile_index]; hi = m_txram[tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); @@ -147,8 +146,7 @@ TILE_GET_INFO_MEMBER(argus_state::argus_get_bg0_tile_info) lo = m_dummy_bg0ram[tile_index]; hi = m_dummy_bg0ram[tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); @@ -163,8 +161,7 @@ TILE_GET_INFO_MEMBER(argus_state::argus_get_bg1_tile_info) lo = m_bg1ram[tile_index]; hi = m_bg1ram[tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); @@ -179,8 +176,7 @@ TILE_GET_INFO_MEMBER(argus_state::valtric_get_tx_tile_info) lo = m_txram[tile_index]; hi = m_txram[tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); @@ -195,8 +191,7 @@ TILE_GET_INFO_MEMBER(argus_state::valtric_get_bg_tile_info) lo = m_bg1ram[tile_index]; hi = m_bg1ram[tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, ((hi & 0xc0) << 2) | ((hi & 0x20) << 5) | lo, hi & 0x0f, 0); @@ -212,8 +207,7 @@ TILE_GET_INFO_MEMBER(argus_state::butasan_get_tx_tile_info) lo = m_butasan_txram[tile_index]; hi = m_butasan_txram[tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); @@ -231,8 +225,7 @@ TILE_GET_INFO_MEMBER(argus_state::butasan_get_bg0_tile_info) lo = m_butasan_bg0ram[attrib]; hi = m_butasan_bg0ram[attrib + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, ((hi & 0xc0) << 2) | lo, hi & 0x0f, TILE_FLIPYX((hi & 0x30) >> 4)); @@ -247,8 +240,7 @@ TILE_GET_INFO_MEMBER(argus_state::butasan_get_bg1_tile_info) tile = m_butasan_bg1ram[attrib] | ((m_butasan_bg1_status & 2) << 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile, (tile & 0x80) >> 7, 0); @@ -269,9 +261,9 @@ void argus_state::reset_common() VIDEO_START_MEMBER(argus_state,argus) { /* info offset w h col row */ - m_bg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::argus_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_bg1_tilemap->set_transparent_pen(15); m_tx_tilemap->set_transparent_pen(15); @@ -295,8 +287,8 @@ VIDEO_RESET_MEMBER(argus_state,argus) VIDEO_START_MEMBER(argus_state,valtric) { /* info offset w h col row */ - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::valtric_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::valtric_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::valtric_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::valtric_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(15); @@ -314,9 +306,9 @@ VIDEO_RESET_MEMBER(argus_state,valtric) VIDEO_START_MEMBER(argus_state,butasan) { /* info offset w h col row */ - m_bg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::butasan_get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::butasan_get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(argus_state::butasan_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::butasan_get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::butasan_get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::butasan_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg1_tilemap->set_transparent_pen(15); m_tx_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index 0bba5710ef2..ffae2d31aca 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -166,12 +166,12 @@ TILE_GET_INFO_MEMBER(arkanoid_state::get_bg_tile_info) 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_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(arkanoid_state,arkanoid) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(arkanoid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(arkanoid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void arkanoid_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index 91e7de663ee..9d838efc406 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -50,8 +50,7 @@ TILE_GET_INFO_MEMBER(armedf_state::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_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number + 256 * (attributes & 0x3), attributes >> 4, 0); @@ -76,8 +75,7 @@ TILE_GET_INFO_MEMBER(armedf_state::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_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number + 256 * (attributes & 0x3), attributes >> 4, 0); @@ -87,8 +85,7 @@ TILE_GET_INFO_MEMBER(armedf_state::get_armedf_tx_tile_info) TILE_GET_INFO_MEMBER(armedf_state::get_fg_tile_info) { int data = m_fg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, data&0x7ff, data>>11, 0); @@ -98,8 +95,7 @@ TILE_GET_INFO_MEMBER(armedf_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(armedf_state::get_bg_tile_info) { int data = m_bg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, data & 0x3ff, data >> 11, 0); @@ -117,10 +113,10 @@ VIDEO_START_MEMBER(armedf_state,terraf) { m_sprite_offy = (m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(armedf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(armedf_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_nb1414m4_tx_tile_info),this), + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(armedf_state::get_nb1414m4_tx_tile_info),this), (m_scroll_type == 2) ? tilemap_mapper_delegate(FUNC(armedf_state::armedf_scan_type3),this) : tilemap_mapper_delegate(FUNC(armedf_state::armedf_scan_type2),this), 8, 8, 64, 32); m_bg_tilemap->set_transparent_pen(0xf); @@ -138,10 +134,10 @@ VIDEO_START_MEMBER(armedf_state,armedf) { m_sprite_offy = (m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(armedf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(armedf_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_armedf_tx_tile_info),this), tilemap_mapper_delegate(FUNC(armedf_state::armedf_scan_type1),this), 8, 8, 64, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(armedf_state::get_armedf_tx_tile_info),this), tilemap_mapper_delegate(FUNC(armedf_state::armedf_scan_type1),this), 8, 8, 64, 32); m_bg_tilemap->set_transparent_pen(0xf); m_fg_tilemap->set_transparent_pen(0xf); diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c index 9586dd054e8..2cd8d3f5349 100644 --- a/src/mame/video/ashnojoe.c +++ b/src/mame/video/ashnojoe.c @@ -13,8 +13,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info) { int code = m_tileram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code & 0xfff, ((code >> 12) & 0x0f), 0); @@ -25,8 +24,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_2) int code = m_tileram_2[tile_index * 2]; int attr = m_tileram_2[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 4, + SET_TILE_INFO_MEMBER(4, (code & 0x7fff), ((attr >> 8) & 0x1f) + 0x40, 0); @@ -36,8 +34,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_3) { int code = m_tileram_3[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0xfff, ((code >> 12) & 0x0f) + 0x10, 0); @@ -47,8 +44,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_4) { int code = m_tileram_4[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0xfff, ((code >> 12) & 0x0f) + 0x60, 0); @@ -59,8 +55,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_5) int code = m_tileram_5[tile_index * 2]; int attr = m_tileram_5[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 4, + SET_TILE_INFO_MEMBER(4, (code & 0x7fff), ((attr >> 8) & 0x1f) + 0x20, 0); @@ -71,8 +66,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_6) int code = m_tileram_6[tile_index * 2]; int attr = m_tileram_6[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, (code & 0x1fff), ((attr >> 8) & 0x1f) + 0x70, 0); @@ -84,8 +78,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_7) int code = m_tileram_7[tile_index * 2]; int attr = m_tileram_7[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, (code & 0x1fff), ((attr >> 8) & 0x1f) + 0x70, 0); @@ -182,13 +175,13 @@ WRITE16_MEMBER(ashnojoe_state::joe_tilemaps_yscroll_w) void ashnojoe_state::video_start() { - m_joetilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_joetilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_2),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_joetilemap3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_joetilemap4 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_4),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_joetilemap5 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_5),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_joetilemap6 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_6),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_joetilemap7 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_7),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_joetilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_joetilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_2),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_joetilemap3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_joetilemap4 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_4),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_joetilemap5 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_5),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_joetilemap6 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_6),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_joetilemap7 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_7),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_joetilemap->set_transparent_pen(15); m_joetilemap2->set_transparent_pen(15); diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index 5e31720d711..0345938c9b5 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -23,7 +23,7 @@ void atarifb_state::get_tile_info_common( tile_data &tileinfo, tilemap_memory_in if (disable) code = 0; /* I *know* this is a space */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, (flip ? TILE_FLIPX | TILE_FLIPY : 0)); + SET_TILE_INFO_MEMBER(0, code, 0, (flip ? TILE_FLIPX | TILE_FLIPY : 0)); } @@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(atarifb_state::field_get_tile_info) int code = m_field_videoram[tile_index] & 0x3f; int flipyx = m_field_videoram[tile_index] >> 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(1, code, 0, TILE_FLIPYX(flipyx)); } @@ -86,9 +86,9 @@ WRITE8_MEMBER(atarifb_state::atarifb_field_videoram_w) void atarifb_state::video_start() { - m_alpha1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::alpha1_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 3, 32); - m_alpha2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::alpha2_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 3, 32); - m_field_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::field_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_alpha1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(atarifb_state::alpha1_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 3, 32); + m_alpha2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(atarifb_state::alpha2_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 3, 32); + m_field_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(atarifb_state::field_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/atarig1.c b/src/mame/video/atarig1.c index 017b687b1b0..b5809441f0f 100644 --- a/src/mame/video/atarig1.c +++ b/src/mame/video/atarig1.c @@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(atarig1_state::get_alpha_tile_info) int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(atarig1_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = (m_playfield_tile_bank << 12) | (data & 0xfff); int color = (data >> 12) & 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index 1f05efce77d..4b31362cefa 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(atarig42_state::get_alpha_tile_info) int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(atarig42_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(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(m_gfxdecode, 0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); tileinfo.category = (m_playfield_color_bank >> 2) & 7; } diff --git a/src/mame/video/atarigt.c b/src/mame/video/atarigt.c index 5a0b8bc4c8d..ec85bc03ead 100644 --- a/src/mame/video/atarigt.c +++ b/src/mame/video/atarigt.c @@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(atarigt_state::get_alpha_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = data & 0xfff; int color = (data >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } @@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(atarigt_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = (m_playfield_tile_bank << 12) | (data & 0xfff); int color = (data >> 12) & 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c index 349c7d6d995..363a42caaab 100644 --- a/src/mame/video/atarigx2.c +++ b/src/mame/video/atarigx2.c @@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(atarigx2_state::get_alpha_tile_info) int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(atarigx2_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(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(m_gfxdecode, 0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); tileinfo.category = (m_playfield_color_bank >> 2) & 7; } diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index 80ff1c4e4ab..b9942f4c3c2 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(atarisy1_state::get_alpha_tile_info) int code = data & 0x3ff; int color = (data >> 10) & 0x07; int opaque = data & 0x2000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(0, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(atarisy1_state::get_playfield_tile_info) int gfxindex = (lookup >> 8) & 15; int code = ((lookup & 0xff) << 8) | (data & 0xff); int color = 0x20 + (((lookup >> 12) & 15) << m_bank_color_shift[gfxindex]); - SET_TILE_INFO_MEMBER(m_gfxdecode, gfxindex, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(gfxindex, code, color, (data >> 15) & 1); } diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c index 55569ef3636..baca749f8b4 100644 --- a/src/mame/video/atarisy2.c +++ b/src/mame/video/atarisy2.c @@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(atarisy2_state::get_alpha_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = data & 0x3ff; int color = (data >> 13) & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } @@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(atarisy2_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = m_playfield_tile_bank[(data >> 10) & 1] + (data & 0x3ff); int color = (data >> 11) & 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); tileinfo.category = (~data >> 14) & 3; } diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c index 9f7a952847c..590fa0c2ecd 100644 --- a/src/mame/video/atetris.c +++ b/src/mame/video/atetris.c @@ -20,7 +20,7 @@ TILE_GET_INFO_MEMBER(atetris_state::get_tile_info) 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_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -49,7 +49,7 @@ WRITE8_MEMBER(atetris_state::atetris_videoram_w) void atetris_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(atetris_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(atetris_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,32); } diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c index d11c38eb9e5..98ebd1c707d 100644 --- a/src/mame/video/badlands.c +++ b/src/mame/video/badlands.c @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(badlands_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = (data & 0x1fff) + ((data & 0x1000) ? (m_playfield_tile_bank << 12) : 0); int color = (data >> 13) & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c index aa7ea321730..916c9f15ba8 100644 --- a/src/mame/video/bagman.c +++ b/src/mame/video/bagman.c @@ -91,12 +91,12 @@ TILE_GET_INFO_MEMBER(bagman_state::get_bg_tile_info) int code = m_videoram[tile_index] + 8 * (m_colorram[tile_index] & 0x20); int color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfxbank, code, color, 0); + SET_TILE_INFO_MEMBER(gfxbank, code, color, 0); } VIDEO_START_MEMBER(bagman_state,bagman) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bagman_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bagman_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c index cead7afa399..368099fa917 100644 --- a/src/mame/video/bankp.c +++ b/src/mame/video/bankp.c @@ -130,7 +130,7 @@ TILE_GET_INFO_MEMBER(bankp_state::get_bg_tile_info) int color = m_colorram2[tile_index] >> 4; int flags = (m_colorram2[tile_index] & 0x08) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); tileinfo.group = color; } @@ -140,14 +140,14 @@ TILE_GET_INFO_MEMBER(bankp_state::get_fg_tile_info) int color = m_colorram[tile_index] >> 3; int flags = (m_colorram[tile_index] & 0x04) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); tileinfo.group = color; } void bankp_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bankp_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bankp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bankp_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bankp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(1), 0); m_palette->configure_tilemap_groups(*m_fg_tilemap, *m_gfxdecode->gfx(0), 0); diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index bc03da3cc35..d56fa996c0f 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -74,8 +74,7 @@ TILEMAP_MAPPER_MEMBER(baraduke_state::tx_tilemap_scan) TILE_GET_INFO_MEMBER(baraduke_state::tx_get_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_textram[tile_index], (m_textram[tile_index+0x400] << 2) & 0x1ff, 0); @@ -86,8 +85,7 @@ TILE_GET_INFO_MEMBER(baraduke_state::get_tile_info0) int code = m_videoram[2*tile_index]; int attr = m_videoram[2*tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code + ((attr & 0x03) << 8), attr, 0); @@ -98,8 +96,7 @@ TILE_GET_INFO_MEMBER(baraduke_state::get_tile_info1) int code = m_videoram[0x1000 + 2*tile_index]; int attr = m_videoram[0x1000 + 2*tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code + ((attr & 0x03) << 8), attr, 0); @@ -115,9 +112,9 @@ TILE_GET_INFO_MEMBER(baraduke_state::get_tile_info1) void baraduke_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(baraduke_state::tx_get_tile_info),this),tilemap_mapper_delegate(FUNC(baraduke_state::tx_tilemap_scan),this),8,8,36,28); - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(baraduke_state::get_tile_info0),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(baraduke_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(baraduke_state::tx_get_tile_info),this),tilemap_mapper_delegate(FUNC(baraduke_state::tx_tilemap_scan),this),8,8,36,28); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(baraduke_state::get_tile_info0),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(baraduke_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_tx_tilemap->set_transparent_pen(3); m_bg_tilemap[0]->set_transparent_pen(7); diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c index 203728c09a7..a9100c1fe76 100644 --- a/src/mame/video/batman.c +++ b/src/mame/video/batman.c @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(batman_state::get_alpha_tile_info) int code = ((data & 0x400) ? (m_alpha_tile_bank * 0x400) : 0) + (data & 0x3ff); int color = (data >> 11) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(batman_state::get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) & 0xff; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); tileinfo.category = (data2 >> 4) & 3; } @@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(batman_state::get_playfield2_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) >> 8; int code = data1 & 0x7fff; int color = data2 & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); tileinfo.category = (data2 >> 4) & 3; } diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index 3718155e8a9..4fb026e6e84 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -99,7 +99,7 @@ TILE_GET_INFO_MEMBER(battlane_state::get_tile_info_bg) int gfxn = (attr & 0x01) + 1; int color = (attr >> 1) & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfxn, code, color, 0); + SET_TILE_INFO_MEMBER(gfxn, code, color, 0); } TILEMAP_MAPPER_MEMBER(battlane_state::battlane_tilemap_scan_rows_2x2) @@ -135,7 +135,7 @@ TILEMAP_MAPPER_MEMBER(battlane_state::battlane_tilemap_scan_rows_2x2) void battlane_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(battlane_state::get_tile_info_bg),this), tilemap_mapper_delegate(FUNC(battlane_state::battlane_tilemap_scan_rows_2x2),this), 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(battlane_state::get_tile_info_bg),this), tilemap_mapper_delegate(FUNC(battlane_state::battlane_tilemap_scan_rows_2x2),this), 16, 16, 32, 32); m_screen_bitmap.allocate(32 * 8, 32 * 8); } diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index a92ff1e5441..72a6fbdcced 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -50,12 +50,12 @@ TILE_GET_INFO_MEMBER(battlex_state::get_bg_tile_info) 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_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } void battlex_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(battlex_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(battlex_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } void battlex_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index a4cfd71eef3..e4e992ab7c8 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -31,21 +31,21 @@ TILE_GET_INFO_MEMBER(bbusters_state::get_bbusters_tile_info) { UINT16 tile = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile&0xfff,tile>>12,0); + SET_TILE_INFO_MEMBER(0,tile&0xfff,tile>>12,0); } TILE_GET_INFO_MEMBER(bbusters_state::get_pf1_tile_info) { UINT16 tile = m_pf1_data[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3,tile&0xfff,tile>>12,0); + SET_TILE_INFO_MEMBER(3,tile&0xfff,tile>>12,0); } TILE_GET_INFO_MEMBER(bbusters_state::get_pf2_tile_info) { UINT16 tile = m_pf2_data[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4,tile&0xfff,tile>>12,0); + SET_TILE_INFO_MEMBER(4,tile&0xfff,tile>>12,0); } WRITE16_MEMBER(bbusters_state::bbusters_video_w) @@ -70,9 +70,9 @@ WRITE16_MEMBER(bbusters_state::bbusters_pf2_w) VIDEO_START_MEMBER(bbusters_state,bbuster) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_bbusters_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_bbusters_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_pf2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); m_pf1_tilemap->set_transparent_pen(15); m_fix_tilemap->set_transparent_pen(15); @@ -80,9 +80,9 @@ VIDEO_START_MEMBER(bbusters_state,bbuster) VIDEO_START_MEMBER(bbusters_state,mechatt) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_bbusters_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_bbusters_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_pf2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); m_pf1_tilemap->set_transparent_pen(15); m_fix_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index fb8d32d0428..b18a7ced7b5 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -143,7 +143,7 @@ TILE_GET_INFO_MEMBER( bfm_adder2_device::get_tile0_info ) flags = ((data & 0x4000)?TILE_FLIPY:0) | ((data & 0x2000)?TILE_FLIPX:0); - SET_TILE_INFO_MEMBER(*m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } /////////////////////////////////////////////////////////////////////////// @@ -166,7 +166,7 @@ TILE_GET_INFO_MEMBER( bfm_adder2_device::get_tile1_info ) flags = ((data & 0x4000)?TILE_FLIPY:0) | ((data & 0x2000)?TILE_FLIPX:0); - SET_TILE_INFO_MEMBER(*m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } // video initialisation /////////////////////////////////////////////////// @@ -206,9 +206,9 @@ void bfm_adder2_device::device_start() save_item(NAME(m_adder_ram)); save_item(NAME(m_adder_screen_ram)); - m_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bfm_adder2_device::get_tile0_info),this), TILEMAP_SCAN_ROWS, 8, 8, 50, 35); + m_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bfm_adder2_device::get_tile0_info),this), TILEMAP_SCAN_ROWS, 8, 8, 50, 35); - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bfm_adder2_device::get_tile1_info),this), TILEMAP_SCAN_ROWS, 8, 8, 50, 35); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bfm_adder2_device::get_tile1_info),this), TILEMAP_SCAN_ROWS, 8, 8, 50, 35); m_palette->set_pen_color(0,rgb_t(0x00,0x00,0x00)); m_palette->set_pen_color(1,rgb_t(0x00,0x00,0xFF)); diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index 94444461ece..9b9c27d7d0e 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_bsb_tile_info) tileno = m_videoram[tile_index] & 0x0fff; col= m_videoram[tile_index] & 0xf000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,col>>12,0); + SET_TILE_INFO_MEMBER(0,tileno,col>>12,0); } WRITE16_MEMBER(bigstrkb_state::bsb_videoram_w) @@ -81,7 +81,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_bsb_tile2_info) tileno = m_videoram2[tile_index] & 0x0fff; col= m_videoram2[tile_index] & 0xf000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno,col>>12,0); + SET_TILE_INFO_MEMBER(1,tileno,col>>12,0); } WRITE16_MEMBER(bigstrkb_state::bsb_videoram2_w) @@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_bsb_tile3_info) tileno = m_videoram3[tile_index] & 0x0fff; col= m_videoram3[tile_index] & 0xf000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 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) @@ -111,9 +111,9 @@ WRITE16_MEMBER(bigstrkb_state::bsb_videoram3_w) void bigstrkb_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile_info),this),TILEMAP_SCAN_COLS, 8, 8,64,32); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile2_info),this),tilemap_mapper_delegate(FUNC(bigstrkb_state::bsb_bg_scan),this), 16, 16,128,64); - m_tilemap3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile3_info),this),tilemap_mapper_delegate(FUNC(bigstrkb_state::bsb_bg_scan),this), 16, 16,128,64); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile_info),this),TILEMAP_SCAN_COLS, 8, 8,64,32); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile2_info),this),tilemap_mapper_delegate(FUNC(bigstrkb_state::bsb_bg_scan),this), 16, 16,128,64); + m_tilemap3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bigstrkb_state::get_bsb_tile3_info),this),tilemap_mapper_delegate(FUNC(bigstrkb_state::bsb_bg_scan),this), 16, 16,128,64); m_tilemap->set_transparent_pen(15); //m_tilemap2->set_transparent_pen(15); diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index e02e279280e..9b4b3302304 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -36,8 +36,7 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_bg_tile_info) { int attr = m_bgvideoram[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (m_bgvideoram[2 * tile_index] & 0xff) + ((attr & 0x07) << 8), (attr & 0x18) >> 3, TILE_FLIPXY((attr & 0xc0) >> 6)); @@ -61,8 +60,7 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_fg_tile_info) flags = TILE_FLIPXY((attr & 0xc0) >> 6); } - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, (m_fgvideoram[2 * tile_index] & 0xff) + ((attr & 0x07) << 8), (attr & 0x18) >> 3, flags); @@ -71,8 +69,7 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(bionicc_state::get_tx_tile_info) { int attr = m_txvideoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (m_txvideoram[tile_index] & 0xff) + ((attr & 0x00c0) << 2), attr & 0x3f, 0); @@ -88,9 +85,9 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_tx_tile_info) void bionicc_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bionicc_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bionicc_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bionicc_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tx_tilemap->set_transparent_pen(3); 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 ed173748bc4..b6468f5e910 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -212,13 +212,13 @@ TILE_GET_INFO_MEMBER(bking_state::get_tile_info) if (code1 & 4) flags |= TILE_FLIPX; if (code1 & 8) flags |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code0 + 256 * code1, m_palette_bank, flags); + SET_TILE_INFO_MEMBER(0, code0 + 256 * code1, m_palette_bank, flags); } void bking_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bking_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bking_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_screen->register_screen_bitmap(m_colmap_bg); m_screen->register_screen_bitmap(m_colmap_ball); } diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index 4f89e2a0a02..3bd7702ee6f 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -37,8 +37,7 @@ TILE_GET_INFO_MEMBER(blktiger_state::get_bg_tile_info) }; UINT8 attr = m_scroll_ram[2 * tile_index + 1]; int color = (attr & 0x78) >> 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_scroll_ram[2 * tile_index] + ((attr & 0x07) << 8), color, (attr & 0x80) ? TILE_FLIPX : 0); @@ -48,8 +47,7 @@ TILE_GET_INFO_MEMBER(blktiger_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(blktiger_state::get_tx_tile_info) { UINT8 attr = m_txvideoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_txvideoram[tile_index] + ((attr & 0xe0) << 3), attr & 0x1f, 0); @@ -71,9 +69,9 @@ void blktiger_state::video_start() m_scroll_ram = auto_alloc_array(machine(), UINT8, BGRAM_BANK_SIZE * BGRAM_BANKS); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blktiger_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap8x4 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blktiger_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(blktiger_state::bg8x4_scan),this), 16, 16, 128, 64); - m_bg_tilemap4x8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blktiger_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(blktiger_state::bg4x8_scan),this), 16, 16, 64, 128); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blktiger_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap8x4 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blktiger_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(blktiger_state::bg8x4_scan),this), 16, 16, 128, 64); + m_bg_tilemap4x8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blktiger_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(blktiger_state::bg4x8_scan),this), 16, 16, 64, 128); m_tx_tilemap->set_transparent_pen(3); diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index d30b5fd5cdf..e8a7dbe4be1 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -73,8 +73,7 @@ TILE_GET_INFO_MEMBER(blmbycar_state::get_tile_info_0) { UINT16 code = m_vram_0[tile_index * 2 + 0]; UINT16 attr = m_vram_0[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, attr & 0x1f, TILE_FLIPYX((attr >> 6) & 3)); @@ -86,8 +85,7 @@ TILE_GET_INFO_MEMBER(blmbycar_state::get_tile_info_1) { UINT16 code = m_vram_1[tile_index * 2 + 0]; UINT16 attr = m_vram_1[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, attr & 0x1f, TILE_FLIPYX((attr >> 6) & 3)); @@ -119,8 +117,8 @@ WRITE16_MEMBER(blmbycar_state::blmbycar_vram_1_w) void blmbycar_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blmbycar_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blmbycar_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blmbycar_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blmbycar_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); m_tilemap_0->set_scroll_rows(1); m_tilemap_0->set_scroll_cols(1); diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c index 36a91ba9f9c..f66ab32f758 100644 --- a/src/mame/video/blockade.c +++ b/src/mame/video/blockade.c @@ -17,12 +17,12 @@ TILE_GET_INFO_MEMBER(blockade_state::get_bg_tile_info) { int code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void blockade_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blockade_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blockade_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 blockade_state::screen_update_blockade(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c index c318c4192de..c5876c2d512 100644 --- a/src/mame/video/bloodbro.c +++ b/src/mame/video/bloodbro.c @@ -21,8 +21,7 @@ TILE_GET_INFO_MEMBER(bloodbro_state::get_bg_tile_info) { int code = m_bgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0xfff, (code >> 12), 0); @@ -31,8 +30,7 @@ TILE_GET_INFO_MEMBER(bloodbro_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(bloodbro_state::get_fg_tile_info) { int code = m_fgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, (code & 0xfff)+0x1000, (code >> 12), 0); @@ -41,8 +39,7 @@ TILE_GET_INFO_MEMBER(bloodbro_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(bloodbro_state::get_tx_tile_info) { int code = m_txvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0xfff, code >> 12, 0); @@ -58,9 +55,9 @@ TILE_GET_INFO_MEMBER(bloodbro_state::get_tx_tile_info) void bloodbro_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bloodbro_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bloodbro_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bloodbro_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bloodbro_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bloodbro_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bloodbro_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); m_fg_tilemap->set_transparent_pen(15); m_tx_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c index 3c827ab9d14..f69a269ac1a 100644 --- a/src/mame/video/blstroid.c +++ b/src/mame/video/blstroid.c @@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(blstroid_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = data & 0x1fff; int color = (data >> 13) & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index c638d9068ce..27edd22d22b 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -109,14 +109,14 @@ TILE_GET_INFO_MEMBER(blueprnt_state::get_bg_tile_info) tileinfo.category = (attr & 0x80) ? 1 : 0; if (bank) code += m_gfx_bank * 0x100; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(blueprnt_state,blueprnt) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blueprnt_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(blueprnt_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index 85b6fc09fa5..48100eced1e 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -73,7 +73,7 @@ TILE_GET_INFO_MEMBER(bogeyman_state::get_bg_tile_info) int code = m_videoram[tile_index] & 0x7f; int color = (attr >> 1) & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfxbank, code, color, 0); + SET_TILE_INFO_MEMBER(gfxbank, code, color, 0); } TILE_GET_INFO_MEMBER(bogeyman_state::get_fg_tile_info) @@ -83,13 +83,13 @@ TILE_GET_INFO_MEMBER(bogeyman_state::get_fg_tile_info) int gfxbank = tile / 0x200; int code = tile & 0x1ff; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfxbank, code, m_colbank, 0); + SET_TILE_INFO_MEMBER(gfxbank, code, m_colbank, 0); } void bogeyman_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bogeyman_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bogeyman_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bogeyman_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bogeyman_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index 2fb46713dda..7316ebb66cc 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(bombjack_state::get_bg_tile_info) int color = attr & 0x0f; int flags = (attr & 0x80) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(bombjack_state::get_fg_tile_info) @@ -57,13 +57,13 @@ TILE_GET_INFO_MEMBER(bombjack_state::get_fg_tile_info) int code = m_videoram[tile_index] + 16 * (m_colorram[tile_index] & 0x10); int color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void bombjack_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bombjack_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bombjack_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bombjack_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bombjack_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index e9a1d33c84f..eaa767fc3cf 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -95,8 +95,7 @@ inline void bosco_state::get_tile_info_bosco(tile_data &tileinfo,int tile_index, UINT8 attr = m_videoram[ram_offs + tile_index + 0x800]; tileinfo.category = (attr & 0x20) >> 5; tileinfo.group = attr & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[ram_offs + tile_index], attr & 0x3f, TILE_FLIPYX(attr >> 6) ^ TILE_FLIPX); @@ -122,8 +121,8 @@ TILE_GET_INFO_MEMBER(bosco_state::fg_get_tile_info ) VIDEO_START_MEMBER(bosco_state,bosco) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bosco_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bosco_state::fg_get_tile_info),this),tilemap_mapper_delegate(FUNC(bosco_state::fg_tilemap_scan),this), 8,8, 8,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bosco_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bosco_state::fg_get_tile_info),this),tilemap_mapper_delegate(FUNC(bosco_state::fg_tilemap_scan),this), 8,8, 8,32); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(0), 0x1f); m_palette->configure_tilemap_groups(*m_fg_tilemap, *m_gfxdecode->gfx(0), 0x1f); diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index 98abd6c722a..a04df7ffb2a 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -83,7 +83,7 @@ TILE_GET_INFO_MEMBER(brkthru_state::get_bg_tile_info) int region = 1 + (code >> 7); int colour = m_bgbasecolor + ((m_videoram[tile_index * 2 + 1] & 0x04) >> 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, region, code & 0x7f, colour,0); + SET_TILE_INFO_MEMBER(region, code & 0x7f, colour,0); } WRITE8_MEMBER(brkthru_state::brkthru_bgram_w) @@ -96,7 +96,7 @@ WRITE8_MEMBER(brkthru_state::brkthru_bgram_w) TILE_GET_INFO_MEMBER(brkthru_state::get_fg_tile_info) { UINT8 code = m_fg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } WRITE8_MEMBER(brkthru_state::brkthru_fgram_w) @@ -107,8 +107,8 @@ WRITE8_MEMBER(brkthru_state::brkthru_fgram_w) void brkthru_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(brkthru_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(brkthru_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(brkthru_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(brkthru_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 16); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index d15de2936c7..c6c9c0a6aed 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -21,12 +21,12 @@ TILE_GET_INFO_MEMBER(bsktball_state::get_bg_tile_info) int color = (attr & 0x40) >> 6; int flags = (attr & 0x80) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void bsktball_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bsktball_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bsktball_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void bsktball_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 02c8cb72f90..b0becb3258c 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -172,19 +172,17 @@ WRITE8_MEMBER(bwing_state::bwing_paletteram_w) TILE_GET_INFO_MEMBER(bwing_state::get_fgtileinfo) { - tileinfo.pen_data = m_gfxdecode->gfx(2)->get_data(m_fgdata[tile_index] & (BW_NTILES - 1)); - tileinfo.palette_base = m_gfxdecode->gfx(2)->colorbase() + ((m_fgdata[tile_index] >> 7) << 3); + SET_TILE_INFO_MEMBER(2, m_fgdata[tile_index] & 0x7f, m_fgdata[tile_index] >> 7, 0); } TILE_GET_INFO_MEMBER(bwing_state::get_bgtileinfo) { - tileinfo.pen_data = m_gfxdecode->gfx(3)->get_data(m_bgdata[tile_index] & (BW_NTILES - 1)); - tileinfo.palette_base = m_gfxdecode->gfx(3)->colorbase() + ((m_bgdata[tile_index] >> 7) << 3); + SET_TILE_INFO_MEMBER(3, m_bgdata[tile_index] & 0x7f, m_bgdata[tile_index] >> 7, 0); } TILE_GET_INFO_MEMBER(bwing_state::get_charinfo) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_videoram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0); } TILEMAP_MAPPER_MEMBER(bwing_state::bwing_scan_cols) @@ -198,9 +196,9 @@ void bwing_state::video_start() // UINT32 *dwptr; int i; - m_charmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bwing_state::get_charinfo),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); - m_fgmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bwing_state::get_fgtileinfo),this), tilemap_mapper_delegate(FUNC(bwing_state::bwing_scan_cols),this), 16, 16, 64, 64); - m_bgmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bwing_state::get_bgtileinfo),this), tilemap_mapper_delegate(FUNC(bwing_state::bwing_scan_cols),this), 16, 16, 64, 64); + m_charmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bwing_state::get_charinfo),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bwing_state::get_fgtileinfo),this), tilemap_mapper_delegate(FUNC(bwing_state::bwing_scan_cols),this), 16, 16, 64, 64); + m_bgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(bwing_state::get_bgtileinfo),this), tilemap_mapper_delegate(FUNC(bwing_state::bwing_scan_cols),this), 16, 16, 64, 64); m_charmap->set_transparent_pen(0); m_fgmap->set_transparent_pen(0); diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index 9f3fdefd7e9..66c208b5bc6 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -16,8 +16,7 @@ TILE_GET_INFO_MEMBER(cabal_state::get_back_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, color, 0); @@ -30,8 +29,7 @@ TILE_GET_INFO_MEMBER(cabal_state::get_text_tile_info) tile &= 0x3ff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -40,8 +38,8 @@ TILE_GET_INFO_MEMBER(cabal_state::get_text_tile_info) void cabal_state::video_start() { - m_background_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cabal_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,16,16); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cabal_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); + m_background_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cabal_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,16,16); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cabal_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); m_text_layer->set_transparent_pen(3); m_background_layer->set_transparent_pen(15); diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c index 9b93ee3c568..dab2c0576e2 100644 --- a/src/mame/video/calomega.c +++ b/src/mame/video/calomega.c @@ -51,12 +51,12 @@ TILE_GET_INFO_MEMBER(calomega_state::get_bg_tile_info) if (attr == 0x32) /* Is the palette wrong? */ color = 0x39; /* 0x39 is the best match */ - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void calomega_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(calomega_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 31); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(calomega_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 31); } UINT32 calomega_state::screen_update_calomega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index a58a571c83d..f653ea86913 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -19,13 +19,13 @@ TILE_GET_INFO_MEMBER(canyon_state::get_bg_tile_info) { UINT8 code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x3f, code >> 7, 0); + SET_TILE_INFO_MEMBER(0, code & 0x3f, code >> 7, 0); } void canyon_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(canyon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(canyon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index c86b3065496..8c729a9a586 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -87,8 +87,7 @@ TILE_GET_INFO_MEMBER(carjmbre_state::get_carjmbre_tile_info) UINT8 attr = m_videoram[tile_index + 0x400]; tile_number += (attr & 0x80) << 1; /* bank */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, attr & 0xf, 0); @@ -96,7 +95,7 @@ TILE_GET_INFO_MEMBER(carjmbre_state::get_carjmbre_tile_info) void carjmbre_state::video_start() { - m_cj_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(carjmbre_state::get_carjmbre_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_cj_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(carjmbre_state::get_carjmbre_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); save_item(NAME(m_flipscreen)); save_item(NAME(m_bgcolor)); } diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index 66a9b13f052..3a00aa42eb4 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -243,7 +243,7 @@ inline void cave_state::get_tile_info( tile_data &tileinfo, int tile_index, int code = (code & 0x00ffffff); } - SET_TILE_INFO_MEMBER(m_gfxdecode, GFX, code, color, 0 ); + SET_TILE_INFO_MEMBER(GFX, code, color, 0 ); tileinfo.category = pri; } @@ -287,7 +287,7 @@ TILE_GET_INFO_MEMBER(cave_state::sailormn_get_tile_info_2) code += 0x40000; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0 ); + SET_TILE_INFO_MEMBER(2, code, color, 0 ); tileinfo.category = pri; } @@ -383,7 +383,7 @@ void cave_state::cave_vh_start( int num ) switch (num) { case 4: - m_tilemap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); + m_tilemap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); m_tilemap[3]->set_transparent_pen(0); m_tilemap[3]->set_scroll_rows(1); m_tilemap[3]->set_scroll_cols(1); @@ -391,7 +391,7 @@ void cave_state::cave_vh_start( int num ) save_item(NAME(m_old_tiledim[3])); case 3: - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); m_tilemap[2]->set_transparent_pen(0); m_tilemap[2]->set_scroll_rows(1); m_tilemap[2]->set_scroll_cols(1); @@ -399,7 +399,7 @@ void cave_state::cave_vh_start( int num ) save_item(NAME(m_old_tiledim[2])); case 2: - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); m_tilemap[1]->set_transparent_pen(0); m_tilemap[1]->set_scroll_rows(1); m_tilemap[1]->set_scroll_cols(1); @@ -407,7 +407,7 @@ void cave_state::cave_vh_start( int num ) save_item(NAME(m_old_tiledim[1])); case 1: - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cave_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8); m_tilemap[0]->set_transparent_pen(0); m_tilemap[0]->set_scroll_rows(1); m_tilemap[0]->set_scroll_cols(1); @@ -456,7 +456,7 @@ VIDEO_START_MEMBER(cave_state,sailormn_3_layers) cave_vh_start(2); /* Layer 2 (8x8) needs to be handled differently */ - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cave_state::sailormn_get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8 ); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cave_state::sailormn_get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 512 / 8, 512 / 8 ); m_tilemap[2]->set_transparent_pen(0); m_tilemap[2]->set_scroll_rows(1); diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index c1a24ffc5ad..2de1f4350d1 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -11,8 +11,7 @@ TILE_GET_INFO_MEMBER(cbasebal_state::get_bg_tile_info) { UINT8 attr = m_scrollram[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_scrollram[2 * tile_index] + ((attr & 0x07) << 8) + 0x800 * m_tilebank, (attr & 0xf0) >> 4, (attr & 0x08) ? TILE_FLIPX : 0); @@ -21,8 +20,7 @@ TILE_GET_INFO_MEMBER(cbasebal_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(cbasebal_state::get_fg_tile_info) { UINT8 attr = m_textram[tile_index + 0x800]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_textram[tile_index] + ((attr & 0xf0) << 4), attr & 0x07, (attr & 0x08) ? TILE_FLIPX : 0); @@ -41,8 +39,8 @@ void cbasebal_state::video_start() m_textram = auto_alloc_array(machine(), UINT8, 0x1000); m_scrollram = auto_alloc_array(machine(), UINT8, 0x1000); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cbasebal_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cbasebal_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cbasebal_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cbasebal_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(3); diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index 1806967bf27..2c973f51492 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -359,7 +359,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::cclimber_get_pf_tile_info) color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } @@ -376,7 +376,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::swimmer_get_pf_tile_info) 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_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } @@ -388,7 +388,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::toprollr_get_pf_tile_info) code = ((attr & 0x30) << 4) | m_videoram[tile_index]; color = attr & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -405,7 +405,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::cclimber_get_bs_tile_info) code = ((m_bigsprite_control[1] & 0x08) << 5) | m_bigsprite_videoram[tile_index]; color = m_bigsprite_control[1] & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } @@ -422,7 +422,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::toprollr_get_bs_tile_info) code = ((m_bigsprite_control[1] & 0x18) << 5) | m_bigsprite_videoram[tile_index]; color = m_bigsprite_control[1] & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } @@ -431,17 +431,17 @@ TILE_GET_INFO_MEMBER(cclimber_state::toproller_get_bg_tile_info) 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_MEMBER(m_gfxdecode, 3, code, color, TILE_FLIPX); + SET_TILE_INFO_MEMBER(3, code, color, TILE_FLIPX); } VIDEO_START_MEMBER(cclimber_state,cclimber) { - m_pf_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_pf_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); m_pf_tilemap->set_scroll_cols(32); - m_bs_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_bs_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bs_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_bs_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bs_tilemap->set_scroll_cols(1); m_bs_tilemap->set_scroll_rows(1); m_bs_tilemap->set_transmask(0, 0x01, 0); /* pen 0 is transaprent */ @@ -451,11 +451,11 @@ VIDEO_START_MEMBER(cclimber_state,cclimber) VIDEO_START_MEMBER(cclimber_state,swimmer) { - m_pf_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::swimmer_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_pf_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::swimmer_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); m_pf_tilemap->set_scroll_cols(32); - m_bs_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_bs_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bs_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_bs_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bs_tilemap->set_scroll_cols(1); m_bs_tilemap->set_scroll_rows(1); m_bs_tilemap->set_transmask(0, 0x01, 0); /* pen 0 is transaprent */ @@ -465,13 +465,13 @@ VIDEO_START_MEMBER(cclimber_state,swimmer) VIDEO_START_MEMBER(cclimber_state,toprollr) { - m_pf_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::toprollr_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_pf_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::toprollr_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); - m_toproller_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::toproller_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_toproller_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::toproller_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_toproller_bg_tilemap->set_scroll_rows(1); - m_bs_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cclimber_state::toprollr_get_bs_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bs_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::toprollr_get_bs_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bs_tilemap->set_scroll_cols(1); m_bs_tilemap->set_scroll_rows(1); 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 cd2c0671d85..88cfaef0131 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -19,7 +19,7 @@ TILE_GET_INFO_MEMBER(centiped_state::centiped_get_tile_info) UINT8 *videoram = m_videoram; int data = videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, (data & 0x3f) + 0x40, 0, TILE_FLIPYX(data >> 6)); + SET_TILE_INFO_MEMBER(0, (data & 0x3f) + 0x40, 0, TILE_FLIPYX(data >> 6)); } @@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(centiped_state::warlords_get_tile_info) int data = videoram[tile_index]; int color = ((tile_index & 0x10) >> 4) | ((tile_index & 0x200) >> 8) | (m_flipscreen >> 5); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, data & 0x3f, color, TILE_FLIPYX(data >> 6)); + SET_TILE_INFO_MEMBER(0, data & 0x3f, color, TILE_FLIPYX(data >> 6)); } @@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(centiped_state::milliped_get_tile_info) /* Flip both x and y if flipscreen is non-zero */ int flip_tiles = (m_flipscreen) ? 0x03 : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 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)); } @@ -52,7 +52,7 @@ TILE_GET_INFO_MEMBER(centiped_state::bullsdrt_get_tile_info) int data = videoram[tile_index]; int bank = m_bullsdrt_tiles_bankram[tile_index & 0x1f] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, (data & 0x3f) + 0x40 * bank, 0, TILE_FLIPYX(data >> 6)); + SET_TILE_INFO_MEMBER(0, (data & 0x3f) + 0x40 * bank, 0, TILE_FLIPYX(data >> 6)); } @@ -95,7 +95,7 @@ VIDEO_START_MEMBER(centiped_state,centiped) init_common(); init_penmask(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(centiped_state::centiped_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(centiped_state::centiped_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -103,7 +103,7 @@ VIDEO_START_MEMBER(centiped_state,warlords) { init_common(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(centiped_state::warlords_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(centiped_state::warlords_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -112,7 +112,7 @@ VIDEO_START_MEMBER(centiped_state,milliped) init_common(); init_penmask(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(centiped_state::milliped_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(centiped_state::milliped_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -121,7 +121,7 @@ VIDEO_START_MEMBER(centiped_state,bullsdrt) init_common(); init_penmask(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(centiped_state::bullsdrt_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(centiped_state::bullsdrt_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index bb263232f09..97dfa7d09a4 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -137,7 +137,7 @@ TILE_GET_INFO_MEMBER(chaknpop_state::chaknpop_get_tx_tile_info) tile |= tile_h_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color, 0); + SET_TILE_INFO_MEMBER(1, tile, color, 0); } @@ -150,7 +150,7 @@ void chaknpop_state::video_start() UINT8 *RAM = memregion("maincpu")->base(); /* info offset type w h col row */ - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(chaknpop_state::chaknpop_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(chaknpop_state::chaknpop_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_vram1 = &RAM[0x10000]; m_vram2 = &RAM[0x12000]; diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index 16233d923e8..df0da19171e 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -128,7 +128,7 @@ TILE_GET_INFO_MEMBER(champbas_state::champbas_get_bg_tile_info) int code = m_bg_videoram[tile_index] | (m_gfx_bank << 8); int color = (m_bg_videoram[tile_index + 0x400] & 0x1f) | 0x20; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(champbas_state::exctsccr_get_bg_tile_info) @@ -136,19 +136,19 @@ TILE_GET_INFO_MEMBER(champbas_state::exctsccr_get_bg_tile_info) int code = m_bg_videoram[tile_index] | (m_gfx_bank << 8); int color = m_bg_videoram[tile_index + 0x400] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(champbas_state,champbas) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(champbas_state::champbas_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(champbas_state::champbas_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } VIDEO_START_MEMBER(champbas_state,exctsccr) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(champbas_state::exctsccr_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(champbas_state::exctsccr_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index 56fcf2b66d0..54679c2c4d2 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(cheekyms_state::cheekyms_get_tile_info) color = palette | (x >> 1); } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void cheekyms_state::video_start() @@ -98,7 +98,7 @@ void cheekyms_state::video_start() height = m_screen->height(); m_bitmap_buffer = auto_bitmap_ind16_alloc(machine(), width, height); - m_cm_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cheekyms_state::cheekyms_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_cm_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cheekyms_state::cheekyms_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_cm_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c index 9a362bfcb00..c90358ac927 100644 --- a/src/mame/video/circus.c +++ b/src/mame/video/circus.c @@ -31,12 +31,12 @@ TILE_GET_INFO_MEMBER(circus_state::get_bg_tile_info) { int code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void circus_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(circus_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(circus_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void circus_state::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 da8b3187eca..315eb4ef2e6 100644 --- a/src/mame/video/circusc.c +++ b/src/mame/video/circusc.c @@ -101,7 +101,7 @@ TILE_GET_INFO_MEMBER(circusc_state::get_tile_info) UINT8 attr = m_colorram[tile_index]; tileinfo.category = (attr & 0x10) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index] + ((attr & 0x20) << 3), attr & 0x0f, TILE_FLIPYX((attr & 0xc0) >> 6)); @@ -117,7 +117,7 @@ TILE_GET_INFO_MEMBER(circusc_state::get_tile_info) void circusc_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(circusc_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(circusc_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); } diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index eef619314cc..c98e244c66f 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -170,14 +170,14 @@ TILE_GET_INFO_MEMBER(cischeat_state::cischeat_get_scroll_tile_info_8x8) { int tmap = (FPTR)tilemap.user_data(); UINT16 code = m_scrollram[tmap][tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, tmap, (code & 0xfff), code >> (16 - m_bits_per_color_code), 0); + SET_TILE_INFO_MEMBER(tmap, (code & 0xfff), code >> (16 - m_bits_per_color_code), 0); } TILE_GET_INFO_MEMBER(cischeat_state::cischeat_get_scroll_tile_info_16x16) { int tmap = (FPTR)tilemap.user_data(); UINT16 code = m_scrollram[tmap][tile_index/4]; - SET_TILE_INFO_MEMBER(m_gfxdecode, tmap, (code & 0xfff) * 4 + (tile_index & 3), code >> (16 - m_bits_per_color_code), 0); + SET_TILE_INFO_MEMBER(tmap, (code & 0xfff) * 4 + (tile_index & 3), code >> (16 - m_bits_per_color_code), 0); } void cischeat_state::create_tilemaps() @@ -187,23 +187,23 @@ void cischeat_state::create_tilemaps() for (layer = 0; layer < 3; layer++) { /* 16x16 tilemaps */ - m_tilemap[layer][0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),this), + m_tilemap[layer][0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),this), 8,8, TILES_PER_PAGE_X * 16, TILES_PER_PAGE_Y * 2); - m_tilemap[layer][0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),this), + m_tilemap[layer][0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),this), 8,8, TILES_PER_PAGE_X * 8, TILES_PER_PAGE_Y * 4); - m_tilemap[layer][0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),this), + m_tilemap[layer][0][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),this), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 8); - m_tilemap[layer][0][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),this), + m_tilemap[layer][0][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_16x16),this), 8,8, TILES_PER_PAGE_X * 2, TILES_PER_PAGE_Y * 16); /* 8x8 tilemaps */ - m_tilemap[layer][1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),this), + m_tilemap[layer][1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),this), 8,8, TILES_PER_PAGE_X * 8, TILES_PER_PAGE_Y * 1); - m_tilemap[layer][1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),this), + m_tilemap[layer][1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),this), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 2); - m_tilemap[layer][1][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),this), + m_tilemap[layer][1][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),this), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 2); - m_tilemap[layer][1][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),this), + m_tilemap[layer][1][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cischeat_state::cischeat_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(cischeat_state::cischeat_scan_8x8),this), 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 39081acf897..132e18ee4d5 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -24,8 +24,7 @@ TILEMAP_MAPPER_MEMBER(citycon_state::citycon_scan) TILE_GET_INFO_MEMBER(citycon_state::get_fg_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], (tile_index & 0x03e0) >> 5, /* color depends on scanline only */ 0); @@ -35,8 +34,7 @@ TILE_GET_INFO_MEMBER(citycon_state::get_bg_tile_info) { UINT8 *rom = memregion("gfx4")->base(); int code = rom[0x1000 * m_bg_image + tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3 + m_bg_image, + SET_TILE_INFO_MEMBER(3 + m_bg_image, code, rom[0xc000 + 0x100 * m_bg_image + code], 0); @@ -52,8 +50,8 @@ TILE_GET_INFO_MEMBER(citycon_state::get_bg_tile_info) void citycon_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(citycon_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(citycon_state::citycon_scan),this), 8, 8, 128, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(citycon_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(citycon_state::citycon_scan),this), 8, 8, 128, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(citycon_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(citycon_state::citycon_scan),this), 8, 8, 128, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(citycon_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(citycon_state::citycon_scan),this), 8, 8, 128, 32); m_fg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_scroll_rows(32); diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index 297b89e0a08..ac9fe659290 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -155,12 +155,12 @@ TILE_GET_INFO_MEMBER(cloak_state::get_bg_tile_info) UINT8 *videoram = m_videoram; int code = videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void cloak_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cloak_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cloak_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bitmap_videoram1 = auto_alloc_array(machine(), UINT8, 256*256); 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 5a002faa4b5..2939d8617e2 100644 --- a/src/mame/video/clshroad.c +++ b/src/mame/video/clshroad.c @@ -107,8 +107,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_0a) tile_index = (tile_index & 0x1f) + (tile_index & ~0x1f)*2; code = m_vram_0[ tile_index * 2 + 0x40 ]; // color = m_vram_0[ tile_index * 2 + 0x41 ]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, 0, 0); @@ -120,8 +119,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_0b) tile_index = (tile_index & 0x1f) + (tile_index & ~0x1f)*2; code = m_vram_0[ tile_index * 2 + 0x00 ]; // color = m_vram_0[ tile_index * 2 + 0x01 ]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, 0, 0); @@ -176,8 +174,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_fb1) UINT8 code = m_vram_1[ tile_index + 0x000 ]; UINT8 color = m_vram_1[ tile_index + 0x400 ] & 0x3f; tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, color, 0); @@ -187,8 +184,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_1) { UINT8 code = m_vram_1[ tile_index + 0x000 ]; UINT8 color = m_vram_1[ tile_index + 0x400 ]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code + ((color & 0xf0)<<4), color & 0x0f, 0); @@ -204,10 +200,10 @@ WRITE8_MEMBER(clshroad_state::clshroad_vram_1_w) VIDEO_START_MEMBER(clshroad_state,firebatl) { /* These 2 use the graphics and scroll value */ - m_tilemap_0a = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); - m_tilemap_0b = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0b),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); + m_tilemap_0a = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); + m_tilemap_0b = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0b),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); /* Text (No scrolling) */ - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_fb1),this),tilemap_mapper_delegate(FUNC(clshroad_state::tilemap_scan_rows_extra),this),8,8,0x24,0x20); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_fb1),this),tilemap_mapper_delegate(FUNC(clshroad_state::tilemap_scan_rows_extra),this),8,8,0x24,0x20); m_tilemap_0a->set_scroll_rows(1); m_tilemap_0b->set_scroll_rows(1); @@ -227,10 +223,10 @@ VIDEO_START_MEMBER(clshroad_state,firebatl) VIDEO_START_MEMBER(clshroad_state,clshroad) { /* These 2 use the graphics and scroll value */ - m_tilemap_0a = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); - m_tilemap_0b = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0b),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); + m_tilemap_0a = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); + m_tilemap_0b = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0b),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); /* Text (No scrolling) */ - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_1),this),tilemap_mapper_delegate(FUNC(clshroad_state::tilemap_scan_rows_extra),this),8,8,0x24,0x20); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_1),this),tilemap_mapper_delegate(FUNC(clshroad_state::tilemap_scan_rows_extra),this),8,8,0x24,0x20); m_tilemap_0a->set_scroll_rows(1); m_tilemap_0b->set_scroll_rows(1); diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index d846e184a9b..504eedae376 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -132,8 +132,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info0) number = m_page[0][tile_index + 0x400] + 256 * bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, number, color, 0); @@ -166,8 +165,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info1) number = m_page[1][tile_index + 0x400] + 256 * bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, number, color, 0); @@ -180,8 +178,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_text_info) int number = m_page[0][tile_index + 0xc00]; int color = 16 + (attributes & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, number, color, 0); @@ -213,8 +210,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info0_bootleg) color = pal*16;// + (attributes & 0x0f); number = m_page[0][tile_index + 0x400] + 256 * bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, number, color, 0); @@ -245,8 +241,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info1_bootleg) color = pal * 16;// + (attributes & 0x0f); number = m_page[1][tile_index + 0x400] + 256 * bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, number, color, 0); @@ -258,8 +253,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_text_info_bootleg) int number = m_page[0][tile_index + 0xc00]; int color = 16;// + (attributes & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, number, color, 0); @@ -273,9 +267,9 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_text_info_bootleg) VIDEO_START_MEMBER(combatsc_state,combatsc) { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_textlayer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_text_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_textlayer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_text_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_spriteram[0] = auto_alloc_array_clear(machine(), UINT8, 0x800); m_spriteram[1] = auto_alloc_array_clear(machine(), UINT8, 0x800); @@ -292,9 +286,9 @@ VIDEO_START_MEMBER(combatsc_state,combatsc) VIDEO_START_MEMBER(combatsc_state,combatscb) { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_textlayer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_text_info_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_textlayer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_text_info_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_spriteram[0] = auto_alloc_array_clear(machine(), UINT8, 0x800); 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 fa1cf1e7fba..ef6a4184b1f 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(commando_state::get_bg_tile_info) int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(commando_state::get_fg_tile_info) @@ -76,13 +76,13 @@ TILE_GET_INFO_MEMBER(commando_state::get_fg_tile_info) int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void commando_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(commando_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(commando_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(commando_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(commando_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(3); } diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c index bee26cf4792..dd6d5fcf443 100644 --- a/src/mame/video/compgolf.c +++ b/src/mame/video/compgolf.c @@ -49,7 +49,7 @@ WRITE8_MEMBER(compgolf_state::compgolf_back_w) TILE_GET_INFO_MEMBER(compgolf_state::get_text_info) { tile_index <<= 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, m_videoram[tile_index + 1] | (m_videoram[tile_index] << 8), 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); } TILEMAP_MAPPER_MEMBER(compgolf_state::back_scan) @@ -64,13 +64,13 @@ TILE_GET_INFO_MEMBER(compgolf_state::get_back_info) int code = m_bg_ram[tile_index * 2 + 1] + ((attr & 1) << 8); int color = (attr & 0x3e) >> 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } void compgolf_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(compgolf_state::get_back_info),this), tilemap_mapper_delegate(FUNC(compgolf_state::back_scan),this), 16, 16, 32, 32); - m_text_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(compgolf_state::get_text_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(compgolf_state::get_back_info),this), tilemap_mapper_delegate(FUNC(compgolf_state::back_scan),this), 16, 16, 32, 32); + m_text_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(compgolf_state::get_text_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_text_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index 9cb1322aaa9..9984e7eb535 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -92,8 +92,7 @@ TILE_GET_INFO_MEMBER(contra_state::get_fg_tile_info) bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fg_vram[tile_index] + bank * 256, ((ctrl_6 & 0x30) * 2 + 16) + (attr & 7), 0); @@ -121,8 +120,7 @@ TILE_GET_INFO_MEMBER(contra_state::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_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_bg_vram[tile_index] + bank * 256, ((ctrl_6 & 0x30) * 2 + 16) + (attr & 7), 0); @@ -143,8 +141,7 @@ TILE_GET_INFO_MEMBER(contra_state::get_tx_tile_info) ((attr >> (bit2 )) & 0x08) | ((attr >> (bit3 - 1)) & 0x10); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_tx_vram[tile_index] + bank * 256, ((ctrl_6 & 0x30) * 2 + 16) + (attr & 7), 0); @@ -159,9 +156,9 @@ TILE_GET_INFO_MEMBER(contra_state::get_tx_tile_info) void contra_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(contra_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(contra_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(contra_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_buffered_spriteram = auto_alloc_array(machine(), UINT8, 0x800); 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 79183de2ac0..a6eb5945098 100644 --- a/src/mame/video/cop01.c +++ b/src/mame/video/cop01.c @@ -77,14 +77,14 @@ TILE_GET_INFO_MEMBER(cop01_state::get_bg_tile_info) if (attr & 0x10) pri = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 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; } TILE_GET_INFO_MEMBER(cop01_state::get_fg_tile_info) { int tile = m_fgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, 0, 0); + SET_TILE_INFO_MEMBER(0, tile, 0, 0); } @@ -97,8 +97,8 @@ TILE_GET_INFO_MEMBER(cop01_state::get_fg_tile_info) void cop01_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cop01_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cop01_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cop01_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cop01_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index cf6b6ba0f09..7519b6b4aec 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -2012,8 +2012,7 @@ TILE_GET_INFO_MEMBER(cps_state::get_tile0_info) should alternate between the left and right side of the 16x16 tiles */ gfxset = (tile_index & 0x20) >> 5; - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfxset, + SET_TILE_INFO_MEMBER(gfxset, code, (attr & 0x1f) + 0x20, TILE_FLIPYX((attr & 0x60) >> 5)); @@ -2032,8 +2031,7 @@ TILE_GET_INFO_MEMBER(cps_state::get_tile1_info) code = gfxrom_bank_mapper(GFXTYPE_SCROLL2, code); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, (attr & 0x1f) + 0x40, TILE_FLIPYX((attr & 0x60) >> 5)); @@ -2051,8 +2049,7 @@ TILE_GET_INFO_MEMBER(cps_state::get_tile2_info) code = gfxrom_bank_mapper(GFXTYPE_SCROLL3, code); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, code, (attr & 0x1f) + 0x60, TILE_FLIPYX((attr & 0x60) >> 5)); @@ -2102,9 +2099,9 @@ VIDEO_START_MEMBER(cps_state,cps) m_stars_rom_size = 0x2000; /* first 0x4000 of gfx ROM are used, but 0x0000-0x1fff is == 0x2000-0x3fff */ /* create tilemaps */ - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cps_state::get_tile0_info),this), tilemap_mapper_delegate(FUNC(cps_state::tilemap0_scan),this), 8, 8, 64, 64); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cps_state::get_tile1_info),this), tilemap_mapper_delegate(FUNC(cps_state::tilemap1_scan),this), 16, 16, 64, 64); - m_bg_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cps_state::get_tile2_info),this), tilemap_mapper_delegate(FUNC(cps_state::tilemap2_scan),this), 32, 32, 64, 64); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cps_state::get_tile0_info),this), tilemap_mapper_delegate(FUNC(cps_state::tilemap0_scan),this), 8, 8, 64, 64); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cps_state::get_tile1_info),this), tilemap_mapper_delegate(FUNC(cps_state::tilemap1_scan),this), 16, 16, 64, 64); + m_bg_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cps_state::get_tile2_info),this), tilemap_mapper_delegate(FUNC(cps_state::tilemap2_scan),this), 32, 32, 64, 64); /* create empty tiles */ memset(m_empty_tile, 0x0f, sizeof(m_empty_tile)); diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c index 94492e3ba85..bccabafe026 100644 --- a/src/mame/video/crbaloon.c +++ b/src/mame/video/crbaloon.c @@ -64,12 +64,12 @@ TILE_GET_INFO_MEMBER(crbaloon_state::get_bg_tile_info) int code = m_videoram[tile_index]; int color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void crbaloon_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(crbaloon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_XY, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(crbaloon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_XY, 8, 8, 32, 32); save_item(NAME(m_collision_address)); save_item(NAME(m_collision_address_clear)); diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c index ee74d41b724..fd0257c24cd 100644 --- a/src/mame/video/crospang.c +++ b/src/mame/video/crospang.c @@ -89,7 +89,7 @@ TILE_GET_INFO_MEMBER(crospang_state::get_bg_tile_info) int tile = data & 0xfff; int color = (data >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile + m_bestri_tilebank * 0x1000, color + 0x20, 0); + SET_TILE_INFO_MEMBER(1, tile + m_bestri_tilebank * 0x1000, color + 0x20, 0); } TILE_GET_INFO_MEMBER(crospang_state::get_fg_tile_info) @@ -98,14 +98,14 @@ TILE_GET_INFO_MEMBER(crospang_state::get_fg_tile_info) int tile = data & 0xfff; int color = (data >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile + m_bestri_tilebank * 0x1000, color + 0x10, 0); + SET_TILE_INFO_MEMBER(1, tile + m_bestri_tilebank * 0x1000, color + 0x10, 0); } void crospang_state::video_start() { - m_bg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(crospang_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_fg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(crospang_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(crospang_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(crospang_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_layer->set_transparent_pen(0); } diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index 4803a9270f5..6b7041914d5 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -13,14 +13,14 @@ TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info1) { int code = m_videoram1[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, (code & 0xfff) + (m_roz_bank << 12), code >> 12, 0); + SET_TILE_INFO_MEMBER(1, (code & 0xfff) + (m_roz_bank << 12), code >> 12, 0); } TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info2) { int code = m_videoram2[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } @@ -39,8 +39,8 @@ UINT32 crshrace_state::crshrace_tile_callback( UINT32 code ) void crshrace_state::video_start() { - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(crshrace_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(crshrace_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(crshrace_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(crshrace_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap1->set_transparent_pen(0x0f); m_tilemap2->set_transparent_pen(0xff); diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index bfaf9996644..c8381b9d4bf 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(cyberbal_state::get_alpha_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = data & 0xfff; int color = (data >> 12) & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(2, code, color, (data >> 15) & 1); } @@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(cyberbal_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = data & 0x1fff; int color = (data >> 11) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index 8d3cb5e5cb1..85a0b6cc0f4 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -8,8 +8,7 @@ inline void darius_state::actual_get_fg_tile_info( tile_data &tileinfo, int tile UINT16 code = (ram[tile_index + 0x2000] & 0x7ff); UINT16 attr = ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, code, ((attr & 0xff) << 2), TILE_FLIPYX((attr & 0xc000) >> 14)); @@ -24,7 +23,7 @@ TILE_GET_INFO_MEMBER(darius_state::get_fg_tile_info) void darius_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(darius_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(darius_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index bcb5e93a8b0..b1b3fc37df9 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -20,8 +20,7 @@ TILE_GET_INFO_MEMBER(darkmist_state::get_bgtile_info) code+=(attr&3)<<8; pal=(attr>>4); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, pal, 0); @@ -41,8 +40,7 @@ TILE_GET_INFO_MEMBER(darkmist_state::get_fgtile_info) pal+=16; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, pal, 0); @@ -61,8 +59,7 @@ TILE_GET_INFO_MEMBER(darkmist_state::get_txttile_info) pal+=48; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, pal, 0); @@ -116,9 +113,9 @@ void darkmist_state::set_pens() void darkmist_state::video_start() { - m_bgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(darkmist_state::get_bgtile_info),this),TILEMAP_SCAN_ROWS,16,16,512,64 ); - m_fgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(darkmist_state::get_fgtile_info),this),TILEMAP_SCAN_ROWS,16,16,64,256 ); - m_txtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(darkmist_state::get_txttile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); + m_bgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(darkmist_state::get_bgtile_info),this),TILEMAP_SCAN_ROWS,16,16,512,64 ); + m_fgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(darkmist_state::get_fgtile_info),this),TILEMAP_SCAN_ROWS,16,16,64,256 ); + m_txtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(darkmist_state::get_txttile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); m_fgtilemap->set_transparent_pen(0); m_txtilemap->set_transparent_pen(0); } diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c index 0b4e3c50f91..986ccbee112 100644 --- a/src/mame/video/dbz.c +++ b/src/mame/video/dbz.c @@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(dbz_state::get_dbz_bg2_tile_info) colour = (m_bg2_videoram[tile_index * 2] & 0x000f); flag = (m_bg2_videoram[tile_index * 2] & 0x0080) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour + (m_layer_colorbase[5] << 1), flag); + SET_TILE_INFO_MEMBER(0, tileno, colour + (m_layer_colorbase[5] << 1), flag); } WRITE16_MEMBER(dbz_state::dbz_bg1_videoram_w) @@ -68,13 +68,13 @@ TILE_GET_INFO_MEMBER(dbz_state::get_dbz_bg1_tile_info) colour = (m_bg1_videoram[tile_index * 2] & 0x000f); flag = (m_bg1_videoram[tile_index * 2] & 0x0080) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, colour + (m_layer_colorbase[4] << 1), flag); + SET_TILE_INFO_MEMBER(1, tileno, colour + (m_layer_colorbase[4] << 1), flag); } void dbz_state::video_start() { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dbz_state::get_dbz_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dbz_state::get_dbz_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dbz_state::get_dbz_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dbz_state::get_dbz_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); m_bg1_tilemap->set_transparent_pen(0); m_bg2_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c index 0a521d11fa3..f08800dab36 100644 --- a/src/mame/video/dcon.c +++ b/src/mame/video/dcon.c @@ -49,8 +49,7 @@ TILE_GET_INFO_MEMBER(dcon_state::get_back_tile_info) tile&=0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, color, 0); @@ -63,8 +62,7 @@ TILE_GET_INFO_MEMBER(dcon_state::get_fore_tile_info) tile&=0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile, color, 0); @@ -77,8 +75,7 @@ TILE_GET_INFO_MEMBER(dcon_state::get_mid_tile_info) tile&=0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, tile|m_gfx_bank_select, color, 0); @@ -91,8 +88,7 @@ TILE_GET_INFO_MEMBER(dcon_state::get_text_tile_info) tile&=0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -100,10 +96,10 @@ TILE_GET_INFO_MEMBER(dcon_state::get_text_tile_info) void dcon_state::video_start() { - m_background_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dcon_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,32,32); - m_foreground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dcon_state::get_fore_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_midground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dcon_state::get_mid_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dcon_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); + m_background_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dcon_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,32,32); + m_foreground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dcon_state::get_fore_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_midground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dcon_state::get_mid_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dcon_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); m_midground_layer->set_transparent_pen(15); m_foreground_layer->set_transparent_pen(15); diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index 24a11013cb1..b8502153bbf 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -152,7 +152,7 @@ TILE_GET_INFO_MEMBER(dday_state::get_bg_tile_info) int code; code = m_bgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, code >> 5, 0); + SET_TILE_INFO_MEMBER(0, code, code >> 5, 0); } TILE_GET_INFO_MEMBER(dday_state::get_fg_tile_info) @@ -161,7 +161,7 @@ TILE_GET_INFO_MEMBER(dday_state::get_fg_tile_info) flipx = m_colorram[tile_index & 0x03e0] & 0x01; code = m_fgvideoram[flipx ? tile_index ^ 0x1f : tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, code >> 5, flipx ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(2, code, code >> 5, flipx ? TILE_FLIPX : 0); } TILE_GET_INFO_MEMBER(dday_state::get_text_tile_info) @@ -169,7 +169,7 @@ TILE_GET_INFO_MEMBER(dday_state::get_text_tile_info) int code; code = m_textvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, code >> 5, 0); + SET_TILE_INFO_MEMBER(1, code, code >> 5, 0); } TILE_GET_INFO_MEMBER(dday_state::get_sl_tile_info) @@ -191,7 +191,7 @@ TILE_GET_INFO_MEMBER(dday_state::get_sl_tile_info) /* no mirroring, draw dark spot */ code = 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, code & 0x3f, 0, flipx ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(3, code & 0x3f, 0, flipx ? TILE_FLIPX : 0); } @@ -203,10 +203,10 @@ TILE_GET_INFO_MEMBER(dday_state::get_sl_tile_info) void dday_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dday_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dday_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_text_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dday_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_sl_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dday_state::get_sl_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dday_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dday_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_text_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dday_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_sl_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dday_state::get_sl_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_screen->register_screen_bitmap(m_main_bitmap); diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c index 04dc7ceabec..eb686ab345a 100644 --- a/src/mame/video/ddragon.c +++ b/src/mame/video/ddragon.c @@ -59,8 +59,7 @@ TILEMAP_MAPPER_MEMBER(ddragon_state::background_scan) TILE_GET_INFO_MEMBER(ddragon_state::get_bg_tile_info) { UINT8 attr = m_bgvideoram[2 * tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, m_bgvideoram[2 * tile_index+1] + ((attr & 0x07) << 8), (attr >> 3) & 0x07, TILE_FLIPYX((attr & 0xc0) >> 6)); @@ -69,8 +68,7 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(ddragon_state::get_fg_tile_info) { UINT8 attr = m_fgvideoram[2 * tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fgvideoram[2 * tile_index + 1] + ((attr & 0x07) << 8), attr >> 5, 0); @@ -79,8 +77,7 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(ddragon_state::get_fg_16color_tile_info) { UINT8 attr = m_fgvideoram[2 * tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fgvideoram[2 * tile_index+1] + ((attr & 0x0f) << 8), attr >> 4, 0); @@ -95,8 +92,8 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_fg_16color_tile_info) VIDEO_START_MEMBER(ddragon_state,ddragon) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(ddragon_state::background_scan),this), 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ddragon_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(ddragon_state::background_scan),this), 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ddragon_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_scrolldx(0, 0); diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c index 6049207fa7e..5ba8b15947e 100644 --- a/src/mame/video/ddragon3.c +++ b/src/mame/video/ddragon3.c @@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(ddragon3_state::get_bg_tile_info) int code = (attr & 0x0fff) | ((m_bg_tilebase & 0x01) << 12); int color = ((attr & 0xf000) >> 12); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -74,8 +74,7 @@ TILE_GET_INFO_MEMBER(ddragon3_state::get_fg_tile_info) tilebase = &m_fg_videoram[tile_index*2]; tileno = (tilebase[1] & 0x1fff); colbank = (tilebase[0] & 0x000f); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tileno, colbank, TILE_FLIPYX((tilebase[0] & 0x00c0) >> 6)); @@ -103,8 +102,7 @@ TILE_GET_INFO_MEMBER(wwfwfest_state::get_fg0_tile_info) tilebase = &m_fg0_videoram[tile_index*2]; tileno = (tilebase[0] & 0x00ff) | ((tilebase[1] & 0x000f) << 8); colbank = (tilebase[1] & 0x00f0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, tileno, colbank, 0); @@ -130,8 +128,8 @@ void ddragon3_state::video_start() { save_item(NAME(m_pri)); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon3_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon3_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ddragon3_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ddragon3_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); @@ -145,7 +143,7 @@ void wwfwfest_state::video_start() ddragon3_state::video_start(); - m_fg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wwfwfest_state::get_fg0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_fg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wwfwfest_state::get_fg0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fg0_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c index d36badf23d7..f31ac9fd839 100644 --- a/src/mame/video/ddribble.c +++ b/src/mame/video/ddribble.c @@ -93,8 +93,7 @@ TILE_GET_INFO_MEMBER(ddribble_state::get_fg_tile_info) { UINT8 attr = m_fg_videoram[tile_index]; int num = m_fg_videoram[tile_index + 0x400] + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5) + ((m_charbank[0] & 2) << 10); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, num, 0, TILE_FLIPYX((attr & 0x30) >> 4)); @@ -104,8 +103,7 @@ TILE_GET_INFO_MEMBER(ddribble_state::get_bg_tile_info) { UINT8 attr = m_bg_videoram[tile_index]; int num = m_bg_videoram[tile_index + 0x400] + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5) + (m_charbank[1] << 11); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, num, 0, TILE_FLIPYX((attr & 0x30) >> 4)); @@ -119,8 +117,8 @@ TILE_GET_INFO_MEMBER(ddribble_state::get_bg_tile_info) void ddribble_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddribble_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(ddribble_state::tilemap_scan),this), 8, 8, 64, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddribble_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(ddribble_state::tilemap_scan),this), 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ddribble_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(ddribble_state::tilemap_scan),this), 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ddribble_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(ddribble_state::tilemap_scan),this), 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c index 6fdcdcf22ee..4bc58c841dd 100644 --- a/src/mame/video/deadang.c +++ b/src/mame/video/deadang.c @@ -41,14 +41,14 @@ TILE_GET_INFO_MEMBER(deadang_state::get_pf3_tile_info) { const UINT16 *bgMap = (const UINT16 *)memregion("gfx6")->base(); int code= bgMap[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4,code&0x7ff,code>>12,0); + SET_TILE_INFO_MEMBER(4,code&0x7ff,code>>12,0); } TILE_GET_INFO_MEMBER(deadang_state::get_pf2_tile_info) { const UINT16 *bgMap = (const UINT16 *)memregion("gfx7")->base(); int code= bgMap[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3,code&0x7ff,code>>12,0); + SET_TILE_INFO_MEMBER(3,code&0x7ff,code>>12,0); } TILE_GET_INFO_MEMBER(deadang_state::get_pf1_tile_info) @@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(deadang_state::get_pf1_tile_info) int color=tile >> 12; tile=tile&0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,tile+m_deadangle_tilebank*0x1000,color,0); + SET_TILE_INFO_MEMBER(2,tile+m_deadangle_tilebank*0x1000,color,0); } TILE_GET_INFO_MEMBER(deadang_state::get_text_tile_info) @@ -66,15 +66,15 @@ TILE_GET_INFO_MEMBER(deadang_state::get_text_tile_info) int tile=(videoram[tile_index] & 0xff) | ((videoram[tile_index] >> 6) & 0x300); int color=(videoram[tile_index] >> 8)&0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } void deadang_state::video_start() { - m_pf3_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deadang_state::get_pf3_tile_info),this),tilemap_mapper_delegate(FUNC(deadang_state::bg_scan),this),16,16,128,256); - m_pf2_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deadang_state::get_pf2_tile_info),this),tilemap_mapper_delegate(FUNC(deadang_state::bg_scan),this),16,16,128,256); - m_pf1_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deadang_state::get_pf1_tile_info),this),TILEMAP_SCAN_COLS,16,16, 32, 32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deadang_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_pf3_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deadang_state::get_pf3_tile_info),this),tilemap_mapper_delegate(FUNC(deadang_state::bg_scan),this),16,16,128,256); + m_pf2_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deadang_state::get_pf2_tile_info),this),tilemap_mapper_delegate(FUNC(deadang_state::bg_scan),this),16,16,128,256); + m_pf1_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deadang_state::get_pf1_tile_info),this),TILEMAP_SCAN_COLS,16,16, 32, 32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deadang_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf2_layer->set_transparent_pen(15); m_pf1_layer->set_transparent_pen(15); diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index e352087d64d..15b68ee59ce 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -277,8 +277,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_cobracom_fix_tile_info) int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8); int color = (tile & 0xe000) >> 13; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile & 0xfff, color, 0); @@ -286,7 +285,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_cobracom_fix_tile_info) VIDEO_START_MEMBER(dec8_state,cobracom) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_cobracom_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_cobracom_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); @@ -313,8 +312,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_ghostb_fix_tile_info) int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8); int color = (tile & 0xc00) >> 10; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile & 0x3ff, color, 0); @@ -322,7 +320,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_ghostb_fix_tile_info) VIDEO_START_MEMBER(dec8_state,ghostb) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_ghostb_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_ghostb_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); m_game_uses_priority = 0; @@ -349,8 +347,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_oscar_fix_tile_info) int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8); int color = (tile & 0xf000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile&0xfff, color, 0); @@ -358,7 +355,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_oscar_fix_tile_info) VIDEO_START_MEMBER(dec8_state,oscar) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_oscar_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_oscar_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); @@ -410,8 +407,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_lastmisn_tile_info) else tileinfo.category = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile & 0xfff, color, 0); @@ -423,8 +419,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_lastmisn_fix_tile_info) int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8); int color = (tile & 0xc000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile&0xfff, color, 0); @@ -432,8 +427,8 @@ TILE_GET_INFO_MEMBER(dec8_state::get_lastmisn_fix_tile_info) VIDEO_START_MEMBER(dec8_state,lastmisn) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_tile_info),this), tilemap_mapper_delegate(FUNC(dec8_state::lastmisn_scan_rows),this), 16, 16, 32, 32); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_tile_info),this), tilemap_mapper_delegate(FUNC(dec8_state::lastmisn_scan_rows),this), 16, 16, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); m_game_uses_priority = 0; @@ -441,8 +436,8 @@ VIDEO_START_MEMBER(dec8_state,lastmisn) VIDEO_START_MEMBER(dec8_state,shackled) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_tile_info),this), tilemap_mapper_delegate(FUNC(dec8_state::lastmisn_scan_rows),this), 16, 16, 32, 32); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_tile_info),this), tilemap_mapper_delegate(FUNC(dec8_state::lastmisn_scan_rows),this), 16, 16, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); m_bg_tilemap->set_transmask(0, 0x000f, 0xfff0); /* Bottom 12 pens */ @@ -470,8 +465,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_srdarwin_fix_tile_info) tileinfo.category = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -486,8 +480,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_srdarwin_tile_info) tile = tile & 0x3ff; bank = (tile / 0x100) + 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, - bank, + SET_TILE_INFO_MEMBER(bank, tile, color, 0); @@ -496,8 +489,8 @@ TILE_GET_INFO_MEMBER(dec8_state::get_srdarwin_tile_info) VIDEO_START_MEMBER(dec8_state,srdarwin) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_srdarwin_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 16); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_srdarwin_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_srdarwin_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 16); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_srdarwin_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); //* draw as background only @@ -539,8 +532,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_gondo_fix_tile_info) int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8); int color = (tile & 0x7000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile&0xfff, color, 0); @@ -557,8 +549,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_gondo_tile_info) else tileinfo.category = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile&0xfff, color, 0); @@ -566,8 +557,8 @@ TILE_GET_INFO_MEMBER(dec8_state::get_gondo_tile_info) VIDEO_START_MEMBER(dec8_state,gondo) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fix_tilemap->set_transparent_pen(0); m_bg_tilemap->set_transmask(0, 0x00ff, 0xff00); /* Bottom 8 pens */ @@ -576,8 +567,8 @@ VIDEO_START_MEMBER(dec8_state,gondo) VIDEO_START_MEMBER(dec8_state,garyoret) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fix_tilemap->set_transparent_pen(0); m_game_uses_priority = 1; diff --git a/src/mame/video/decbac06.c b/src/mame/video/decbac06.c index 069ce6348ec..946de9de0a2 100644 --- a/src/mame/video/decbac06.c +++ b/src/mame/video/decbac06.c @@ -166,7 +166,7 @@ TILE_GET_INFO_MEMBER(deco_bac06_device::get_pf8x8_tile_info) if (m_rambank&1) tile_index+=0x1000; int tile=m_pf_data[tile_index]; int colourpri=(tile>>12); - SET_TILE_INFO_MEMBER(*m_gfxdecode, m_tile_region,tile&0xfff,0,0); + SET_TILE_INFO_MEMBER(m_tile_region,tile&0xfff,0,0); tileinfo.category = colourpri; } @@ -175,7 +175,7 @@ TILE_GET_INFO_MEMBER(deco_bac06_device::get_pf16x16_tile_info) if (m_rambank&1) tile_index+=0x1000; int tile=m_pf_data[tile_index]; int colourpri=(tile>>12); - SET_TILE_INFO_MEMBER(*m_gfxdecode, m_tile_region,tile&0xfff,0,0); + SET_TILE_INFO_MEMBER(m_tile_region,tile&0xfff,0,0); tileinfo.category = colourpri; } @@ -183,29 +183,29 @@ void deco_bac06_device::create_tilemaps(int region8x8, int region16x16) { m_tile_region = region8x8; - m_pf8x8_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf8x8_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape0_8x8_scan),this), 8, 8,128, 32); - m_pf8x8_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf8x8_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape1_8x8_scan),this), 8, 8, 64, 64); - m_pf8x8_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf8x8_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape2_8x8_scan),this), 8, 8, 32,128); + m_pf8x8_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf8x8_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape0_8x8_scan),this), 8, 8,128, 32); + m_pf8x8_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf8x8_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape1_8x8_scan),this), 8, 8, 64, 64); + m_pf8x8_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf8x8_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape2_8x8_scan),this), 8, 8, 32,128); m_tile_region = region16x16; if (m_wide==2) { - m_pf16x16_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape0_scan),this), 16, 16, 256, 16); - m_pf16x16_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape1_scan),this), 16, 16, 128, 32); - m_pf16x16_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape2_scan),this), 16, 16, 64, 64); + m_pf16x16_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape0_scan),this), 16, 16, 256, 16); + m_pf16x16_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape1_scan),this), 16, 16, 128, 32); + m_pf16x16_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape2_scan),this), 16, 16, 64, 64); } else if (m_wide==1) { - m_pf16x16_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape0_scan),this), 16, 16, 128, 16); - m_pf16x16_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape1_scan),this), 16, 16, 64, 32); - m_pf16x16_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape2_scan),this), 16, 16, 32, 64); + m_pf16x16_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape0_scan),this), 16, 16, 128, 16); + m_pf16x16_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape1_scan),this), 16, 16, 64, 32); + m_pf16x16_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this), tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape2_scan),this), 16, 16, 32, 64); } else { - m_pf16x16_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape0_scan),this), 16,16, 64, 16); - m_pf16x16_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape1_scan),this), 16,16, 32, 32); - m_pf16x16_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape2_scan),this), 16,16, 16, 64); + m_pf16x16_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape0_scan),this), 16,16, 64, 16); + m_pf16x16_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape1_scan),this), 16,16, 32, 32); + m_pf16x16_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco_bac06_device::get_pf16x16_tile_info),this),tilemap_mapper_delegate(FUNC(deco_bac06_device::tile_shape2_scan),this), 16,16, 16, 64); } } diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index 50d2b17d38f..e90787e79b8 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -235,16 +235,16 @@ void deco16ic_device::device_start() if (m_full_width12&1) fullwidth = 1; - m_pf1_tilemap_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf1_tile_info),this), tilemap_mapper_delegate(FUNC(deco16ic_device::deco16_scan_rows),this), 16, 16, fullwidth ? 64 : 32, fullheight ?64 : 32); -// m_pf1_tilemap_8x8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf1_tile_info_b),this), TILEMAP_SCAN_ROWS, 8, 8, m_full_width12 ? 64 : 32, 32); - m_pf1_tilemap_8x8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf1_tile_info_b),this), TILEMAP_SCAN_ROWS, 8, 8, 64 , 32); // nitroball + m_pf1_tilemap_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf1_tile_info),this), tilemap_mapper_delegate(FUNC(deco16ic_device::deco16_scan_rows),this), 16, 16, fullwidth ? 64 : 32, fullheight ?64 : 32); +// m_pf1_tilemap_8x8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf1_tile_info_b),this), TILEMAP_SCAN_ROWS, 8, 8, m_full_width12 ? 64 : 32, 32); + m_pf1_tilemap_8x8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf1_tile_info_b),this), TILEMAP_SCAN_ROWS, 8, 8, 64 , 32); // nitroball if (m_split) - m_pf2_tilemap_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf2_tile_info),this), tilemap_mapper_delegate(FUNC(deco16ic_device::deco16_scan_rows),this), 16, 16, fullwidth ? 64 : 32, fullheight ? 64 : 32); + m_pf2_tilemap_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf2_tile_info),this), tilemap_mapper_delegate(FUNC(deco16ic_device::deco16_scan_rows),this), 16, 16, fullwidth ? 64 : 32, fullheight ? 64 : 32); else - m_pf2_tilemap_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf2_tile_info),this), tilemap_mapper_delegate(FUNC(deco16ic_device::deco16_scan_rows),this), 16, 16, fullwidth ? 64 : 32, fullheight ? 64 : 32); + m_pf2_tilemap_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf2_tile_info),this), tilemap_mapper_delegate(FUNC(deco16ic_device::deco16_scan_rows),this), 16, 16, fullwidth ? 64 : 32, fullheight ? 64 : 32); - m_pf2_tilemap_8x8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf2_tile_info_b),this), TILEMAP_SCAN_ROWS, 8, 8, fullwidth ? 64 : 32, fullheight ? 64 : 32); + m_pf2_tilemap_8x8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deco16ic_device::get_pf2_tile_info_b),this), TILEMAP_SCAN_ROWS, 8, 8, fullwidth ? 64 : 32, fullheight ? 64 : 32); m_pf1_tilemap_8x8->set_transparent_pen(0); m_pf2_tilemap_8x8->set_transparent_pen(0); @@ -318,8 +318,7 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info) } } - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_pf12_16x16_gfx_bank, + SET_TILE_INFO_MEMBER(m_pf12_16x16_gfx_bank, (tile & 0xfff) | m_pf2_bank, (colour & m_pf2_colourmask) + m_pf2_colour_bank, flags); @@ -350,16 +349,14 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info) // Captain America operates this chip in 8bpp mode. // In 8bpp mode you appear to only get 1 layer, not 2, but you also // have an extra 2 tile bits, and 2 less colour bits. - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_pf12_16x16_gfx_bank, + SET_TILE_INFO_MEMBER(m_pf12_16x16_gfx_bank, (tile & 0x3fff) | m_pf1_bank, ((colour & m_pf1_colourmask) + m_pf1_colour_bank)>>2, flags); } else { - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_pf12_16x16_gfx_bank, + SET_TILE_INFO_MEMBER(m_pf12_16x16_gfx_bank, (tile & 0xfff) | m_pf1_bank, (colour & m_pf1_colourmask) + m_pf1_colour_bank, flags); @@ -386,8 +383,7 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info_b) } } - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_pf12_8x8_gfx_bank, + SET_TILE_INFO_MEMBER(m_pf12_8x8_gfx_bank, (tile & 0xfff) | m_pf2_bank, (colour & m_pf2_colourmask) + m_pf2_colour_bank, flags); @@ -413,8 +409,7 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info_b) } } - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_pf12_8x8_gfx_bank, + SET_TILE_INFO_MEMBER(m_pf12_8x8_gfx_bank, (tile & 0xfff) | m_pf1_bank, (colour & m_pf1_colourmask) + m_pf1_colour_bank, flags); diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 4dbe89928e6..8ae46a636d0 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -200,8 +200,7 @@ TILEMAP_MAPPER_MEMBER(decocass_state::bgvideoram_scan_cols ) TILE_GET_INFO_MEMBER(decocass_state::get_bg_l_tile_info) { int color = (m_color_center_bot >> 7) & 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, (0x80 == (tile_index & 0x80)) ? 16 : m_bgvideoram[tile_index] >> 4, color, 0); @@ -210,8 +209,7 @@ TILE_GET_INFO_MEMBER(decocass_state::get_bg_l_tile_info) TILE_GET_INFO_MEMBER(decocass_state::get_bg_r_tile_info ) { int color = (m_color_center_bot >> 7) & 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, (0x00 == (tile_index & 0x80)) ? 16 : m_bgvideoram[tile_index] >> 4, color, TILE_FLIPY); @@ -221,8 +219,7 @@ TILE_GET_INFO_MEMBER(decocass_state::get_fg_tile_info ) { UINT8 code = m_fgvideoram[tile_index]; UINT8 attr = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, 256 * (attr & 3) + code, m_color_center_bot & 1, 0); @@ -656,9 +653,9 @@ void decocass_state::draw_edge(bitmap_ind16 &bitmap, const rectangle &cliprect, void decocass_state::video_start() { - m_bg_tilemap_l = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(decocass_state::get_bg_l_tile_info),this), tilemap_mapper_delegate(FUNC(decocass_state::bgvideoram_scan_cols),this), 16, 16, 32, 32); - m_bg_tilemap_r = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(decocass_state::get_bg_r_tile_info),this), tilemap_mapper_delegate(FUNC(decocass_state::bgvideoram_scan_cols),this), 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(decocass_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(decocass_state::fgvideoram_scan_cols),this), 8, 8, 32, 32); + m_bg_tilemap_l = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(decocass_state::get_bg_l_tile_info),this), tilemap_mapper_delegate(FUNC(decocass_state::bgvideoram_scan_cols),this), 16, 16, 32, 32); + m_bg_tilemap_r = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(decocass_state::get_bg_r_tile_info),this), tilemap_mapper_delegate(FUNC(decocass_state::bgvideoram_scan_cols),this), 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(decocass_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(decocass_state::fgvideoram_scan_cols),this), 8, 8, 32, 32); m_bg_tilemap_l->set_transparent_pen(0); m_bg_tilemap_r->set_transparent_pen(0); diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c index 621674c3a2f..d430a9427c2 100644 --- a/src/mame/video/deniam.c +++ b/src/mame/video/deniam.c @@ -61,8 +61,7 @@ TILE_GET_INFO_MEMBER(deniam_state::get_bg_tile_info) { int page = tile_index >> 11; UINT16 attr = m_videoram[m_bg_page[page] * 0x0800 + (tile_index & 0x7ff)]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, attr, (attr & 0x1fc0) >> 6, 0); @@ -72,8 +71,7 @@ TILE_GET_INFO_MEMBER(deniam_state::get_fg_tile_info) { int page = tile_index >> 11; UINT16 attr = m_videoram[m_fg_page[page] * 0x0800 + (tile_index & 0x7ff)]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, attr, (attr & 0x1fc0) >> 6, 0); @@ -82,8 +80,7 @@ TILE_GET_INFO_MEMBER(deniam_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(deniam_state::get_tx_tile_info) { UINT16 attr = m_textram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, attr & 0xf1ff, (attr & 0x0e00) >> 9, 0); @@ -99,9 +96,9 @@ TILE_GET_INFO_MEMBER(deniam_state::get_tx_tile_info) void deniam_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deniam_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(deniam_state::scan_pages),this), 8, 8, 128, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deniam_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(deniam_state::scan_pages),this), 8, 8, 128, 64); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(deniam_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deniam_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(deniam_state::scan_pages),this), 8, 8, 128, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deniam_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(deniam_state::scan_pages),this), 8, 8, 128, 64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(deniam_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0); m_tx_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index 6b09b65a881..688e0269a8c 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -97,8 +97,7 @@ TILE_GET_INFO_MEMBER(digdug_state::bg_get_tile_info) tilemap RAM, therefore allowing to pick some bits of the color code from the top 4 bits of alpha code. This feature is not used by Dig Dug. */ int color = m_bg_disable ? 0xf : (code >> 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, color | m_bg_color_bank, 0); @@ -124,8 +123,7 @@ TILE_GET_INFO_MEMBER(digdug_state::tx_get_tile_info) timing signals, while x flip is done by selecting the 2nd character set. We reproduce this here, but since the tilemap system automatically flips characters when screen is flipped, we have to flip them back. */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x7f) | (flip_screen() ? 0x80 : 0), color, flip_screen() ? TILE_FLIPX : 0); @@ -141,8 +139,8 @@ TILE_GET_INFO_MEMBER(digdug_state::tx_get_tile_info) VIDEO_START_MEMBER(digdug_state,digdug) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(digdug_state::bg_get_tile_info),this),tilemap_mapper_delegate(FUNC(digdug_state::tilemap_scan),this),8,8,36,28); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(digdug_state::tx_get_tile_info),this),tilemap_mapper_delegate(FUNC(digdug_state::tilemap_scan),this),8,8,36,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(digdug_state::bg_get_tile_info),this),tilemap_mapper_delegate(FUNC(digdug_state::tilemap_scan),this),8,8,36,28); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(digdug_state::tx_get_tile_info),this),tilemap_mapper_delegate(FUNC(digdug_state::tilemap_scan),this),8,8,36,28); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c index 7d952b030b4..10da431a411 100644 --- a/src/mame/video/djboy.c +++ b/src/mame/video/djboy.c @@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(djboy_state::get_bg_tile_info) if (color & 8) code |= 0x1000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); /* no flip */ + SET_TILE_INFO_MEMBER(1, code, color, 0); /* no flip */ } WRITE8_MEMBER(djboy_state::djboy_videoram_w) @@ -37,7 +37,7 @@ WRITE8_MEMBER(djboy_state::djboy_videoram_w) void djboy_state::video_start() { - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(djboy_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(djboy_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); } WRITE8_MEMBER(djboy_state::djboy_paletteram_w) diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index a01a7338d58..3b31c4abaaa 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -447,7 +447,7 @@ TILE_GET_INFO_MEMBER(dkong_state::dkong_bg_tile_info) int code = m_video_ram[tile_index] + 256 * m_gfx_bank; int color = (m_color_codes[tile_index % 32 + 32 * (tile_index / 32 / 4)] & 0x0f) + 0x10 * m_palette_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(dkong_state::radarscp1_bg_tile_info) @@ -456,7 +456,7 @@ TILE_GET_INFO_MEMBER(dkong_state::radarscp1_bg_tile_info) int color = (m_color_codes[tile_index % 32] & 0x0f); color = color | (m_palette_bank<<4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } /*************************************************************************** @@ -944,10 +944,10 @@ VIDEO_START_MEMBER(dkong_state,dkong) /* fall through */ case HARDWARE_TKG04: case HARDWARE_TKG02: - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dkong_state::dkong_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dkong_state::dkong_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); break; case HARDWARE_TRS01: - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dkong_state::radarscp1_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dkong_state::radarscp1_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_screen->register_screen_bitmap(m_bg_bits); m_gfx4 = memregion("gfx4")->base(); diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c index 8d524f0b461..336eca8c4fc 100644 --- a/src/mame/video/docastle.c +++ b/src/mame/video/docastle.c @@ -89,12 +89,12 @@ TILE_GET_INFO_MEMBER(docastle_state::get_tile_info) int code = m_videoram[tile_index] + 8 * (m_colorram[tile_index] & 0x20); int color = m_colorram[tile_index] & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void docastle_state::video_start_common( UINT32 tile_transmask ) { - m_do_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(docastle_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_do_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(docastle_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_do_tilemap->set_scrolldy(-32, -32); m_do_tilemap->set_transmask(0, tile_transmask, 0x0000); } diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c index 633a78fe0e0..f837b60b502 100644 --- a/src/mame/video/dogfgt.c +++ b/src/mame/video/dogfgt.c @@ -51,8 +51,7 @@ PALETTE_INIT_MEMBER(dogfgt_state, dogfgt) TILE_GET_INFO_MEMBER(dogfgt_state::get_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_bgvideoram[tile_index], m_bgvideoram[tile_index + 0x400] & 0x03, 0); @@ -67,7 +66,7 @@ TILE_GET_INFO_MEMBER(dogfgt_state::get_tile_info) void dogfgt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dogfgt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dogfgt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bitmapram = auto_alloc_array(machine(), UINT8, BITMAPRAM_SIZE); save_pointer(NAME(m_bitmapram), BITMAPRAM_SIZE); diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index 62b128c6074..61d9503e6f0 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -238,7 +238,7 @@ inline void dooyong_state::lastday_get_tile_info(tile_data &tileinfo, int tile_i flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); } - SET_TILE_INFO_MEMBER(m_gfxdecode, graphics, code, color, flags); + SET_TILE_INFO_MEMBER(graphics, code, color, flags); } inline void dooyong_state::rshark_get_tile_info(tile_data &tileinfo, int tile_index, @@ -258,7 +258,7 @@ inline void dooyong_state::rshark_get_tile_info(tile_data &tileinfo, int tile_in int color = tilerom2[offs] & 0x0f; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, graphics, code, color, flags); + SET_TILE_INFO_MEMBER(graphics, code, color, flags); } TILE_GET_INFO_MEMBER(dooyong_state::get_bg_tile_info) @@ -305,7 +305,7 @@ TILE_GET_INFO_MEMBER(dooyong_state::flytiger_get_fg_tile_info) int color = (attr & 0x78) >> 3; int flags = ((attr & 0x02) ? TILE_FLIPX : 0) | ((attr & 0x04) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, m_fg_gfx, code, color, flags); + SET_TILE_INFO_MEMBER(m_fg_gfx, code, color, flags); } TILE_GET_INFO_MEMBER(dooyong_state::get_tx_tile_info) @@ -330,7 +330,7 @@ TILE_GET_INFO_MEMBER(dooyong_state::get_tx_tile_info) code = m_txvideoram[offs] | ((attr & 0x0f) << 8); color = (attr & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -621,11 +621,11 @@ VIDEO_START_MEMBER(dooyong_state,lastday) m_tx_tilemap_mode = 0; /* Create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -660,11 +660,11 @@ VIDEO_START_MEMBER(dooyong_state,gulfstrm) m_tx_tilemap_mode = 0; /* Create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -698,11 +698,11 @@ VIDEO_START_MEMBER(dooyong_state,pollux) m_tx_tilemap_mode = 0; /* Create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -736,13 +736,13 @@ VIDEO_START_MEMBER(dooyong_state,bluehawk) m_tx_tilemap_mode = 1; /* Create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_fg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),this), TILEMAP_SCAN_COLS, + m_fg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -773,11 +773,11 @@ VIDEO_START_MEMBER(dooyong_state,flytiger) m_tx_tilemap_mode = 0; /* Create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::flytiger_get_fg_tile_info),this), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::flytiger_get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -808,11 +808,11 @@ VIDEO_START_MEMBER(dooyong_state,primella) m_tx_tilemap_mode = 1; /* Create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -847,13 +847,13 @@ VIDEO_START_MEMBER(dooyong_state,rshark) m_fg2_gfx = 1; /* Create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - m_fg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),this), TILEMAP_SCAN_COLS, + m_fg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); /* Configure tilemap transparency */ @@ -881,7 +881,7 @@ VIDEO_START_MEMBER(dooyong_state,popbingo) m_bg_gfx = 1; /* Create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 32, 8); m_bg2_tilemap = m_fg_tilemap = m_fg2_tilemap = NULL; /* Stop scroll handler from crashing on these */ diff --git a/src/mame/video/dragrace.c b/src/mame/video/dragrace.c index 7bf2a130d4b..57436a344e3 100644 --- a/src/mame/video/dragrace.c +++ b/src/mame/video/dragrace.c @@ -35,13 +35,13 @@ TILE_GET_INFO_MEMBER(dragrace_state::get_tile_info) break; } - SET_TILE_INFO_MEMBER(m_gfxdecode, ((code & 0xA0) == 0x80) ? 1 : 0, num, col, 0); + SET_TILE_INFO_MEMBER(((code & 0xA0) == 0x80) ? 1 : 0, num, col, 0); } void dragrace_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dragrace_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dragrace_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); } diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c index bdbac6e8238..d196b9c779b 100644 --- a/src/mame/video/drgnmst.c +++ b/src/mame/video/drgnmst.c @@ -13,7 +13,7 @@ TILE_GET_INFO_MEMBER(drgnmst_state::get_drgnmst_fg_tile_info) colour = m_fg_videoram[tile_index * 2 + 1] & 0x1f; flipyx = (m_fg_videoram[tile_index * 2 + 1] & 0x60)>>5; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, colour, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(1, tileno, colour, TILE_FLIPYX(flipyx)); } WRITE16_MEMBER(drgnmst_state::drgnmst_fg_videoram_w) @@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(drgnmst_state::get_drgnmst_bg_tile_info) colour = m_bg_videoram[tile_index * 2 + 1] & 0x1f; flipyx = (m_bg_videoram[tile_index * 2 + 1] & 0x60) >> 5; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tileno, colour, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(3, tileno, colour, TILE_FLIPYX(flipyx)); } WRITE16_MEMBER(drgnmst_state::drgnmst_bg_videoram_w) @@ -45,7 +45,7 @@ TILE_GET_INFO_MEMBER(drgnmst_state::get_drgnmst_md_tile_info) colour = m_md_videoram[tile_index * 2 + 1] & 0x1f; flipyx = (m_md_videoram[tile_index * 2 + 1] & 0x60) >> 5; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tileno, colour, TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(2, tileno, colour, TILE_FLIPYX(flipyx)); } WRITE16_MEMBER(drgnmst_state::drgnmst_md_videoram_w) @@ -118,13 +118,13 @@ TILEMAP_MAPPER_MEMBER(drgnmst_state::drgnmst_bg_tilemap_scan_cols) void drgnmst_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drgnmst_state::get_drgnmst_fg_tile_info),this), tilemap_mapper_delegate(FUNC(drgnmst_state::drgnmst_fg_tilemap_scan_cols),this), 8, 8, 64,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(drgnmst_state::get_drgnmst_fg_tile_info),this), tilemap_mapper_delegate(FUNC(drgnmst_state::drgnmst_fg_tilemap_scan_cols),this), 8, 8, 64,64); m_fg_tilemap->set_transparent_pen(15); - m_md_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drgnmst_state::get_drgnmst_md_tile_info),this), tilemap_mapper_delegate(FUNC(drgnmst_state::drgnmst_md_tilemap_scan_cols),this), 16, 16, 64,64); + m_md_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(drgnmst_state::get_drgnmst_md_tile_info),this), tilemap_mapper_delegate(FUNC(drgnmst_state::drgnmst_md_tilemap_scan_cols),this), 16, 16, 64,64); m_md_tilemap->set_transparent_pen(15); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drgnmst_state::get_drgnmst_bg_tile_info),this), tilemap_mapper_delegate(FUNC(drgnmst_state::drgnmst_bg_tilemap_scan_cols),this), 32, 32, 64,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(drgnmst_state::get_drgnmst_bg_tile_info),this), tilemap_mapper_delegate(FUNC(drgnmst_state::drgnmst_bg_tilemap_scan_cols),this), 32, 32, 64,64); m_bg_tilemap->set_transparent_pen(15); // do the other tilemaps have rowscroll too? probably not .. diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c index d100cd61372..d54520939aa 100644 --- a/src/mame/video/drmicro.c +++ b/src/mame/video/drmicro.c @@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(drmicro_state::get_bg1_tile_info) flags = ((col & 0x20) ? TILEMAP_FLIPY : 0) | ((col & 0x10) ? TILEMAP_FLIPX : 0); col &= 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, col, flags); + SET_TILE_INFO_MEMBER(0, code, col, flags); } TILE_GET_INFO_MEMBER(drmicro_state::get_bg2_tile_info) @@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(drmicro_state::get_bg2_tile_info) flags = ((col & 0x20) ? TILEMAP_FLIPY : 0) | ((col & 0x10) ? TILEMAP_FLIPX : 0); col &= 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, col, flags); + SET_TILE_INFO_MEMBER(1, code, col, flags); } /****************************************************************************/ @@ -103,8 +103,8 @@ void drmicro_state::video_start() m_videoram = auto_alloc_array(machine(), UINT8, 0x1000); save_pointer(NAME(m_videoram), 0x1000); - m_bg1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drmicro_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drmicro_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(drmicro_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(drmicro_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg2->set_transparent_pen(0); } diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index 246078d14b2..1068639afd0 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -40,8 +40,7 @@ TILE_GET_INFO_MEMBER(dynduke_state::get_bg_tile_info) tile=tile&0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile+m_back_bankbase, color, 0); @@ -54,8 +53,7 @@ TILE_GET_INFO_MEMBER(dynduke_state::get_fg_tile_info) tile=tile&0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile+m_fore_bankbase, color, 0); @@ -69,8 +67,7 @@ TILE_GET_INFO_MEMBER(dynduke_state::get_tx_tile_info) tile = (tile & 0xff) | ((tile & 0xc000) >> 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -78,9 +75,9 @@ TILE_GET_INFO_MEMBER(dynduke_state::get_tx_tile_info) void dynduke_state::video_start() { - m_bg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dynduke_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS, 16,16,32,32); - m_fg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dynduke_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); - m_tx_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dynduke_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_bg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dynduke_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS, 16,16,32,32); + m_fg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dynduke_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); + m_tx_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dynduke_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); m_fg_layer->set_transparent_pen(15); m_tx_layer->set_transparent_pen(15); diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c index da1ff64db10..fce52152da5 100644 --- a/src/mame/video/eprom.c +++ b/src/mame/video/eprom.c @@ -55,7 +55,7 @@ TILE_GET_INFO_MEMBER(eprom_state::get_alpha_tile_info) int code = data & 0x3ff; int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20); int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(eprom_state::get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) >> 8; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); } @@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(eprom_state::guts_get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) >> 8; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(2, code, color, (data1 >> 15) & 1); } diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index bb28ecc06c5..d8a8efda0a4 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -63,7 +63,7 @@ TILE_GET_INFO_MEMBER(equites_state::equites_fg_info) int tile = m_fg_videoram[2 * tile_index]; int color = m_fg_videoram[2 * tile_index + 1] & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); if (color & 0x10) tileinfo.flags |= TILE_FORCE_LAYER0; } @@ -73,7 +73,7 @@ TILE_GET_INFO_MEMBER(equites_state::splndrbt_fg_info) int tile = m_fg_videoram[2 * tile_index] + (m_fg_char_bank << 8); int color = m_fg_videoram[2 * tile_index + 1] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); if (color & 0x10) tileinfo.flags |= TILE_FORCE_LAYER0; } @@ -85,7 +85,7 @@ TILE_GET_INFO_MEMBER(equites_state::equites_bg_info) int color = (data & 0xf000) >> 12; int fxy = (data & 0x0600) >> 9; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color, TILE_FLIPXY(fxy)); + SET_TILE_INFO_MEMBER(1, tile, color, TILE_FLIPXY(fxy)); } TILE_GET_INFO_MEMBER(equites_state::splndrbt_bg_info) @@ -95,7 +95,7 @@ TILE_GET_INFO_MEMBER(equites_state::splndrbt_bg_info) int color = (data & 0xf800) >> 11; int fxy = (data & 0x0600) >> 9; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color, TILE_FLIPXY(fxy)); + SET_TILE_INFO_MEMBER(1, tile, color, TILE_FLIPXY(fxy)); tileinfo.group = color; } @@ -112,10 +112,10 @@ VIDEO_START_MEMBER(equites_state,equites) m_fg_videoram = auto_alloc_array(machine(), UINT8, 0x800); save_pointer(NAME(m_fg_videoram), 0x800); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(equites_state::equites_fg_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(equites_state::equites_fg_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(equites_state::equites_bg_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(equites_state::equites_bg_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scrolldx(0, -10); } @@ -127,11 +127,11 @@ VIDEO_START_MEMBER(equites_state,splndrbt) m_fg_videoram = auto_alloc_array(machine(), UINT8, 0x800); save_pointer(NAME(m_fg_videoram), 0x800); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(equites_state::splndrbt_fg_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(equites_state::splndrbt_fg_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_scrolldx(8, -8); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(equites_state::splndrbt_bg_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(equites_state::splndrbt_bg_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(1), 0x10); } diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c index de99c6426d0..60f8f65a027 100644 --- a/src/mame/video/esd16.c +++ b/src/mame/video/esd16.c @@ -53,8 +53,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: TILE_GET_INFO_MEMBER(esd16_state::get_tile_info_0) { UINT16 code = m_vram_0[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, m_tilemap0_color, 0); @@ -63,8 +62,7 @@ TILE_GET_INFO_MEMBER(esd16_state::get_tile_info_0) TILE_GET_INFO_MEMBER(esd16_state::get_tile_info_0_16x16) { UINT16 code = m_vram_0[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, m_tilemap0_color, 0); @@ -74,8 +72,7 @@ TILE_GET_INFO_MEMBER(esd16_state::get_tile_info_0_16x16) TILE_GET_INFO_MEMBER(esd16_state::get_tile_info_1) { UINT16 code = m_vram_1[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, m_tilemap1_color, 0); @@ -84,8 +81,7 @@ TILE_GET_INFO_MEMBER(esd16_state::get_tile_info_1) TILE_GET_INFO_MEMBER(esd16_state::get_tile_info_1_16x16) { UINT16 code = m_vram_1[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, m_tilemap1_color, 0); @@ -135,14 +131,14 @@ WRITE16_MEMBER(esd16_state::esd16_tilemap0_color_jumppop_w) void esd16_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80, 0x40); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80, 0x40); + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80, 0x40); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80, 0x40); /* swatpolc changes tilemap 0 to 16x16 at various times */ - m_tilemap_0_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_0_16x16),this), TILEMAP_SCAN_ROWS, 16,16, 0x40, 0x40); + m_tilemap_0_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_0_16x16),this), TILEMAP_SCAN_ROWS, 16,16, 0x40, 0x40); /* hedpanic changes tilemap 1 to 16x16 at various times */ - m_tilemap_1_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_1_16x16),this), TILEMAP_SCAN_ROWS, 16,16, 0x40, 0x40); + m_tilemap_1_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_1_16x16),this), TILEMAP_SCAN_ROWS, 16,16, 0x40, 0x40); m_tilemap_0->set_scrolldx(-0x60 + 2, -0x60); m_tilemap_1->set_scrolldx(-0x60, -0x60 + 2); diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c index 6e7986d6bd2..fe9f4775160 100644 --- a/src/mame/video/espial.c +++ b/src/mame/video/espial.c @@ -71,7 +71,7 @@ TILE_GET_INFO_MEMBER(espial_state::get_tile_info) UINT8 code = m_videoram[tile_index]; UINT8 col = m_colorram[tile_index]; UINT8 attr = m_attributeram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, code | ((attr & 0x03) << 8), col & 0x3f, TILE_FLIPYX(attr >> 2)); @@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(espial_state::get_tile_info) void espial_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(espial_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(espial_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); save_item(NAME(m_flipscreen)); @@ -96,7 +96,7 @@ void espial_state::video_start() VIDEO_START_MEMBER(espial_state,netwars) { /* Net Wars has a tile map that's twice as big as Espial's */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(espial_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(espial_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); m_bg_tilemap->set_scroll_cols(32); m_bg_tilemap->set_scrolldy(0, 0x100); diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index cff03ad516b..7caa54ed0d3 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -129,14 +129,14 @@ TILE_GET_INFO_MEMBER(exedexes_state::get_bg_tile_info) int color = tilerom[tile_index + (8 * 8)]; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(exedexes_state::get_fg_tile_info) { int code = memregion("gfx5")->base()[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, 0, 0); + SET_TILE_INFO_MEMBER(2, code, 0, 0); } TILE_GET_INFO_MEMBER(exedexes_state::get_tx_tile_info) @@ -146,7 +146,7 @@ TILE_GET_INFO_MEMBER(exedexes_state::get_tx_tile_info) tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILEMAP_MAPPER_MEMBER(exedexes_state::exedexes_bg_tilemap_scan) @@ -163,9 +163,9 @@ TILEMAP_MAPPER_MEMBER(exedexes_state::exedexes_fg_tilemap_scan) void exedexes_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exedexes_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(exedexes_state::exedexes_bg_tilemap_scan),this), 32, 32, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exedexes_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(exedexes_state::exedexes_fg_tilemap_scan),this), 16, 16, 128, 128); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exedexes_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(exedexes_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(exedexes_state::exedexes_bg_tilemap_scan),this), 32, 32, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(exedexes_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(exedexes_state::exedexes_fg_tilemap_scan),this), 16, 16, 128, 128); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(exedexes_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_palette->configure_tilemap_groups(*m_tx_tilemap, *m_gfxdecode->gfx(0), 0xcf); diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index 0f2078fc4c6..75b866bed76 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(exprraid_state::get_bg_tile_info) tileinfo.category = ((attr & 0x80) ? 1 : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, flags); + SET_TILE_INFO_MEMBER(bank, code, color, flags); } TILE_GET_INFO_MEMBER(exprraid_state::get_fg_tile_info) @@ -75,13 +75,13 @@ TILE_GET_INFO_MEMBER(exprraid_state::get_fg_tile_info) int code = m_videoram[tile_index] + ((attr & 0x07) << 8); int color = (attr & 0x10) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void exprraid_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exprraid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exprraid_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(exprraid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(exprraid_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(2); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index 1b45aa3b457..08d64c5c15a 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -16,21 +16,21 @@ TILE_GET_INFO_MEMBER(f1gp_state::f1gp_get_roz_tile_info) { int code = m_rozvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, code & 0x7ff, code >> 12, 0); + SET_TILE_INFO_MEMBER(3, code & 0x7ff, code >> 12, 0); } TILE_GET_INFO_MEMBER(f1gp_state::f1gp2_get_roz_tile_info) { int code = m_rozvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, (code & 0x7ff) + (m_roz_bank << 11), code >> 12, 0); + SET_TILE_INFO_MEMBER(2, (code & 0x7ff) + (m_roz_bank << 11), code >> 12, 0); } TILE_GET_INFO_MEMBER(f1gp_state::get_fg_tile_info) { int code = m_fgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x7fff, 0, (code & 0x8000) ? TILE_FLIPY : 0); + SET_TILE_INFO_MEMBER(0, code & 0x7fff, 0, (code & 0x8000) ? TILE_FLIPY : 0); } @@ -45,8 +45,8 @@ TILE_GET_INFO_MEMBER(f1gp_state::get_fg_tile_info) VIDEO_START_MEMBER(f1gp_state,f1gp) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_roz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0xff); @@ -59,8 +59,8 @@ VIDEO_START_MEMBER(f1gp_state,f1gp) VIDEO_START_MEMBER(f1gp_state,f1gpb) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_roz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0xff); @@ -91,8 +91,8 @@ UINT32 f1gp_state::f1gp_ol2_tile_callback( UINT32 code ) VIDEO_START_MEMBER(f1gp_state,f1gp2) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::f1gp2_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_roz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp2_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0xff); m_roz_tilemap->set_transparent_pen(0x0f); diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c index 53497fd2b2b..f320393341a 100644 --- a/src/mame/video/fastfred.c +++ b/src/mame/video/fastfred.c @@ -84,7 +84,7 @@ TILE_GET_INFO_MEMBER(fastfred_state::get_tile_info) UINT16 code = m_charbank | m_videoram[tile_index]; UINT8 color = m_colorbank | (m_attributesram[2 * x + 1] & 0x07); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(fastfred_state::get_tile_info) VIDEO_START_MEMBER(fastfred_state,fastfred) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fastfred_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(32); @@ -300,18 +300,18 @@ TILE_GET_INFO_MEMBER(fastfred_state::imago_get_tile_info_bg) UINT16 code = m_charbank * 0x100 + m_videoram[tile_index]; UINT8 color = m_colorbank | (m_attributesram[2 * x + 1] & 0x07); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(fastfred_state::imago_get_tile_info_fg) { int code = m_imago_fg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, 2, 0); + SET_TILE_INFO_MEMBER(2, code, 2, 0); } TILE_GET_INFO_MEMBER(fastfred_state::imago_get_tile_info_web) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tile_index & 0x1ff, 0, 0); + SET_TILE_INFO_MEMBER(3, tile_index & 0x1ff, 0, 0); } WRITE8_MEMBER(fastfred_state::imago_fg_videoram_w ) @@ -331,9 +331,9 @@ WRITE8_MEMBER(fastfred_state::imago_charbank_w ) VIDEO_START_MEMBER(fastfred_state,imago) { - m_web_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_web),this),TILEMAP_SCAN_ROWS, 8,8,32,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_bg),this), TILEMAP_SCAN_ROWS,8,8,32,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_fg),this), TILEMAP_SCAN_ROWS,8,8,32,32); + m_web_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_web),this),TILEMAP_SCAN_ROWS, 8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_bg),this), TILEMAP_SCAN_ROWS,8,8,32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_fg),this), TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c index 4f704649874..e0cbb2e726e 100644 --- a/src/mame/video/fastlane.c +++ b/src/mame/video/fastlane.c @@ -63,8 +63,7 @@ TILE_GET_INFO_MEMBER(fastlane_state::get_tile_info0) bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code+bank*256, 1 + 64 * (attr & 0x0f), 0); @@ -91,8 +90,7 @@ TILE_GET_INFO_MEMBER(fastlane_state::get_tile_info1) bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code+bank*256, 0 + 64 * (attr & 0x0f), 0); @@ -106,8 +104,8 @@ TILE_GET_INFO_MEMBER(fastlane_state::get_tile_info1) void fastlane_state::video_start() { - m_layer0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fastlane_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_layer1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fastlane_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_layer0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fastlane_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_layer1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fastlane_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_layer0->set_scroll_rows(32); diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 7fe4e443dec..9b5b4045feb 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -16,7 +16,7 @@ TILE_GET_INFO_MEMBER(fcombat_state::get_bg_tile_info) tileno = memregion("user1")->base()[tile_index]; palno = 0x18; //memregion("user2")->base()[tile_index] >> 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tileno, palno, 0); + SET_TILE_INFO_MEMBER(2, tileno, palno, 0); } @@ -98,7 +98,7 @@ PALETTE_INIT_MEMBER(fcombat_state, fcombat) void fcombat_state::video_start() { - m_bgmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fcombat_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32 * 8 * 2, 32); + m_bgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fcombat_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32 * 8 * 2, 32); } diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c index d31c5db4f56..1b04c4f662a 100644 --- a/src/mame/video/finalizr.c +++ b/src/mame/video/finalizr.c @@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(finalizr_state::get_bg_tile_info) int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } TILE_GET_INFO_MEMBER(finalizr_state::get_fg_tile_info) @@ -58,13 +58,13 @@ TILE_GET_INFO_MEMBER(finalizr_state::get_fg_tile_info) int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void finalizr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(finalizr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(finalizr_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(finalizr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(finalizr_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c index 5011e5b97b4..c43e5d6ebb4 100644 --- a/src/mame/video/firetrap.c +++ b/src/mame/video/firetrap.c @@ -88,8 +88,7 @@ TILE_GET_INFO_MEMBER(firetrap_state::get_fg_tile_info) { int code = m_fgvideoram[tile_index]; int color = m_fgvideoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code | ((color & 0x01) << 8), color >> 4, 0); @@ -99,8 +98,7 @@ inline void firetrap_state::get_bg_tile_info(tile_data &tileinfo, int tile_index { int code = bgvideoram[tile_index]; int color = bgvideoram[tile_index + 0x100]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfx_region, + SET_TILE_INFO_MEMBER(gfx_region, code + ((color & 0x03) << 8), (color & 0x30) >> 4, TILE_FLIPXY((color & 0x0c) >> 2)); @@ -125,9 +123,9 @@ TILE_GET_INFO_MEMBER(firetrap_state::get_bg2_tile_info) void firetrap_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrap_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(firetrap_state::get_fg_memory_offset),this), 8, 8, 32, 32); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrap_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(firetrap_state::get_bg_memory_offset),this), 16, 16, 32, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrap_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(firetrap_state::get_bg_memory_offset),this), 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrap_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(firetrap_state::get_fg_memory_offset),this), 8, 8, 32, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrap_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(firetrap_state::get_bg_memory_offset),this), 16, 16, 32, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrap_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(firetrap_state::get_bg_memory_offset),this), 16, 16, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_bg1_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index 179561692de..bb4d00b9004 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::firetrk_get_tile_info1) if (m_flash) color = color | 0x04; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } @@ -137,7 +137,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::superbug_get_tile_info1) if (m_flash) color = color | 0x04; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } @@ -149,7 +149,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::montecar_get_tile_info1) if (m_flash) color = color | 0x04; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } @@ -165,7 +165,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::firetrk_get_tile_info2) if ((code & 0x3c) == 0x0c) color = 2; /* palette 0, 2 */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } @@ -181,7 +181,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::superbug_get_tile_info2) if ((code & 0x38) == 0x00) color = 2; /* palette 0, 2 */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } @@ -203,7 +203,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::montecar_get_tile_info2) if ((code & 0x30) == 0x30) color = 0; /* palette 0, 0 */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code & 0x3f, color, 0); + SET_TILE_INFO_MEMBER(2, code & 0x3f, color, 0); } @@ -212,8 +212,8 @@ void firetrk_state::video_start() m_screen->register_screen_bitmap(m_helper1); m_screen->register_screen_bitmap(m_helper2); - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrk_state::firetrk_get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrk_state::firetrk_get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrk_state::firetrk_get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrk_state::firetrk_get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); } @@ -222,8 +222,8 @@ VIDEO_START_MEMBER(firetrk_state,superbug) m_screen->register_screen_bitmap(m_helper1); m_screen->register_screen_bitmap(m_helper2); - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrk_state::superbug_get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrk_state::superbug_get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrk_state::superbug_get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrk_state::superbug_get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); } @@ -232,8 +232,8 @@ VIDEO_START_MEMBER(firetrk_state,montecar) m_screen->register_screen_bitmap(m_helper1); m_screen->register_screen_bitmap(m_helper2); - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrk_state::montecar_get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(firetrk_state::montecar_get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrk_state::montecar_get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(firetrk_state::montecar_get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); } diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index a51979961a9..0d2bc30604a 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_bak_tile_info) int xflip = (m_fof_bak_tileram[tile_index * 2] & 0x0020) >> 5; xflip ^= 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, colr, TILE_FLIPYX(xflip)); + SET_TILE_INFO_MEMBER(2, code, colr, TILE_FLIPYX(xflip)); } WRITE16_MEMBER(fitfight_state::fof_bak_tileram_w) @@ -64,7 +64,7 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_mid_tile_info) int xflip = (m_fof_mid_tileram[tile_index * 2] & 0x0020) >> 5; xflip ^= 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, colr, TILE_FLIPYX(xflip)); + SET_TILE_INFO_MEMBER(1, code, colr, TILE_FLIPYX(xflip)); } WRITE16_MEMBER(fitfight_state::fof_mid_tileram_w) @@ -80,7 +80,7 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_txt_tile_info) int xflip = (m_fof_txt_tileram[tile_index * 2] & 0x0020) >> 5; xflip ^= 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, colr, TILE_FLIPYX(xflip)); + SET_TILE_INFO_MEMBER(0, code, colr, TILE_FLIPYX(xflip)); } WRITE16_MEMBER(fitfight_state::fof_txt_tileram_w) @@ -93,13 +93,13 @@ WRITE16_MEMBER(fitfight_state::fof_txt_tileram_w) void fitfight_state::video_start() { - m_fof_bak_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fitfight_state::get_fof_bak_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 128, 32); + m_fof_bak_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fitfight_state::get_fof_bak_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 128, 32); /* opaque */ - m_fof_mid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fitfight_state::get_fof_mid_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 128, 32); + m_fof_mid_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fitfight_state::get_fof_mid_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 128, 32); m_fof_mid_tilemap->set_transparent_pen(0); - m_fof_txt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fitfight_state::get_fof_txt_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 128, 32); + m_fof_txt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fitfight_state::get_fof_txt_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 128, 32); m_fof_txt_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index a8d1ecb4eb8..f1fdf4bf64f 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -40,8 +40,7 @@ TILE_GET_INFO_MEMBER(flkatck_state::get_tile_info_A) bank = 0; /* this allows the game to print text in all banks selected by the k007121 */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + 256*bank, (attr & 0x0f) + 16, (attr & 0x20) ? TILE_FLIPY : 0); @@ -52,8 +51,7 @@ TILE_GET_INFO_MEMBER(flkatck_state::get_tile_info_B) int attr = m_k007121_ram[tile_index + 0x800]; int code = m_k007121_ram[tile_index + 0xc00]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr & 0x0f) + 16, 0); @@ -68,8 +66,8 @@ TILE_GET_INFO_MEMBER(flkatck_state::get_tile_info_B) void flkatck_state::video_start() { - m_k007121_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flkatck_state::get_tile_info_A),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_k007121_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flkatck_state::get_tile_info_B),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_k007121_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flkatck_state::get_tile_info_A),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_k007121_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flkatck_state::get_tile_info_B),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c index 14d83f4565d..93f2299a2ed 100644 --- a/src/mame/video/flower.c +++ b/src/mame/video/flower.c @@ -101,7 +101,7 @@ TILE_GET_INFO_MEMBER(flower_state::get_bg0_tile_info) int color = m_bg0ram[tile_index+0x100]; /* Todo - may be tile flip bits? */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color>>4, 0); + SET_TILE_INFO_MEMBER(2, code, color>>4, 0); } TILE_GET_INFO_MEMBER(flower_state::get_bg1_tile_info) @@ -110,7 +110,7 @@ TILE_GET_INFO_MEMBER(flower_state::get_bg1_tile_info) int color = m_bg1ram[tile_index+0x100]; /* Todo - may be tile flip bits? */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color>>4, 0); + SET_TILE_INFO_MEMBER(2, code, color>>4, 0); } TILE_GET_INFO_MEMBER(flower_state::get_text_tile_info) @@ -119,15 +119,15 @@ TILE_GET_INFO_MEMBER(flower_state::get_text_tile_info) int color = m_textram[tile_index+0x400]; /* Todo - may be tile flip bits? */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color>>2, 0); + SET_TILE_INFO_MEMBER(0, code, color>>2, 0); } void flower_state::video_start() { - m_bg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flower_state::get_bg0_tile_info),this), TILEMAP_SCAN_ROWS,16,16,16,16); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flower_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS,16,16,16,16); - m_text_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flower_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); - m_text_right_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flower_state::get_text_tile_info),this),TILEMAP_SCAN_COLS, 8, 8, 2,32); + m_bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flower_state::get_bg0_tile_info),this), TILEMAP_SCAN_ROWS,16,16,16,16); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flower_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS,16,16,16,16); + m_text_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flower_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_text_right_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flower_state::get_text_tile_info),this),TILEMAP_SCAN_COLS, 8, 8, 2,32); m_bg1_tilemap->set_transparent_pen(15); m_text_tilemap->set_transparent_pen(3); diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c index 430068b238f..b36e8f4bcde 100644 --- a/src/mame/video/flstory.c +++ b/src/mame/video/flstory.c @@ -17,8 +17,7 @@ TILE_GET_INFO_MEMBER(flstory_state::get_tile_info) int flags = TILE_FLIPYX((attr & 0x18) >> 3); tileinfo.category = (attr & 0x20) >> 5; tileinfo.group = (attr & 0x20) >> 5; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, attr & 0x0f, flags); @@ -31,8 +30,7 @@ TILE_GET_INFO_MEMBER(flstory_state::victnine_get_tile_info) int tile_number = ((attr & 0x38) << 5) + code; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, attr & 0x07, flags); @@ -47,8 +45,7 @@ TILE_GET_INFO_MEMBER(flstory_state::get_rumba_tile_info) tileinfo.category = (attr & 0x20) >> 5; tileinfo.group = (attr & 0x20) >> 5; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, col, 0); @@ -56,7 +53,7 @@ TILE_GET_INFO_MEMBER(flstory_state::get_rumba_tile_info) VIDEO_START_MEMBER(flstory_state,flstory) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flstory_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); // m_bg_tilemap->set_transparent_pen(15); m_bg_tilemap->set_transmask(0, 0x3fff, 0xc000); /* split type 0 has pens 0-13 transparent in front half */ m_bg_tilemap->set_transmask(1, 0x8000, 0x7fff); /* split type 1 has pen 15 transparent in front half */ @@ -73,7 +70,7 @@ VIDEO_START_MEMBER(flstory_state,flstory) VIDEO_START_MEMBER(flstory_state,rumba) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flstory_state::get_rumba_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::get_rumba_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); // m_bg_tilemap->set_transparent_pen(15); m_bg_tilemap->set_transmask(0, 0x3fff, 0xc000); /* split type 0 has pens 0-13 transparent in front half */ m_bg_tilemap->set_transmask(1, 0x8000, 0x7fff); /* split type 1 has pen 15 transparent in front half */ @@ -90,7 +87,7 @@ VIDEO_START_MEMBER(flstory_state,rumba) VIDEO_START_MEMBER(flstory_state,victnine) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(flstory_state::victnine_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::victnine_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); m_paletteram.resize(m_palette->entries()); diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c index d85bf0b2316..f5d7fa8cec9 100644 --- a/src/mame/video/foodf.c +++ b/src/mame/video/foodf.c @@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(foodf_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = (data & 0xff) | ((data >> 7) & 0x100); int color = (data >> 8) & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, m_playfield_flip ? (TILE_FLIPX | TILE_FLIPY) : 0); + SET_TILE_INFO_MEMBER(0, code, color, m_playfield_flip ? (TILE_FLIPX | TILE_FLIPY) : 0); } diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c index 7c2f2a35fd8..edd3e79fd40 100644 --- a/src/mame/video/freekick.c +++ b/src/mame/video/freekick.c @@ -10,13 +10,13 @@ TILE_GET_INFO_MEMBER(freekick_state::get_freek_tile_info) tileno = m_videoram[tile_index] + ((m_videoram[tile_index + 0x400] & 0xe0) << 3); palno = m_videoram[tile_index + 0x400] & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, palno, 0); + SET_TILE_INFO_MEMBER(0, tileno, palno, 0); } void freekick_state::video_start() { - m_freek_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(freekick_state::get_freek_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_freek_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(freekick_state::get_freek_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index 81994b1ab07..63b9d91c0de 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -22,7 +22,7 @@ inline void fromanc2_state::fromanc2_get_tile_info( tile_data &tileinfo, int til tile = (m_videoram[vram][layer][tile_index] & 0x3fff) | (m_gfxbank[vram][layer] << 14); color = ((m_videoram[vram][layer][tile_index] & 0xc000) >> 14) | (0x10 * vram); - SET_TILE_INFO_MEMBER(m_gfxdecode, layer, tile, color, 0); + SET_TILE_INFO_MEMBER(layer, tile, color, 0); } TILE_GET_INFO_MEMBER(fromanc2_state::fromanc2_get_v0_l0_tile_info){ fromanc2_get_tile_info(tileinfo, tile_index, 0, 0); } @@ -42,7 +42,7 @@ inline void fromanc2_state::fromancr_get_tile_info( tile_data &tileinfo, int til tile = m_videoram[vram][layer][tile_index] | (m_gfxbank[vram][layer] << 16); color = vram; - SET_TILE_INFO_MEMBER(m_gfxdecode, layer, tile, color, 0); + SET_TILE_INFO_MEMBER(layer, tile, color, 0); } TILE_GET_INFO_MEMBER(fromanc2_state::fromancr_get_v0_l0_tile_info){ fromancr_get_tile_info(tileinfo, tile_index, 0, 0); } @@ -374,14 +374,14 @@ WRITE16_MEMBER(fromanc2_state::fromanc4_gfxreg_2_w) VIDEO_START_MEMBER(fromanc2_state,fromanc2) { - m_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[0][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v1_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v1_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[1][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v1_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[1][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v1_l3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v1_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v1_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v1_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v1_l3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][1]->set_transparent_pen(0x000); m_tilemap[0][2]->set_transparent_pen(0x000); @@ -422,13 +422,13 @@ VIDEO_START_MEMBER(fromanc2_state,fromanc2) VIDEO_START_MEMBER(fromanc2_state,fromancr) { - m_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][3] = 0; - m_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[1][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[1][3] = 0; m_tilemap[0][1]->set_transparent_pen(0x0ff); @@ -465,13 +465,13 @@ VIDEO_START_MEMBER(fromanc2_state,fromancr) VIDEO_START_MEMBER(fromanc2_state,fromanc4) { - m_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); - m_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); - m_tilemap[0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); + m_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); + m_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); + m_tilemap[0][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); m_tilemap[0][3] = 0; - m_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); - m_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); - m_tilemap[1][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); + m_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); + m_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); + m_tilemap[1][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v1_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); m_tilemap[1][3] = 0; m_tilemap[0][1]->set_transparent_pen(0x000); diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index f38cf9a8e82..eb70a412e5f 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -26,7 +26,7 @@ inline void fromance_state::get_fromance_tile_info( tile_data &tileinfo, int til m_local_videoram[layer][0x2000 + tile_index]; int color = m_local_videoram[layer][tile_index] & 0x7f; - SET_TILE_INFO_MEMBER(m_gfxdecode, layer, tile, color, 0); + SET_TILE_INFO_MEMBER(layer, tile, color, 0); } TILE_GET_INFO_MEMBER(fromance_state::get_fromance_bg_tile_info){ get_fromance_tile_info(tileinfo, tile_index, 0); } @@ -39,7 +39,7 @@ inline void fromance_state::get_nekkyoku_tile_info( tile_data &tileinfo, int til m_local_videoram[layer][0x1000 + tile_index]; int color = m_local_videoram[layer][tile_index + 0x2000] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, layer, tile, color, 0); + SET_TILE_INFO_MEMBER(layer, tile, color, 0); } TILE_GET_INFO_MEMBER(fromance_state::get_nekkyoku_bg_tile_info){ get_nekkyoku_tile_info(tileinfo, tile_index, 0); } @@ -88,8 +88,8 @@ void fromance_state::init_common( ) VIDEO_START_MEMBER(fromance_state,fromance) { /* allocate tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromance_state::get_fromance_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromance_state::get_fromance_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromance_state::get_fromance_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromance_state::get_fromance_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); init_common(); } @@ -97,8 +97,8 @@ VIDEO_START_MEMBER(fromance_state,fromance) VIDEO_START_MEMBER(fromance_state,nekkyoku) { /* allocate tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromance_state::get_nekkyoku_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromance_state::get_nekkyoku_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromance_state::get_nekkyoku_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fromance_state::get_nekkyoku_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); init_common(); } diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index 9adbd11b50d..2f439c8bc30 100644 --- a/src/mame/video/funkybee.c +++ b/src/mame/video/funkybee.c @@ -76,7 +76,7 @@ TILE_GET_INFO_MEMBER(funkybee_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 0x80) << 1); int color = m_colorram[tile_index] & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode, m_gfx_bank, code, color, 0); + SET_TILE_INFO_MEMBER(m_gfx_bank, code, color, 0); } TILEMAP_MAPPER_MEMBER(funkybee_state::funkybee_tilemap_scan) @@ -87,7 +87,7 @@ TILEMAP_MAPPER_MEMBER(funkybee_state::funkybee_tilemap_scan) void funkybee_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(funkybee_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(funkybee_state::funkybee_tilemap_scan),this), 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(funkybee_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(funkybee_state::funkybee_tilemap_scan),this), 8, 8, 32, 32); } void funkybee_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c index 0d55ba9067b..ad0bfd6e266 100644 --- a/src/mame/video/funworld.c +++ b/src/mame/video/funworld.c @@ -119,23 +119,23 @@ TILE_GET_INFO_MEMBER(funworld_state::get_bg_tile_info) int code = attr & 0xfff; int color = m_colorram[offs] >> 4; // 4 bits for color. - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(funworld_state, funworld) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 29); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 29); } VIDEO_START_MEMBER(funworld_state, magicrd2) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 112, 34); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 112, 34); } VIDEO_START_MEMBER(funworld_state, chinatow) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 31); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 31); } diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c index 46302dfe63d..e79920c6c41 100644 --- a/src/mame/video/fuukifg2.c +++ b/src/mame/video/fuukifg2.c @@ -48,7 +48,7 @@ inline void fuuki16_state::get_tile_info(tile_data &tileinfo, tilemap_memory_ind { UINT16 code = m_vram[_N_][2 * tile_index + 0]; UINT16 attr = m_vram[_N_][2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1 + _N_, code, attr & 0x3f, TILE_FLIPYX((attr >> 6) & 3)); + SET_TILE_INFO_MEMBER(1 + _N_, code, attr & 0x3f, TILE_FLIPYX((attr >> 6) & 3)); } TILE_GET_INFO_MEMBER(fuuki16_state::get_tile_info_0){ get_tile_info(tileinfo, tile_index, 0); } @@ -92,10 +92,10 @@ PALETTE_INIT_MEMBER(fuuki16_state,fuuki16) void fuuki16_state::video_start() { - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fuuki16_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fuuki16_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fuuki16_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fuuki16_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fuuki16_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fuuki16_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fuuki16_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fuuki16_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tilemap[0]->set_transparent_pen(0x0f); // 4 bits m_tilemap[1]->set_transparent_pen(0xff); // 8 bits diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c index 6ac1cfc2a49..bb316d15f4d 100644 --- a/src/mame/video/fuukifg3.c +++ b/src/mame/video/fuukifg3.c @@ -52,7 +52,7 @@ inline void fuuki32_state::get_tile_info8bpp(tile_data &tileinfo, tilemap_memory { UINT16 code = (m_vram[_N_][tile_index] & 0xffff0000) >> 16; UINT16 attr = (m_vram[_N_][tile_index] & 0x0000ffff); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1 + _N_, code, (attr & 0x3f) >> 4, TILE_FLIPYX((attr >> 6) & 3)); + SET_TILE_INFO_MEMBER(1 + _N_, code, (attr & 0x3f) >> 4, TILE_FLIPYX((attr >> 6) & 3)); } TILE_GET_INFO_MEMBER(fuuki32_state::get_tile_info_0){ get_tile_info8bpp(tileinfo, tile_index, 0); } @@ -62,7 +62,7 @@ inline void fuuki32_state::get_tile_info4bpp(tile_data &tileinfo, tilemap_memory { UINT16 code = (m_vram[_N_][tile_index] & 0xffff0000) >> 16; UINT16 attr = (m_vram[_N_][tile_index] & 0x0000ffff); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1 + _N_, code, attr & 0x3f, TILE_FLIPYX((attr >> 6) & 3)); + SET_TILE_INFO_MEMBER(1 + _N_, code, attr & 0x3f, TILE_FLIPYX((attr >> 6) & 3)); } TILE_GET_INFO_MEMBER(fuuki32_state::get_tile_info_2){ get_tile_info4bpp(tileinfo, tile_index, 2); } @@ -96,10 +96,10 @@ void fuuki32_state::video_start() save_pointer(NAME(m_buf_spriteram), m_spriteram.bytes() / 4); save_pointer(NAME(m_buf_spriteram2), m_spriteram.bytes() / 4); - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fuuki32_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fuuki32_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fuuki32_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fuuki32_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fuuki32_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fuuki32_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fuuki32_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(fuuki32_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tilemap[0]->set_transparent_pen(0xff); // 8 bits m_tilemap[1]->set_transparent_pen(0xff); // 8 bits diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index 1c24c39cfe0..5ecfc58ea3f 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(gaelco_state::get_tile_info_gaelco_screen0) tileinfo.category = (data2 >> 6) & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode,1, 0x4000 + code, data2 & 0x3f, TILE_FLIPYX(data & 0x03)); + SET_TILE_INFO_MEMBER(1, 0x4000 + code, data2 & 0x3f, TILE_FLIPYX(data & 0x03)); } @@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(gaelco_state::get_tile_info_gaelco_screen1) tileinfo.category = (data2 >> 6) & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode,1, 0x4000 + code, data2 & 0x3f, TILE_FLIPYX(data & 0x03)); + SET_TILE_INFO_MEMBER(1, 0x4000 + code, data2 & 0x3f, TILE_FLIPYX(data & 0x03)); } /*************************************************************************** @@ -74,8 +74,8 @@ WRITE16_MEMBER(gaelco_state::gaelco_vram_w) VIDEO_START_MEMBER(gaelco_state,bigkarnk) { - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap[0]->set_transmask(0, 0xff01, 0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ m_tilemap[1]->set_transmask(0, 0xff01, 0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ @@ -83,8 +83,8 @@ VIDEO_START_MEMBER(gaelco_state,bigkarnk) VIDEO_START_MEMBER(gaelco_state,maniacsq) { - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap[0]->set_transparent_pen(0); m_tilemap[1]->set_transparent_pen(0); diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index 891f2df8744..af690928c1b 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -107,7 +107,7 @@ TILE_GET_INFO_MEMBER(gaelco2_state::get_tile_info_gaelco2_screen0) int data2 = m_videoram[(((m_vregs[0] >> 9) & 0x07)*0x2000/2) + ((tile_index << 1) + 1)]; int code = ((data & 0x07) << 16) | (data2 & 0xffff); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, ((data >> 9) & 0x7f), TILE_FLIPXY((data >> 6) & 0x03)); + SET_TILE_INFO_MEMBER(0, code, ((data >> 9) & 0x7f), TILE_FLIPXY((data >> 6) & 0x03)); } TILE_GET_INFO_MEMBER(gaelco2_state::get_tile_info_gaelco2_screen1) @@ -116,7 +116,7 @@ TILE_GET_INFO_MEMBER(gaelco2_state::get_tile_info_gaelco2_screen1) int data2 = m_videoram[(((m_vregs[1] >> 9) & 0x07)*0x2000/2) + ((tile_index << 1) + 1)]; int code = ((data & 0x07) << 16) | (data2 & 0xffff); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, ((data >> 9) & 0x7f), TILE_FLIPXY((data >> 6) & 0x03)); + SET_TILE_INFO_MEMBER(0, code, ((data >> 9) & 0x7f), TILE_FLIPXY((data >> 6) & 0x03)); } @@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(gaelco2_state::get_tile_info_gaelco2_screen0_dual) int data2 = m_videoram[(((m_vregs[0] >> 9) & 0x07)*0x2000/2) + ((tile_index << 1) + 1)]; int code = ((data & 0x07) << 16) | (data2 & 0xffff); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, ((data >> 9) & 0x3f), TILE_FLIPXY((data >> 6) & 0x03)); + SET_TILE_INFO_MEMBER(0, code, ((data >> 9) & 0x3f), TILE_FLIPXY((data >> 6) & 0x03)); } TILE_GET_INFO_MEMBER(gaelco2_state::get_tile_info_gaelco2_screen1_dual) @@ -157,7 +157,7 @@ TILE_GET_INFO_MEMBER(gaelco2_state::get_tile_info_gaelco2_screen1_dual) int data2 = m_videoram[(((m_vregs[1] >> 9) & 0x07)*0x2000/2) + ((tile_index << 1) + 1)]; int code = ((data & 0x07) << 16) | (data2 & 0xffff); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0x40 + ((data >> 9) & 0x3f), TILE_FLIPXY((data >> 6) & 0x03)); + SET_TILE_INFO_MEMBER(0, code, 0x40 + ((data >> 9) & 0x3f), TILE_FLIPXY((data >> 6) & 0x03)); } @@ -261,8 +261,8 @@ VIDEO_START_MEMBER(gaelco2_state,gaelco2) m_videoram = m_spriteram->live(); /* create tilemaps */ - m_pant[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaelco2_state::get_tile_info_gaelco2_screen0),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_pant[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaelco2_state::get_tile_info_gaelco2_screen1),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pant[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco2_state::get_tile_info_gaelco2_screen0),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pant[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco2_state::get_tile_info_gaelco2_screen1),this),TILEMAP_SCAN_ROWS,16,16,64,32); /* set tilemap properties */ m_pant[0]->set_transparent_pen(0); @@ -281,8 +281,8 @@ VIDEO_START_MEMBER(gaelco2_state,gaelco2_dual) m_videoram = m_spriteram->live(); /* create tilemaps */ - m_pant[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaelco2_state::get_tile_info_gaelco2_screen0_dual),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_pant[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaelco2_state::get_tile_info_gaelco2_screen1_dual),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pant[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco2_state::get_tile_info_gaelco2_screen0_dual),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pant[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco2_state::get_tile_info_gaelco2_screen1_dual),this),TILEMAP_SCAN_ROWS,16,16,64,32); /* set tilemap properties */ m_pant[0]->set_transparent_pen(0); diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c index 48209bc5501..d5b6022ff3e 100644 --- a/src/mame/video/gaiden.c +++ b/src/mame/video/gaiden.c @@ -17,8 +17,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_bg_tile_info) { UINT16 *videoram1 = &m_videoram3[0x0800]; UINT16 *videoram2 = m_videoram3; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, videoram1[tile_index] & 0x0fff, (videoram2[tile_index] & 0xf0) >> 4, 0); @@ -28,8 +27,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_fg_tile_info) { UINT16 *videoram1 = &m_videoram2[0x0800]; UINT16 *videoram2 = m_videoram2; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, videoram1[tile_index] & 0x0fff, (videoram2[tile_index] & 0xf0) >> 4, 0); @@ -43,8 +41,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_fg_tile_info_raiga) /* bit 3 controls blending */ tileinfo.category = (videoram2[tile_index] & 0x08) >> 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, videoram1[tile_index] & 0x0fff, ((videoram2[tile_index] & 0xf0) >> 4) | (tileinfo.category ? 0x80 : 0x00), 0); @@ -54,8 +51,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_tx_tile_info) { UINT16 *videoram1 = &m_videoram[0x0400]; UINT16 *videoram2 = m_videoram; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, videoram1[tile_index] & 0x07ff, (videoram2[tile_index] & 0xf0) >> 4, 0); @@ -74,9 +70,9 @@ VIDEO_START_MEMBER(gaiden_state,gaiden) m_screen->register_screen_bitmap(m_tile_bitmap_bg); m_screen->register_screen_bitmap(m_tile_bitmap_fg); - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info_raiga),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info_raiga),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_background->set_transparent_pen(0); m_foreground->set_transparent_pen(0); @@ -100,9 +96,9 @@ VIDEO_START_MEMBER(gaiden_state,mastninj) m_screen->register_screen_bitmap(m_tile_bitmap_bg); m_screen->register_screen_bitmap(m_tile_bitmap_fg); - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info_raiga),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info_raiga),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); // m_background->set_transparent_pen(15); m_foreground->set_transparent_pen(15); @@ -121,9 +117,9 @@ VIDEO_START_MEMBER(gaiden_state,raiga) m_screen->register_screen_bitmap(m_tile_bitmap_bg); m_screen->register_screen_bitmap(m_tile_bitmap_fg); - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info_raiga),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info_raiga),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_background->set_transparent_pen(0); m_foreground->set_transparent_pen(0); @@ -136,9 +132,9 @@ VIDEO_START_MEMBER(gaiden_state,raiga) VIDEO_START_MEMBER(gaiden_state,drgnbowl) { /* set up tile layers */ - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_foreground->set_transparent_pen(15); m_text_layer->set_transparent_pen(15); diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index 45ff75bc644..71efb3d59a5 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -411,8 +411,7 @@ TILE_GET_INFO_MEMBER(galaga_state::get_tile_info) We reproduce this here, but since the tilemap system automatically flips characters when screen is flipped, we have to flip them back. */ int color = m_videoram[tile_index + 0x400] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (m_videoram[tile_index] & 0x7f) | (flip_screen() ? 0x80 : 0) | (m_galaga_gfxbank << 8), color, flip_screen() ? TILE_FLIPX : 0); @@ -429,7 +428,7 @@ TILE_GET_INFO_MEMBER(galaga_state::get_tile_info) VIDEO_START_MEMBER(galaga_state,galaga) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaga_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(galaga_state::tilemap_scan),this),8,8,36,28); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaga_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(galaga_state::tilemap_scan),this),8,8,36,28); m_palette->configure_tilemap_groups(*m_fg_tilemap, *m_gfxdecode->gfx(0), 0x1f); m_galaga_gfxbank = 0; diff --git a/src/mame/video/galaxia.c b/src/mame/video/galaxia.c index e788e80dada..0b2b965344f 100644 --- a/src/mame/video/galaxia.c +++ b/src/mame/video/galaxia.c @@ -64,7 +64,7 @@ TILE_GET_INFO_MEMBER(galaxia_state::get_galaxia_bg_tile_info) UINT8 code = m_video_ram[tile_index] & 0x7f; // d7 unused UINT8 color = m_color_ram[tile_index] & 3; // highest bits unused - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(galaxia_state::get_astrowar_bg_tile_info) @@ -72,7 +72,7 @@ TILE_GET_INFO_MEMBER(galaxia_state::get_astrowar_bg_tile_info) UINT8 code = m_video_ram[tile_index]; UINT8 color = m_color_ram[tile_index] & 7; // highest bits unused - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void galaxia_state::init_common() @@ -85,7 +85,7 @@ VIDEO_START_MEMBER(galaxia_state,galaxia) { init_common(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxia_state::get_galaxia_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxia_state::get_galaxia_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(8); @@ -95,7 +95,7 @@ VIDEO_START_MEMBER(galaxia_state,astrowar) { init_common(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxia_state::get_astrowar_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxia_state::get_astrowar_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(8); m_bg_tilemap->set_scrolldx(8, 8); diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index ff9cc5062f9..60502e1d406 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -379,13 +379,13 @@ void galaxian_state::video_start() if (!m_sfx_tilemap) { /* normal galaxian hardware is row-based and individually scrolling columns */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxian_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, GALAXIAN_XSCALE*8,8, 32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxian_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, GALAXIAN_XSCALE*8,8, 32,32); m_bg_tilemap->set_scroll_cols(32); } else { /* sfx hardware is column-based and individually scrolling rows */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxian_state::bg_get_tile_info),this), TILEMAP_SCAN_COLS, GALAXIAN_XSCALE*8,8, 32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxian_state::bg_get_tile_info),this), TILEMAP_SCAN_COLS, GALAXIAN_XSCALE*8,8, 32,32); m_bg_tilemap->set_scroll_rows(32); } m_bg_tilemap->set_transparent_pen(0); @@ -472,7 +472,7 @@ TILE_GET_INFO_MEMBER(galaxian_state::bg_get_tile_info) if (m_extend_tile_info_ptr != NULL) (this->*m_extend_tile_info_ptr)(&code, &color, attrib, x); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index ac1122b4be6..3a2e19cbd13 100644 --- a/src/mame/video/galaxold.c +++ b/src/mame/video/galaxold.c @@ -426,7 +426,7 @@ void galaxold_state::video_start_common() VIDEO_START_MEMBER(galaxold_state,galaxold_plain) { video_start_common(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxold_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(32); @@ -621,7 +621,7 @@ void galaxold_state::rockclim_modify_spritecode(UINT8 *spriteram, int *code, int VIDEO_START_MEMBER(galaxold_state,rockclim) { VIDEO_START_CALL_MEMBER(galaxold); - m_rockclim_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxold_state::rockclim_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_rockclim_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::rockclim_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_draw_background = &galaxold_state::rockclim_draw_background; m_modify_charcode = &galaxold_state::mooncrst_modify_charcode; @@ -642,13 +642,13 @@ TILE_GET_INFO_MEMBER(galaxold_state::drivfrcg_get_tile_info) code |= (bank << 4); color |= ((m_attributesram[(x << 1) | 1] & 0x40) >> 3); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(galaxold_state,drivfrcg) { video_start_common(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxold_state::drivfrcg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::drivfrcg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(32); @@ -662,7 +662,7 @@ VIDEO_START_MEMBER(galaxold_state,drivfrcg) VIDEO_START_MEMBER(galaxold_state,ad2083) { video_start_common(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxold_state::drivfrcg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::drivfrcg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(32); @@ -692,13 +692,13 @@ TILE_GET_INFO_MEMBER(galaxold_state::racknrol_get_tile_info) code |= (bank << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(galaxold_state,racknrol) { video_start_common(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxold_state::racknrol_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::racknrol_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_cols(32); @@ -718,7 +718,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::harem_get_tile_info) code |= bank * 0x200; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void galaxold_state::harem_modify_spritecode(UINT8 *spriteram, int *code, int *flipx, int *flipy, int offs) @@ -729,7 +729,7 @@ void galaxold_state::harem_modify_spritecode(UINT8 *spriteram, int *code, int *f VIDEO_START_MEMBER(galaxold_state,harem) { video_start_common(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxold_state::harem_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::harem_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); // m_bg_tilemap->set_transparent_pen(0); // opaque tilemap to get sky and sand colors m_bg_tilemap->set_scroll_cols(32); @@ -772,7 +772,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::dambustr_get_tile_info2) (this->*m_modify_color)(&color); } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(galaxold_state,dambustr) @@ -797,7 +797,7 @@ VIDEO_START_MEMBER(galaxold_state,dambustr) /* make a copy of the tilemap to emulate background priority */ m_dambustr_videoram2 = auto_alloc_array(machine(), UINT8, 0x0400); - m_dambustr_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxold_state::dambustr_get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_dambustr_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::dambustr_get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_dambustr_tilemap2->set_transparent_pen(0); } @@ -1612,13 +1612,13 @@ TILE_GET_INFO_MEMBER(galaxold_state::get_tile_info) (this->*m_modify_color)(&color); } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(galaxold_state::rockclim_get_tile_info) { UINT16 code = m_rockclim_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, 0, 0); + SET_TILE_INFO_MEMBER(2, code, 0, 0); } void galaxold_state::draw_bullets_common(bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index 471b5395003..9ebf00ad1f7 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -122,8 +122,7 @@ TILE_GET_INFO_MEMBER(galivan_state::get_bg_tile_info) UINT8 *BGROM = memregion("gfx4")->base(); int attr = BGROM[tile_index + 0x4000]; int code = BGROM[tile_index] | ((attr & 0x03) << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, (attr & 0x78) >> 3, /* seems correct */ 0); @@ -133,8 +132,7 @@ TILE_GET_INFO_MEMBER(galivan_state::get_tx_tile_info) { int attr = m_videoram[tile_index + 0x400]; int code = m_videoram[tile_index] | ((attr & 0x01) << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr & 0xe0) >> 5, /* not sure */ 0); @@ -146,8 +144,7 @@ TILE_GET_INFO_MEMBER(galivan_state::ninjemak_get_bg_tile_info) UINT8 *BGROM = memregion("gfx4")->base(); int attr = BGROM[tile_index + 0x4000]; int code = BGROM[tile_index] | ((attr & 0x03) << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, ((attr & 0x60) >> 3) | ((attr & 0x0c) >> 2), /* seems correct */ 0); @@ -161,8 +158,7 @@ TILE_GET_INFO_MEMBER(galivan_state::ninjemak_get_tx_tile_info) if(tile_index < 0x12) /* don't draw the NB1414M4 params! TODO: could be a better fix */ code = attr = 0x01; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr & 0x1c) >> 2, /* seems correct ? */ 0); @@ -178,16 +174,16 @@ TILE_GET_INFO_MEMBER(galivan_state::ninjemak_get_tx_tile_info) VIDEO_START_MEMBER(galivan_state,galivan) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galivan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galivan_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(15); } VIDEO_START_MEMBER(galivan_state,ninjemak) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 512, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 512, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(15); } diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c index f6f6a05bd15..2e037febbf0 100644 --- a/src/mame/video/gaplus.c +++ b/src/mame/video/gaplus.c @@ -97,8 +97,7 @@ TILE_GET_INFO_MEMBER(gaplus_state::get_tile_info) UINT8 attr = m_videoram[tile_index + 0x400]; tileinfo.category = (attr & 0x40) >> 6; tileinfo.group = attr & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index] + ((attr & 0x80) << 1), attr & 0x3f, 0); @@ -177,7 +176,7 @@ void gaplus_state::starfield_init() void gaplus_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaplus_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(gaplus_state::tilemap_scan),this),8,8,36,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaplus_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(gaplus_state::tilemap_scan),this),8,8,36,28); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(0), 0xff); diff --git a/src/mame/video/gatron.c b/src/mame/video/gatron.c index 3751d511752..b0d7d34b2e0 100644 --- a/src/mame/video/gatron.c +++ b/src/mame/video/gatron.c @@ -40,12 +40,12 @@ TILE_GET_INFO_MEMBER(gatron_state::get_bg_tile_info) int code = videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void gatron_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gatron_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 16, 48, 16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gatron_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 16, 48, 16); } UINT32 gatron_state::screen_update_gat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/gauntlet.c b/src/mame/video/gauntlet.c index bb639c12353..014c11699ed 100644 --- a/src/mame/video/gauntlet.c +++ b/src/mame/video/gauntlet.c @@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(gauntlet_state::get_alpha_tile_info) int code = data & 0x3ff; int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20); int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(gauntlet_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = ((m_playfield_tile_bank * 0x1000) + (data & 0xfff)) ^ 0x800; int color = 0x10 + (m_playfield_color_bank * 8) + ((data >> 12) & 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index fd793f497db..1902095878f 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -112,12 +112,12 @@ TILE_GET_INFO_MEMBER(gberet_state::get_bg_tile_info) tileinfo.group = color; tileinfo.category = (attr & 0x80) >> 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } VIDEO_START_MEMBER(gberet_state,gberet) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gberet_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gberet_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(0), 0x10); m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c index 0272a908b2a..61e42cee0f3 100644 --- a/src/mame/video/gcpinbal.c +++ b/src/mame/video/gcpinbal.c @@ -10,8 +10,7 @@ TILE_GET_INFO_MEMBER(gcpinbal_state::get_bg0_tile_info) UINT16 tilenum = m_tilemapram[0 + tile_index * 2]; UINT16 attr = m_tilemapram[1 + tile_index * 2]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (tilenum & 0xfff) + m_bg0_gfxset, (attr & 0x1f), TILE_FLIPYX( (attr & 0x300) >> 8)); @@ -22,8 +21,7 @@ TILE_GET_INFO_MEMBER(gcpinbal_state::get_bg1_tile_info) UINT16 tilenum = m_tilemapram[0x800 + tile_index * 2]; UINT16 attr = m_tilemapram[0x801 + tile_index * 2]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (tilenum & 0xfff) + 0x2000 + m_bg1_gfxset, (attr & 0x1f) + 0x30, TILE_FLIPYX( (attr & 0x300) >> 8)); @@ -33,8 +31,7 @@ TILE_GET_INFO_MEMBER(gcpinbal_state::get_fg_tile_info) { UINT16 tilenum = m_tilemapram[0x1000 + tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, (tilenum & 0xfff), (tilenum >> 12) | 0x70, 0); @@ -45,9 +42,9 @@ void gcpinbal_state::gcpinbal_core_vh_start( ) int xoffs = 0; int yoffs = 0; - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gcpinbal_state::get_bg0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gcpinbal_state::get_bg1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gcpinbal_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gcpinbal_state::get_bg0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gcpinbal_state::get_bg1_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gcpinbal_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); m_tilemap[0]->set_transparent_pen(0); m_tilemap[1]->set_transparent_pen(0); diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index 0c1720e8adc..0c6d8dfb5d7 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -78,8 +78,7 @@ TILE_GET_INFO_MEMBER(ginganin_state::get_bg_tile_info) { UINT8 *gfx = memregion("gfx5")->base(); int code = gfx[2 * tile_index + 0] * 256 + gfx[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - BG_GFX, + SET_TILE_INFO_MEMBER(BG_GFX, code, code >> 12, 0); @@ -95,8 +94,7 @@ TILE_GET_INFO_MEMBER(ginganin_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(ginganin_state::get_fg_tile_info) { UINT16 code = m_fgram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - FG_GFX, + SET_TILE_INFO_MEMBER(FG_GFX, code, code >> 12, 0); @@ -118,8 +116,7 @@ WRITE16_MEMBER(ginganin_state::ginganin_fgram16_w) TILE_GET_INFO_MEMBER(ginganin_state::get_txt_tile_info) { UINT16 code = m_txtram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - TXT_GFX, + SET_TILE_INFO_MEMBER(TXT_GFX, code, code >> 12, 0); @@ -134,9 +131,9 @@ WRITE16_MEMBER(ginganin_state::ginganin_txtram16_w) void ginganin_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ginganin_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, BG_NX, BG_NY); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ginganin_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, FG_NX, FG_NY); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ginganin_state::get_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, TXT_NX, TXT_NY); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ginganin_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, BG_NX, BG_NY); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ginganin_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, FG_NX, FG_NY); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ginganin_state::get_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, TXT_NX, TXT_NY); m_fg_tilemap->set_transparent_pen(15); m_tx_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c index c72baae221e..99bfe8fffab 100644 --- a/src/mame/video/gladiatr.c +++ b/src/mame/video/gladiatr.c @@ -18,8 +18,7 @@ TILE_GET_INFO_MEMBER(gladiatr_state::bg_get_tile_info) { UINT8 attr = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_videoram[tile_index] + ((attr & 0x07) << 8) + (m_bg_tile_bank << 11), (attr >> 3) ^ 0x1f, 0); @@ -27,8 +26,7 @@ TILE_GET_INFO_MEMBER(gladiatr_state::bg_get_tile_info) TILE_GET_INFO_MEMBER(gladiatr_state::fg_get_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_textram[tile_index] + (m_fg_tile_bank << 8), 0, 0); @@ -44,8 +42,8 @@ TILE_GET_INFO_MEMBER(gladiatr_state::fg_get_tile_info) VIDEO_START_MEMBER(gladiatr_state,ppking) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gladiatr_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gladiatr_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); m_fg_tilemap->set_transparent_pen(0); @@ -56,8 +54,8 @@ VIDEO_START_MEMBER(gladiatr_state,ppking) VIDEO_START_MEMBER(gladiatr_state,gladiatr) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gladiatr_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gladiatr_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index 118784cd314..3c5c1aea574 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(glass_state::get_tile_info_glass_screen0) int data2 = m_videoram[(tile_index << 1) + 1]; int code = ((data & 0x03) << 14) | ((data & 0x0fffc) >> 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0x20 + (data2 & 0x1f), TILE_FLIPYX((data2 & 0xc0) >> 6)); + SET_TILE_INFO_MEMBER(0, code, 0x20 + (data2 & 0x1f), TILE_FLIPYX((data2 & 0xc0) >> 6)); } @@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(glass_state::get_tile_info_glass_screen1) int data2 = m_videoram[(0x1000 / 2) + (tile_index << 1) + 1]; int code = ((data & 0x03) << 14) | ((data & 0x0fffc) >> 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0x20 + (data2 & 0x1f), TILE_FLIPYX((data2 & 0xc0) >> 6)); + SET_TILE_INFO_MEMBER(0, code, 0x20 + (data2 & 0x1f), TILE_FLIPYX((data2 & 0xc0) >> 6)); } /*************************************************************************** @@ -125,8 +125,8 @@ WRITE16_MEMBER(glass_state::glass_vram_w) void glass_state::video_start() { - m_pant[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(glass_state::get_tile_info_glass_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_pant[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(glass_state::get_tile_info_glass_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_pant[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(glass_state::get_tile_info_glass_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_pant[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(glass_state::get_tile_info_glass_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_screen_bitmap = auto_bitmap_ind16_alloc (machine(), 320, 200); save_item(NAME(*m_screen_bitmap)); diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index 75425d5c545..916e290fb32 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -19,8 +19,7 @@ TILE_GET_INFO_MEMBER(gng_state::get_fg_tile_info) { UINT8 attr = m_fgvideoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fgvideoram[tile_index] + ((attr & 0xc0) << 2), attr & 0x0f, TILE_FLIPYX((attr & 0x30) >> 4)); @@ -29,8 +28,7 @@ TILE_GET_INFO_MEMBER(gng_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(gng_state::get_bg_tile_info) { UINT8 attr = m_bgvideoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_bgvideoram[tile_index] + ((attr & 0xc0) << 2), attr & 0x07, TILE_FLIPYX((attr & 0x30) >> 4)); @@ -47,8 +45,8 @@ TILE_GET_INFO_MEMBER(gng_state::get_bg_tile_info) void gng_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gng_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gng_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gng_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gng_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_fg_tilemap->set_transparent_pen(3); m_bg_tilemap->set_transmask(0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c index 77338553b67..7ba27b01ed0 100644 --- a/src/mame/video/goal92.c +++ b/src/mame/video/goal92.c @@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(goal92_state::get_text_tile_info) tile |= 0xc000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color, 0); + SET_TILE_INFO_MEMBER(1, tile, color, 0); } TILE_GET_INFO_MEMBER(goal92_state::get_back_tile_info) @@ -59,7 +59,7 @@ TILE_GET_INFO_MEMBER(goal92_state::get_back_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tile, color, 0); + SET_TILE_INFO_MEMBER(2, tile, color, 0); } TILE_GET_INFO_MEMBER(goal92_state::get_fore_tile_info) @@ -81,7 +81,7 @@ TILE_GET_INFO_MEMBER(goal92_state::get_fore_tile_info) tile |= 0x2000; } - SET_TILE_INFO_MEMBER(m_gfxdecode, region, tile, color, 0); + SET_TILE_INFO_MEMBER(region, tile, color, 0); } void goal92_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ) @@ -130,9 +130,9 @@ void goal92_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect void goal92_state::video_start() { - m_bg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goal92_state::get_back_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_fg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goal92_state::get_fore_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tx_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goal92_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goal92_state::get_back_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goal92_state::get_fore_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goal92_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_buffered_spriteram = auto_alloc_array(machine(), UINT16, 0x400 * 2); save_pointer(NAME(m_buffered_spriteram), 0x400 * 2); diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c index e4643adab94..ea9af9beaf7 100644 --- a/src/mame/video/goindol.c +++ b/src/mame/video/goindol.c @@ -19,8 +19,7 @@ TILE_GET_INFO_MEMBER(goindol_state::get_fg_tile_info) { int code = m_fg_videoram[2 * tile_index + 1]; int attr = m_fg_videoram[2 * tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code | ((attr & 0x7) << 8) | (m_char_bank << 11), (attr & 0xf8) >> 3, 0); @@ -30,8 +29,7 @@ TILE_GET_INFO_MEMBER(goindol_state::get_bg_tile_info) { int code = m_bg_videoram[2 * tile_index + 1]; int attr = m_bg_videoram[2 * tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code | ((attr & 0x7) << 8) | (m_char_bank << 11), (attr & 0xf8) >> 3, 0); @@ -47,8 +45,8 @@ TILE_GET_INFO_MEMBER(goindol_state::get_bg_tile_info) void goindol_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goindol_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goindol_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goindol_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goindol_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index b060011094b..a9bb50139fe 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -63,8 +63,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_fg_tile_info) int code = m_fg_vidram[tile_index]; int attr = m_fg_atrram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code | (attr & 0xf0)<<4, attr&0x0f, 0); @@ -75,8 +74,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_magical_fg_tile_info) int code = m_fg_vidram[tile_index]; int attr = m_fg_atrram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code | (attr & 0xf0)<<4)+m_tile_bank*0x1000, attr&0x0f, 0); @@ -89,8 +87,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_cherrym_fg_tile_info) int code = m_fg_vidram[tile_index]; int attr = m_fg_atrram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code | (attr & 0x0f)<<8, (attr&0xf0)>>4, 0); @@ -108,8 +105,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel1_tile_info) { int code = m_reel1_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, m_bgcolor, 0); @@ -126,8 +122,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel2_tile_info) { int code = m_reel2_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, m_bgcolor, 0); @@ -143,8 +138,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel3_tile_info) { int code = m_reel3_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, m_bgcolor, 0); @@ -175,8 +169,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_unkch_reel1_tile_info) int code = m_reel1_ram[tile_index]; int attr = m_reel1_attrram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, (attr&0xf0)>>4, 0); @@ -187,8 +180,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_unkch_reel2_tile_info) int code = m_reel2_ram[tile_index]; int attr = m_reel2_attrram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, (attr&0xf0)>>4, 0); @@ -199,8 +191,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_unkch_reel3_tile_info) int code = m_reel3_ram[tile_index]; int attr = m_reel3_attrram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, (attr&0xf0)>>4, 0); @@ -211,15 +202,15 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_unkch_reel3_tile_info) VIDEO_START_MEMBER(goldstar_state,goldstar) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); m_reel2_tilemap->set_scroll_cols(64); m_reel3_tilemap->set_scroll_cols(64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); m_fg_tilemap->set_transparent_pen(0); // is there an enable reg for this game? @@ -228,11 +219,11 @@ VIDEO_START_MEMBER(goldstar_state,goldstar) VIDEO_START_MEMBER(goldstar_state,bingowng) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); m_fg_tilemap->set_transparent_pen(0); // is there an enable reg for this game? @@ -241,15 +232,15 @@ VIDEO_START_MEMBER(goldstar_state,bingowng) VIDEO_START_MEMBER(goldstar_state,magical) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel1_tilemap->set_scroll_cols(32); m_reel2_tilemap->set_scroll_cols(32); m_reel3_tilemap->set_scroll_cols(32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_magical_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_magical_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); m_fg_tilemap->set_transparent_pen(0); // is there an enable reg for this game? @@ -258,9 +249,9 @@ VIDEO_START_MEMBER(goldstar_state,magical) VIDEO_START_MEMBER(goldstar_state,unkch) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel1_tilemap->set_scroll_cols(32); m_reel2_tilemap->set_scroll_cols(32); @@ -270,7 +261,7 @@ VIDEO_START_MEMBER(goldstar_state,unkch) m_cmaster_girl_pal = 0; m_unkch_vidreg = 0x00; - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_cherrym_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_cherrym_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); m_fg_tilemap->set_transparent_pen(0); m_cm_enable_reg = 0x0b; @@ -278,9 +269,9 @@ VIDEO_START_MEMBER(goldstar_state,unkch) VIDEO_START_MEMBER(goldstar_state,cherrym) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); - m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); + m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); m_reel2_tilemap->set_scroll_cols(64); @@ -289,7 +280,7 @@ VIDEO_START_MEMBER(goldstar_state,cherrym) m_cmaster_girl_num = 0; m_cmaster_girl_pal = 0; - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_cherrym_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_cherrym_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8, 64, 32); m_fg_tilemap->set_transparent_pen(0); m_cm_enable_reg = 0x0b; diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c index 4e62c564893..626f8879d77 100644 --- a/src/mame/video/gomoku.c +++ b/src/mame/video/gomoku.c @@ -61,8 +61,7 @@ TILE_GET_INFO_MEMBER(gomoku_state::get_fg_tile_info) int color = (attr& 0x0f); int flipyx = (attr & 0xc0) >> 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(flipyx)); @@ -113,7 +112,7 @@ void gomoku_state::video_start() m_screen->register_screen_bitmap(m_bg_bitmap); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gomoku_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gomoku_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c index 11e1a7f9353..0913948e783 100644 --- a/src/mame/video/gotcha.c +++ b/src/mame/video/gotcha.c @@ -18,7 +18,7 @@ inline void gotcha_state::get_tile_info( tile_data &tileinfo, int tile_index ,UI UINT16 data = vram[tile_index]; int code = (data & 0x3ff) | (m_gfxbank[(data & 0x0c00) >> 10] << 10); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, (data >> 12) + color_offs, 0); + SET_TILE_INFO_MEMBER(0, code, (data >> 12) + color_offs, 0); } TILE_GET_INFO_MEMBER(gotcha_state::fg_get_tile_info) @@ -41,8 +41,8 @@ TILE_GET_INFO_MEMBER(gotcha_state::bg_get_tile_info) void gotcha_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gotcha_state::fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(gotcha_state::gotcha_tilemap_scan),this), 16, 16, 64, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gotcha_state::bg_get_tile_info),this), tilemap_mapper_delegate(FUNC(gotcha_state::gotcha_tilemap_scan),this), 16, 16, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gotcha_state::fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(gotcha_state::gotcha_tilemap_scan),this), 16, 16, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gotcha_state::bg_get_tile_info),this), tilemap_mapper_delegate(FUNC(gotcha_state::gotcha_tilemap_scan),this), 16, 16, 64, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index 55887886771..d1404782bea 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -114,9 +114,9 @@ TILE_GET_INFO_MEMBER(gottlieb_state::get_bg_tile_info) UINT8 *videoram = m_videoram; int code = videoram[tile_index]; if ((code & 0x80) == 0) - SET_TILE_INFO_MEMBER(m_gfxdecode, m_gfxcharlo, code, 0, 0); + SET_TILE_INFO_MEMBER(m_gfxcharlo, code, 0, 0); else - SET_TILE_INFO_MEMBER(m_gfxdecode, m_gfxcharhi, code, 0, 0); + SET_TILE_INFO_MEMBER(m_gfxcharhi, code, 0, 0); } TILE_GET_INFO_MEMBER(gottlieb_state::get_screwloo_bg_tile_info) @@ -124,9 +124,9 @@ TILE_GET_INFO_MEMBER(gottlieb_state::get_screwloo_bg_tile_info) UINT8 *videoram = m_videoram; int code = videoram[tile_index]; if ((code & 0xc0) == 0) - SET_TILE_INFO_MEMBER(m_gfxdecode, m_gfxcharlo, code, 0, 0); + SET_TILE_INFO_MEMBER(m_gfxcharlo, code, 0, 0); else - SET_TILE_INFO_MEMBER(m_gfxdecode, m_gfxcharhi, code, 0, 0); + SET_TILE_INFO_MEMBER(m_gfxcharhi, code, 0, 0); } @@ -144,7 +144,7 @@ void gottlieb_state::video_start() m_transparent0 = FALSE; /* configure the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gottlieb_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gottlieb_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_gfxdecode->gfx(0)->set_source(m_charram); @@ -169,7 +169,7 @@ VIDEO_START_MEMBER(gottlieb_state,screwloo) m_transparent0 = FALSE; /* configure the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gottlieb_state::get_screwloo_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gottlieb_state::get_screwloo_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_gfxdecode->gfx(0)->set_source(m_charram); diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index 8b352513797..5feef958fdd 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(gotya_state::get_bg_tile_info) int code = m_videoram[tile_index]; int color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILEMAP_MAPPER_MEMBER(gotya_state::tilemap_scan_rows_thehand) @@ -104,7 +104,7 @@ TILEMAP_MAPPER_MEMBER(gotya_state::tilemap_scan_rows_thehand) void gotya_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gotya_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(gotya_state::tilemap_scan_rows_thehand),this), 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gotya_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(gotya_state::tilemap_scan_rows_thehand),this), 8, 8, 64, 32); } void gotya_state::draw_status_row( bitmap_ind16 &bitmap, const rectangle &cliprect, int sx, int col ) diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c index f95546f0c94..014bb1cb045 100644 --- a/src/mame/video/gp9001.c +++ b/src/mame/video/gp9001.c @@ -253,8 +253,7 @@ TILE_GET_INFO_MEMBER(gp9001vdp_device::get_top0_tile_info) } color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour - SET_TILE_INFO_MEMBER(*m_gfxdecode, - tile_region, + SET_TILE_INFO_MEMBER(tile_region, tile_number, color, 0); @@ -276,8 +275,7 @@ TILE_GET_INFO_MEMBER(gp9001vdp_device::get_fg0_tile_info) } color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour - SET_TILE_INFO_MEMBER(*m_gfxdecode, - tile_region, + SET_TILE_INFO_MEMBER(tile_region, tile_number, color, 0); @@ -297,8 +295,7 @@ TILE_GET_INFO_MEMBER(gp9001vdp_device::get_bg0_tile_info) } color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour - SET_TILE_INFO_MEMBER(*m_gfxdecode, - tile_region, + SET_TILE_INFO_MEMBER(tile_region, tile_number, color, 0); @@ -309,9 +306,9 @@ void gp9001vdp_device::create_tilemaps(int region) { tile_region = region; - top.tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gp9001vdp_device::get_top0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - fg.tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gp9001vdp_device::get_fg0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - bg.tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gp9001vdp_device::get_bg0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + top.tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gp9001vdp_device::get_top0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + fg.tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gp9001vdp_device::get_fg0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + bg.tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gp9001vdp_device::get_bg0_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); top.tmap->set_transparent_pen(0); fg.tmap->set_transparent_pen(0); diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index e0f2d3c6b43..1ac540f32e7 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -72,22 +72,22 @@ WRITE8_MEMBER(grchamp_state::grchamp_right_w) TILE_GET_INFO_MEMBER(grchamp_state::get_text_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_videoram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0); } TILE_GET_INFO_MEMBER(grchamp_state::get_left_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, m_leftram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(1, m_leftram[tile_index], 0, 0); } TILE_GET_INFO_MEMBER(grchamp_state::get_right_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, m_rightram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(2, m_rightram[tile_index], 0, 0); } TILE_GET_INFO_MEMBER(grchamp_state::get_center_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, m_centerram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(3, m_centerram[tile_index], 0, 0); } TILEMAP_MAPPER_MEMBER(grchamp_state::get_memory_offset) @@ -102,10 +102,10 @@ void grchamp_state::video_start() m_work_bitmap.allocate(32,32); /* allocate tilemaps for each of the three sections */ - m_text_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(grchamp_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); - m_left_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(grchamp_state::get_left_tile_info),this), tilemap_mapper_delegate(FUNC(grchamp_state::get_memory_offset),this), 8,8, 64,32); - m_right_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(grchamp_state::get_right_tile_info),this), tilemap_mapper_delegate(FUNC(grchamp_state::get_memory_offset),this), 8,8, 64,32); - m_center_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(grchamp_state::get_center_tile_info),this), tilemap_mapper_delegate(FUNC(grchamp_state::get_memory_offset),this), 8,8, 64,32); + m_text_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(grchamp_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_left_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(grchamp_state::get_left_tile_info),this), tilemap_mapper_delegate(FUNC(grchamp_state::get_memory_offset),this), 8,8, 64,32); + m_right_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(grchamp_state::get_right_tile_info),this), tilemap_mapper_delegate(FUNC(grchamp_state::get_memory_offset),this), 8,8, 64,32); + m_center_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(grchamp_state::get_center_tile_info),this), tilemap_mapper_delegate(FUNC(grchamp_state::get_memory_offset),this), 8,8, 64,32); } #if 0 diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c index 55d84c94216..6771e6f1f41 100644 --- a/src/mame/video/gstriker.c +++ b/src/mame/video/gstriker.c @@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(gstriker_state::VS920A_get_tile_info) tileno = data & 0xFFF; pal = (data >> 12) & 0xF; - SET_TILE_INFO_MEMBER(m_gfxdecode, m_VS920A_cur_chip->gfx_region, tileno, m_VS920A_cur_chip->pal_base + pal, 0); + SET_TILE_INFO_MEMBER(m_VS920A_cur_chip->gfx_region, tileno, m_VS920A_cur_chip->pal_base + pal, 0); } WRITE16_MEMBER(gstriker_state::VS920A_0_vram_w) @@ -59,7 +59,7 @@ void gstriker_state::VS920A_init(int numchips) for (i=0;iset_transparent_pen(0); } @@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(gstriker_state::MB60553_get_tile_info) pal = (data >> 12) & 0xF; bankno = (data >> 9) & 0x7; - SET_TILE_INFO_MEMBER(m_gfxdecode, m_MB60553->gfx_region, tileno + m_MB60553_cur_chip->bank[bankno] * 0x200, pal + m_MB60553->pal_base, 0); + SET_TILE_INFO_MEMBER(m_MB60553->gfx_region, tileno + m_MB60553_cur_chip->bank[bankno] * 0x200, pal + m_MB60553->pal_base, 0); } void gstriker_state::MB60553_reg_written(int numchip, int num_reg) @@ -215,7 +215,7 @@ void gstriker_state::MB60553_init(int numchips) for (i=0;iset_transparent_pen(0); } diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c index d0616b35b61..1344dc08904 100644 --- a/src/mame/video/gsword.c +++ b/src/mame/video/gsword.c @@ -143,12 +143,12 @@ TILE_GET_INFO_MEMBER(gsword_state::get_bg_tile_info) int color = ((code & 0x3c0) >> 6) + 16 * m_charpalbank; int flags = m_flipscreen ? (TILE_FLIPX | TILE_FLIPY) : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void gsword_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gsword_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gsword_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); } diff --git a/src/mame/video/gumbo.c b/src/mame/video/gumbo.c index 1c768c550bc..ce9a858b353 100644 --- a/src/mame/video/gumbo.c +++ b/src/mame/video/gumbo.c @@ -13,7 +13,7 @@ WRITE16_MEMBER(gumbo_state::gumbo_bg_videoram_w) TILE_GET_INFO_MEMBER(gumbo_state::get_gumbo_bg_tile_info) { int tileno = m_bg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, 0, 0); + SET_TILE_INFO_MEMBER(0, tileno, 0, 0); } @@ -26,14 +26,14 @@ WRITE16_MEMBER(gumbo_state::gumbo_fg_videoram_w) TILE_GET_INFO_MEMBER(gumbo_state::get_gumbo_fg_tile_info) { int tileno = m_fg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, 1, 0); + SET_TILE_INFO_MEMBER(1, tileno, 1, 0); } void gumbo_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gumbo_state::get_gumbo_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gumbo_state::get_gumbo_fg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 4, 128, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gumbo_state::get_gumbo_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gumbo_state::get_gumbo_fg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 4, 128, 64); m_fg_tilemap->set_transparent_pen(0xff); } diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c index efc30d40cc6..9b6d66cd639 100644 --- a/src/mame/video/gundealr.c +++ b/src/mame/video/gundealr.c @@ -19,8 +19,7 @@ TILE_GET_INFO_MEMBER(gundealr_state::get_bg_tile_info) { UINT8 attr = m_bg_videoram[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_bg_videoram[2 * tile_index] + ((attr & 0x07) << 8), (attr & 0xf0) >> 4, 0); @@ -35,8 +34,7 @@ TILEMAP_MAPPER_MEMBER(gundealr_state::gundealr_scan) TILE_GET_INFO_MEMBER(gundealr_state::get_fg_tile_info) { UINT8 attr = m_fg_videoram[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_fg_videoram[2 * tile_index] + ((attr & 0x03) << 8), (attr & 0xf0) >> 4, 0); @@ -52,8 +50,8 @@ TILE_GET_INFO_MEMBER(gundealr_state::get_fg_tile_info) void gundealr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gundealr_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gundealr_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(gundealr_state::gundealr_scan),this), 16, 16, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gundealr_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gundealr_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(gundealr_state::gundealr_scan),this), 16, 16, 64, 32); m_fg_tilemap->set_transparent_pen(15); } diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index e961f665133..897726f6848 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -108,7 +108,7 @@ TILE_GET_INFO_MEMBER(gunsmoke_state::get_bg_tile_info) int color = (attr & 0x3c) >> 2; int flags = TILE_FLIPYX((attr & 0xc0) >> 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(gunsmoke_state::get_fg_tile_info) @@ -119,13 +119,13 @@ TILE_GET_INFO_MEMBER(gunsmoke_state::get_fg_tile_info) tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void gunsmoke_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gunsmoke_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 2048, 8); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gunsmoke_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gunsmoke_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 32, 32, 2048, 8); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gunsmoke_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_palette->configure_tilemap_groups(*m_fg_tilemap, *m_gfxdecode->gfx(0), 0x4f); } diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index df3ade43d1a..9b5c913cdfe 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -104,13 +104,13 @@ TILE_GET_INFO_MEMBER(gyruss_state::gyruss_get_tile_info) tileinfo.group = (m_colorram[tile_index] & 0x10) ? 0 : 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, flags); + SET_TILE_INFO_MEMBER(2, code, color, flags); } void gyruss_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gyruss_state::gyruss_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gyruss_state::gyruss_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tilemap->set_transmask(0, 0x00, 0); /* opaque */ m_tilemap->set_transmask(1, 0x0f, 0); /* transparent */ } diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c index c3535802a56..3c31eaf4c83 100644 --- a/src/mame/video/hanaawas.c +++ b/src/mame/video/hanaawas.c @@ -94,12 +94,12 @@ TILE_GET_INFO_MEMBER(hanaawas_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((attr & 0x20) << 3); int color = m_colorram[tile_index] & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfxbank, code, color, 0); + SET_TILE_INFO_MEMBER(gfxbank, code, color, 0); } void hanaawas_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hanaawas_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hanaawas_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 hanaawas_state::screen_update_hanaawas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c index 1677b8c26d8..5c05f4ce45f 100644 --- a/src/mame/video/hcastle.c +++ b/src/mame/video/hcastle.c @@ -83,8 +83,7 @@ TILE_GET_INFO_MEMBER(hcastle_state::get_fg_tile_info) ((attr >> (bit2 )) & 0x08) | ((attr >> (bit3 - 1)) & 0x10); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile + bank * 0x100 + m_pf1_bankbase, ((ctrl_6 & 0x30) * 2 + 16) + color, 0); @@ -107,8 +106,7 @@ TILE_GET_INFO_MEMBER(hcastle_state::get_bg_tile_info) ((attr >> (bit2 )) & 0x08) | ((attr >> (bit3 - 1)) & 0x10); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile + bank * 0x100 + m_pf2_bankbase, ((ctrl_6 & 0x30) * 2 + 16) + color, 0); @@ -124,8 +122,8 @@ TILE_GET_INFO_MEMBER(hcastle_state::get_bg_tile_info) void hcastle_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hcastle_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(hcastle_state::tilemap_scan),this), 8, 8, 64, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hcastle_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(hcastle_state::tilemap_scan),this), 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hcastle_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(hcastle_state::tilemap_scan),this), 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hcastle_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(hcastle_state::tilemap_scan),this), 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c index 1db04269cfc..0e9be7c63d8 100644 --- a/src/mame/video/hexion.c +++ b/src/mame/video/hexion.c @@ -13,8 +13,7 @@ inline void hexion_state::get_tile_info(tile_data &tileinfo,int tile_index,UINT8 *ram) { tile_index *= 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, ram[tile_index] + ((ram[tile_index+1] & 0x3f) << 8), ram[tile_index+2] & 0x0f, 0); @@ -40,8 +39,8 @@ TILE_GET_INFO_MEMBER(hexion_state::get_tile_info1) void hexion_state::video_start() { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hexion_state::get_tile_info0),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hexion_state::get_tile_info1),this),TILEMAP_SCAN_ROWS, 8,8,64,32); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hexion_state::get_tile_info0),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hexion_state::get_tile_info1),this),TILEMAP_SCAN_ROWS, 8,8,64,32); m_bg_tilemap[0]->set_transparent_pen(0); m_bg_tilemap[1]->set_scrollx(0,-4); diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c index 1725ed6b86c..017597947e0 100644 --- a/src/mame/video/higemaru.c +++ b/src/mame/video/higemaru.c @@ -91,12 +91,12 @@ TILE_GET_INFO_MEMBER(higemaru_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 0x80) << 1); int color = m_colorram[tile_index] & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void higemaru_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(higemaru_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(higemaru_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void higemaru_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c index 708cdced6c1..8f227bf3608 100644 --- a/src/mame/video/himesiki.c +++ b/src/mame/video/himesiki.c @@ -17,12 +17,12 @@ TILE_GET_INFO_MEMBER(himesiki_state::get_bg_tile_info) code &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, col, 0); + SET_TILE_INFO_MEMBER(0, code, col, 0); } void himesiki_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(himesiki_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(himesiki_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } WRITE8_MEMBER(himesiki_state::himesiki_bg_ram_w) diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index 35ae71fa1ea..34d89fce09b 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -445,22 +445,22 @@ static void transition_control(running_machine &machine, bitmap_rgb32 &bitmap, c { \ if (tilemapinfo&0x400) \ { \ - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno>>1,pal>>4,TILE_FLIPYX(flip)); \ + SET_TILE_INFO_MEMBER(1,tileno>>1,pal>>4,TILE_FLIPYX(flip)); \ } \ else \ { \ - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno, pal,TILE_FLIPYX(flip)); \ + SET_TILE_INFO_MEMBER(0,tileno, pal,TILE_FLIPYX(flip)); \ } \ } \ else \ { \ if (tilemapinfo&0x400) \ { \ - SET_TILE_INFO_MEMBER(m_gfxdecode, 3,tileno>>3,pal>>4,TILE_FLIPYX(flip)); \ + SET_TILE_INFO_MEMBER(3,tileno>>3,pal>>4,TILE_FLIPYX(flip)); \ } \ else \ { \ - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,tileno>>2, pal,TILE_FLIPYX(flip)); \ + SET_TILE_INFO_MEMBER(2,tileno>>2, pal,TILE_FLIPYX(flip)); \ } \ } \ } @@ -1552,21 +1552,21 @@ void hng64_state::video_start() m_old_tileflags2 = -1; m_old_tileflags3 = -1; - m_tilemap0_8x8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile0_8x8_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 128); /* 128x128x4 = 0x10000 */ - m_tilemap0_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile0_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ - m_tilemap0_16x16_alt = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile0_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ + m_tilemap0_8x8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile0_8x8_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 128); /* 128x128x4 = 0x10000 */ + m_tilemap0_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile0_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ + m_tilemap0_16x16_alt = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile0_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ - m_tilemap1_8x8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile1_8x8_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 128); /* 128x128x4 = 0x10000 */ - m_tilemap1_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile1_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ - m_tilemap1_16x16_alt = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile1_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ + m_tilemap1_8x8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile1_8x8_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 128); /* 128x128x4 = 0x10000 */ + m_tilemap1_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile1_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ + m_tilemap1_16x16_alt = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile1_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ - m_tilemap2_8x8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile2_8x8_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 128); /* 128x128x4 = 0x10000 */ - m_tilemap2_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile2_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ - m_tilemap2_16x16_alt = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile2_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ + m_tilemap2_8x8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile2_8x8_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 128); /* 128x128x4 = 0x10000 */ + m_tilemap2_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile2_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ + m_tilemap2_16x16_alt = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile2_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ - m_tilemap3_8x8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile3_8x8_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 128); /* 128x128x4 = 0x10000 */ - m_tilemap3_16x16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile3_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ - m_tilemap3_16x16_alt = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile3_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ + m_tilemap3_8x8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile3_8x8_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 128); /* 128x128x4 = 0x10000 */ + m_tilemap3_16x16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile3_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ + m_tilemap3_16x16_alt = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hng64_state::get_hng64_tile3_16x16_info),this), TILEMAP_SCAN_ROWS, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ m_tilemap0_8x8->set_transparent_pen(0); m_tilemap0_16x16->set_transparent_pen(0); diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index 79dc5e01a37..67bee594774 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -28,8 +28,7 @@ TILE_GET_INFO_MEMBER(holeland_state::holeland_get_tile_info) int attr = m_colorram[tile_index]; int tile_number = m_videoram[tile_index] | ((attr & 0x03) << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, m_palette_offset + ((attr >> 4) & 0x0f), TILE_FLIPYX((attr >> 2) & 0x03)); @@ -41,8 +40,7 @@ TILE_GET_INFO_MEMBER(holeland_state::crzrally_get_tile_info) int attr = m_colorram[tile_index]; int tile_number = m_videoram[tile_index] | ((attr & 0x03) << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, m_palette_offset + ((attr >> 4) & 0x0f), TILE_FLIPYX((attr >> 2) & 0x03)); @@ -57,7 +55,7 @@ TILE_GET_INFO_MEMBER(holeland_state::crzrally_get_tile_info) VIDEO_START_MEMBER(holeland_state,holeland) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(holeland_state::holeland_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(holeland_state::holeland_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap->set_transmask(0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ m_bg_tilemap->set_transmask(1, 0x01, 0xfe); /* split type 1 has pen 0? transparent in front half */ @@ -65,7 +63,7 @@ VIDEO_START_MEMBER(holeland_state,holeland) VIDEO_START_MEMBER(holeland_state,crzrally) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(holeland_state::crzrally_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(holeland_state::crzrally_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); } WRITE8_MEMBER(holeland_state::holeland_videoram_w) diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index 0856f563299..87b5a7a20e5 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -408,7 +408,7 @@ inline void homedata_state::mrokumei_info0( tile_data &tileinfo, int tile_index, int code = m_videoram[addr + 1] + ((attr & 0x03) << 8) + (gfxbank << 10); int color = (attr >> 2) + (gfxbank << 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, m_flipscreen ); + SET_TILE_INFO_MEMBER(0, code, color, m_flipscreen ); } inline void homedata_state::mrokumei_info1( tile_data &tileinfo, int tile_index, int page, int gfxbank ) { @@ -417,7 +417,7 @@ inline void homedata_state::mrokumei_info1( tile_data &tileinfo, int tile_index, int code = m_videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11); int color = (attr >> 3) + ((gfxbank & 3) << 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, m_flipscreen ); + SET_TILE_INFO_MEMBER(1, code, color, m_flipscreen ); } TILE_GET_INFO_MEMBER(homedata_state::mrokumei_get_info0_0) @@ -451,7 +451,7 @@ inline void homedata_state::reikaids_info( tile_data &tileinfo, int tile_index, if (attr & 0x80) flags ^= TILE_FLIPX; - SET_TILE_INFO_MEMBER(m_gfxdecode, layer, code, color, flags ); + SET_TILE_INFO_MEMBER(layer, code, color, flags ); } /* reikaids_gfx_bank[0]: @@ -510,7 +510,7 @@ inline void homedata_state::pteacher_info( tile_data &tileinfo, int tile_index, int code = m_videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11); int color = (attr >> 3) + ((gfxbank & 1) << 5); - SET_TILE_INFO_MEMBER(m_gfxdecode, layer, code, color, m_flipscreen); + SET_TILE_INFO_MEMBER(layer, code, color, m_flipscreen); } TILE_GET_INFO_MEMBER(homedata_state::pteacher_get_info0_0) @@ -541,7 +541,7 @@ inline void homedata_state::lemnangl_info( tile_data &tileinfo, int tile_index, int code = m_videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11); int color = 16 * (attr >> 3) + gfxbank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2 * layer + gfxset, code, color, m_flipscreen); + SET_TILE_INFO_MEMBER(2 * layer + gfxset, code, color, m_flipscreen); } TILE_GET_INFO_MEMBER(homedata_state::lemnangl_get_info0_0) @@ -573,7 +573,7 @@ inline void homedata_state::mirderby_info0( tile_data &tileinfo, int tile_index, int code = m_videoram[addr + 1] + ((attr & 0x03) << 8) + 0x400;// + (gfxbank << 10); int color = (attr >> 2) + (gfxbank << 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, m_flipscreen ); + SET_TILE_INFO_MEMBER(0, code, color, m_flipscreen ); } inline void homedata_state::mirderby_info1( tile_data &tileinfo, int tile_index, int page, int gfxbank ) { @@ -582,7 +582,7 @@ inline void homedata_state::mirderby_info1( tile_data &tileinfo, int tile_index, int code = m_videoram[addr + 1] + ((attr & 0x07) << 8) + 0x400;//(gfxbank << 11); int color = (attr >> 3) + ((gfxbank & 3) << 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, m_flipscreen ); + SET_TILE_INFO_MEMBER(1, code, color, m_flipscreen ); } TILE_GET_INFO_MEMBER(homedata_state::mirderby_get_info0_0) @@ -615,10 +615,10 @@ TILE_GET_INFO_MEMBER(homedata_state::mirderby_get_info1_1) VIDEO_START_MEMBER(homedata_state,mrokumei) { - m_bg_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); - m_bg_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); - m_bg_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); - m_bg_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); + m_bg_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); + m_bg_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); + m_bg_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); + m_bg_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); m_bg_tilemap[0][1]->set_transparent_pen(0); m_bg_tilemap[1][1]->set_transparent_pen(0); @@ -626,14 +626,14 @@ VIDEO_START_MEMBER(homedata_state,mrokumei) VIDEO_START_MEMBER(homedata_state,reikaids) { - m_bg_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_2),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[0][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_3),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[1][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info1_2),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap[1][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info1_3),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[0][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_2),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[0][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_3),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[1][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info1_2),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap[1][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info1_3),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[0][0]->set_transparent_pen(0xff); m_bg_tilemap[0][1]->set_transparent_pen(0xff); @@ -647,10 +647,10 @@ VIDEO_START_MEMBER(homedata_state,reikaids) VIDEO_START_MEMBER(homedata_state,pteacher) { - m_bg_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap[0][1]->set_transparent_pen(0xff); m_bg_tilemap[1][1]->set_transparent_pen(0xff); @@ -658,10 +658,10 @@ VIDEO_START_MEMBER(homedata_state,pteacher) VIDEO_START_MEMBER(homedata_state,lemnangl) { - m_bg_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap[0][1]->set_transparent_pen(0x0f); m_bg_tilemap[1][1]->set_transparent_pen(0x0f); @@ -669,10 +669,10 @@ VIDEO_START_MEMBER(homedata_state,lemnangl) VIDEO_START_MEMBER(homedata_state,mirderby) { - m_bg_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); - m_bg_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); - m_bg_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); - m_bg_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); + m_bg_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); + m_bg_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); + m_bg_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info1_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); + m_bg_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info1_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); m_bg_tilemap[0][1]->set_transparent_pen(0); m_bg_tilemap[1][1]->set_transparent_pen(0); diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 00d5f86e7f1..647bf65a00d 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -98,13 +98,13 @@ TILE_GET_INFO_MEMBER(homerun_state::get_homerun_tile_info) int tileno = (m_videoram[tile_index]) | ((m_videoram[tile_index | 0x1000] & 0x38) << 5) | ((m_gfx_ctrl & 1) << 11); int palno = (m_videoram[tile_index | 0x1000] & 0x07); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, palno, 0); + SET_TILE_INFO_MEMBER(0, tileno, palno, 0); } void homerun_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(homerun_state::get_homerun_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(homerun_state::get_homerun_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); } diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index 2711fece038..b2c0cc316d6 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -114,12 +114,12 @@ TILE_GET_INFO_MEMBER(hyperspt_state::get_bg_tile_info) int color = m_colorram[tile_index] & 0x0f; int flags = ((m_colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x20) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } void hyperspt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hyperspt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hyperspt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); } @@ -189,11 +189,11 @@ TILE_GET_INFO_MEMBER(hyperspt_state::roadf_get_bg_tile_info) int color = m_colorram[tile_index] & 0x0f; int flags = (m_colorram[tile_index] & 0x10) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } VIDEO_START_MEMBER(hyperspt_state,roadf) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hyperspt_state::roadf_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hyperspt_state::roadf_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index d72fcc357a9..aa00883b8ba 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -131,8 +131,7 @@ inline void hyprduel_state::get_tile_info( tile_data &tileinfo, int tile_index, else { tileinfo.group = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (tile & 0xfffff) + (code & 0xf), (((tile & 0x0ff00000) >> 20)) + 0x100, TILE_FLIPXY((code & 0x6000) >> 13)); @@ -169,8 +168,7 @@ inline void hyprduel_state::get_tile_info_8bit( tile_data &tileinfo, int tile_in else if ((tile & 0x00f00000) == 0x00f00000) /* draw tile as 8bpp */ { tileinfo.group = 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (tile & 0xfffff) + 2*(code & 0xf), ((tile & 0x0f000000) >> 24) + 0x10, TILE_FLIPXY((code & 0x6000) >> 13)); @@ -178,8 +176,7 @@ inline void hyprduel_state::get_tile_info_8bit( tile_data &tileinfo, int tile_in else { tileinfo.group = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (tile & 0xfffff) + (code & 0xf), (((tile & 0x0ff00000) >> 20)) + 0x100, TILE_FLIPXY((code & 0x6000) >> 13)); @@ -216,8 +213,7 @@ inline void hyprduel_state::get_tile_info_16x16_8bit( tile_data &tileinfo, int t else if ((tile & 0x00f00000) == 0x00f00000) /* draw tile as 8bpp */ { tileinfo.group = 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, (tile & 0xfffff) + 8*(code & 0xf), ((tile & 0x0f000000) >> 24) + 0x10, TILE_FLIPXY((code & 0x6000) >> 13)); @@ -225,8 +221,7 @@ inline void hyprduel_state::get_tile_info_16x16_8bit( tile_data &tileinfo, int t else { tileinfo.group = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, (tile & 0xfffff) + 4*(code & 0xf), (((tile & 0x0ff00000) >> 20)) + 0x100, TILE_FLIPXY((code & 0x6000) >> 13)); @@ -360,9 +355,9 @@ VIDEO_START_MEMBER(hyprduel_state,common_14220) save_pointer(NAME(m_tiletable_old), m_tiletable.bytes() / 2); save_pointer(NAME(m_dirtyindex), m_tiletable.bytes() / 4); - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hyprduel_state::get_tile_info_0_8bit),this), TILEMAP_SCAN_ROWS, 8, 8, WIN_NX, WIN_NY); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hyprduel_state::get_tile_info_1_8bit),this), TILEMAP_SCAN_ROWS, 8, 8, WIN_NX, WIN_NY); - m_bg_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hyprduel_state::get_tile_info_2_8bit),this), TILEMAP_SCAN_ROWS, 8, 8, WIN_NX, WIN_NY); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hyprduel_state::get_tile_info_0_8bit),this), TILEMAP_SCAN_ROWS, 8, 8, WIN_NX, WIN_NY); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hyprduel_state::get_tile_info_1_8bit),this), TILEMAP_SCAN_ROWS, 8, 8, WIN_NX, WIN_NY); + m_bg_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(hyprduel_state::get_tile_info_2_8bit),this), TILEMAP_SCAN_ROWS, 8, 8, WIN_NX, WIN_NY); m_bg_tilemap[0]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); m_bg_tilemap[0]->map_pen_to_layer(1, 255, TILEMAP_PIXEL_TRANSPARENT); diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c index 1287c02a2a9..d247324d7ed 100644 --- a/src/mame/video/inufuku.c +++ b/src/mame/video/inufuku.c @@ -64,8 +64,7 @@ WRITE16_MEMBER(inufuku_state::inufuku_scrollreg_w) TILE_GET_INFO_MEMBER(inufuku_state::get_inufuku_bg_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_bg_videoram[tile_index], m_bg_palettebank, 0); @@ -73,8 +72,7 @@ TILE_GET_INFO_MEMBER(inufuku_state::get_inufuku_bg_tile_info) TILE_GET_INFO_MEMBER(inufuku_state::get_inufuku_tx_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_tx_videoram[tile_index], m_tx_palettebank, 0); @@ -117,8 +115,8 @@ UINT32 inufuku_state::inufuku_tile_callback( UINT32 code ) void inufuku_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(inufuku_state::get_inufuku_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(inufuku_state::get_inufuku_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(inufuku_state::get_inufuku_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(inufuku_state::get_inufuku_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_bg_tilemap->set_transparent_pen(255); m_tx_tilemap->set_transparent_pen(255); diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c index 65aa83d167b..fc9bc21e9e2 100644 --- a/src/mame/video/iqblock.c +++ b/src/mame/video/iqblock.c @@ -11,8 +11,7 @@ TILE_GET_INFO_MEMBER(iqblock_state::get_bg_tile_info) { int code = m_bgvideoram[tile_index] + (m_bgvideoram[tile_index + 0x800] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code &(m_video_type ? 0x1fff : 0x3fff), m_video_type? (2*(code >> 13)+1) : (4*(code >> 14)+3), 0); @@ -21,8 +20,7 @@ TILE_GET_INFO_MEMBER(iqblock_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(iqblock_state::get_fg_tile_info) { int code = m_fgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0x7f, (code & 0x80) ? 3 : 0, 0); @@ -38,8 +36,8 @@ TILE_GET_INFO_MEMBER(iqblock_state::get_fg_tile_info) void iqblock_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(iqblock_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(iqblock_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,32,64, 8); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(iqblock_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(iqblock_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,32,64, 8); m_bg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_scroll_cols(64); diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index afcca391380..22bf3afcafa 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -137,12 +137,12 @@ TILE_GET_INFO_MEMBER(ironhors_state::get_bg_tile_info) int flags = ((m_colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x20) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void ironhors_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ironhors_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ironhors_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); } @@ -249,12 +249,12 @@ TILE_GET_INFO_MEMBER(ironhors_state::farwest_get_bg_tile_info) int color = (m_colorram[tile_index] & 0x0f) + 16 * m_palettebank; int flags = 0;//((m_colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x20) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } VIDEO_START_MEMBER(ironhors_state,farwest) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ironhors_state::farwest_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ironhors_state::farwest_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index b726bf5e829..35d31c52ef2 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(jack_state::get_bg_tile_info) // striv: m_colorram[tile_index] & 0x80 ??? - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILEMAP_MAPPER_MEMBER(jack_state::tilemap_scan_cols_flipy) @@ -61,7 +61,7 @@ TILEMAP_MAPPER_MEMBER(jack_state::tilemap_scan_cols_flipy) void jack_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jack_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),this), 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jack_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),this), 8, 8, 32, 32); } @@ -175,12 +175,12 @@ TILE_GET_INFO_MEMBER(jack_state::joinem_get_bg_tile_info) int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 0x03) << 8); int color = (m_colorram[tile_index] & 0x38) >> 3 | m_joinem_palette_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(jack_state,joinem) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jack_state::joinem_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),this), 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jack_state::joinem_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),this), 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); } diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index 715743862d9..5f2f033581d 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -66,12 +66,12 @@ TILE_GET_INFO_MEMBER(jackal_state::get_bg_tile_info) int color = 0;//attr & 0x0f; int flags = ((attr & 0x10) ? TILE_FLIPX : 0) | ((attr & 0x20) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void jackal_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jackal_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jackal_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void jackal_state::draw_background( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c index 7bd39752585..a60038e9230 100644 --- a/src/mame/video/jailbrek.c +++ b/src/mame/video/jailbrek.c @@ -50,12 +50,12 @@ TILE_GET_INFO_MEMBER(jailbrek_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void jailbrek_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(jailbrek_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jailbrek_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scrolldx(0, 396 - 256); } diff --git a/src/mame/video/k001604.c b/src/mame/video/k001604.c index d70052242e0..702d17fd8c5 100644 --- a/src/mame/video/k001604.c +++ b/src/mame/video/k001604.c @@ -104,17 +104,17 @@ void k001604_device::device_start() if (m_layer_size) { - m_layer_8x8[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_8x8),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_8x8_0_size1),this), 8, 8, 64, 64); - m_layer_8x8[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_8x8),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_8x8_1_size1),this), 8, 8, 64, 64); + m_layer_8x8[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_8x8),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_8x8_0_size1),this), 8, 8, 64, 64); + m_layer_8x8[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_8x8),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_8x8_1_size1),this), 8, 8, 64, 64); - m_layer_roz = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_roz),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_roz_256),this), roz_tile_size, roz_tile_size, 128, 64); + m_layer_roz = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_roz),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_roz_256),this), roz_tile_size, roz_tile_size, 128, 64); } else { - m_layer_8x8[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_8x8),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_8x8_0_size0),this), 8, 8, 64, 64); - m_layer_8x8[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_8x8),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_8x8_1_size0),this), 8, 8, 64, 64); + m_layer_8x8[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_8x8),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_8x8_0_size0),this), 8, 8, 64, 64); + m_layer_8x8[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_8x8),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_8x8_1_size0),this), 8, 8, 64, 64); - m_layer_roz = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_roz),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_roz_128),this), roz_tile_size, roz_tile_size, 128, 64); + m_layer_roz = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k001604_device::tile_info_layer_roz),this), tilemap_mapper_delegate(FUNC(k001604_device::scan_layer_roz_128),this), roz_tile_size, roz_tile_size, 128, 64); } m_layer_8x8[0]->set_transparent_pen(0); @@ -195,7 +195,7 @@ TILE_GET_INFO_MEMBER(k001604_device::tile_info_layer_8x8) if (val & 0x800000) flags |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(*m_gfxdecode, m_gfx_index[0], tile, color, flags); + SET_TILE_INFO_MEMBER(m_gfx_index[0], tile, color, flags); } TILE_GET_INFO_MEMBER(k001604_device::tile_info_layer_roz) @@ -212,7 +212,7 @@ TILE_GET_INFO_MEMBER(k001604_device::tile_info_layer_roz) tile += m_roz_size ? 0x800 : 0x2000; - SET_TILE_INFO_MEMBER(*m_gfxdecode, m_gfx_index[m_roz_size], tile, color, flags); + SET_TILE_INFO_MEMBER(m_gfx_index[m_roz_size], tile, color, flags); } diff --git a/src/mame/video/k007342.c b/src/mame/video/k007342.c index fd2ea6689b1..0e8581a5b05 100644 --- a/src/mame/video/k007342.c +++ b/src/mame/video/k007342.c @@ -90,8 +90,8 @@ void k007342_device::device_config_complete() void k007342_device::device_start() { - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k007342_device::get_tile_info0),this), tilemap_mapper_delegate(FUNC(k007342_device::scan),this), 8, 8, 64, 32); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k007342_device::get_tile_info1),this), tilemap_mapper_delegate(FUNC(k007342_device::scan),this), 8, 8, 64, 32); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k007342_device::get_tile_info0),this), tilemap_mapper_delegate(FUNC(k007342_device::scan),this), 8, 8, 64, 32); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k007342_device::get_tile_info1),this), tilemap_mapper_delegate(FUNC(k007342_device::scan),this), 8, 8, 64, 32); m_ram = auto_alloc_array_clear(machine(), UINT8, 0x2000); m_scroll_ram = auto_alloc_array_clear(machine(), UINT8, 0x0200); @@ -298,8 +298,7 @@ void k007342_device::get_tile_info( tile_data &tileinfo, int tile_index, int lay m_callback(machine(), layer, m_regs[1], &code, &color, &flags); - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_gfxnum, + SET_TILE_INFO_MEMBER(m_gfxnum, code, color, flags); diff --git a/src/mame/video/k037122.c b/src/mame/video/k037122.c index b81124ab3e8..c3c3688939e 100644 --- a/src/mame/video/k037122.c +++ b/src/mame/video/k037122.c @@ -66,8 +66,8 @@ void k037122_device::device_start() m_tile_ram = auto_alloc_array_clear(machine(), UINT32, 0x20000 / 4); m_reg = auto_alloc_array_clear(machine(), UINT32, 0x400 / 4); - m_layer[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k037122_device::tile_info_layer0),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); - m_layer[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k037122_device::tile_info_layer1),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_layer[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k037122_device::tile_info_layer0),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); + m_layer[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k037122_device::tile_info_layer1),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); m_layer[0]->set_transparent_pen(0); m_layer[1]->set_transparent_pen(0); @@ -107,7 +107,7 @@ TILE_GET_INFO_MEMBER(k037122_device::tile_info_layer0) if (val & 0x800000) flags |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(*m_gfxdecode, m_gfx_index, tile, color, flags); + SET_TILE_INFO_MEMBER(m_gfx_index, tile, color, flags); } TILE_GET_INFO_MEMBER(k037122_device::tile_info_layer1) @@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(k037122_device::tile_info_layer1) if (val & 0x800000) flags |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(*m_gfxdecode, m_gfx_index, tile, color, flags); + SET_TILE_INFO_MEMBER(m_gfx_index, tile, color, flags); } diff --git a/src/mame/video/k051316.c b/src/mame/video/k051316.c index 138217a1336..37c436301ee 100644 --- a/src/mame/video/k051316.c +++ b/src/mame/video/k051316.c @@ -195,7 +195,7 @@ void k051316_device::device_start() m_bpp = is_tail2nos ? 4 : m_bpp; // tail2nos is passed with bpp = -4 to setup the custom charlayout! - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k051316_device::get_tile_info0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k051316_device::get_tile_info0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_ram = auto_alloc_array_clear(machine(), UINT8, 0x800); @@ -284,8 +284,7 @@ void k051316_device::get_tile_info( tile_data &tileinfo, int tile_index ) m_callback(machine(), &code, &color, &flags); - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_gfx_num, + SET_TILE_INFO_MEMBER(m_gfx_num, code, color, flags); diff --git a/src/mame/video/k052109.c b/src/mame/video/k052109.c index 63184b6aea4..b598606c23a 100644 --- a/src/mame/video/k052109.c +++ b/src/mame/video/k052109.c @@ -251,9 +251,9 @@ void k052109_device::device_start() /* deinterleave the graphics, if needed */ konami_deinterleave_gfx(machine(), m_gfx_memory_region, m_deinterleave); - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_ram = auto_alloc_array_clear(machine(), UINT8, 0x6000); @@ -739,8 +739,7 @@ void k052109_device::get_tile_info( tile_data &tileinfo, int tile_index, int lay if (flipy && (m_tileflip_enable & 2)) flags |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_gfx_num, + SET_TILE_INFO_MEMBER(m_gfx_num, code, color, flags); diff --git a/src/mame/video/k054156_k054157_k056832.c b/src/mame/video/k054156_k054157_k056832.c index eb6c6b254af..d811786d483 100644 --- a/src/mame/video/k054156_k054157_k056832.c +++ b/src/mame/video/k054156_k054157_k056832.c @@ -304,22 +304,22 @@ void k056832_device::create_tilemaps(running_machine &machine) m_videoram = auto_alloc_array_clear(machine, UINT16, 0x2000 * (K056832_PAGE_COUNT + 1) / 2); - m_tilemap[0x0] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x1] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x2] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x3] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x4] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info4),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x5] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info5),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x6] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info6),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x7] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info7),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x8] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info8),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0x9] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info9),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0xa] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infoa),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0xb] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infob),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0xc] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infoc),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0xd] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infod),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0xe] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infoe),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap[0xf] = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infof),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x0] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x1] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x2] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x3] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x4] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info4),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x5] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info5),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x6] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info6),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x7] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info7),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x8] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info8),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0x9] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_info9),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0xa] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infoa),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0xb] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infob),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0xc] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infoc),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0xd] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infod),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0xe] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infoe),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0xf] = &machine.tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k056832_device::get_tile_infof),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); for (i = 0; i < K056832_PAGE_COUNT; i++) { @@ -560,8 +560,7 @@ void k056832_device::get_tile_info( tile_data &tileinfo, int tile_index, int pa m_callback(machine(), layer, &code, &color, &flags); - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_gfx_num, + SET_TILE_INFO_MEMBER(m_gfx_num, code, color, flags); diff --git a/src/mame/video/kaneko_tmap.c b/src/mame/video/kaneko_tmap.c index 5f2e9f7cfd2..ed25e3ff036 100644 --- a/src/mame/video/kaneko_tmap.c +++ b/src/mame/video/kaneko_tmap.c @@ -136,7 +136,7 @@ void kaneko_view2_tilemap_device::get_tile_info(tile_data &tileinfo, tilemap_mem { UINT16 code_hi = m_vram[_N_][ 2 * tile_index + 0]; UINT16 code_lo = m_vram[_N_][ 2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, m_tilebase, code_lo + m_vram_tile_addition[_N_], (code_hi >> 2) & 0x3f, TILE_FLIPXY( code_hi & 3 )); + SET_TILE_INFO_MEMBER(m_tilebase, code_lo + m_vram_tile_addition[_N_], (code_hi >> 2) & 0x3f, TILE_FLIPXY( code_hi & 3 )); tileinfo.category = (code_hi >> 8) & 7; } @@ -152,9 +152,9 @@ void kaneko_view2_tilemap_device::device_start() m_vscroll[1] = (UINT16*)auto_alloc_array_clear(this->machine(), UINT16, 0x1000/2); m_regs = (UINT16*)auto_alloc_array_clear(this->machine(), UINT16, 0x20/2); - m_tmap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kaneko_view2_tilemap_device::get_tile_info_0),this), TILEMAP_SCAN_ROWS, + m_tmap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kaneko_view2_tilemap_device::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16,16, 0x20,0x20 ); - m_tmap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kaneko_view2_tilemap_device::get_tile_info_1),this), TILEMAP_SCAN_ROWS, + m_tmap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kaneko_view2_tilemap_device::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16,16, 0x20,0x20 ); m_tmap[0]->set_transparent_pen(0); diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 253086f5448..5f9e0a172c0 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -135,8 +135,7 @@ UINT32 karnov_state::screen_update_karnov(screen_device &screen, bitmap_ind16 &b TILE_GET_INFO_MEMBER(karnov_state::get_fix_tile_info) { int tile = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile&0xfff, tile>>14, 0); @@ -160,7 +159,7 @@ VIDEO_START_MEMBER(karnov_state,karnov) { /* Allocate bitmap & tilemap */ m_bitmap_f = auto_bitmap_ind16_alloc(machine(), 512, 512); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(karnov_state::get_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(karnov_state::get_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); save_item(NAME(*m_bitmap_f)); @@ -171,7 +170,7 @@ VIDEO_START_MEMBER(karnov_state,wndrplnt) { /* Allocate bitmap & tilemap */ m_bitmap_f = auto_bitmap_ind16_alloc(machine(), 512, 512); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(karnov_state::get_fix_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(karnov_state::get_fix_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); save_item(NAME(*m_bitmap_f)); diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c index 9f36056f11b..f0fce7718b6 100644 --- a/src/mame/video/kchamp.c +++ b/src/mame/video/kchamp.c @@ -47,12 +47,12 @@ TILE_GET_INFO_MEMBER(kchamp_state::get_bg_tile_info) int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 7) << 8); int color = (m_colorram[tile_index] >> 3) & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void kchamp_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kchamp_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kchamp_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } /* diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c index 2cce0190639..7b54a351337 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(kickgoal_state::get_kickgoal_fg_tile_info) int tileno = m_fgram[tile_index * 2] & 0x0fff; int color = m_fgram[tile_index * 2 + 1] & 0x000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno + m_fg_base, color + 0x00, 0); + SET_TILE_INFO_MEMBER(0, tileno + m_fg_base, color + 0x00, 0); } /* BG */ @@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(kickgoal_state::get_kickgoal_bg_tile_info) int flipx = m_bgram[tile_index * 2 + 1] & 0x0020; int flipy = m_bgram[tile_index * 2 + 1] & 0x0040; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno + m_bg_base, color + 0x10, (flipx ? TILE_FLIPX : 0) | (flipy ? TILE_FLIPY : 0)); + SET_TILE_INFO_MEMBER(1, tileno + m_bg_base, color + 0x10, (flipx ? TILE_FLIPX : 0) | (flipy ? TILE_FLIPY : 0)); } /* BG 2 */ @@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(kickgoal_state::get_kickgoal_bg2_tile_info) int flipx = m_bg2ram[tile_index * 2 + 1] & 0x0020; int flipy = m_bg2ram[tile_index * 2 + 1] & 0x0040; - SET_TILE_INFO_MEMBER(m_gfxdecode, m_bg2_region, tileno + m_bg2_base, color + 0x20, (flipx ? TILE_FLIPX : 0) | (flipy ? TILE_FLIPY : 0)); + SET_TILE_INFO_MEMBER(m_bg2_region, tileno + m_bg2_base, color + 0x20, (flipx ? TILE_FLIPX : 0) | (flipy ? TILE_FLIPY : 0)); } @@ -127,9 +127,9 @@ VIDEO_START_MEMBER(kickgoal_state,kickgoal) m_bg2_base = 0x2000 / 4; m_bg2_mask = (0x2000/4) - 1; - m_fgtm = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_fg_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksfg),this), 8, 8, 64, 64); - m_bgtm = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_bg_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksbg),this), 16, 16, 64, 64); - m_bg2tm = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksbg2),this), 32, 32, 64, 64); + m_fgtm = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_fg_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksfg),this), 8, 8, 64, 64); + m_bgtm = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_bg_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksbg),this), 16, 16, 64, 64); + m_bg2tm = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksbg2),this), 32, 32, 64, 64); m_fgtm->set_transparent_pen(15); m_bgtm->set_transparent_pen(15); @@ -147,9 +147,9 @@ VIDEO_START_MEMBER(kickgoal_state,actionhw) m_bg2_base = 0x2000; m_bg2_mask = 0x2000 - 1; - m_fgtm = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_fg_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksfg),this), 8, 8, 64, 64); - m_bgtm = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_bg_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksbg),this), 16, 16, 64, 64); - m_bg2tm = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_actionhwbg2),this), 16, 16, 64, 64); + m_fgtm = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_fg_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksfg),this), 8, 8, 64, 64); + m_bgtm = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_bg_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_kicksbg),this), 16, 16, 64, 64); + m_bg2tm = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kickgoal_state::get_kickgoal_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(kickgoal_state::tilemap_scan_actionhwbg2),this), 16, 16, 64, 64); m_fgtm->set_transparent_pen(15); m_bgtm->set_transparent_pen(15); diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index 2a1fa9737af..ea494cd5289 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -178,7 +178,7 @@ TILE_GET_INFO_MEMBER(kingofb_state::get_bg_tile_info) int code = (tile_index / 16) ? m_videoram[tile_index] + ((attr & 0x03) << 8) : 0; int color = ((attr & 0x70) >> 4) + 8 * m_palette_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } TILE_GET_INFO_MEMBER(kingofb_state::get_fg_tile_info) @@ -188,13 +188,13 @@ TILE_GET_INFO_MEMBER(kingofb_state::get_fg_tile_info) int code = m_videoram2[tile_index] + ((attr & 0x01) << 8); int color = (attr & 0x38) >> 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } VIDEO_START_MEMBER(kingofb_state,kingofb) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kingofb_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 16, 16, 16, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kingofb_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 16, 16, 16, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } @@ -252,13 +252,13 @@ TILE_GET_INFO_MEMBER(kingofb_state::ringking_get_bg_tile_info) int code = (tile_index / 16) ? m_videoram[tile_index] : 0; int color = ((m_colorram[tile_index] & 0x70) >> 4) + 8 * m_palette_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4, code, color, 0); + SET_TILE_INFO_MEMBER(4, code, color, 0); } VIDEO_START_MEMBER(kingofb_state,ringking) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kingofb_state::ringking_get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 16, 16, 16, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kingofb_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::ringking_get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 16, 16, 16, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/klax.c b/src/mame/video/klax.c index 4a214fb1d91..d9369f7e507 100644 --- a/src/mame/video/klax.c +++ b/src/mame/video/klax.c @@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(klax_state::get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) >> 8; int code = data1 & 0x1fff; int color = data2 & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); } diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 7a85aed69d6..8ca8843f179 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -83,8 +83,7 @@ TILE_GET_INFO_MEMBER(kncljoe_state::get_bg_tile_info) int attr = m_videoram[2 * tile_index + 1]; int code = m_videoram[2 * tile_index] + ((attr & 0xc0) << 2) + (m_tile_bank << 10); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, attr & 0xf, TILE_FLIPXY((attr & 0x30) >> 4)); @@ -100,7 +99,7 @@ TILE_GET_INFO_MEMBER(kncljoe_state::get_bg_tile_info) void kncljoe_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kncljoe_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kncljoe_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(4); } diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 878587940ad..02972ccf649 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -992,7 +992,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac_tile_info) colour = (psac_colorbase << 4) + col; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, TILE_FLIPYX(flip)); + SET_TILE_INFO_MEMBER(0, tileno, colour, TILE_FLIPYX(flip)); } static int konamigx_type3_psac2_actual_bank; @@ -1035,7 +1035,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac3_tile_info) if (tmap[(base_index*2)+1] & 0x20) flip |= TILE_FLIPY; if (tmap[(base_index*2)+1] & 0x10) flip |= TILE_FLIPX; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, flip); + SET_TILE_INFO_MEMBER(0, tileno, colour, flip); } TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac3_alt_tile_info) @@ -1056,7 +1056,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac3_alt_tile_info) if (tmap[(base_index*2)+1] & 0x20) flip |= TILE_FLIPY; if (tmap[(base_index*2)+1] & 0x10) flip |= TILE_FLIPX; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, flip); + SET_TILE_INFO_MEMBER(0, tileno, colour, flip); } @@ -1082,7 +1082,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac1a_tile_info) if (flipx) flip |= TILE_FLIPX; if (flipy) flip |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, colour, flip); + SET_TILE_INFO_MEMBER(1, tileno, colour, flip); } TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac1b_tile_info) @@ -1104,7 +1104,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac1b_tile_info) if (flipx) flip |= TILE_FLIPX; if (flipy) flip |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, flip); + SET_TILE_INFO_MEMBER(0, tileno, colour, flip); } static void konamigx_type2_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags) @@ -1312,8 +1312,8 @@ VIDEO_START_MEMBER(konamigx_state,konamigx_type3) _gxcommoninitnosprites(machine()); - gx_psac_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac3_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 256); - gx_psac_tilemap_alt = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac3_alt_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 256); + gx_psac_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac3_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 256); + gx_psac_tilemap_alt = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac3_alt_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 256); gx_rozenable = 0; gx_specialrozenable = 2; @@ -1351,7 +1351,7 @@ VIDEO_START_MEMBER(konamigx_state,konamigx_type4) _gxcommoninitnosprites(machine()); - gx_psac_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); + gx_psac_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); gx_rozenable = 0; gx_specialrozenable = 3; @@ -1382,7 +1382,7 @@ VIDEO_START_MEMBER(konamigx_state,konamigx_type4_vsn) _gxcommoninitnosprites(machine()); - gx_psac_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); + gx_psac_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); gx_rozenable = 0; gx_specialrozenable = 3; @@ -1412,7 +1412,7 @@ VIDEO_START_MEMBER(konamigx_state,konamigx_type4_sd2) _gxcommoninitnosprites(machine()); - gx_psac_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); + gx_psac_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); gx_rozenable = 0; gx_specialrozenable = 3; @@ -1461,8 +1461,8 @@ VIDEO_START_MEMBER(konamigx_state,opengolf) m_k056832->set_layer_offs(2, 2+1, 0); m_k056832->set_layer_offs(3, 3+1, 0); - gx_psac_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac1a_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); - gx_psac_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac1b_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); + gx_psac_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac1a_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); + gx_psac_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac1b_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); // transparency will be handled manually in post-processing //gx_psac_tilemap->set_transparent_pen(0); @@ -1499,8 +1499,8 @@ VIDEO_START_MEMBER(konamigx_state,racinfrc) m_k056832->set_layer_offs(2, 2+1, 0); m_k056832->set_layer_offs(3, 3+1, 0); - gx_psac_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac1a_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); - gx_psac_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac1b_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); + gx_psac_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac1a_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); + gx_psac_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(konamigx_state::get_gx_psac1b_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 128); // transparency will be handled manually in post-processing //gx_psac_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c index 41e697ddbb6..a77f2be2af5 100644 --- a/src/mame/video/kopunch.c +++ b/src/mame/video/kopunch.c @@ -70,20 +70,20 @@ TILE_GET_INFO_MEMBER(kopunch_state::get_fg_tile_info) { int code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } TILE_GET_INFO_MEMBER(kopunch_state::get_bg_tile_info) { int code = (m_videoram2[tile_index] & 0x7f) + 128 * m_gfxbank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, 0); + SET_TILE_INFO_MEMBER(1, code, 0, 0); } void kopunch_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kopunch_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kopunch_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kopunch_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kopunch_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index 8bd9e2e5bec..1f9eef8a894 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(ksayakyu_state::get_ksayakyu_tile_info) int code = memregion("user1")->base()[tile_index]; int attr = memregion("user1")->base()[tile_index + 0x2000]; code += (attr & 3) << 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, ((attr >> 2) & 0x0f) * 2, (attr & 0x80) ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(1, code, ((attr >> 2) & 0x0f) * 2, (attr & 0x80) ? TILE_FLIPX : 0); } /* @@ -67,7 +67,7 @@ TILE_GET_INFO_MEMBER(ksayakyu_state::get_text_tile_info) code |= (attr & 3) << 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } /* @@ -114,8 +114,8 @@ void ksayakyu_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre void ksayakyu_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ksayakyu_state::get_ksayakyu_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32 * 8); - m_textmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ksayakyu_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ksayakyu_state::get_ksayakyu_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32 * 8); + m_textmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ksayakyu_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_textmap->set_transparent_pen(0); } diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index f1d56ce8aca..0838fc5631b 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -17,7 +17,7 @@ TILE_GET_INFO_MEMBER(kyugo_state::get_fg_tile_info) { int code = m_fgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, code, 2 * m_color_codes[code >> 3] + m_fgcolor, 0); @@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(kyugo_state::get_bg_tile_info) { int code = m_bgvideoram[tile_index]; int attr = m_bgattribram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, + SET_TILE_INFO_MEMBER(1, code | ((attr & 0x03) << 8), (attr >> 4) | (m_bgpalbank << 4), TILE_FLIPYX((attr & 0x0c) >> 2)); @@ -45,8 +45,8 @@ void kyugo_state::video_start() { m_color_codes = memregion("proms")->base() + 0x300; - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kyugo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kyugo_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kyugo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(kyugo_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c index f52e0a80e5b..6f2493051a8 100644 --- a/src/mame/video/labyrunr.c +++ b/src/mame/video/labyrunr.c @@ -82,8 +82,7 @@ TILE_GET_INFO_MEMBER(labyrunr_state::get_tile_info0) bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + bank * 256, ((ctrl_6 & 0x30) * 2 + 16)+(attr & 7), 0); @@ -111,8 +110,7 @@ TILE_GET_INFO_MEMBER(labyrunr_state::get_tile_info1) bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code+bank*256, ((ctrl_6 & 0x30) * 2 + 16) + (attr & 7), 0); @@ -127,8 +125,8 @@ TILE_GET_INFO_MEMBER(labyrunr_state::get_tile_info1) void labyrunr_state::video_start() { - m_layer0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(labyrunr_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_layer1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(labyrunr_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_layer0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(labyrunr_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_layer1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(labyrunr_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_layer0->set_transparent_pen(0); m_layer1->set_transparent_pen(0); diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c index 138438df2f2..51a729a28b8 100644 --- a/src/mame/video/ladybug.c +++ b/src/mame/video/ladybug.c @@ -188,35 +188,35 @@ TILE_GET_INFO_MEMBER(ladybug_state::get_bg_tile_info) int code = m_videoram[tile_index] + 32 * (m_colorram[tile_index] & 0x08); int color = m_colorram[tile_index] & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(ladybug_state::get_grid_tile_info) { if (tile_index < 512) - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tile_index, 0, 0); + SET_TILE_INFO_MEMBER(3, tile_index, 0, 0); else { int temp = tile_index / 32; tile_index = (31 - temp) * 32 + (tile_index % 32); - SET_TILE_INFO_MEMBER(m_gfxdecode, 4, tile_index, 0, 0); + SET_TILE_INFO_MEMBER(4, tile_index, 0, 0); } } VIDEO_START_MEMBER(ladybug_state,ladybug) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladybug_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ladybug_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); m_bg_tilemap->set_transparent_pen(0); } VIDEO_START_MEMBER(ladybug_state,sraider) { - m_grid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladybug_state::get_grid_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_grid_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ladybug_state::get_grid_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_grid_tilemap->set_scroll_rows(32); m_grid_tilemap->set_transparent_pen(0); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladybug_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ladybug_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); m_bg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index 0c50ad2a665..fe6bc04fbff 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -23,8 +23,7 @@ TILE_GET_INFO_MEMBER(ladyfrog_state::get_tile_info) { int pal = m_videoram[tile_index * 2 + 1] & 0x0f; int tile = m_videoram[tile_index * 2] + ((m_videoram[tile_index * 2 + 1] & 0xc0) << 2)+ ((m_videoram[tile_index * 2 + 1] & 0x30) << 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile + 0x1000 * m_tilebank, pal,TILE_FLIPY ); @@ -126,7 +125,7 @@ void ladyfrog_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre VIDEO_START_MEMBER(ladyfrog_state,ladyfrog_common) { m_spriteram = auto_alloc_array(machine(), UINT8, 160); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladyfrog_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ladyfrog_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_paletteram.resize(0x200); m_paletteram_ext.resize(0x200); diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index 2112e91fe6d..b6d16d21c64 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -123,7 +123,7 @@ TILE_GET_INFO_MEMBER(lasso_state::lasso_get_bg_tile_info) int code = m_videoram[tile_index]; int color = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, code + ((UINT16)m_gfxbank << 8), color & 0x0f, 0); @@ -135,7 +135,7 @@ TILE_GET_INFO_MEMBER(lasso_state::wwjgtin_get_track_tile_info) int code = ROM[tile_index]; int color = ROM[tile_index + 0x2000]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, + SET_TILE_INFO_MEMBER(2, code, color & 0x0f, 0); @@ -146,7 +146,7 @@ TILE_GET_INFO_MEMBER(lasso_state::pinbo_get_bg_tile_info) int code = m_videoram[tile_index]; int color = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, code + ((color & 0x30) << 4), color & 0x0f, 0); @@ -162,7 +162,7 @@ TILE_GET_INFO_MEMBER(lasso_state::pinbo_get_bg_tile_info) void lasso_state::video_start() { /* create tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lasso_state::lasso_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lasso_state::lasso_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); } @@ -170,8 +170,8 @@ void lasso_state::video_start() VIDEO_START_MEMBER(lasso_state,wwjgtin) { /* create tilemaps */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lasso_state::lasso_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_track_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lasso_state::wwjgtin_get_track_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lasso_state::lasso_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_track_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lasso_state::wwjgtin_get_track_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 64); m_bg_tilemap->set_transparent_pen(0); } @@ -179,7 +179,7 @@ VIDEO_START_MEMBER(lasso_state,wwjgtin) VIDEO_START_MEMBER(lasso_state,pinbo) { /* create tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lasso_state::pinbo_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lasso_state::pinbo_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index 8f420fb60f6..9bec2a1bd59 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -20,8 +20,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::ld_get_bg_tile_info) { int tile = m_scroll2[2 * tile_index] & 0x1fff; int color = m_scroll2[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile,color & 0xf, TILE_FLIPYX((color & 0x60) >> 5)); } @@ -30,8 +29,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::ld_get_fg_tile_info) { int tile = m_scroll1[2 * tile_index] & 0x1fff; int color = m_scroll1[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, tile, color & 0xf, TILE_FLIPYX((color & 0x60) >> 5)); @@ -42,8 +40,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_bg_tile_info) { int tile = m_scroll2[tile_index] & 0x1fff; int color = m_scroll2[tile_index + 0x0800]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile, color & 0xf, TILE_FLIPYX((color & 0x60) >> 5)); @@ -53,8 +50,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fg_tile_info) { int tile = m_scroll1[tile_index] & 0x1fff; int color = m_scroll1[tile_index + 0x0800]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, tile, color & 0xf, TILE_FLIPYX((color & 0x60) >> 5)); @@ -64,8 +60,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(lastduel_state::get_fix_info) { int tile = m_vram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile & 0x7ff, tile>>12, (tile & 0x800) ? TILE_FLIPY : 0); @@ -81,9 +76,9 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fix_info) VIDEO_START_MEMBER(lastduel_state,lastduel) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lastduel_state::get_fix_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fix_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transmask(0, 0xffff, 0x0001); m_fg_tilemap->set_transmask(1, 0xf07f, 0x0f81); @@ -96,9 +91,9 @@ VIDEO_START_MEMBER(lastduel_state,lastduel) VIDEO_START_MEMBER(lastduel_state,madgear) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lastduel_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lastduel_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lastduel_state::get_fix_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fix_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fg_tilemap->set_transmask(0, 0xffff, 0x8000); m_fg_tilemap->set_transmask(1, 0x80ff, 0xff00); diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c index 385b0e066d2..e34836c2e39 100644 --- a/src/mame/video/legionna.c +++ b/src/mame/video/legionna.c @@ -72,7 +72,7 @@ TILE_GET_INFO_MEMBER(legionna_state::get_back_tile_info) tile &= 0xfff; tile |= m_back_gfx_bank; /* Heatbrl uses banking */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tile,color,0); + SET_TILE_INFO_MEMBER(1,tile,color,0); } TILE_GET_INFO_MEMBER(legionna_state::get_mid_tile_info) @@ -82,7 +82,7 @@ TILE_GET_INFO_MEMBER(legionna_state::get_mid_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 5,tile,color,0); + SET_TILE_INFO_MEMBER(5,tile,color,0); } TILE_GET_INFO_MEMBER(legionna_state::get_mid_tile_info_denji) @@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(legionna_state::get_mid_tile_info_denji) tile &= 0xfff; tile |= m_mid_gfx_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 5,tile,color,0); + SET_TILE_INFO_MEMBER(5,tile,color,0); } TILE_GET_INFO_MEMBER(legionna_state::get_mid_tile_info_cupsoc) @@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(legionna_state::get_mid_tile_info_cupsoc) tile |= 0x1000; color += 0x10; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tile,color,0); + SET_TILE_INFO_MEMBER(1,tile,color,0); } TILE_GET_INFO_MEMBER(legionna_state::get_fore_tile_info)/* this is giving bad tiles... */ @@ -117,7 +117,7 @@ TILE_GET_INFO_MEMBER(legionna_state::get_fore_tile_info)/* this is giving bad ti // legionnaire tile numbers / gfx set wrong, see screen after coin insertion tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4,tile,color,0); + SET_TILE_INFO_MEMBER(4,tile,color,0); } TILE_GET_INFO_MEMBER(legionna_state::get_fore_tile_info_denji) @@ -128,7 +128,7 @@ TILE_GET_INFO_MEMBER(legionna_state::get_fore_tile_info_denji) tile &= 0xfff; tile |= m_fore_gfx_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4,tile,color,0); + SET_TILE_INFO_MEMBER(4,tile,color,0); } TILE_GET_INFO_MEMBER(legionna_state::get_text_tile_info) @@ -138,15 +138,15 @@ TILE_GET_INFO_MEMBER(legionna_state::get_text_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tile,color,0); + SET_TILE_INFO_MEMBER(0,tile,color,0); } VIDEO_START_MEMBER(legionna_state,legionna) { - m_background_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_foreground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_fore_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_midground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_mid_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); + m_background_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_foreground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_fore_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_midground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_mid_tile_info),this), TILEMAP_SCAN_ROWS,16,16,32,32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); m_scrollram16 = auto_alloc_array(machine(), UINT16, 0x60/2); m_sprite_xoffs = 0; @@ -163,10 +163,10 @@ VIDEO_START_MEMBER(legionna_state,legionna) VIDEO_START_MEMBER(legionna_state,denjinmk) { - m_background_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_foreground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_fore_tile_info_denji),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_midground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_mid_tile_info_denji),this), TILEMAP_SCAN_ROWS,16,16,32,32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); + m_background_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_foreground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_fore_tile_info_denji),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_midground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_mid_tile_info_denji),this), TILEMAP_SCAN_ROWS,16,16,32,32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); m_scrollram16 = auto_alloc_array(machine(), UINT16, 0x60/2); m_sprite_xoffs = 0; @@ -183,10 +183,10 @@ VIDEO_START_MEMBER(legionna_state,denjinmk) VIDEO_START_MEMBER(legionna_state,cupsoc) { - m_background_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_foreground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_fore_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_midground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_mid_tile_info_cupsoc),this), TILEMAP_SCAN_ROWS,16,16,32,32); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(legionna_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); + m_background_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_foreground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_fore_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_midground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_mid_tile_info_cupsoc),this), TILEMAP_SCAN_ROWS,16,16,32,32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(legionna_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); m_scrollram16 = auto_alloc_array(machine(), UINT16, 0x60/2); m_sprite_xoffs = 0; diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c index 06ed014c555..a10abca6809 100644 --- a/src/mame/video/lemmings.c +++ b/src/mame/video/lemmings.c @@ -22,8 +22,7 @@ TILE_GET_INFO_MEMBER(lemmings_state::get_tile_info) { UINT16 tile = m_vram_data[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile&0x7ff, (tile>>12)&0xf, 0); @@ -31,7 +30,7 @@ TILE_GET_INFO_MEMBER(lemmings_state::get_tile_info) void lemmings_state::video_start() { - m_vram_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lemmings_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); + m_vram_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lemmings_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); m_vram_tilemap->set_transparent_pen(0); m_bitmap0.fill(0x100); diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 910bd71f9dd..6578431a423 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -64,7 +64,7 @@ TILE_GET_INFO_MEMBER(liberate_state::get_back_tile_info) bank = 3; else bank = 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, tile & 0x7f, m_background_color, 0); + SET_TILE_INFO_MEMBER(bank, tile & 0x7f, m_background_color, 0); } TILE_GET_INFO_MEMBER(liberate_state::get_fix_tile_info) @@ -76,7 +76,7 @@ TILE_GET_INFO_MEMBER(liberate_state::get_fix_tile_info) tile = videoram[tile_index] + (colorram[tile_index] << 8); color = (colorram[tile_index] & 0x70) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } TILE_GET_INFO_MEMBER(liberate_state::prosport_get_back_tile_info) @@ -95,7 +95,7 @@ TILE_GET_INFO_MEMBER(liberate_state::prosport_get_back_tile_info) tile += m_io_ram[0]&0x20; //Pro Bowling bg tiles banking bit - SET_TILE_INFO_MEMBER(m_gfxdecode, 8, tile, 0, 0); + SET_TILE_INFO_MEMBER(8, tile, 0, 0); } /***************************************************************************/ @@ -202,8 +202,8 @@ WRITE8_MEMBER(liberate_state::prosport_bg_vram_w) VIDEO_START_MEMBER(liberate_state,prosoccr) { - m_back_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); + m_back_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); @@ -212,8 +212,8 @@ VIDEO_START_MEMBER(liberate_state,prosoccr) VIDEO_START_MEMBER(liberate_state,boomrang) { - m_back_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); + m_back_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); m_back_tilemap->set_transmask(0, 0x0001, 0x007e); /* Bottom 1 pen/Top 7 pens */ m_fix_tilemap->set_transparent_pen(0); @@ -221,16 +221,16 @@ VIDEO_START_MEMBER(liberate_state,boomrang) VIDEO_START_MEMBER(liberate_state,liberate) { - m_back_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); + m_back_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); } VIDEO_START_MEMBER(liberate_state,prosport) { - m_back_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(liberate_state::prosport_get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); + m_back_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::prosport_get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index 37aedf5bc67..e174a7f74f5 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -67,26 +67,26 @@ WRITE8_MEMBER(lkage_state::lkage_videoram_w) TILE_GET_INFO_MEMBER(lkage_state::get_bg_tile_info) { int code = m_videoram[tile_index + 0x800] + 256 * (m_bg_tile_bank ? 5 : 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0/*gfx*/, code, 0/*color*/, 0/*flags*/ ); + SET_TILE_INFO_MEMBER(0/*gfx*/, code, 0/*color*/, 0/*flags*/ ); } TILE_GET_INFO_MEMBER(lkage_state::get_fg_tile_info) { int code = m_videoram[tile_index + 0x400] + 256 * (m_fg_tile_bank ? 1 : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0/*gfx*/, code, 0/*color*/, 0/*flags*/); + SET_TILE_INFO_MEMBER(0/*gfx*/, code, 0/*color*/, 0/*flags*/); } TILE_GET_INFO_MEMBER(lkage_state::get_tx_tile_info) { int code = m_videoram[tile_index] + 256 * (m_tx_tile_bank ? 4 : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0/*gfx*/, code, 0/*color*/, 0/*flags*/); + SET_TILE_INFO_MEMBER(0/*gfx*/, code, 0/*color*/, 0/*flags*/); } void lkage_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lkage_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lkage_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lkage_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lkage_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lkage_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lkage_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_tx_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index 512821b1933..b006856c22c 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -143,7 +143,7 @@ TILE_GET_INFO_MEMBER(lockon_state::get_lockon_tile_info) UINT32 col = (m_char_ram[tile_index] >> 10) & 0x3f; col = (col & 0x1f) + (col & 0x20 ? 64 : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, col, 0); + SET_TILE_INFO_MEMBER(0, tileno, col, 0); } @@ -885,7 +885,7 @@ void lockon_state::hud_draw( bitmap_ind16 &bitmap, const rectangle &cliprect ) void lockon_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lockon_state::get_lockon_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lockon_state::get_lockon_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tilemap->set_transparent_pen(0); /* Allocate the two frame buffers for rotation */ diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index cc9a164fc07..e5ccf6eb33e 100644 --- a/src/mame/video/lordgun.c +++ b/src/mame/video/lordgun.c @@ -66,7 +66,7 @@ inline void lordgun_state::get_tile_info(tile_data &tileinfo, tilemap_memory_ind UINT16 attr = m_vram[_N_][tile_index * 2 + 0 ]; UINT16 code = m_vram[_N_][ tile_index * 2 + 1 ]; UINT16 pri = (attr & 0x0e00) >> 9; - SET_TILE_INFO_MEMBER(m_gfxdecode, _N_, code, ((attr & 0x0030) >> 4) + 0x10 + 0x4 * ((_N_ + 1) & 3) + pri*0x800/0x40, TILE_FLIPXY(attr >> 14)); + SET_TILE_INFO_MEMBER(_N_, code, ((attr & 0x0030) >> 4) + 0x10 + 0x4 * ((_N_ + 1) & 3) + pri*0x800/0x40, TILE_FLIPXY(attr >> 14)); } TILE_GET_INFO_MEMBER(lordgun_state::get_tile_info_0){ get_tile_info(tileinfo, tile_index, 0); } @@ -99,16 +99,16 @@ void lordgun_state::video_start() int h = m_screen->height(); // 0x800 x 200 - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lordgun_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS,8,8, 0x100, 0x40 ); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lordgun_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS,8,8, 0x100, 0x40 ); // 0x800 x 200 - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lordgun_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS,16,16, 0x80,0x20 ); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lordgun_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS,16,16, 0x80,0x20 ); // 0x800 x 200 - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lordgun_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS,32,32, 0x40,0x10 ); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lordgun_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS,32,32, 0x40,0x10 ); // 0x200 x 100 - m_tilemap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lordgun_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS,8,8, 0x40,0x20 ); + m_tilemap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lordgun_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS,8,8, 0x40,0x20 ); m_tilemap[0]->set_scroll_rows(1); m_tilemap[0]->set_scroll_cols(1); diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c index 4e2c759c104..fda74ffb0e9 100644 --- a/src/mame/video/lucky74.c +++ b/src/mame/video/lucky74.c @@ -208,7 +208,7 @@ TILE_GET_INFO_MEMBER(lucky74_state::get_fg_tile_info) int code = m_fg_videoram[tile_index] + ((attr & 0xf0) << 4); int color = (attr & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } TILE_GET_INFO_MEMBER(lucky74_state::get_bg_tile_info) @@ -223,14 +223,14 @@ TILE_GET_INFO_MEMBER(lucky74_state::get_bg_tile_info) int code = m_bg_videoram[tile_index] + ((attr & 0xf0) << 4); int color = (attr & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); } void lucky74_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lucky74_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lucky74_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lucky74_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lucky74_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/lvcards.c b/src/mame/video/lvcards.c index 362d1ad2ccc..38aeeda664e 100644 --- a/src/mame/video/lvcards.c +++ b/src/mame/video/lvcards.c @@ -101,12 +101,12 @@ TILE_GET_INFO_MEMBER(lvcards_state::get_bg_tile_info) int color = attr & 0x0f; int flags = (attr & 0x40) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void lvcards_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lvcards_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lvcards_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index cf294ec41cc..385d6b313a0 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -24,8 +24,7 @@ TILE_GET_INFO_MEMBER(lwings_state::get_fg_tile_info) { int code = m_fgvideoram[tile_index]; int color = m_fgvideoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((color & 0xc0) << 2), color & 0x0f, TILE_FLIPYX((color & 0x30) >> 4)); @@ -35,8 +34,7 @@ TILE_GET_INFO_MEMBER(lwings_state::lwings_get_bg1_tile_info) { int code = m_bg1videoram[tile_index]; int color = m_bg1videoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code + ((color & 0xe0) << 3), color & 0x07, TILE_FLIPYX((color & 0x18) >> 3)); @@ -47,8 +45,7 @@ TILE_GET_INFO_MEMBER(lwings_state::trojan_get_bg1_tile_info) int code = m_bg1videoram[tile_index]; int color = m_bg1videoram[tile_index + 0x400]; code += (color & 0xe0)<<3; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, m_bg2_avenger_hw ? ((color & 7) ^ 6) : (color & 7), ((color & 0x10) ? TILE_FLIPX : 0)); @@ -65,8 +62,7 @@ TILE_GET_INFO_MEMBER(lwings_state::get_bg2_tile_info) tile_index = (tile_index + m_bg2_image * 0x20) & mask; code = rom[tile_index]; color = rom[tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, code + ((color & 0x80) << 1), color & 0x07, TILE_FLIPYX((color & 0x30) >> 4)); @@ -80,17 +76,17 @@ TILE_GET_INFO_MEMBER(lwings_state::get_bg2_tile_info) void lwings_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::lwings_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::lwings_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_fg_tilemap->set_transparent_pen(3); } VIDEO_START_MEMBER(lwings_state,trojan) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::trojan_get_bg1_tile_info),this),TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(lwings_state::get_bg2_memory_offset),this), 16, 16, 32, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::trojan_get_bg1_tile_info),this),TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(lwings_state::get_bg2_memory_offset),this), 16, 16, 32, 16); m_fg_tilemap->set_transparent_pen(3); m_bg1_tilemap->set_transmask(0, 0xffff, 0x0001); /* split type 0 is totally transparent in front half */ diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index d2de47ca4f2..d727a3c7cdf 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -50,7 +50,7 @@ TILEMAP_MAPPER_MEMBER(m10_state::tilemap_scan) TILE_GET_INFO_MEMBER(m10_state::get_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_videoram[tile_index], m_colorram[tile_index] & 0x07, 0); + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], m_colorram[tile_index] & 0x07, 0); } @@ -95,7 +95,7 @@ inline void m10_state::plot_pixel_m10( bitmap_ind16 &bm, int x, int y, int col ) VIDEO_START_MEMBER(m10_state,m10) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m10_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(m10_state::tilemap_scan),this), 8, 8, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m10_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(m10_state::tilemap_scan),this), 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(0); m_back_gfx = auto_alloc(machine(), gfx_element(machine(), backlayout, m_chargen, 8, 0)); @@ -108,7 +108,7 @@ VIDEO_START_MEMBER(m10_state,m15) { m_gfxdecode->set_gfx(0,auto_alloc(machine(), gfx_element(machine(), charlayout, m_chargen, 8, 0))); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m10_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(m10_state::tilemap_scan),this), 8, 8, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m10_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(m10_state::tilemap_scan),this), 8, 8, 32, 32); return ; } diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c index 8a7a19025a4..763021737d1 100644 --- a/src/mame/video/m107.c +++ b/src/mame/video/m107.c @@ -51,8 +51,7 @@ TILE_GET_INFO_MEMBER(m107_state::get_pf_tile_info) attrib = m_vram_data[tile_index + 1]; tile = m_vram_data[tile_index] + ((attrib & 0x1000) << 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, attrib & 0x7f, TILE_FLIPYX(attrib >> 10)); @@ -127,7 +126,7 @@ void m107_state::video_start() pf_layer_info *layer = &m_pf_layer[laynum]; /* allocate a tilemaps per layer */ - layer->tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m107_state::get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,64); + layer->tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m107_state::get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,64); /* set the user data to point to the layer */ layer->tmap->set_user_data(&m_pf_layer[laynum]); diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index eed176ec8bc..2b714c1a694 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -133,7 +133,7 @@ TILE_GET_INFO_MEMBER(m52_state::get_tile_info) flag |= TILE_FORCE_LAYER0; /* lines 0 to 6 are opaqe? */ } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color & 0x3f, flag); + SET_TILE_INFO_MEMBER(0, code, color & 0x3f, flag); } @@ -146,7 +146,7 @@ TILE_GET_INFO_MEMBER(m52_state::get_tile_info) void m52_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m52_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m52_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scrolldx(127, 127); diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index 58ef05017da..142125b79c8 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -113,7 +113,7 @@ TILE_GET_INFO_MEMBER(m57_state::get_tile_info) UINT8 attr = m_videoram[tile_index * 2 + 0]; UINT16 code = m_videoram[tile_index * 2 + 1] | ((attr & 0xc0) << 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, attr & 0x0f, TILE_FLIPXY(attr >> 4)); + SET_TILE_INFO_MEMBER(0, code, attr & 0x0f, TILE_FLIPXY(attr >> 4)); } @@ -138,7 +138,7 @@ WRITE8_MEMBER(m57_state::m57_videoram_w) void m57_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m57_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m57_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(256); save_item(NAME(m_flipscreen)); diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index dff3e8147fe..a1506410841 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(m58_state::yard_get_bg_tile_info) int color = attr & 0x1f; int flags = (attr & 0x20) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } @@ -175,7 +175,7 @@ void m58_state::video_start() int height = m_screen->height(); const rectangle &visarea = m_screen->visible_area(); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m58_state::yard_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(m58_state::yard_tilemap_scan_rows),this), 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m58_state::yard_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(m58_state::yard_tilemap_scan_rows),this), 8, 8, 64, 32); m_bg_tilemap->set_scrolldx(visarea.min_x, width - (visarea.max_x + 1)); m_bg_tilemap->set_scrolldy(visarea.min_y - 8, height + 16 - (visarea.max_y + 1)); diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index a1c22c482c9..31a98788e16 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -404,7 +404,7 @@ void m62_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, i void m62_state::m62_start( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ) { - m_bg_tilemap = &machine().tilemap().create(tile_get_info, TILEMAP_SCAN_ROWS, x1, y1, x2, y2); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tile_get_info, TILEMAP_SCAN_ROWS, x1, y1, x2, y2); register_savestate(); @@ -417,7 +417,7 @@ void m62_state::m62_start( tilemap_get_info_delegate tile_get_info, int rows, in void m62_state::m62_textlayer( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ) { - m_fg_tilemap = &machine().tilemap().create(tile_get_info, TILEMAP_SCAN_ROWS, x1, y1, x2, y2); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tile_get_info, TILEMAP_SCAN_ROWS, x1, y1, x2, y2); if (rows != 0) m_fg_tilemap->set_scroll_rows(rows); @@ -444,7 +444,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kungfum_bg_tile_info) { flags |= TILE_FLIPX; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0xc0)<< 2), color & 0x1f, flags); + SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0)<< 2), color & 0x1f, flags); /* is the following right? */ if ((tile_index / 64) < 6 || ((color & 0x1f) >> 1) > 0x0c) @@ -488,7 +488,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun_bg_tile_info) { flags |= TILE_FLIPX; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0xc0) << 2), color & 0x1f, flags); + SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, flags); if (((color & 0x1f) >> 1) >= 0x0c) tileinfo.group = 1; else @@ -526,7 +526,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun2_bg_tile_info) { flags |= TILE_FLIPX; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0xc0) << 2), color & 0x1f, flags); + SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, flags); if (((color & 0x1f) >> 1) >= 0x04) tileinfo.group = 1; else @@ -579,7 +579,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_battroad_bg_tile_info) { flags |= TILE_FLIPX; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, flags); + SET_TILE_INFO_MEMBER(0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, flags); if (((color & 0x1f) >> 1) >= 0x04) tileinfo.group = 1; else @@ -592,7 +592,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_battroad_fg_tile_info) int color; code = m_m62_textram[tile_index << 1]; color = m_m62_textram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, 0); + SET_TILE_INFO_MEMBER(2, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, 0); } VIDEO_START_MEMBER(m62_state,battroad) @@ -628,7 +628,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun4_bg_tile_info) int color; code = m_m62_tileram[tile_index << 1]; color = m_m62_tileram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0); + SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0); } VIDEO_START_MEMBER(m62_state,ldrun4) @@ -658,7 +658,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_lotlot_bg_tile_info) { flags |= TILE_FLIPX; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0xc0) << 2), color & 0x1f, flags); + SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, flags); } TILE_GET_INFO_MEMBER(m62_state::get_lotlot_fg_tile_info) @@ -667,7 +667,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_lotlot_fg_tile_info) int color; code = m_m62_textram[tile_index << 1]; color = m_m62_textram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code | ((color & 0xc0) << 2), color & 0x1f, 0); + SET_TILE_INFO_MEMBER(2, code | ((color & 0xc0) << 2), color & 0x1f, 0); } VIDEO_START_MEMBER(m62_state,lotlot) @@ -716,7 +716,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kidniki_bg_tile_info) int color; code = m_m62_tileram[tile_index << 1]; color = m_m62_tileram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0xe0) << 3) | (m_kidniki_background_bank << 11), color & 0x1f, 0); + SET_TILE_INFO_MEMBER(0, code | ((color & 0xe0) << 3) | (m_kidniki_background_bank << 11), color & 0x1f, 0); tileinfo.group = ((color & 0xe0) == 0xe0) ? 1 : 0; } @@ -726,12 +726,12 @@ TILE_GET_INFO_MEMBER(m62_state::get_kidniki_fg_tile_info) int color; code = m_m62_textram[tile_index << 1]; color = m_m62_textram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code | ( ( color & 0xc0 ) << 2 ), color & 0x1f, 0); + SET_TILE_INFO_MEMBER(2, code | ( ( color & 0xc0 ) << 2 ), color & 0x1f, 0); } VIDEO_START_MEMBER(m62_state,kidniki) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m62_state::get_kidniki_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m62_state::get_kidniki_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ @@ -771,7 +771,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunkr_bg_tile_info) int color; code = m_m62_tileram[tile_index << 1]; color = m_m62_tileram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0x10) << 4) | ((color & 0x20) << 6) | ((color & 0xc0) << 3), (color & 0x0f) | (m_spelunkr_palbank << 4), 0); + SET_TILE_INFO_MEMBER(0, code | ((color & 0x10) << 4) | ((color & 0x20) << 6) | ((color & 0xc0) << 3), (color & 0x0f) | (m_spelunkr_palbank << 4), 0); } TILE_GET_INFO_MEMBER(m62_state::get_spelunkr_fg_tile_info) @@ -781,7 +781,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunkr_fg_tile_info) code = m_m62_textram[tile_index << 1]; color = m_m62_textram[(tile_index << 1) | 1]; if (color & 0xe0) popmessage("fg tilemap %x %x", tile_index, color & 0xe0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code | ((color & 0x10) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0); + SET_TILE_INFO_MEMBER(2, code | ((color & 0x10) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0); } VIDEO_START_MEMBER(m62_state,spelunkr) @@ -823,7 +823,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunk2_bg_tile_info) int color; code = m_m62_tileram[tile_index << 1]; color = m_m62_tileram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0xf0) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0 ); + SET_TILE_INFO_MEMBER(0, code | ((color & 0xf0) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0 ); } VIDEO_START_MEMBER(m62_state,spelunk2) @@ -853,7 +853,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_youjyudn_bg_tile_info) int color; code = m_m62_tileram[tile_index << 1]; color = m_m62_tileram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0x60) << 3), color & 0x1f, 0); + SET_TILE_INFO_MEMBER(0, code | ((color & 0x60) << 3), color & 0x1f, 0); if (((color & 0x1f) >> 1) >= 0x08) tileinfo.group = 1; else @@ -866,7 +866,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_youjyudn_fg_tile_info) int color; code = m_m62_textram[tile_index << 1]; color = m_m62_textram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code | ((color & 0xc0) << 2), (color & 0x0f), 0); + SET_TILE_INFO_MEMBER(2, code | ((color & 0xc0) << 2), (color & 0x0f), 0); } VIDEO_START_MEMBER(m62_state,youjyudn) @@ -903,7 +903,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_horizon_bg_tile_info) int color; code = m_m62_tileram[tile_index << 1]; color = m_m62_tileram[(tile_index << 1) | 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0); + SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0); if (((color & 0x1f) >> 1) >= 0x08) tileinfo.group = 1; diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c index eb866d03d3a..a26f615be36 100644 --- a/src/mame/video/m72.c +++ b/src/mame/video/m72.c @@ -22,8 +22,7 @@ inline void m72_state::m72_get_tile_info(tile_data &tileinfo,int tile_index,cons else pri = 0; /* color & 0x10 is used in bchopper and hharry, more priority? */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, code + ((attr & 0x3f) << 8), color & 0x0f, TILE_FLIPYX((attr & 0xc0) >> 6)); @@ -47,8 +46,7 @@ inline void m72_state::rtype2_get_tile_info(tile_data &tileinfo,int tile_index,c /* (vram[tile_index+2] & 0x10) is used by majtitle on the green, but it's not clear for what */ /* (vram[tile_index+3] & 0xfe) are used as well */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, code, color & 0x0f, TILE_FLIPYX((color & 0x60) >> 5)); @@ -109,8 +107,8 @@ void m72_state::register_savestate() VIDEO_START_MEMBER(m72_state,m72) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::m72_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::m72_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::m72_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::m72_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_buffered_spriteram = auto_alloc_array(machine(), UINT16, m_spriteram.bytes()/2); @@ -148,8 +146,8 @@ VIDEO_START_MEMBER(m72_state,xmultipl) VIDEO_START_MEMBER(m72_state,rtype2) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_buffered_spriteram = auto_alloc_array(machine(), UINT16, m_spriteram.bytes()/2); @@ -197,9 +195,9 @@ VIDEO_START_MEMBER(m72_state,majtitle) { // The tilemap can be 256x64, but seems to be used at 128x64 (scroll wraparound). // The layout ramains 256x64, the right half is just not displayed. -// m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,256,64); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(m72_state::majtitle_scan_rows),this),8,8,128,64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); +// m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,256,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(m72_state::majtitle_scan_rows),this),8,8,128,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_buffered_spriteram = auto_alloc_array(machine(), UINT16, m_spriteram.bytes()/2); @@ -224,8 +222,8 @@ VIDEO_START_MEMBER(m72_state,majtitle) VIDEO_START_MEMBER(m72_state,hharry) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::hharry_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m72_state::m72_get_fg_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::hharry_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::m72_get_fg_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); m_buffered_spriteram = auto_alloc_array(machine(), UINT16, m_spriteram.bytes()/2); diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c index 033ecc95299..e16dba549a2 100644 --- a/src/mame/video/m90.c +++ b/src/mame/video/m90.c @@ -37,8 +37,7 @@ inline void m90_state::get_tile_info(tile_data &tileinfo,int tile_index,int laye tile=m_video_data[tile_index]; color=m_video_data[tile_index+1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color&0xf, TILE_FLIPYX((color & 0xc0) >> 6)); @@ -52,8 +51,7 @@ inline void m90_state::bomblord_get_tile_info(tile_data &tileinfo,int tile_index tile=m_video_data[tile_index]; color=m_video_data[tile_index+1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color&0xf, TILE_FLIPYX((color & 0xc0) >> 6)); @@ -67,8 +65,7 @@ inline void m90_state::dynablsb_get_tile_info(tile_data &tileinfo,int tile_index tile=m_video_data[tile_index]; color=m_video_data[tile_index+1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color&0xf, TILE_FLIPYX((color & 0xc0) >> 6)); @@ -92,10 +89,10 @@ TILE_GET_INFO_MEMBER(m90_state::dynablsb_get_pf2w_tile_info){ dynablsb_get_tile_ void m90_state::video_start() { - m_pf1_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::get_pf1_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); - m_pf1_wide_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::get_pf1w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); - m_pf2_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::get_pf2_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); - m_pf2_wide_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::get_pf2w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_pf1_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::get_pf1_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); + m_pf1_wide_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::get_pf1w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_pf2_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::get_pf2_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); + m_pf2_wide_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::get_pf2w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_pf1_layer->set_transparent_pen(0); m_pf1_wide_layer->set_transparent_pen(0); @@ -107,10 +104,10 @@ void m90_state::video_start() VIDEO_START_MEMBER(m90_state,bomblord) { - m_pf1_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::bomblord_get_pf1_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); - m_pf1_wide_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::bomblord_get_pf1w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); - m_pf2_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::bomblord_get_pf2_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); - m_pf2_wide_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::bomblord_get_pf2w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_pf1_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::bomblord_get_pf1_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); + m_pf1_wide_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::bomblord_get_pf1w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_pf2_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::bomblord_get_pf2_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); + m_pf2_wide_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::bomblord_get_pf2w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_pf2_layer->set_transparent_pen(0); m_pf2_wide_layer->set_transparent_pen(0); @@ -122,10 +119,10 @@ VIDEO_START_MEMBER(m90_state,bomblord) VIDEO_START_MEMBER(m90_state,dynablsb) { - m_pf1_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::dynablsb_get_pf1_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); - m_pf1_wide_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::dynablsb_get_pf1w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); - m_pf2_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::dynablsb_get_pf2_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); - m_pf2_wide_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m90_state::dynablsb_get_pf2w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_pf1_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::dynablsb_get_pf1_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); + m_pf1_wide_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::dynablsb_get_pf1w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_pf2_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::dynablsb_get_pf2_tile_info),this), TILEMAP_SCAN_ROWS,8,8,64,64); + m_pf2_wide_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m90_state::dynablsb_get_pf2w_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_pf2_layer->set_transparent_pen(0); m_pf2_wide_layer->set_transparent_pen(0); diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index ebac134b506..7ecac6112df 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -152,8 +152,7 @@ TILE_GET_INFO_MEMBER(m92_state::get_pf_tile_info) attrib = m_vram_data[tile_index + 1]; tile = m_vram_data[tile_index] + ((attrib & 0x8000) << 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, attrib & 0x7f, TILE_FLIPYX(attrib >> 9)); @@ -254,8 +253,8 @@ VIDEO_START_MEMBER(m92_state,m92) pf_layer_info *layer = &m_pf_layer[laynum]; /* allocate two tilemaps per layer, one normal, one wide */ - layer->tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m92_state::get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,64); - layer->wide_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m92_state::get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 128,64); + layer->tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m92_state::get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,64); + layer->wide_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m92_state::get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 128,64); /* set the user data for each one to point to the layer */ layer->tmap->set_user_data(&m_pf_layer[laynum]); diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index c719e7e31e4..548b6de2072 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scra_tile_info) break; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30)); + SET_TILE_INFO_MEMBER(1, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30)); } /*** SCR B LAYER ***/ @@ -71,7 +71,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scrb_tile_info) break; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30)); + SET_TILE_INFO_MEMBER(2, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30)); } /*** SCR C LAYER ***/ @@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scrc_tile_info) break; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30)); + SET_TILE_INFO_MEMBER(3, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30)); } /*** TEXT LAYER ***/ @@ -126,7 +126,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_text_tile_info) tileno = m_text_videoram[tile_index] & 0x0000ffff; colour = (m_text_videoram[tile_index] & 0x00fe0000) >> 17; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4, tileno, colour, 0); + SET_TILE_INFO_MEMBER(4, tileno, colour, 0); } @@ -138,10 +138,10 @@ void macrossp_state::video_start() m_spriteram_old = auto_alloc_array_clear(machine(), UINT32, m_spriteram.bytes() / 4); m_spriteram_old2 = auto_alloc_array_clear(machine(), UINT32, m_spriteram.bytes() / 4); - m_text_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(macrossp_state::get_macrossp_text_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_scra_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(macrossp_state::get_macrossp_scra_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_scrb_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(macrossp_state::get_macrossp_scrb_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_scrc_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(macrossp_state::get_macrossp_scrc_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_text_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(macrossp_state::get_macrossp_text_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_scra_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(macrossp_state::get_macrossp_scra_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_scrb_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(macrossp_state::get_macrossp_scrb_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_scrc_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(macrossp_state::get_macrossp_scrc_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_text_tilemap->set_transparent_pen(0); m_scra_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index 0653f934e98..cd14de6ffc6 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -90,7 +90,7 @@ TILE_GET_INFO_MEMBER(madalien_state::get_tile_info_BG_1) { UINT8 *map = memregion("user1")->base() + ((*m_video_flags & 0x08) << 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, map[tile_index], BIT(*m_video_flags, 2) ? 2 : 0, 0); + SET_TILE_INFO_MEMBER(1, map[tile_index], BIT(*m_video_flags, 2) ? 2 : 0, 0); } @@ -98,13 +98,13 @@ TILE_GET_INFO_MEMBER(madalien_state::get_tile_info_BG_2) { UINT8 *map = memregion("user1")->base() + ((*m_video_flags & 0x08) << 6) + 0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, map[tile_index], BIT(*m_video_flags, 2) ? 2 : 0, 0); + SET_TILE_INFO_MEMBER(1, map[tile_index], BIT(*m_video_flags, 2) ? 2 : 0, 0); } TILE_GET_INFO_MEMBER(madalien_state::get_tile_info_FG) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_videoram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0); } WRITE8_MEMBER(madalien_state::madalien_videoram_w) @@ -131,14 +131,14 @@ VIDEO_START_MEMBER(madalien_state,madalien) 16, 16, 32, 32 }; - m_tilemap_fg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(madalien_state::get_tile_info_FG),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); + m_tilemap_fg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(madalien_state::get_tile_info_FG),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); m_tilemap_fg->set_transparent_pen(0); for (i = 0; i < 4; i++) { - m_tilemap_edge1[i] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(madalien_state::get_tile_info_BG_1),this), scan_functions[i], 16, 16, tilemap_cols[i], 8); + m_tilemap_edge1[i] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(madalien_state::get_tile_info_BG_1),this), scan_functions[i], 16, 16, tilemap_cols[i], 8); - m_tilemap_edge2[i] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(madalien_state::get_tile_info_BG_2),this), scan_functions[i], 16, 16, tilemap_cols[i], 8); + m_tilemap_edge2[i] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(madalien_state::get_tile_info_BG_2),this), scan_functions[i], 16, 16, tilemap_cols[i], 8); } m_headlight_bitmap = auto_bitmap_ind16_alloc(machine(), 128, 128); diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c index b2c7dd90e8d..be283043d13 100644 --- a/src/mame/video/mainsnk.c +++ b/src/mame/video/mainsnk.c @@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(mainsnk_state::get_tx_tile_info) { int code = m_fgram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, code, 0, tile_index & 0x400 ? TILE_FORCE_LAYER0 : 0); @@ -59,8 +59,7 @@ TILE_GET_INFO_MEMBER(mainsnk_state::get_bg_tile_info) { int code = (m_bgram[tile_index]); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_bg_tile_offset + code, 0, 0); @@ -69,8 +68,8 @@ TILE_GET_INFO_MEMBER(mainsnk_state::get_bg_tile_info) void mainsnk_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mainsnk_state::get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(mainsnk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mainsnk_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mainsnk_state::get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(mainsnk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mainsnk_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(15); m_tx_tilemap->set_scrolldy(8, 8); diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c index abfc243be99..303a3c5bdd6 100644 --- a/src/mame/video/mappy.c +++ b/src/mame/video/mappy.c @@ -268,8 +268,7 @@ TILE_GET_INFO_MEMBER(mappy_state::superpac_get_tile_info) tileinfo.category = (attr & 0x40) >> 6; tileinfo.group = attr & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], attr & 0x3f, 0); @@ -281,8 +280,7 @@ TILE_GET_INFO_MEMBER(mappy_state::phozon_get_tile_info) tileinfo.category = (attr & 0x40) >> 6; tileinfo.group = attr & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index] + ((attr & 0x80) << 1), attr & 0x3f, 0); @@ -294,8 +292,7 @@ TILE_GET_INFO_MEMBER(mappy_state::mappy_get_tile_info) tileinfo.category = (attr & 0x40) >> 6; tileinfo.group = attr & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], attr & 0x3f, 0); @@ -311,7 +308,7 @@ TILE_GET_INFO_MEMBER(mappy_state::mappy_get_tile_info) VIDEO_START_MEMBER(mappy_state,superpac) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mappy_state::superpac_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::superpac_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); m_screen->register_screen_bitmap(m_sprite_bitmap); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(0), 31); @@ -319,7 +316,7 @@ VIDEO_START_MEMBER(mappy_state,superpac) VIDEO_START_MEMBER(mappy_state,phozon) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mappy_state::phozon_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::phozon_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(0), 15); @@ -328,7 +325,7 @@ VIDEO_START_MEMBER(mappy_state,phozon) VIDEO_START_MEMBER(mappy_state,mappy) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mappy_state::mappy_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::mappy_tilemap_scan),this),8,8,36,60); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::mappy_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::mappy_tilemap_scan),this),8,8,36,60); m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(0), 31); m_bg_tilemap->set_scroll_cols(36); diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c index 17ee066e1f4..08574f9984f 100644 --- a/src/mame/video/marineb.c +++ b/src/mame/video/marineb.c @@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(marineb_state::get_tile_info) UINT8 code = m_videoram[tile_index]; UINT8 col = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, code | ((col & 0xc0) << 2), (col & 0x0f) | (m_palette_bank << 4), TILE_FLIPXY((col >> 4) & 0x03)); @@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(marineb_state::get_tile_info) void marineb_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(marineb_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(marineb_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); save_item(NAME(m_palette_bank)); diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index b62a964c5ff..98ac4f073e2 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -127,12 +127,12 @@ TILE_GET_INFO_MEMBER(mario_state::get_bg_tile_info) color = ((m_videoram[tile_index] >> 2) & 0x38) | 0x40 | (m_palette_bank<<7) | (m_monitor<<8); color = color >> 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void mario_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mario_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mario_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_gfx_bank = 0; diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index f46a779c3a7..b6668dc7a8b 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -58,12 +58,12 @@ TILE_GET_INFO_MEMBER(markham_state::get_bg_tile_info) int code = m_videoram[(tile_index * 2) + 1] + ((attr & 0x60) << 3); int color = (attr & 0x1f) | ((attr & 0x80) >> 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void markham_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(markham_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(markham_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index e4bab9f5ef2..4e6a7f82228 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -19,7 +19,7 @@ TILE_GET_INFO_MEMBER(mcatadv_state::get_mcatadv_tile_info1) int colour = (m_videoram1[tile_index * 2] & 0x3f00) >> 8; int pri = (m_videoram1[tile_index * 2] & 0xc000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour + m_palette_bank1 * 0x40, 0); + SET_TILE_INFO_MEMBER(0,tileno,colour + m_palette_bank1 * 0x40, 0); tileinfo.category = pri; } @@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(mcatadv_state::get_mcatadv_tile_info2) int colour = (m_videoram2[tile_index * 2] & 0x3f00) >> 8; int pri = (m_videoram2[tile_index * 2] & 0xc000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, colour + m_palette_bank2 * 0x40, 0); + SET_TILE_INFO_MEMBER(1, tileno, colour + m_palette_bank2 * 0x40, 0); tileinfo.category = pri; } @@ -246,10 +246,10 @@ UINT32 mcatadv_state::screen_update_mcatadv(screen_device &screen, bitmap_ind16 void mcatadv_state::video_start() { - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcatadv_state::get_mcatadv_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcatadv_state::get_mcatadv_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap1->set_transparent_pen(0); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcatadv_state::get_mcatadv_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcatadv_state::get_mcatadv_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap2->set_transparent_pen(0); m_spriteram_old = auto_alloc_array_clear(machine(), UINT16, m_spriteram.bytes() / 2); diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c index 8eaa469ceff..f082cdcd290 100644 --- a/src/mame/video/mcr.c +++ b/src/mame/video/mcr.c @@ -31,7 +31,7 @@ static tilemap_t *bg_tilemap; TILE_GET_INFO_MEMBER(mcr_state::mcr_90009_get_tile_info) { UINT8 *videoram = m_videoram; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, videoram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, videoram[tile_index], 0, 0); /* sprite color base is constant 0x10 */ tileinfo.category = 1; @@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(mcr_state::mcr_90010_get_tile_info) int data = videoram[tile_index * 2] | (videoram[tile_index * 2 + 1] << 8); int code = data & 0x1ff; int color = (data >> 11) & 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, TILE_FLIPYX((data >> 9) & 3)); + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((data >> 9) & 3)); /* sprite color base comes from the top 2 bits */ tileinfo.category = (data >> 14) & 3; @@ -83,7 +83,7 @@ TILE_GET_INFO_MEMBER(mcr_state::mcr_91490_get_tile_info) int data = videoram[tile_index * 2] | (videoram[tile_index * 2 + 1] << 8); int code = data & 0x3ff; int color = (data >> 12) & 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, TILE_FLIPYX((data >> 10) & 3)); + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((data >> 10) & 3)); /* sprite color base might come from the top 2 bits */ tileinfo.category = (data >> 14) & 3; @@ -103,19 +103,19 @@ VIDEO_START_MEMBER(mcr_state,mcr) switch (mcr_cpu_board) { case 90009: - bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr_state::mcr_90009_get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); + bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr_state::mcr_90009_get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); break; case 90010: - bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr_state::mcr_90010_get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); + bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr_state::mcr_90010_get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); break; case 91475: - bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr_state::mcr_90010_get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); + bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr_state::mcr_90010_get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); break; case 91490: - bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr_state::mcr_91490_get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); + bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr_state::mcr_91490_get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); break; default: diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c index 596d83d2f36..f2bf405e08b 100644 --- a/src/mame/video/mcr3.c +++ b/src/mame/video/mcr3.c @@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(mcr3_state::get_bg_tile_info) int data = videoram[tile_index * 2] | (videoram[tile_index * 2 + 1] << 8); int code = (data & 0x3ff) | ((data >> 4) & 0x400); int color = (data >> 12) & 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, TILE_FLIPYX((data >> 10) & 3)); + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((data >> 10) & 3)); } #endif @@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(mcr3_state::mcrmono_get_bg_tile_info) int data = videoram[tile_index * 2] | (videoram[tile_index * 2 + 1] << 8); int code = (data & 0x3ff) | ((data >> 4) & 0x400); int color = ((data >> 12) & 3) ^ 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, TILE_FLIPYX((data >> 10) & 3)); + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((data >> 10) & 3)); } @@ -52,13 +52,13 @@ TILE_GET_INFO_MEMBER(mcr3_state::spyhunt_get_bg_tile_info) UINT8 *videoram = m_videoram; int data = videoram[tile_index]; int code = (data & 0x3f) | ((data >> 1) & 0x40); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, (data & 0x40) ? TILE_FLIPY : 0); + SET_TILE_INFO_MEMBER(0, code, 0, (data & 0x40) ? TILE_FLIPY : 0); } TILE_GET_INFO_MEMBER(mcr3_state::spyhunt_get_alpha_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, m_spyhunt_alpharam[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(2, m_spyhunt_alpharam[tile_index], 0, 0); } @@ -97,7 +97,7 @@ PALETTE_INIT_MEMBER(mcr3_state,spyhunt) VIDEO_START_MEMBER(mcr3_state,mcr3) { /* initialize the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr3_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); } #endif @@ -105,17 +105,17 @@ VIDEO_START_MEMBER(mcr3_state,mcr3) VIDEO_START_MEMBER(mcr3_state,mcrmono) { /* initialize the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr3_state::mcrmono_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::mcrmono_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,30); } VIDEO_START_MEMBER(mcr3_state,spyhunt) { /* initialize the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(mcr3_state::spyhunt_bg_scan),this), 64,32, 64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(mcr3_state::spyhunt_bg_scan),this), 64,32, 64,32); /* initialize the text tilemap */ - m_alpha_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_alpha_tile_info),this), TILEMAP_SCAN_COLS, 16,16, 32,32); + m_alpha_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_alpha_tile_info),this), TILEMAP_SCAN_COLS, 16,16, 32,32); m_alpha_tilemap->set_transparent_pen(0); m_alpha_tilemap->set_scrollx(0, 16); @@ -128,10 +128,10 @@ VIDEO_START_MEMBER(mcr3_state,spyhunt) VIDEO_START_MEMBER(mcr3_state,spyhuntpr) { /* initialize the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(mcr3_state::spyhunt_bg_scan),this), 64,16, 64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(mcr3_state::spyhunt_bg_scan),this), 64,16, 64,32); /* initialize the text tilemap */ - m_alpha_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_alpha_tile_info),this), TILEMAP_SCAN_COLS, 16,8, 32,32); + m_alpha_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_alpha_tile_info),this), TILEMAP_SCAN_COLS, 16,8, 32,32); m_alpha_tilemap->set_transparent_pen(0); m_alpha_tilemap->set_scrollx(0, 16); diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index db00c40b26d..99d019b0aea 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(mcr68_state::get_bg_tile_info) int data = LOW_BYTE(videoram[tile_index * 2]) | (LOW_BYTE(videoram[tile_index * 2 + 1]) << 8); int code = (data & 0x3ff) | ((data >> 4) & 0xc00); int color = (~data >> 12) & 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, TILE_FLIPYX((data >> 10) & 3)); + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((data >> 10) & 3)); if (m_gfxdecode->gfx(0)->elements() < 0x1000) tileinfo.category = (data >> 15) & 1; } @@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(mcr68_state::zwackery_get_bg_tile_info) UINT16 *videoram = m_videoram; int data = videoram[tile_index]; int color = (data >> 13) & 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, data & 0x3ff, color, TILE_FLIPYX((data >> 11) & 3)); + SET_TILE_INFO_MEMBER(0, data & 0x3ff, color, TILE_FLIPYX((data >> 11) & 3)); } @@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(mcr68_state::zwackery_get_fg_tile_info) UINT16 *videoram = m_videoram; int data = videoram[tile_index]; int color = (data >> 13) & 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, data & 0x3ff, color, TILE_FLIPYX((data >> 11) & 3)); + SET_TILE_INFO_MEMBER(2, data & 0x3ff, color, TILE_FLIPYX((data >> 11) & 3)); tileinfo.category = (color != 0); } @@ -61,7 +61,7 @@ TILE_GET_INFO_MEMBER(mcr68_state::zwackery_get_fg_tile_info) VIDEO_START_MEMBER(mcr68_state,mcr68) { /* initialize the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr68_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr68_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32); m_bg_tilemap->set_transparent_pen(0); } @@ -76,10 +76,10 @@ VIDEO_START_MEMBER(mcr68_state,zwackery) int code, y, x; /* initialize the background tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr68_state::zwackery_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr68_state::zwackery_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32); /* initialize the foreground tilemap */ - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mcr68_state::zwackery_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr68_state::zwackery_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32); m_fg_tilemap->set_transparent_pen(0); /* allocate memory for the assembled gfx data */ diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c index 40c9b1a75d8..ad5407f1139 100644 --- a/src/mame/video/meadows.c +++ b/src/mame/video/meadows.c @@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(meadows_state::get_tile_info) { UINT8 *videoram = m_videoram; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, videoram[tile_index] & 0x7f, 0, 0); + SET_TILE_INFO_MEMBER(0, videoram[tile_index] & 0x7f, 0, 0); } @@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(meadows_state::get_tile_info) void meadows_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(meadows_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(meadows_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,30); } diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index b0def8bbd93..7bb38a46f0c 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -348,14 +348,14 @@ TILE_GET_INFO_MEMBER(megasys1_state::megasys1_get_scroll_tile_info_8x8) { int tmap = (FPTR)tilemap.user_data(); UINT16 code = m_scrollram[tmap][tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, tmap, (code & 0xfff) * m_8x8_scroll_factor[tmap], code >> (16 - m_bits_per_color_code), 0); + SET_TILE_INFO_MEMBER(tmap, (code & 0xfff) * m_8x8_scroll_factor[tmap], code >> (16 - m_bits_per_color_code), 0); } TILE_GET_INFO_MEMBER(megasys1_state::megasys1_get_scroll_tile_info_16x16) { int tmap = (FPTR)tilemap.user_data(); UINT16 code = m_scrollram[tmap][tile_index/4]; - SET_TILE_INFO_MEMBER(m_gfxdecode, tmap, (code & 0xfff) * m_16x16_scroll_factor[tmap] + (tile_index & 3), code >> (16 - m_bits_per_color_code), 0); + SET_TILE_INFO_MEMBER(tmap, (code & 0xfff) * m_16x16_scroll_factor[tmap] + (tile_index & 3), code >> (16 - m_bits_per_color_code), 0); } void megasys1_state::create_tilemaps() @@ -365,23 +365,23 @@ void megasys1_state::create_tilemaps() for (layer = 0; layer < 3; layer++) { /* 16x16 tilemaps */ - m_tilemap[layer][0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_16x16),this), + m_tilemap[layer][0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_16x16),this), 8,8, TILES_PER_PAGE_X * 16, TILES_PER_PAGE_Y * 2); - m_tilemap[layer][0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_16x16),this), + m_tilemap[layer][0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_16x16),this), 8,8, TILES_PER_PAGE_X * 8, TILES_PER_PAGE_Y * 4); - m_tilemap[layer][0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_16x16),this), + m_tilemap[layer][0][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_16x16),this), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 8); - m_tilemap[layer][0][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_16x16),this), + m_tilemap[layer][0][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_16x16),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_16x16),this), 8,8, TILES_PER_PAGE_X * 2, TILES_PER_PAGE_Y * 16); /* 8x8 tilemaps */ - m_tilemap[layer][1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_8x8),this), + m_tilemap[layer][1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_8x8),this), 8,8, TILES_PER_PAGE_X * 8, TILES_PER_PAGE_Y * 1); - m_tilemap[layer][1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_8x8),this), + m_tilemap[layer][1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_8x8),this), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 2); - m_tilemap[layer][1][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_8x8),this), + m_tilemap[layer][1][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_8x8),this), 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 2); - m_tilemap[layer][1][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_8x8),this), + m_tilemap[layer][1][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(megasys1_state::megasys1_get_scroll_tile_info_8x8),this), tilemap_mapper_delegate(FUNC(megasys1_state::megasys1_scan_8x8),this), 8,8, TILES_PER_PAGE_X * 2, TILES_PER_PAGE_Y * 4); /* set user data and transparency */ diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 05a8544a7df..2da8a3f4eea 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -143,7 +143,7 @@ TILE_GET_INFO_MEMBER(mermaid_state::get_bg_tile_info) int sx = tile_index % 32; int color = (sx >= 26) ? 0 : 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } TILE_GET_INFO_MEMBER(mermaid_state::get_fg_tile_info) @@ -156,15 +156,15 @@ TILE_GET_INFO_MEMBER(mermaid_state::get_fg_tile_info) code |= m_rougien_gfxbank1 * 0x2800; code |= m_rougien_gfxbank2 * 0x2400; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void mermaid_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mermaid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mermaid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mermaid_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mermaid_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_scroll_cols(32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index e15727bfc0b..e6b631a2111 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -69,7 +69,7 @@ TILEMAP_MAPPER_MEMBER(metlclsh_state::metlclsh_bgtilemap_scan) TILE_GET_INFO_MEMBER(metlclsh_state::get_bg_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, m_bgram[tile_index] + (m_gfxbank << 7), 0, 0); + SET_TILE_INFO_MEMBER(1, m_bgram[tile_index] + (m_gfxbank << 7), 0, 0); } WRITE8_MEMBER(metlclsh_state::metlclsh_bgram_w) @@ -112,7 +112,7 @@ TILE_GET_INFO_MEMBER(metlclsh_state::get_fg_tile_info) { UINT8 code = m_fgram[tile_index + 0x000]; UINT8 attr = m_fgram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code + ((attr & 0x03) << 8), (attr >> 5) & 3, 0); + SET_TILE_INFO_MEMBER(2, code + ((attr & 0x03) << 8), (attr >> 5) & 3, 0); tileinfo.category = ((attr & 0x80) ? 1 : 2); } @@ -133,8 +133,8 @@ void metlclsh_state::video_start() { m_otherram = auto_alloc_array(machine(), UINT8, 0x800); // banked ram - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(metlclsh_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(metlclsh_state::metlclsh_bgtilemap_scan),this), 16, 16, 32, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(metlclsh_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(metlclsh_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(metlclsh_state::metlclsh_bgtilemap_scan),this), 16, 16, 32, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(metlclsh_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index f8a47701337..0eada3e707d 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -58,8 +58,7 @@ TILE_GET_INFO_MEMBER(metro_state::metro_k053936_get_tile_info) { int code = m_k053936_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 4, + SET_TILE_INFO_MEMBER(4, code & 0x7fff, 0xe, 0); @@ -69,8 +68,7 @@ TILE_GET_INFO_MEMBER(metro_state::metro_k053936_gstrik2_get_tile_info) { int code = m_k053936_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 4, + SET_TILE_INFO_MEMBER(4, (code & 0x7fff)>>2, 0xe, 0); @@ -326,7 +324,7 @@ VIDEO_START_MEMBER(metro_state,blzntrnd) m_has_zoom = 1; - m_k053936_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(metro_state::metro_k053936_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 512); + m_k053936_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(metro_state::metro_k053936_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 512); m_tilemap_scrolldx[0] = 8; m_tilemap_scrolldx[1] = 8; @@ -339,7 +337,7 @@ VIDEO_START_MEMBER(metro_state,gstrik2) m_has_zoom = 1; - m_k053936_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(metro_state::metro_k053936_gstrik2_get_tile_info),this), tilemap_mapper_delegate(FUNC(metro_state::tilemap_scan_gstrik2),this), 16, 16, 128, 256); + m_k053936_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(metro_state::metro_k053936_gstrik2_get_tile_info),this), tilemap_mapper_delegate(FUNC(metro_state::tilemap_scan_gstrik2),this), 16, 16, 128, 256); m_tilemap_scrolldx[0] = 8; m_tilemap_scrolldx[1] = 0; diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index 8ef54cced81..53f6dd58062 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -125,14 +125,14 @@ TILE_GET_INFO_MEMBER(mikie_state::get_bg_tile_info) else tileinfo.category = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void mikie_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mikie_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mikie_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void mikie_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index a9582118edd..e9868147601 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -18,8 +18,7 @@ TILE_GET_INFO_MEMBER(mitchell_state::get_tile_info) { UINT8 attr = m_colorram[tile_index]; int code = m_videoram[2 * tile_index] + (m_videoram[2 * tile_index + 1] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, attr & 0x7f, (attr & 0x80) ? TILE_FLIPX : 0); @@ -35,7 +34,7 @@ TILE_GET_INFO_MEMBER(mitchell_state::get_tile_info) VIDEO_START_MEMBER(mitchell_state,pang) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mitchell_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mitchell_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transparent_pen(15); /* OBJ RAM */ diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index 049c1964df9..5f0a2aeeeb3 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -13,7 +13,7 @@ TILE_GET_INFO_MEMBER(mjkjidai_state::get_tile_info) int attr = m_videoram[tile_index + 0x800]; int code = m_videoram[tile_index] + ((attr & 0x1f) << 8); int color = m_videoram[tile_index + 0x1000]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,color >> 3,0); + SET_TILE_INFO_MEMBER(0,code,color >> 3,0); } @@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(mjkjidai_state::get_tile_info) void mjkjidai_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mjkjidai_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mjkjidai_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); } diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c index 63396be95bc..9dfa24cbb53 100644 --- a/src/mame/video/mosaic.c +++ b/src/mame/video/mosaic.c @@ -18,8 +18,7 @@ TILE_GET_INFO_MEMBER(mosaic_state::get_fg_tile_info) { tile_index *= 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fgvideoram[tile_index] + (m_fgvideoram[tile_index+1] << 8), 0, 0); @@ -28,8 +27,7 @@ TILE_GET_INFO_MEMBER(mosaic_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(mosaic_state::get_bg_tile_info) { tile_index *= 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_bgvideoram[tile_index] + (m_bgvideoram[tile_index+1] << 8), 0, 0); @@ -45,8 +43,8 @@ TILE_GET_INFO_MEMBER(mosaic_state::get_bg_tile_info) void mosaic_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mosaic_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mosaic_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mosaic_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mosaic_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(0xff); } diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 8a95c55c598..8d9b3e9fcf3 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -134,8 +134,7 @@ PALETTE_INIT_MEMBER(mrdo_state, mrdo) TILE_GET_INFO_MEMBER(mrdo_state::get_bg_tile_info) { UINT8 attr = m_bgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_bgvideoram[tile_index + 0x400] + ((attr & 0x80) << 1), attr & 0x3f, (attr & 0x40) ? TILE_FORCE_LAYER0 : 0); @@ -144,8 +143,7 @@ TILE_GET_INFO_MEMBER(mrdo_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(mrdo_state::get_fg_tile_info) { UINT8 attr = m_fgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fgvideoram[tile_index+0x400] + ((attr & 0x80) << 1), attr & 0x3f, (attr & 0x40) ? TILE_FORCE_LAYER0 : 0); @@ -161,8 +159,8 @@ TILE_GET_INFO_MEMBER(mrdo_state::get_fg_tile_info) void mrdo_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mrdo_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mrdo_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mrdo_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mrdo_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index ee96b3a4438..056a265d14f 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -93,12 +93,12 @@ TILE_GET_INFO_MEMBER(mrjong_state::get_bg_tile_info) int color = m_colorram[tile_index] & 0x1f; int flags = ((m_colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void mrjong_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mrjong_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_XY, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mrjong_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_XY, 8, 8, 32, 32); } /* diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c index 3fa87b44f7a..4ee6a7c9c8f 100644 --- a/src/mame/video/ms32.c +++ b/src/mame/video/ms32.c @@ -27,7 +27,7 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_tx_tile_info) tileno = m_txram[tile_index *2] & 0xffff; colour = m_txram[tile_index *2+1] & 0x000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3,tileno,colour,0); + SET_TILE_INFO_MEMBER(3,tileno,colour,0); } TILE_GET_INFO_MEMBER(ms32_state::get_ms32_roz_tile_info) @@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_roz_tile_info) tileno = m_rozram[tile_index *2] & 0xffff; colour = m_rozram[tile_index *2+1] & 0x000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno,colour,0); + SET_TILE_INFO_MEMBER(1,tileno,colour,0); } TILE_GET_INFO_MEMBER(ms32_state::get_ms32_bg_tile_info) @@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_bg_tile_info) tileno = m_bgram[tile_index *2] & 0xffff; colour = m_bgram[tile_index *2+1] & 0x000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,tileno,colour,0); + SET_TILE_INFO_MEMBER(2,tileno,colour,0); } TILE_GET_INFO_MEMBER(ms32_state::get_ms32_extra_tile_info) @@ -57,17 +57,17 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_extra_tile_info) tileno = m_f1superb_extraram[tile_index *2] & 0xffff; colour = m_f1superb_extraram[tile_index *2+1] & 0x000f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 4,tileno,colour+0x50,0); + SET_TILE_INFO_MEMBER(4,tileno,colour+0x50,0); } void ms32_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_tx_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,64,64); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,64); - m_bg_tilemap_alt = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,256,16); // alt layout, controller by register? - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_roz_tile_info),this),TILEMAP_SCAN_ROWS,16,16,128,128); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_tx_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,64,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,64); + m_bg_tilemap_alt = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,256,16); // alt layout, controller by register? + m_roz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_roz_tile_info),this),TILEMAP_SCAN_ROWS,16,16,128,128); /* set up tile layers */ @@ -115,7 +115,7 @@ VIDEO_START_MEMBER(ms32_state,f1superb) { ms32_state::video_start(); - m_extra_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_extra_tile_info),this),TILEMAP_SCAN_ROWS,2048,1,1,0x400); + m_extra_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ms32_state::get_ms32_extra_tile_info),this),TILEMAP_SCAN_ROWS,2048,1,1,0x400); } /********** PALETTE WRITES **********/ diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c index f9608827839..c9e88eae48a 100644 --- a/src/mame/video/msisaac.c +++ b/src/mame/video/msisaac.c @@ -15,7 +15,7 @@ TILE_GET_INFO_MEMBER(msisaac_state::get_fg_tile_info) { int tile_number = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, tile_number, 0x10, 0); @@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(msisaac_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(msisaac_state::get_bg_tile_info) { int tile_number = m_videoram2[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, + SET_TILE_INFO_MEMBER(1, 0x100 + tile_number, 0x30, 0); @@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(msisaac_state::get_bg2_tile_info) /* graphics 0 or 1 */ int gfx_b = (m_bg2_textbank >> 3) & 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfx_b, + SET_TILE_INFO_MEMBER(gfx_b, tile_number, 0x20, 0); @@ -51,9 +51,9 @@ TILE_GET_INFO_MEMBER(msisaac_state::get_bg2_tile_info) void msisaac_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(msisaac_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(msisaac_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(msisaac_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(msisaac_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(msisaac_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(msisaac_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg2_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index bf08084eedf..2cd0bb61243 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -73,7 +73,7 @@ TILE_GET_INFO_MEMBER(mugsmash_state::get_mugsmash_tile_info1) colour = m_videoram1[tile_index * 2] & 0x000f; fx = (m_videoram1[tile_index * 2] & 0xc0) >> 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, colour, TILE_FLIPYX(fx)); + SET_TILE_INFO_MEMBER(1, tileno, colour, TILE_FLIPYX(fx)); } WRITE16_MEMBER(mugsmash_state::mugsmash_videoram1_w) @@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(mugsmash_state::get_mugsmash_tile_info2) colour = m_videoram2[tile_index * 2] & 0x000f; fx = (m_videoram2[tile_index * 2] & 0xc0) >> 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, 16 + colour, TILE_FLIPYX(fx)); + SET_TILE_INFO_MEMBER(1, tileno, 16 + colour, TILE_FLIPYX(fx)); } WRITE16_MEMBER(mugsmash_state::mugsmash_videoram2_w) @@ -131,10 +131,10 @@ WRITE16_MEMBER(mugsmash_state::mugsmash_reg_w) void mugsmash_state::video_start() { - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mugsmash_state::get_mugsmash_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mugsmash_state::get_mugsmash_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap1->set_transparent_pen(0); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mugsmash_state::get_mugsmash_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mugsmash_state::get_mugsmash_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); } UINT32 mugsmash_state::screen_update_mugsmash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c index 5753e4822f2..92bcf24ea92 100644 --- a/src/mame/video/mustache.c +++ b/src/mame/video/mustache.c @@ -83,14 +83,14 @@ TILE_GET_INFO_MEMBER(mustache_state::get_bg_tile_info) int code = videoram[2 * tile_index] + ((attr & 0x60) << 3) + ((m_control_byte & 0x08) << 7); int color = attr & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, ((attr & 0x10) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0) ); + SET_TILE_INFO_MEMBER(0, code, color, ((attr & 0x10) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0) ); } void mustache_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mustache_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mustache_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(4); diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index a778eeba666..d289da38230 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -152,7 +152,7 @@ TILE_GET_INFO_MEMBER(mystston_state::get_bg_tile_info) int code = ((m_bg_videoram[page | 0x200 | tile_index] & 0x01) << 8) | m_bg_videoram[page | tile_index]; int flags = (tile_index & 0x10) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, flags); + SET_TILE_INFO_MEMBER(1, code, 0, flags); } @@ -161,7 +161,7 @@ TILE_GET_INFO_MEMBER(mystston_state::get_fg_tile_info) int code = ((m_fg_videoram[0x400 | tile_index] & 0x07) << 8) | m_fg_videoram[tile_index]; int color = ((*m_video_control & 0x01) << 1) | ((*m_video_control & 0x02) >> 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -212,9 +212,9 @@ void mystston_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec VIDEO_START_MEMBER(mystston_state,mystston) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mystston_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mystston_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mystston_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mystston_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); /* create the interrupt timer */ diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c index 2b05f587398..160dccd814f 100644 --- a/src/mame/video/mystwarr.c +++ b/src/mame/video/mystwarr.c @@ -157,7 +157,7 @@ TILE_GET_INFO_MEMBER(mystwarr_state::get_gai_936_tile_info) colour |= m_sub1_colorbase << 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, 0); + SET_TILE_INFO_MEMBER(0, tileno, colour, 0); } VIDEO_START_MEMBER(mystwarr_state,gaiapols) @@ -183,7 +183,7 @@ VIDEO_START_MEMBER(mystwarr_state,gaiapols) K053936_wraparound_enable(0, 1); K053936GP_set_offset(0, -10, 0); // floor tiles in demo loop2 (Elaine vs. boss) - m_ult_936_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mystwarr_state::get_gai_936_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); + m_ult_936_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mystwarr_state::get_gai_936_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); m_ult_936_tilemap->set_transparent_pen(0); } @@ -197,7 +197,7 @@ TILE_GET_INFO_MEMBER(mystwarr_state::get_ult_936_tile_info) colour = m_sub1_colorbase; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, (dat1[tile_index]&0x40) ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(0, tileno, colour, (dat1[tile_index]&0x40) ? TILE_FLIPX : 0); } VIDEO_START_MEMBER(mystwarr_state,dadandrn) @@ -225,7 +225,7 @@ VIDEO_START_MEMBER(mystwarr_state,dadandrn) K053936_wraparound_enable(0, 1); K053936GP_set_offset(0, -8, 0); // Brainy's laser - m_ult_936_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mystwarr_state::get_ult_936_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); + m_ult_936_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mystwarr_state::get_ult_936_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); m_ult_936_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c index 652873b8515..6abf5aee3ee 100644 --- a/src/mame/video/namcona1.c +++ b/src/mame/video/namcona1.c @@ -36,11 +36,11 @@ void namcona1_state::tilemap_get_info( if( data & 0x8000 ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, gfx,tile,tilemap_color,TILE_FORCE_LAYER0 ); + SET_TILE_INFO_MEMBER(gfx,tile,tilemap_color,TILE_FORCE_LAYER0 ); } else { - SET_TILE_INFO_MEMBER(m_gfxdecode, gfx,tile,tilemap_color,0 ); + SET_TILE_INFO_MEMBER(gfx,tile,tilemap_color,0 ); if (ENDIANNESS_NATIVE == ENDIANNESS_BIG) tileinfo.mask_data = (UINT8 *)(m_shaperam+4*tile); else @@ -102,7 +102,7 @@ TILE_GET_INFO_MEMBER(namcona1_state::roz_get_info) } if( data & 0x8000 ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, gfx,tile,tilemap_color,TILE_FORCE_LAYER0 ); + SET_TILE_INFO_MEMBER(gfx,tile,tilemap_color,TILE_FORCE_LAYER0 ); } else { @@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(namcona1_state::roz_get_info) conv_data[7] = source[3]&0xff; mask_data = conv_data; } - SET_TILE_INFO_MEMBER(m_gfxdecode, gfx,tile,tilemap_color,0 ); + SET_TILE_INFO_MEMBER(gfx,tile,tilemap_color,0 ); tileinfo.mask_data = mask_data; } } /* roz_get_info */ @@ -275,7 +275,7 @@ static void UpdateGfx(running_machine &machine) void namcona1_state::video_start() { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcona1_state::roz_get_info),this), TILEMAP_SCAN_ROWS, 8,8,64,64 ); + m_roz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcona1_state::roz_get_info),this), TILEMAP_SCAN_ROWS, 8,8,64,64 ); m_roz_palette = -1; for( int i=0; ibase(), TilemapCB); - m_tilemap_roz = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos2_state::roz_tile_info), this), TILEMAP_SCAN_ROWS, 8,8,256,256); + m_tilemap_roz = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_state::roz_tile_info), this), TILEMAP_SCAN_ROWS, 8,8,256,256); m_tilemap_roz->set_transparent_pen(0xff); draw_sprite_init(); } diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index 0bea04a5324..cc24cbc908c 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -1727,7 +1727,7 @@ TILE_GET_INFO_MEMBER(namcos22_state::get_text_tile_info) * ----.xx--.----.---- flip * ----.--xx.xxxx.xxxx code */ - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, data & 0x03ff, data >> 12, TILE_FLIPYX((data & 0x0c00) >> 10)); + SET_TILE_INFO_MEMBER(0, data & 0x03ff, data >> 12, TILE_FLIPYX((data & 0x0c00) >> 10)); } WRITE32_MEMBER(namcos22_state::namcos22_textram_w) @@ -2468,7 +2468,7 @@ VIDEO_START_MEMBER(namcos22_state,common) init_tables(); m_mix_bitmap = auto_bitmap_ind16_alloc(machine(), 640, 480); - m_bgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos22_state::get_text_tile_info), this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_bgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos22_state::get_text_tile_info), this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_bgtilemap->set_transparent_pen(0xf); m_gfxdecode->gfx(0)->set_source((UINT8 *)m_cgram.target()); diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c index fec29b05ec9..7145fd657ff 100644 --- a/src/mame/video/namcos86.c +++ b/src/mame/video/namcos86.c @@ -96,8 +96,7 @@ inline void namcos86_state::get_tile_info(tile_data &tileinfo,int tile_index,int else tile_offs = ((m_tile_address_prom[((layer & 1) << 4) + ((attr & 0x03) << 2)] & 0x0e) >> 1) * 0x100 + m_tilebank * 0x800; - SET_TILE_INFO_MEMBER(m_gfxdecode, - (layer & 2) ? 1 : 0, + SET_TILE_INFO_MEMBER((layer & 2) ? 1 : 0, vram[2*tile_index] + tile_offs, attr, 0); @@ -132,10 +131,10 @@ TILE_GET_INFO_MEMBER(namcos86_state::get_tile_info3) void namcos86_state::video_start() { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos86_state::get_tile_info0),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos86_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_bg_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos86_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_bg_tilemap[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(namcos86_state::get_tile_info3),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos86_state::get_tile_info0),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos86_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos86_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos86_state::get_tile_info3),this),TILEMAP_SCAN_ROWS,8,8,64,32); for (int i = 0; i < 4; i++) { diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index 95f6cbaa9c8..bafbe0b6f87 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -40,11 +40,11 @@ TILE_GET_INFO_MEMBER(nemesis_state::get_bg_tile_info) if (code & 0xf800) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x7ff, color & 0x7f, flags ); + SET_TILE_INFO_MEMBER(0, code & 0x7ff, color & 0x7f, flags ); } else { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, 0, 0x00, 0 ); + SET_TILE_INFO_MEMBER(0, 0, 0x00, 0 ); tileinfo.pen_data = m_blank_tile; } @@ -75,11 +75,11 @@ TILE_GET_INFO_MEMBER(nemesis_state::get_fg_tile_info) if (code & 0xf800) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x7ff, color & 0x7f, flags ); + SET_TILE_INFO_MEMBER(0, code & 0x7ff, color & 0x7f, flags ); } else { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, 0, 0x00, 0 ); + SET_TILE_INFO_MEMBER(0, 0, 0x00, 0 ); tileinfo.pen_data = m_blank_tile; } @@ -286,8 +286,8 @@ void nemesis_state::video_start() { m_spriteram_words = m_spriteram.bytes() / 2; - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nemesis_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nemesis_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nemesis_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nemesis_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_background->set_transparent_pen(0); m_foreground->set_transparent_pen(0); diff --git a/src/mame/video/news.c b/src/mame/video/news.c index 36cd59a5bbb..b64e93f19b1 100644 --- a/src/mame/video/news.c +++ b/src/mame/video/news.c @@ -11,8 +11,7 @@ TILE_GET_INFO_MEMBER(news_state::get_fg_tile_info) { int code = (m_fgram[tile_index * 2] << 8) | m_fgram[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0x0fff, (code & 0xf000) >> 12, 0); @@ -27,8 +26,7 @@ TILE_GET_INFO_MEMBER(news_state::get_bg_tile_info) if ((code & 0x0e00) == 0x0e00) code = (code & 0x1ff) | (m_bgpic << 9); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, 0); @@ -44,10 +42,10 @@ TILE_GET_INFO_MEMBER(news_state::get_bg_tile_info) void news_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(news_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(news_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(news_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(news_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c index 6e67653c87d..26268e5ec05 100644 --- a/src/mame/video/ninjakd2.c +++ b/src/mame/video/ninjakd2.c @@ -24,8 +24,7 @@ TILE_GET_INFO_MEMBER(ninjakd2_state::get_fg_tile_info) int const flipyx = (hi & 0x30) >> 4; int const color = hi & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, TILE_FLIPYX(flipyx)); @@ -39,8 +38,7 @@ TILE_GET_INFO_MEMBER(ninjakd2_state::ninjakd2_get_bg_tile_info) int const flipyx = (hi & 0x30) >> 4; int const color = hi & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile, color, TILE_FLIPYX(flipyx)); @@ -54,8 +52,7 @@ TILE_GET_INFO_MEMBER(ninjakd2_state::mnight_get_bg_tile_info) int const flipy = (hi & 0x20) >> 5; int const color = hi & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile, color, flipy ? TILE_FLIPY : 0); @@ -80,8 +77,7 @@ void ninjakd2_state::robokid_get_bg_tile_info( tile_data& tileinfo, tilemap_memo int const tile = ((hi & 0x10) << 7) | ((hi & 0x20) << 5) | ((hi & 0xc0) << 2) | lo; int const color = hi & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, tile, color, 0); @@ -124,7 +120,7 @@ void ninjakd2_state::video_init_common(UINT32 vram_alloc_size) save_pointer(NAME(m_robokid_bg2_videoram), vram_alloc_size); } - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0xf); m_screen->register_screen_bitmap(m_sprites_bitmap); @@ -151,7 +147,7 @@ void ninjakd2_state::video_start() { video_init_common(0); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::ninjakd2_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::ninjakd2_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_stencil_compare_function = stencil_ninjakd2; } @@ -160,7 +156,7 @@ VIDEO_START_MEMBER(ninjakd2_state,mnight) { video_init_common(0); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::mnight_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::mnight_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_stencil_compare_function = stencil_mnight; } @@ -169,7 +165,7 @@ VIDEO_START_MEMBER(ninjakd2_state,arkarea) { video_init_common(0); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::mnight_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::mnight_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_stencil_compare_function = stencil_arkarea; } @@ -180,9 +176,9 @@ VIDEO_START_MEMBER(ninjakd2_state,robokid) m_vram_bank_mask = 1; m_robokid_sprites = 1; - m_bg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::robokid_bg_scan),this), 16, 16, 32, 32); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::robokid_bg_scan),this), 16, 16, 32, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::robokid_bg_scan),this), 16, 16, 32, 32); + m_bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::robokid_bg_scan),this), 16, 16, 32, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::robokid_bg_scan),this), 16, 16, 32, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::robokid_bg_scan),this), 16, 16, 32, 32); m_bg1_tilemap->set_transparent_pen(0xf); m_bg2_tilemap->set_transparent_pen(0xf); @@ -196,9 +192,9 @@ VIDEO_START_MEMBER(ninjakd2_state,omegaf) m_vram_bank_mask = 7; m_robokid_sprites = 1; - m_bg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::omegaf_bg_scan),this), 16, 16, 128, 32); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::omegaf_bg_scan),this), 16, 16, 128, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::omegaf_bg_scan),this), 16, 16, 128, 32); + m_bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::omegaf_bg_scan),this), 16, 16, 128, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::omegaf_bg_scan),this), 16, 16, 128, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ninjakd2_state::robokid_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(ninjakd2_state::omegaf_bg_scan),this), 16, 16, 128, 32); m_bg0_tilemap->set_transparent_pen(0xf); m_bg1_tilemap->set_transparent_pen(0xf); diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c index 2137d8b1d15..ae33517a8db 100644 --- a/src/mame/video/nitedrvr.c +++ b/src/mame/video/nitedrvr.c @@ -25,14 +25,14 @@ TILE_GET_INFO_MEMBER(nitedrvr_state::get_bg_tile_info) { int code = m_videoram[tile_index] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void nitedrvr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nitedrvr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nitedrvr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void nitedrvr_state::draw_box( bitmap_ind16 &bitmap, int bx, int by, int ex, int ey ) diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c index 777e9d8d909..fd6644bc373 100644 --- a/src/mame/video/nmk16.c +++ b/src/mame/video/nmk16.c @@ -38,33 +38,32 @@ TILEMAP_MAPPER_MEMBER(nmk16_state::afega_tilemap_scan_pages) TILE_GET_INFO_MEMBER(nmk16_state::macross_get_bg0_tile_info) { int code = m_nmk_bgvideoram0[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,(code & 0xfff) + (m_bgbank << 12),code >> 12,0); + SET_TILE_INFO_MEMBER(1,(code & 0xfff) + (m_bgbank << 12),code >> 12,0); } TILE_GET_INFO_MEMBER(nmk16_state::macross_get_bg1_tile_info) { int code = m_nmk_bgvideoram1[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,(code & 0xfff) + (m_bgbank << 12),code >> 12,0); + SET_TILE_INFO_MEMBER(1,(code & 0xfff) + (m_bgbank << 12),code >> 12,0); } TILE_GET_INFO_MEMBER(nmk16_state::macross_get_bg2_tile_info) { int code = m_nmk_bgvideoram2[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,(code & 0xfff) + (m_bgbank << 12),code >> 12,0); + SET_TILE_INFO_MEMBER(1,(code & 0xfff) + (m_bgbank << 12),code >> 12,0); } TILE_GET_INFO_MEMBER(nmk16_state::macross_get_bg3_tile_info) { int code = m_nmk_bgvideoram3[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,(code & 0xfff) + (m_bgbank << 12),code >> 12,0); + SET_TILE_INFO_MEMBER(1,(code & 0xfff) + (m_bgbank << 12),code >> 12,0); } TILE_GET_INFO_MEMBER(nmk16_state::strahl_get_fg_tile_info) { int code = m_nmk_fgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, (code & 0xfff), code >> 12, 0); @@ -73,8 +72,7 @@ TILE_GET_INFO_MEMBER(nmk16_state::strahl_get_fg_tile_info) TILE_GET_INFO_MEMBER(nmk16_state::macross_get_tx_tile_info) { int code = m_nmk_txvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code & 0xfff, code >> 12, 0); @@ -84,8 +82,7 @@ TILE_GET_INFO_MEMBER(nmk16_state::bjtwin_get_bg_tile_info) { int code = m_nmk_bgvideoram0[tile_index]; int bank = (code & 0x800) ? 1 : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - bank, + SET_TILE_INFO_MEMBER(bank, (code & 0x7ff) + ((bank) ? (m_bgbank << 11) : 0), code >> 12, 0); @@ -94,8 +91,7 @@ TILE_GET_INFO_MEMBER(nmk16_state::bjtwin_get_bg_tile_info) TILE_GET_INFO_MEMBER(nmk16_state::get_tile_info_0_8bit) { UINT16 code = m_nmk_bgvideoram0[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, 0, 0); @@ -121,8 +117,8 @@ void nmk16_state::nmk16_video_init() VIDEO_START_MEMBER(nmk16_state,bioship) { - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); m_bg_tilemap0->set_transparent_pen(15); m_tx_tilemap->set_transparent_pen(15); @@ -136,9 +132,9 @@ VIDEO_START_MEMBER(nmk16_state,bioship) VIDEO_START_MEMBER(nmk16_state,strahl) { - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::strahl_get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::strahl_get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); m_fg_tilemap->set_transparent_pen(15); m_tx_tilemap->set_transparent_pen(15); @@ -148,8 +144,8 @@ VIDEO_START_MEMBER(nmk16_state,strahl) VIDEO_START_MEMBER(nmk16_state,macross) { - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); m_tx_tilemap->set_transparent_pen(15); @@ -158,8 +154,8 @@ VIDEO_START_MEMBER(nmk16_state,macross) VIDEO_START_MEMBER(nmk16_state,gunnail) { - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); m_tx_tilemap->set_transparent_pen(15); m_bg_tilemap0->set_scroll_rows(512); @@ -172,12 +168,12 @@ VIDEO_START_MEMBER(nmk16_state,gunnail) VIDEO_START_MEMBER(nmk16_state,macross2) { - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_bg_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_bg_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_bg_tilemap3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg3_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_bg_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_bg_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); + m_bg_tilemap3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg3_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); m_tx_tilemap->set_transparent_pen(15); @@ -194,7 +190,7 @@ VIDEO_START_MEMBER(nmk16_state,raphero) VIDEO_START_MEMBER(nmk16_state,bjtwin) { - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::bjtwin_get_bg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::bjtwin_get_bg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); nmk16_video_init(); m_videoshift = 64; /* 384x224 screen, leftmost 64 pixels have to be retrieved */ @@ -832,11 +828,11 @@ VIDEO_START_MEMBER(nmk16_state,afega) m_spriteram_old = auto_alloc_array_clear(machine(), UINT16, 0x1000/2); m_spriteram_old2 = auto_alloc_array_clear(machine(), UINT16, 0x1000/2); - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this), + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_bg0_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this), 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8,8, 32,32); @@ -850,11 +846,11 @@ VIDEO_START_MEMBER(nmk16_state,grdnstrm) m_spriteram_old2 = auto_alloc_array_clear(machine(), UINT16, 0x1000/2); - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::get_tile_info_0_8bit),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this), + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::get_tile_info_0_8bit),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this), 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8,8, 32,32); @@ -868,11 +864,11 @@ VIDEO_START_MEMBER(nmk16_state,firehawk) m_spriteram_old2 = auto_alloc_array_clear(machine(), UINT16, 0x1000/2); - m_bg_tilemap0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::get_tile_info_0_8bit),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this), + m_bg_tilemap0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::get_tile_info_0_8bit),this), tilemap_mapper_delegate(FUNC(nmk16_state::afega_tilemap_scan_pages),this), 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this), TILEMAP_SCAN_COLS, + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::macross_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8,8, 32,32); diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index 250d6fa16fc..832f5cf8ab9 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -82,7 +82,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::nova2001_get_bg_tile_info) int code = m_bg_videoram[tile_index]; int color = m_bg_videoram[tile_index + 0x400] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } TILE_GET_INFO_MEMBER(nova2001_state::nova2001_get_fg_tile_info) @@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::nova2001_get_fg_tile_info) int code = m_fg_videoram[tile_index]; int color = attr & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); tileinfo.category = (attr & 0x10) >> 4; } @@ -102,7 +102,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::ninjakun_get_bg_tile_info) int code = m_bg_videoram[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } TILE_GET_INFO_MEMBER(nova2001_state::ninjakun_get_fg_tile_info) @@ -111,7 +111,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::ninjakun_get_fg_tile_info) int code = m_fg_videoram[tile_index] + ((attr & 0x20) << 3); int color = attr & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); tileinfo.category = (attr & 0x10) >> 4; } @@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::pkunwar_get_bg_tile_info) int code = m_bg_videoram[tile_index] + ((attr & 0x07) << 8); int color = (attr & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); tileinfo.category = (attr & 0x08) >> 3; } @@ -133,7 +133,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_bg_tile_info) int code = m_bg_videoram[tile_index] + ((attr & 0x01) << 8); int color = (attr & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_fg_tile_info) @@ -141,7 +141,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_fg_tile_info) int code = m_fg_videoram[tile_index]; int color = (m_fg_videoram[tile_index + 0x400] & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } @@ -154,30 +154,30 @@ TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_fg_tile_info) VIDEO_START_MEMBER(nova2001_state,nova2001) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nova2001_state::nova2001_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nova2001_state::nova2001_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::nova2001_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::nova2001_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scrolldx(0, -7); } VIDEO_START_MEMBER(nova2001_state,pkunwar) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nova2001_state::pkunwar_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::pkunwar_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); } VIDEO_START_MEMBER(nova2001_state,ninjakun) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nova2001_state::ninjakun_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nova2001_state::ninjakun_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::ninjakun_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::ninjakun_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scrolldx(7, 0); } VIDEO_START_MEMBER(nova2001_state,raiders5) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nova2001_state::raiders5_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nova2001_state::raiders5_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::raiders5_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::raiders5_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scrolldx(7, 0); } diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index c288be1044b..bddcd69da8a 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -51,8 +51,7 @@ TILE_GET_INFO_MEMBER(nycaptor_state::get_tile_info) } #endif - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index * 2] + ((m_videoram[tile_index * 2 + 1] & 0xc0) << 2) + 0x400 * m_char_bank, pal, 0 ); @@ -61,7 +60,7 @@ TILE_GET_INFO_MEMBER(nycaptor_state::get_tile_info) void nycaptor_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nycaptor_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32 ); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(nycaptor_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32 ); m_bg_tilemap->set_transmask(0, 0xf800, 0x7ff); //split 0 m_bg_tilemap->set_transmask(1, 0xfe00, 0x01ff);//split 1 diff --git a/src/mame/video/offtwall.c b/src/mame/video/offtwall.c index f9a0b816da8..d5f49ba387b 100644 --- a/src/mame/video/offtwall.c +++ b/src/mame/video/offtwall.c @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(offtwall_state::get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) >> 8; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); } diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index d7907d7c9a5..24252f33ed4 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -11,8 +11,7 @@ TILE_GET_INFO_MEMBER(ohmygod_state::get_tile_info) { UINT16 code = m_videoram[2 * tile_index + 1]; UINT16 attr = m_videoram[2 * tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr & 0x0f00) >> 8, 0); @@ -28,7 +27,7 @@ TILE_GET_INFO_MEMBER(ohmygod_state::get_tile_info) void ohmygod_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ohmygod_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ohmygod_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); } diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index 8daf9ae5d77..01cdf43c00b 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -161,7 +161,7 @@ TILE_GET_INFO_MEMBER(ojankohs_state::ojankohs_get_tile_info) color |= (m_gfxreg & 0xe0) >> 2; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } TILE_GET_INFO_MEMBER(ojankohs_state::ojankoy_get_tile_info) @@ -171,7 +171,7 @@ TILE_GET_INFO_MEMBER(ojankohs_state::ojankoy_get_tile_info) int flipx = ((m_colorram[tile_index] & 0x40) >> 6) ? TILEMAP_FLIPX : 0; int flipy = ((m_colorram[tile_index] & 0x80) >> 7) ? TILEMAP_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, (flipx | flipy)); + SET_TILE_INFO_MEMBER(0, tile, color, (flipx | flipy)); } @@ -255,7 +255,7 @@ WRITE8_MEMBER(ojankohs_state::ojankoc_videoram_w) VIDEO_START_MEMBER(ojankohs_state,ojankohs) { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ojankohs_state::ojankohs_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ojankohs_state::ojankohs_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); // m_videoram = auto_alloc_array(machine(), UINT8, 0x1000); // m_colorram = auto_alloc_array(machine(), UINT8, 0x1000); // m_paletteram = auto_alloc_array(machine(), UINT8, 0x800); @@ -263,7 +263,7 @@ VIDEO_START_MEMBER(ojankohs_state,ojankohs) VIDEO_START_MEMBER(ojankohs_state,ojankoy) { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ojankohs_state::ojankoy_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ojankohs_state::ojankoy_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); // m_videoram = auto_alloc_array(machine(), UINT8, 0x2000); // m_colorram = auto_alloc_array(machine(), UINT8, 0x1000); } diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 9c229aa6950..6b72616ad28 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -9,7 +9,7 @@ TILE_GET_INFO_MEMBER(oneshot_state::get_oneshot_bg_tile_info) { int tileno = m_bg_videoram[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, 0, 0); + SET_TILE_INFO_MEMBER(0, tileno, 0, 0); } WRITE16_MEMBER(oneshot_state::oneshot_bg_videoram_w) @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(oneshot_state::get_oneshot_mid_tile_info) { int tileno = m_mid_videoram[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, 2, 0); + SET_TILE_INFO_MEMBER(0, tileno, 2, 0); } WRITE16_MEMBER(oneshot_state::oneshot_mid_videoram_w) @@ -38,7 +38,7 @@ TILE_GET_INFO_MEMBER(oneshot_state::get_oneshot_fg_tile_info) { int tileno = m_fg_videoram[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, 3, 0); + SET_TILE_INFO_MEMBER(0, tileno, 3, 0); } WRITE16_MEMBER(oneshot_state::oneshot_fg_videoram_w) @@ -49,9 +49,9 @@ WRITE16_MEMBER(oneshot_state::oneshot_fg_videoram_w) void oneshot_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_mid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_mid_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_mid_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_mid_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap->set_transparent_pen(0); m_mid_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index 44b9653ed97..5068262c027 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -24,13 +24,13 @@ TILE_GET_INFO_MEMBER(orbit_state::get_tile_info) if (m_flip_screen) flags |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, code & 0x3f, 0, flags); + SET_TILE_INFO_MEMBER(3, code & 0x3f, 0, flags); } void orbit_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(orbit_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(orbit_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 30); } diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index a7dc671f56e..bd20835d0eb 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -160,7 +160,7 @@ TILE_GET_INFO_MEMBER(pacland_state::get_bg_tile_info) int color = ((attr & 0x3e) >> 1) + ((code & 0x1c0) >> 1); int flags = TILE_FLIPYX(attr >> 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(pacland_state::get_fg_tile_info) @@ -174,7 +174,7 @@ TILE_GET_INFO_MEMBER(pacland_state::get_fg_tile_info) tileinfo.category = (attr & 0x20) ? 1 : 0; tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } @@ -192,8 +192,8 @@ void pacland_state::video_start() m_screen->register_screen_bitmap(m_fg_bitmap); m_fg_bitmap.fill(0xffff); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pacland_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pacland_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pacland_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pacland_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_bg_tilemap->set_scrolldx(3, 340); m_fg_tilemap->set_scrolldx(0, 336); /* scrolling portion needs an additional offset when flipped */ diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index d4800f2a2b8..0cd8dd0b981 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -135,7 +135,7 @@ TILE_GET_INFO_MEMBER(pacman_state::pacman_get_tile_info) int code = m_videoram[tile_index] | (m_charbank << 8); int attr = (m_colorram[tile_index] & 0x1f) | (m_colortablebank << 5) | (m_palettebank << 6 ); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,attr,0); + SET_TILE_INFO_MEMBER(0,code,attr,0); } /*************************************************************************** @@ -171,7 +171,7 @@ VIDEO_START_MEMBER(pacman_state,pacman) /* one pixel to the left to get a more correct placement */ m_xoffsethack = 1; - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pacman_state::pacman_get_tile_info),this), tilemap_mapper_delegate(FUNC(pacman_state::pacman_scan_rows),this), 8, 8, 36, 28 ); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pacman_state::pacman_get_tile_info),this), tilemap_mapper_delegate(FUNC(pacman_state::pacman_scan_rows),this), 8, 8, 36, 28 ); } VIDEO_START_MEMBER(pacman_state,birdiy) @@ -320,7 +320,7 @@ VIDEO_START_MEMBER(pacman_state,pengo) m_inv_spr = 0; m_xoffsethack = 0; - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pacman_state::pacman_get_tile_info),this), tilemap_mapper_delegate(FUNC(pacman_state::pacman_scan_rows),this), 8, 8, 36, 28 ); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pacman_state::pacman_get_tile_info),this), tilemap_mapper_delegate(FUNC(pacman_state::pacman_scan_rows),this), 8, 8, 36, 28 ); } WRITE8_MEMBER(pacman_state::pengo_palettebank_w) @@ -367,7 +367,7 @@ TILE_GET_INFO_MEMBER(pacman_state::s2650_get_tile_info) code = m_videoram[tile_index] + (colbank << 8); attr = m_colorram[tile_index & 0x1f]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,attr & 0x1f,0); + SET_TILE_INFO_MEMBER(0,code,attr & 0x1f,0); } VIDEO_START_MEMBER(pacman_state,s2650games) @@ -383,7 +383,7 @@ VIDEO_START_MEMBER(pacman_state,s2650games) m_inv_spr = 0; m_xoffsethack = 1; - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pacman_state::s2650_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pacman_state::s2650_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); m_bg_tilemap->set_scroll_cols(32); } @@ -512,7 +512,7 @@ TILE_GET_INFO_MEMBER(pacman_state::jrpacman_get_tile_info) code = m_videoram[tile_index] | (m_charbank << 8); attr = (m_videoram[color_index] & 0x1f) | (m_colortablebank << 5) | (m_palettebank << 6 ); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,attr,0); + SET_TILE_INFO_MEMBER(0,code,attr,0); } void pacman_state::jrpacman_mark_tile_dirty( int offset ) @@ -551,7 +551,7 @@ VIDEO_START_MEMBER(pacman_state,jrpacman) m_inv_spr = 0; m_xoffsethack = 1; - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pacman_state::jrpacman_get_tile_info),this),tilemap_mapper_delegate(FUNC(pacman_state::jrpacman_scan_rows),this),8,8,36,54 ); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pacman_state::jrpacman_get_tile_info),this),tilemap_mapper_delegate(FUNC(pacman_state::jrpacman_scan_rows),this),8,8,36,54 ); m_bg_tilemap->set_transparent_pen(0 ); m_bg_tilemap->set_scroll_cols(36 ); diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index bbbc47c50ef..f435f3f6537 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -88,8 +88,7 @@ PALETTE_INIT_MEMBER(pandoras_state, pandoras) TILE_GET_INFO_MEMBER(pandoras_state::get_tile_info0) { UINT8 attr = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_videoram[tile_index] + ((attr & 0x10) << 4), attr & 0x0f, TILE_FLIPYX((attr & 0xc0) >> 6)); @@ -104,7 +103,7 @@ TILE_GET_INFO_MEMBER(pandoras_state::get_tile_info0) void pandoras_state::video_start() { - m_layer0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pandoras_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_layer0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pandoras_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); save_item(NAME(m_flipscreen)); } diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index 3185e110db3..f0e0fc8a21e 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -97,7 +97,7 @@ WRITE8_MEMBER(paradise_state::paradise_palbank_w) TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_0) { int code = m_vram_0[tile_index] + (m_vram_0[tile_index + 0x400] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, m_palbank, 0); + SET_TILE_INFO_MEMBER(1, code, m_palbank, 0); } @@ -111,7 +111,7 @@ WRITE8_MEMBER(paradise_state::paradise_vram_1_w) TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_1) { int code = m_vram_1[tile_index] + (m_vram_1[tile_index + 0x400] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, 0, 0); + SET_TILE_INFO_MEMBER(2, code, 0, 0); } @@ -125,7 +125,7 @@ WRITE8_MEMBER(paradise_state::paradise_vram_2_w) TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_2) { int code = m_vram_2[tile_index] + (m_vram_2[tile_index + 0x400] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, code, 0, 0); + SET_TILE_INFO_MEMBER(3, code, 0, 0); } /* 256 x 256 bitmap. 4 bits per pixel so every byte encodes 2 pixels */ @@ -152,9 +152,9 @@ WRITE8_MEMBER(paradise_state::paradise_pixmap_w) void paradise_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); - m_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); + m_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); /* pixmap */ m_screen->register_screen_bitmap(m_tmpbitmap); diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c index 1755d883db3..d7d5122d1a4 100644 --- a/src/mame/video/pass.c +++ b/src/mame/video/pass.c @@ -11,7 +11,7 @@ TILE_GET_INFO_MEMBER(pass_state::get_pass_bg_tile_info) tileno = m_bg_videoram[tile_index] & 0x1fff; fx = (m_bg_videoram[tile_index] & 0xc000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, 0, TILE_FLIPYX(fx)); + SET_TILE_INFO_MEMBER(1, tileno, 0, TILE_FLIPYX(fx)); } @@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(pass_state::get_pass_fg_tile_info) tileno = m_fg_videoram[tile_index] & 0x3fff; flip = (m_fg_videoram[tile_index] & 0xc000) >>14; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, 0, TILE_FLIPYX(flip)); + SET_TILE_INFO_MEMBER(0, tileno, 0, TILE_FLIPYX(flip)); } @@ -44,8 +44,8 @@ WRITE16_MEMBER(pass_state::pass_fg_videoram_w) void pass_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pass_state::get_pass_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pass_state::get_pass_fg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 4, 128, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pass_state::get_pass_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pass_state::get_pass_fg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 4, 128, 64); m_fg_tilemap->set_transparent_pen(255); } diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index 7d268b4f40b..877f6289b58 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -55,7 +55,7 @@ TILE_GET_INFO_MEMBER(pbaction_state::get_bg_tile_info) int color = attr & 0x07; int flags = (attr & 0x80) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(pbaction_state::get_fg_tile_info) @@ -65,13 +65,13 @@ TILE_GET_INFO_MEMBER(pbaction_state::get_fg_tile_info) int color = attr & 0x0f; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void pbaction_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pbaction_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pbaction_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pbaction_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pbaction_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/pc080sn.c b/src/mame/video/pc080sn.c index ae9dccb861b..cb56af74e46 100644 --- a/src/mame/video/pc080sn.c +++ b/src/mame/video/pc080sn.c @@ -109,13 +109,13 @@ void pc080sn_device::device_start() /* use the given gfx set for bg tiles */ if (!m_dblwidth) /* standard tilemaps */ { - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pc080sn_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pc080sn_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pc080sn_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pc080sn_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); } else /* double width tilemaps */ { - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pc080sn_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pc080sn_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pc080sn_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pc080sn_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); } m_tilemap[0]->set_transparent_pen(0); @@ -164,8 +164,7 @@ void pc080sn_device::common_get_pc080sn_bg_tile_info( tile_data &tileinfo, int t attr = ram[tile_index]; } - SET_TILE_INFO_MEMBER(*m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, code, (attr & 0x1ff), TILE_FLIPYX((attr & 0xc000) >> 14)); @@ -191,8 +190,7 @@ void pc080sn_device::common_get_pc080sn_fg_tile_info( tile_data &tileinfo, int t attr = ram[tile_index]; } - SET_TILE_INFO_MEMBER(*m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, code, (attr & 0x1ff), TILE_FLIPYX((attr & 0xc000) >> 14)); diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c index f77ae85deff..a246f22963e 100644 --- a/src/mame/video/pgm.c +++ b/src/mame/video/pgm.c @@ -579,7 +579,7 @@ TILE_GET_INFO_MEMBER(pgm_state::get_pgm_tx_tilemap_tile_info) colour = (m_tx_videoram[tile_index * 2 + 1] & 0x3e) >> 1; flipyx = (m_tx_videoram[tile_index * 2 + 1] & 0xc0) >> 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour,TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(0,tileno,colour,TILE_FLIPYX(flipyx)); } /* BG Layer */ @@ -601,7 +601,7 @@ TILE_GET_INFO_MEMBER(pgm_state::get_pgm_bg_tilemap_tile_info) colour = (m_bg_videoram[tile_index * 2 + 1] & 0x3e) >> 1; flipyx = (m_bg_videoram[tile_index * 2 + 1] & 0xc0) >> 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno,colour,TILE_FLIPYX(flipyx)); + SET_TILE_INFO_MEMBER(1,tileno,colour,TILE_FLIPYX(flipyx)); } @@ -617,10 +617,10 @@ VIDEO_START_MEMBER(pgm_state,pgm) m_aoffset = 0; m_boffset = 0; - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pgm_state::get_pgm_tx_tilemap_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pgm_state::get_pgm_tx_tilemap_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tx_tilemap->set_transparent_pen(15); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pgm_state::get_pgm_bg_tilemap_tile_info),this), TILEMAP_SCAN_ROWS, 32, 32, 64, 16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pgm_state::get_pgm_bg_tilemap_tile_info),this), TILEMAP_SCAN_ROWS, 32, 32, 64, 16); m_bg_tilemap->set_transparent_pen(31); m_bg_tilemap->set_scroll_rows(16 * 32); diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c index 1e6bef17e4a..d92f094d655 100644 --- a/src/mame/video/phoenix.c +++ b/src/mame/video/phoenix.c @@ -142,8 +142,7 @@ TILE_GET_INFO_MEMBER(phoenix_state::get_fg_tile_info) code = m_videoram_pg[m_videoram_pg_index][tile_index]; col = (code >> 5); col = col | 0x08 | (m_palette_bank << 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, col, 0); @@ -156,8 +155,7 @@ TILE_GET_INFO_MEMBER(phoenix_state::get_bg_tile_info) code = m_videoram_pg[m_videoram_pg_index][tile_index + 0x800]; col = (code >> 5); col = col | 0x00 | (m_palette_bank << 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, col, 0); @@ -184,8 +182,8 @@ VIDEO_START_MEMBER(phoenix_state,phoenix) m_palette_bank = 0; m_cocktail_mode = 0; - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(phoenix_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(phoenix_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(phoenix_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(phoenix_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c index a3367aa9228..26f07467339 100644 --- a/src/mame/video/pingpong.c +++ b/src/mame/video/pingpong.c @@ -99,12 +99,12 @@ TILE_GET_INFO_MEMBER(pingpong_state::get_bg_tile_info) int color = attr & 0x1f; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void pingpong_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pingpong_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pingpong_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void pingpong_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c index e2f469e95ff..a4e84a4022e 100644 --- a/src/mame/video/pirates.c +++ b/src/mame/video/pirates.c @@ -11,7 +11,7 @@ TILE_GET_INFO_MEMBER(pirates_state::get_tx_tile_info) int code = m_tx_tileram[tile_index*2]; int colr = m_tx_tileram[tile_index*2+1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,colr,0); + SET_TILE_INFO_MEMBER(0,code,colr,0); } TILE_GET_INFO_MEMBER(pirates_state::get_fg_tile_info) @@ -19,7 +19,7 @@ TILE_GET_INFO_MEMBER(pirates_state::get_fg_tile_info) int code = m_fg_tileram[tile_index*2]; int colr = m_fg_tileram[tile_index*2+1]+0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,colr,0); + SET_TILE_INFO_MEMBER(0,code,colr,0); } TILE_GET_INFO_MEMBER(pirates_state::get_bg_tile_info) @@ -27,7 +27,7 @@ TILE_GET_INFO_MEMBER(pirates_state::get_bg_tile_info) int code = m_bg_tileram[tile_index*2]; int colr = m_bg_tileram[tile_index*2+1]+ 0x100; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,colr,0); + SET_TILE_INFO_MEMBER(0,code,colr,0); } @@ -35,11 +35,11 @@ TILE_GET_INFO_MEMBER(pirates_state::get_bg_tile_info) void pirates_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pirates_state::get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,36,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pirates_state::get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,36,32); /* Not sure how big they can be, Pirates uses only 32 columns, Genix 44 */ - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pirates_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pirates_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS, 8,8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pirates_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pirates_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS, 8,8,64,32); m_tx_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index 9c02a015b45..63ffaaf8320 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -26,8 +26,7 @@ TILE_GET_INFO_MEMBER(pitnrun_state::get_tile_info1) UINT8 *videoram = m_videoram; int code; code = videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, 0, 0); @@ -37,8 +36,7 @@ TILE_GET_INFO_MEMBER(pitnrun_state::get_tile_info2) { int code; code = m_videoram2[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code + (m_char_bank<<8), m_color_select&1, 0); @@ -161,8 +159,8 @@ PALETTE_INIT_MEMBER(pitnrun_state, pitnrun) void pitnrun_state::video_start() { - m_fg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pitnrun_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); - m_bg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pitnrun_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,32*4,32 ); + m_fg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pitnrun_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); + m_bg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pitnrun_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,32*4,32 ); m_fg->set_transparent_pen(0 ); m_tmp_bitmap[0] = auto_bitmap_ind16_alloc(machine(),128,128); m_tmp_bitmap[1] = auto_bitmap_ind16_alloc(machine(),128,128); diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index b786dd10277..83c3ea5c46a 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -83,7 +83,7 @@ TILE_GET_INFO_MEMBER(playch10_state::get_bg_tile_info) int code = videoram[offs] + ((videoram[offs + 1] & 0x07) << 8); int color = (videoram[offs + 1] >> 3) & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void playch10_state::video_start() @@ -91,7 +91,7 @@ void playch10_state::video_start() const UINT8 *bios = memregion("maincpu")->base(); m_pc10_bios = (bios[3] == 0x2a) ? 1 : 2; - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playch10_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playch10_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -100,7 +100,7 @@ VIDEO_START_MEMBER(playch10_state,playch10_hboard) const UINT8 *bios = memregion("maincpu")->base(); m_pc10_bios = (bios[3] == 0x2a) ? 1 : 2; - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playch10_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playch10_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index eac6e542724..452c771e881 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -12,8 +12,7 @@ TILE_GET_INFO_MEMBER(playmark_state::bigtwin_get_tx_tile_info) { UINT16 code = m_videoram1[2 * tile_index]; UINT16 color = m_videoram1[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, color, 0); @@ -23,8 +22,7 @@ TILE_GET_INFO_MEMBER(playmark_state::bigtwin_get_fg_tile_info) { UINT16 code = m_videoram2[2 * tile_index]; UINT16 color = m_videoram2[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, color, 0); @@ -35,8 +33,7 @@ TILE_GET_INFO_MEMBER(playmark_state::wbeachvl_get_tx_tile_info) UINT16 code = m_videoram1[2 * tile_index]; UINT16 color = m_videoram1[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, color / 4, 0); @@ -47,8 +44,7 @@ TILE_GET_INFO_MEMBER(playmark_state::wbeachvl_get_fg_tile_info) UINT16 code = m_videoram2[2 * tile_index]; UINT16 color = m_videoram2[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0x7fff, color / 4 + 8, (code & 0x8000) ? TILE_FLIPX : 0); @@ -59,8 +55,7 @@ TILE_GET_INFO_MEMBER(playmark_state::wbeachvl_get_bg_tile_info) UINT16 code = m_videoram3[2 * tile_index]; UINT16 color = m_videoram3[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0x7fff, color / 4, (code & 0x8000) ? TILE_FLIPX : 0); @@ -71,7 +66,7 @@ TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_tx_tile_info) int code = m_videoram1[tile_index] & 0x03ff; int colr = m_videoram1[tile_index] & 0xe000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,code + m_txt_tile_offset, colr >> 13, 0); + SET_TILE_INFO_MEMBER(2,code + m_txt_tile_offset, colr >> 13, 0); } TILE_GET_INFO_MEMBER(playmark_state::bigtwinb_get_tx_tile_info) @@ -79,7 +74,7 @@ TILE_GET_INFO_MEMBER(playmark_state::bigtwinb_get_tx_tile_info) int code = m_videoram1[tile_index] & 0x0fff; int colr = m_videoram1[tile_index] & 0xf000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,code + m_txt_tile_offset, colr >> 12, 0); + SET_TILE_INFO_MEMBER(2,code + m_txt_tile_offset, colr >> 12, 0); } TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_fg_tile_info) @@ -87,7 +82,7 @@ TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_fg_tile_info) int code = m_videoram2[tile_index] & 0x1fff; int colr = m_videoram2[tile_index] & 0xe000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,code + m_fg_tile_offset,(colr >> 13) + 8,0); + SET_TILE_INFO_MEMBER(1,code + m_fg_tile_offset,(colr >> 13) + 8,0); } TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_bg_tile_info) @@ -95,7 +90,7 @@ TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_bg_tile_info) int code = m_videoram3[tile_index] & 0x1fff; int colr = m_videoram3[tile_index] & 0xe000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, colr >> 13, 0); + SET_TILE_INFO_MEMBER(1, code, colr >> 13, 0); } /*************************************************************************** @@ -106,8 +101,8 @@ TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_bg_tile_info) VIDEO_START_MEMBER(playmark_state,bigtwin) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tx_tilemap->set_transparent_pen(0); @@ -123,9 +118,9 @@ VIDEO_START_MEMBER(playmark_state,bigtwin) VIDEO_START_MEMBER(playmark_state,bigtwinb) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwinb_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwinb_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tx_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); @@ -145,9 +140,9 @@ VIDEO_START_MEMBER(playmark_state,bigtwinb) VIDEO_START_MEMBER(playmark_state,wbeachvl) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); m_tx_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); @@ -163,8 +158,8 @@ VIDEO_START_MEMBER(playmark_state,wbeachvl) VIDEO_START_MEMBER(playmark_state,excelsr) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tx_tilemap->set_transparent_pen(0); @@ -179,9 +174,9 @@ VIDEO_START_MEMBER(playmark_state,excelsr) VIDEO_START_MEMBER(playmark_state,hotmind) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tx_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); @@ -203,9 +198,9 @@ VIDEO_START_MEMBER(playmark_state,hotmind) // this is wrong, and the offsets seem to move, so it can probably help find the register. VIDEO_START_MEMBER(playmark_state,luckboomh) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tx_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); @@ -246,9 +241,9 @@ TILEMAP_MAPPER_MEMBER(playmark_state::playmark_tilemap_scan_pages) VIDEO_START_MEMBER(playmark_state,hrdtimes) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(playmark_state::playmark_tilemap_scan_pages),this), 16, 16, 128, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(playmark_state::playmark_tilemap_scan_pages),this), 16, 16, 128, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tx_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c index c858471273e..6610abc104c 100644 --- a/src/mame/video/plygonet.c +++ b/src/mame/video/plygonet.c @@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(polygonet_state::ttl_get_tile_info) attr = m_ttl_vram[tile_index]>>12; /* palette in all 4 bits? */ - SET_TILE_INFO_MEMBER(m_gfxdecode, m_ttl_gfx_index, code, attr, 0); + SET_TILE_INFO_MEMBER(m_ttl_gfx_index, code, attr, 0); } TILE_GET_INFO_MEMBER(polygonet_state::roz_get_tile_info) @@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(polygonet_state::roz_get_tile_info) attr = (m_roz_vram[tile_index] >> 12) + 16; /* roz base palette is palette 16 */ code = m_roz_vram[tile_index] & 0x3ff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, attr, 0); + SET_TILE_INFO_MEMBER(0, code, attr, 0); } READ32_MEMBER(polygonet_state::polygonet_ttl_ram_r) @@ -102,12 +102,12 @@ void polygonet_state::video_start() m_gfxdecode->set_gfx(m_ttl_gfx_index, auto_alloc(machine(), gfx_element(machine(), charlayout, memregion("gfx1")->base(), m_palette->entries() / 16, 0))); /* create the tilemap */ - m_ttl_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(polygonet_state::ttl_get_tile_info),this), tilemap_mapper_delegate(FUNC(polygonet_state::plygonet_scan),this), 8, 8, 64, 32); + m_ttl_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(polygonet_state::ttl_get_tile_info),this), tilemap_mapper_delegate(FUNC(polygonet_state::plygonet_scan),this), 8, 8, 64, 32); m_ttl_tilemap->set_transparent_pen(0); /* set up the roz t-map too */ - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(polygonet_state::roz_get_tile_info),this), tilemap_mapper_delegate(FUNC(polygonet_state::plygonet_scan_cols),this), 16, 16, 32, 64); + m_roz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(polygonet_state::roz_get_tile_info),this), tilemap_mapper_delegate(FUNC(polygonet_state::plygonet_scan_cols),this), 16, 16, 32, 64); m_roz_tilemap->set_transparent_pen(0); /* save states */ diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c index e9f5626e514..b098e2a6629 100644 --- a/src/mame/video/pokechmp.c +++ b/src/mame/video/pokechmp.c @@ -26,12 +26,12 @@ TILE_GET_INFO_MEMBER(pokechmp_state::get_bg_tile_info) int code = videoram[tile_index*2+1] + ((videoram[tile_index*2] & 0x3f) << 8); int color = videoram[tile_index*2] >> 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void pokechmp_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pokechmp_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pokechmp_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c index 08d4c87653b..186f659dfc4 100644 --- a/src/mame/video/polepos.c +++ b/src/mame/video/polepos.c @@ -146,8 +146,7 @@ TILE_GET_INFO_MEMBER(polepos_state::bg_get_tile_info) UINT16 word = m_view16_memory[tile_index]; int code = (word & 0xff) | ((word & 0x4000) >> 6); int color = (word & 0x3f00) >> 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, color, 0); @@ -171,8 +170,7 @@ TILE_GET_INFO_MEMBER(polepos_state::tx_get_tile_info) /* 128V input to the palette PROM */ if (tile_index >= 32*16) color |= 0x40; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, 0); @@ -189,8 +187,8 @@ TILE_GET_INFO_MEMBER(polepos_state::tx_get_tile_info) VIDEO_START_MEMBER(polepos_state,polepos) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(polepos_state::bg_get_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,16); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(polepos_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(polepos_state::bg_get_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,16); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(polepos_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_palette->configure_tilemap_groups(*m_tx_tilemap, *m_gfxdecode->gfx(0), 0x2f); } diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c index 8a09f68daa9..b28c2342f6c 100644 --- a/src/mame/video/poolshrk.c +++ b/src/mame/video/poolshrk.c @@ -12,13 +12,13 @@ Atari Poolshark video emulation TILE_GET_INFO_MEMBER(poolshrk_state::get_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, m_playfield_ram[tile_index] & 0x3f, 0, 0); + SET_TILE_INFO_MEMBER(1, m_playfield_ram[tile_index] & 0x3f, 0, 0); } void poolshrk_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(poolshrk_state::get_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(poolshrk_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c index b3ab73dfcbb..3fae26d0367 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -100,7 +100,7 @@ TILE_GET_INFO_MEMBER(pooyan_state::get_bg_tile_info) int color = attr & 0x0f; int flags = TILE_FLIPYX(attr >> 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } @@ -113,7 +113,7 @@ TILE_GET_INFO_MEMBER(pooyan_state::get_bg_tile_info) void pooyan_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pooyan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pooyan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index 746e1ba31ec..3da7e8f7c67 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -332,7 +332,7 @@ TILE_GET_INFO_MEMBER(popeye_state::get_fg_tile_info) int code = m_videoram[tile_index]; int color = m_colorram[tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void popeye_state::video_start() @@ -342,7 +342,7 @@ void popeye_state::video_start() m_bitmap_type = TYPE_SKYSKIPR; - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popeye_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popeye_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_lastflip = 0; @@ -361,7 +361,7 @@ VIDEO_START_MEMBER(popeye_state,popeye) m_bitmap_type = TYPE_POPEYE; - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popeye_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popeye_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_lastflip = 0; diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index 454eb5d0eef..26c8d4114ba 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -108,8 +108,7 @@ TILE_GET_INFO_MEMBER(popper_state::get_popper_p123_tile_info) UINT8 attr = m_attribram[tile_index]; tile_number += m_gfx_bank << 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (attr & 0xf), 0); @@ -125,8 +124,7 @@ TILE_GET_INFO_MEMBER(popper_state::get_popper_p0_tile_info) //pen 0 only in front if colour set as well tileinfo.group = (attr & 0x70) ? ((attr & 0x80) >> 7) : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, ((attr & 0x70) >> 4) + 8, 0); @@ -138,8 +136,7 @@ TILE_GET_INFO_MEMBER(popper_state::get_popper_ol_p123_tile_info) UINT8 attr = m_ol_attribram[tile_index]; tile_number += m_gfx_bank << 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (attr & 0xf), 0); @@ -155,8 +152,7 @@ TILE_GET_INFO_MEMBER(popper_state::get_popper_ol_p0_tile_info) //pen 0 only in front if colour set as well tileinfo.group = (attr & 0x70) ? ((attr & 0x80) >> 7) : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, ((attr & 0x70) >> 4) + 8, 0); @@ -164,10 +160,10 @@ TILE_GET_INFO_MEMBER(popper_state::get_popper_ol_p0_tile_info) void popper_state::video_start() { - m_p123_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popper_state::get_popper_p123_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 33, 32 ); - m_p0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popper_state::get_popper_p0_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 33, 32); - m_ol_p123_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popper_state::get_popper_ol_p123_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 2, 32); - m_ol_p0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(popper_state::get_popper_ol_p0_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 2, 32); + m_p123_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popper_state::get_popper_p123_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 33, 32 ); + m_p0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popper_state::get_popper_p0_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 33, 32); + m_ol_p123_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popper_state::get_popper_ol_p123_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 2, 32); + m_ol_p0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popper_state::get_popper_ol_p0_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 2, 32); m_p123_tilemap->set_transmask(0, 0x0f, 0x01); m_p123_tilemap->set_transmask(1, 0x01, 0x0f); diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c index f9856a0eefe..7f67565e0a3 100644 --- a/src/mame/video/portrait.c +++ b/src/mame/video/portrait.c @@ -49,7 +49,7 @@ inline void portrait_state::get_tile_info( tile_data &tileinfo, int tile_index, else color = ((tilenum&0xff)>>1)+0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tilenum, color, flags ); + SET_TILE_INFO_MEMBER(0, tilenum, color, flags ); } TILE_GET_INFO_MEMBER(portrait_state::get_bg_tile_info) @@ -64,8 +64,8 @@ TILE_GET_INFO_MEMBER(portrait_state::get_fg_tile_info) void portrait_state::video_start() { - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(portrait_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32 ); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(portrait_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32 ); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(portrait_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32 ); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(portrait_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32 ); m_foreground->set_transparent_pen(7 ); } diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index d0520fe3c5d..c14f407235c 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -99,8 +99,7 @@ Offset: TILE_GET_INFO_MEMBER(powerins_state::get_tile_info_0) { UINT16 code = m_vram_0[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x07ff) + (m_tile_bank*0x800), ((code & 0xf000) >> (16-4)) + ((code & 0x0800) >> (11-4)), 0); @@ -139,8 +138,7 @@ Offset: TILE_GET_INFO_MEMBER(powerins_state::get_tile_info_1) { UINT16 code = m_vram_1[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0x0fff, (code & 0xf000) >> (16-4), 0); @@ -166,8 +164,8 @@ WRITE16_MEMBER(powerins_state::powerins_vram_1_w) void powerins_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(powerins_state::get_tile_info_0),this),tilemap_mapper_delegate(FUNC(powerins_state::powerins_get_memory_offset_0),this),16,16,DIM_NX_0, DIM_NY_0 ); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(powerins_state::get_tile_info_1),this),TILEMAP_SCAN_COLS,8,8,DIM_NX_1, DIM_NY_1 ); + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(powerins_state::get_tile_info_0),this),tilemap_mapper_delegate(FUNC(powerins_state::powerins_get_memory_offset_0),this),16,16,DIM_NX_0, DIM_NY_0 ); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(powerins_state::get_tile_info_1),this),TILEMAP_SCAN_COLS,8,8,DIM_NX_1, DIM_NY_1 ); m_tilemap_0->set_scroll_rows(1); m_tilemap_0->set_scroll_cols(1); diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index feb38d0153e..3031ff9179b 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -64,7 +64,7 @@ TILE_GET_INFO_MEMBER(prehisle_state::get_bg2_tile_info) int color = attr >> 12; int flags = (attr & 0x800) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(prehisle_state::get_bg_tile_info) @@ -74,7 +74,7 @@ TILE_GET_INFO_MEMBER(prehisle_state::get_bg_tile_info) int color = attr >> 12; int flags = (attr & 0x800) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, flags); + SET_TILE_INFO_MEMBER(2, code, color, flags); } TILE_GET_INFO_MEMBER(prehisle_state::get_fg_tile_info) @@ -83,18 +83,18 @@ TILE_GET_INFO_MEMBER(prehisle_state::get_fg_tile_info) int code = attr & 0xfff; int color = attr >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void prehisle_state::video_start() { - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(prehisle_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(prehisle_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 1024, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(prehisle_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(prehisle_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(prehisle_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(prehisle_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index 8c5f336f040..974cdaf9a1e 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -74,8 +74,7 @@ Offset: TILE_GET_INFO_MEMBER(psikyo_state::get_tile_info_0) { UINT16 code = ((UINT16 *)m_vram_0.target())[BYTE_XOR_BE(tile_index)]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code & 0x1fff) + 0x2000 * m_tilemap_0_bank, (code >> 13) & 7, 0); @@ -84,8 +83,7 @@ TILE_GET_INFO_MEMBER(psikyo_state::get_tile_info_0) TILE_GET_INFO_MEMBER(psikyo_state::get_tile_info_1) { UINT16 code = ((UINT16 *)m_vram_1.target())[BYTE_XOR_BE(tile_index)]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code & 0x1fff) + 0x2000 * m_tilemap_1_bank, ((code >> 13) & 7) + 0x40, // So we only have to decode the gfx once. 0); @@ -158,15 +156,15 @@ VIDEO_START_MEMBER(psikyo_state,psikyo) /* The Hardware is Capable of Changing the Dimensions of the Tilemaps, its safer to create the various sized tilemaps now as opposed to later */ - m_tilemap_0_size0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x80); - m_tilemap_0_size1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x40); - m_tilemap_0_size2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x80, 0x20); - m_tilemap_0_size3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x100, 0x10); + m_tilemap_0_size0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x80); + m_tilemap_0_size1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x40); + m_tilemap_0_size2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x80, 0x20); + m_tilemap_0_size3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x100, 0x10); - m_tilemap_1_size0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x80); - m_tilemap_1_size1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x40); - m_tilemap_1_size2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x80, 0x20); - m_tilemap_1_size3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x100, 0x10); + m_tilemap_1_size0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x80); + m_tilemap_1_size1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x40); + m_tilemap_1_size2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x80, 0x20); + m_tilemap_1_size3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psikyo_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x100, 0x10); m_spritebuf1 = auto_alloc_array(machine(), UINT32, 0x2000 / 4); m_spritebuf2 = auto_alloc_array(machine(), UINT32, 0x2000 / 4); diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c index fcc77c687e2..98bd6e6d58c 100644 --- a/src/mame/video/psychic5.c +++ b/src/mame/video/psychic5.c @@ -203,7 +203,7 @@ TILE_GET_INFO_MEMBER(psychic5_state::get_bg_tile_info) int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(psychic5_state::get_fg_tile_info) @@ -214,7 +214,7 @@ TILE_GET_INFO_MEMBER(psychic5_state::get_fg_tile_info) int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, flags); + SET_TILE_INFO_MEMBER(2, code, color, flags); } @@ -225,8 +225,8 @@ TILE_GET_INFO_MEMBER(psychic5_state::get_fg_tile_info) VIDEO_START_MEMBER(psychic5_state,psychic5) { /* info offset w h col row */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psychic5_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psychic5_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psychic5_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psychic5_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(15); @@ -248,8 +248,8 @@ VIDEO_START_MEMBER(psychic5_state,psychic5) VIDEO_START_MEMBER(psychic5_state,bombsa) { /* info offset w h col row */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psychic5_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(psychic5_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psychic5_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psychic5_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index 92dd6182339..d720fdce1d8 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(punchout_state::top_get_info) int code = m_bg_top_videoram[tile_index*2] + ((attr & 0x03) << 8); int color = ((attr & 0x7c) >> 2); int flipx = attr & 0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flipx ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(0, code, color, flipx ? TILE_FLIPX : 0); } TILE_GET_INFO_MEMBER(punchout_state::armwrest_top_get_info) @@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(punchout_state::armwrest_top_get_info) int attr = m_bg_top_videoram[tile_index*2 + 1]; int code = m_bg_top_videoram[tile_index*2] + ((attr & 0x03) << 8) + ((attr & 0x80) << 3); int color = ((attr & 0x7c) >> 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(punchout_state::bot_get_info) @@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(punchout_state::bot_get_info) int code = m_bg_bot_videoram[tile_index*2] + ((attr & 0x03) << 8); int color = ((attr & 0x7c) >> 2); int flipx = attr & 0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flipx ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(1, code, color, flipx ? TILE_FLIPX : 0); } TILE_GET_INFO_MEMBER(punchout_state::armwrest_bot_get_info) @@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(punchout_state::armwrest_bot_get_info) int code = m_bg_bot_videoram[tile_index*2] + ((attr & 0x03) << 8); int color = ((attr & 0x7c) >> 2) + 0x40; int flipx = attr & 0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flipx ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(0, code, color, flipx ? TILE_FLIPX : 0); } TILE_GET_INFO_MEMBER(punchout_state::bs1_get_info) @@ -84,7 +84,7 @@ TILE_GET_INFO_MEMBER(punchout_state::bs1_get_info) int code = m_spr1_videoram[tile_index*4] + ((m_spr1_videoram[tile_index*4 + 1] & 0x1f) << 8); int color = attr & 0x1f; int flipx = attr & 0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, flipx ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(2, code, color, flipx ? TILE_FLIPX : 0); } TILE_GET_INFO_MEMBER(punchout_state::bs2_get_info) @@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(punchout_state::bs2_get_info) int code = m_spr2_videoram[tile_index*4] + ((m_spr2_videoram[tile_index*4 + 1] & 0x0f) << 8); int color = attr & 0x3f; int flipx = attr & 0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, code, color, flipx ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(3, code, color, flipx ? TILE_FLIPX : 0); } TILE_GET_INFO_MEMBER(punchout_state::armwrest_fg_get_info) @@ -102,7 +102,7 @@ TILE_GET_INFO_MEMBER(punchout_state::armwrest_fg_get_info) int code = m_armwrest_fg_videoram[tile_index*2] + 256 * (attr & 0x07); int color = ((attr & 0xf8) >> 3); int flipx = attr & 0x80; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flipx ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(1, code, color, flipx ? TILE_FLIPX : 0); } TILEMAP_MAPPER_MEMBER(punchout_state::armwrest_bs1_scan) @@ -121,12 +121,12 @@ TILEMAP_MAPPER_MEMBER(punchout_state::armwrest_bs1_scan_flipx) void punchout_state::video_start() { - m_bg_top_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::top_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); - m_bg_bot_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bot_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,32); + m_bg_top_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::top_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_bot_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::bot_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,32); m_bg_bot_tilemap->set_scroll_rows(32); - m_spr1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); - m_spr2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs2_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); + m_spr1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); + m_spr2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::bs2_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); m_fg_tilemap = NULL; @@ -137,13 +137,13 @@ void punchout_state::video_start() VIDEO_START_MEMBER(punchout_state,armwrest) { - m_bg_top_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_top_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); - m_bg_bot_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_bot_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_top_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::armwrest_top_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_bot_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::armwrest_bot_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); - m_spr1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), tilemap_mapper_delegate(FUNC(punchout_state::armwrest_bs1_scan),this), 8,8, 32,16); - m_spr1_tilemap_flipx = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), tilemap_mapper_delegate(FUNC(punchout_state::armwrest_bs1_scan_flipx),this), 8,8, 32,16); - m_spr2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::bs2_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(punchout_state::armwrest_fg_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_spr1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), tilemap_mapper_delegate(FUNC(punchout_state::armwrest_bs1_scan),this), 8,8, 32,16); + m_spr1_tilemap_flipx = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::bs1_get_info),this), tilemap_mapper_delegate(FUNC(punchout_state::armwrest_bs1_scan_flipx),this), 8,8, 32,16); + m_spr2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::bs2_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 16,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::armwrest_fg_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); m_spr1_tilemap->set_transparent_pen(0x07); m_spr1_tilemap_flipx->set_transparent_pen(0x07); diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index 893a7a86b7b..b9e994e2163 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -19,8 +19,7 @@ TILE_GET_INFO_MEMBER(pushman_state::get_back_tile_info) int tile; tile = bg_map[tile_index << 1] + (bg_map[(tile_index << 1) + 1] << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, (tile & 0xff) | ((tile & 0x4000) >> 6), (tile >> 8) & 0xf, (tile & 0x2000) ? TILE_FLIPX : 0); @@ -29,8 +28,7 @@ TILE_GET_INFO_MEMBER(pushman_state::get_back_tile_info) TILE_GET_INFO_MEMBER(pushman_state::get_text_tile_info) { int tile = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (tile & 0xff) | ((tile & 0xc000) >> 6) | ((tile & 0x2000) >> 3), (tile >> 8) & 0xf, (tile & 0x1000) ? TILE_FLIPY : 0); /* not used? from Tiger Road */ @@ -46,8 +44,8 @@ TILE_GET_INFO_MEMBER(pushman_state::get_text_tile_info) void pushman_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pushman_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(pushman_state::background_scan_rows),this), 32, 32, 128, 64); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pushman_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pushman_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(pushman_state::background_scan_rows),this), 32, 32, 128, 64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pushman_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(3); } diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index 9fec119f474..3452d1d8ec1 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(quizdna_state::get_bg_tile_info) if (code>0x7fff) code &= 0x83ff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, col, 0); + SET_TILE_INFO_MEMBER(1, code, col, 0); } TILE_GET_INFO_MEMBER(quizdna_state::get_fg_tile_info) @@ -40,7 +40,7 @@ TILE_GET_INFO_MEMBER(quizdna_state::get_fg_tile_info) col >>= 5; col = (col & 3) | ((col & 4) << 1); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, col, 0); + SET_TILE_INFO_MEMBER(0, code, col, 0); } @@ -54,8 +54,8 @@ void quizdna_state::video_start() m_bg_ram = auto_alloc_array(machine(), UINT8, 0x2000); m_fg_ram = auto_alloc_array(machine(), UINT8, 0x1000); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(quizdna_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(quizdna_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,8,32,32 ); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizdna_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32 ); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizdna_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,8,32,32 ); m_fg_tilemap->set_transparent_pen(0 ); } diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c index e7043589023..29001b47da8 100644 --- a/src/mame/video/quizpani.c +++ b/src/mame/video/quizpani.c @@ -18,8 +18,7 @@ TILE_GET_INFO_MEMBER(quizpani_state::bg_tile_info) { int code = m_bg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code & 0xfff) + (0x1000 * m_bgbank), code >> 12, 0); @@ -29,8 +28,7 @@ TILE_GET_INFO_MEMBER(quizpani_state::txt_tile_info) { int code = m_txt_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0xfff) + (0x1000 * m_txtbank), code >> 12, 0); @@ -68,8 +66,8 @@ WRITE16_MEMBER(quizpani_state::quizpani_tilesbank_w) void quizpani_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(quizpani_state::bg_tile_info),this), tilemap_mapper_delegate(FUNC(quizpani_state::bg_scan),this),16,16,256,32); - m_txt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(quizpani_state::txt_tile_info),this),tilemap_mapper_delegate(FUNC(quizpani_state::bg_scan),this),16,16,256,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizpani_state::bg_tile_info),this), tilemap_mapper_delegate(FUNC(quizpani_state::bg_scan),this),16,16,256,32); + m_txt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizpani_state::txt_tile_info),this),tilemap_mapper_delegate(FUNC(quizpani_state::bg_scan),this),16,16,256,32); m_txt_tilemap->set_transparent_pen(15); } diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index d2c7d01121b..5ff92ed97cd 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -199,7 +199,7 @@ TILE_GET_INFO_MEMBER(raiden_state::get_back_tile_info) int tile = tiledata & 0x0fff; int color = tiledata >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color, 0); + SET_TILE_INFO_MEMBER(1, tile, color, 0); } TILE_GET_INFO_MEMBER(raiden_state::get_fore_tile_info) @@ -208,7 +208,7 @@ TILE_GET_INFO_MEMBER(raiden_state::get_fore_tile_info) int tile = tiledata & 0x0fff; int color = tiledata >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tile, color, 0); + SET_TILE_INFO_MEMBER(2, tile, color, 0); } TILE_GET_INFO_MEMBER(raiden_state::get_text_tile_info) @@ -217,14 +217,14 @@ TILE_GET_INFO_MEMBER(raiden_state::get_text_tile_info) int tile = (tiledata & 0xff) | ((tiledata >> 6) & 0x300); int color = (tiledata >> 8) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } void raiden_state::video_start() { - m_bg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden_state::get_back_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); - m_fg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden_state::get_fore_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); - m_tx_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8, 8, 32,32); + m_bg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_back_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); + m_fg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_fore_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); + m_tx_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8, 8, 32,32); m_fg_layer->set_transparent_pen(15); m_tx_layer->set_transparent_pen(15); @@ -232,9 +232,9 @@ void raiden_state::video_start() VIDEO_START_MEMBER(raiden_state,raidenb) { - m_bg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden_state::get_back_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); - m_fg_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden_state::get_fore_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); - m_tx_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(raiden_state::get_text_tile_info),this),TILEMAP_SCAN_COLS,8, 8, 32,32); + m_bg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_back_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); + m_fg_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_fore_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); + m_tx_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_text_tile_info),this),TILEMAP_SCAN_COLS,8, 8, 32,32); m_fg_layer->set_transparent_pen(15); m_tx_layer->set_transparent_pen(15); diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index 15b1f06d566..1b398c03b8a 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -220,8 +220,7 @@ inline void rallyx_state::rallyx_get_tile_info( tile_data &tileinfo, int tile_in { UINT8 attr = m_videoram[ram_offs + tile_index + 0x800]; tileinfo.category = (attr & 0x20) >> 5; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[ram_offs + tile_index], attr & 0x3f, TILE_FLIPYX(attr >> 6) ^ TILE_FLIPX); @@ -244,8 +243,7 @@ inline void rallyx_state::locomotn_get_tile_info(tile_data &tileinfo,int tile_in int code = m_videoram[ram_offs + tile_index]; code = (code & 0x7f) + 2 * (attr & 0x40) + 2 * (code & 0x80); tileinfo.category = (attr & 0x20) >> 5; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, attr & 0x3f, (attr & 0x80) ? (TILE_FLIPX | TILE_FLIPY) : 0); @@ -331,8 +329,8 @@ void rallyx_state::rallyx_video_start_common( ) VIDEO_START_MEMBER(rallyx_state,rallyx) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); /* the scrolling tilemap is slightly misplaced in Rally X */ m_bg_tilemap->set_scrolldx(3, 3); @@ -345,8 +343,8 @@ VIDEO_START_MEMBER(rallyx_state,rallyx) VIDEO_START_MEMBER(rallyx_state,jungler) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); m_spriteram_base = 0x14; @@ -357,8 +355,8 @@ VIDEO_START_MEMBER(rallyx_state,jungler) VIDEO_START_MEMBER(rallyx_state,locomotn) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); m_spriteram_base = 0x14; @@ -369,8 +367,8 @@ VIDEO_START_MEMBER(rallyx_state,locomotn) VIDEO_START_MEMBER(rallyx_state,commsega) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); /* commsega has more sprites and bullets than the other games */ m_spriteram_base = 0x00; diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index 9b3d1b3b084..2c7d10908e8 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -72,8 +72,7 @@ TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info_0) { UINT16 attr = m_vram_0[tile_index * 2 + 0]; UINT16 code = m_vram_0[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, attr & 0x7f, TILE_FLIPYX( attr >> 14 )); @@ -83,8 +82,7 @@ TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info_1) { UINT16 attr = m_vram_1[tile_index * 2 + 0]; UINT16 code = m_vram_1[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, attr & 0x7f, TILE_FLIPYX( attr >> 14 )); @@ -119,8 +117,7 @@ WRITE16_MEMBER(realbrk_state::realbrk_vram_1_w) TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info_2) { UINT16 code = m_vram_2[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code & 0x0fff, ((code & 0xf000) >> 12) | ((m_vregs[0xa/2] & 0x7f) << 4), 0); @@ -145,11 +142,11 @@ WRITE16_MEMBER(realbrk_state::realbrk_vram_2_w) void realbrk_state::video_start() { /* Backgrounds */ - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x20); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x20); + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x20); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, 0x40, 0x20); /* Text */ - m_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20); + m_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(realbrk_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20); m_tilemap_0->set_transparent_pen(0); m_tilemap_1->set_transparent_pen(0); diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index c6be1b74bc3..e1bc175910d 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -156,12 +156,12 @@ TILE_GET_INFO_MEMBER(ladybug_state::get_fg_tile_info) int code = m_videoram[tile_index]; int color = (m_videoram[tile_index] & 0x70) >> 4; // ?? - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(ladybug_state,redclash) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladybug_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ladybug_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c index 39a075eb187..8acf0e2ac63 100644 --- a/src/mame/video/relief.c +++ b/src/mame/video/relief.c @@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(relief_state::get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) & 0xff; int code = data1 & 0x7fff; int color = 0x20 + (data2 & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); } @@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(relief_state::get_playfield2_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) >> 8; int code = data1 & 0x7fff; int color = data2 & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); } diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c index f302b4df36b..55570402319 100644 --- a/src/mame/video/renegade.c +++ b/src/mame/video/renegade.c @@ -43,8 +43,7 @@ TILE_GET_INFO_MEMBER(renegade_state::get_bg_tilemap_info) UINT8 *videoram = m_videoram; const UINT8 *source = &videoram[tile_index]; UINT8 attributes = source[0x400]; /* CCC??BBB */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1 + (attributes & 0x7), + SET_TILE_INFO_MEMBER(1 + (attributes & 0x7), source[0], attributes >> 5, 0); @@ -54,8 +53,7 @@ TILE_GET_INFO_MEMBER(renegade_state::get_fg_tilemap_info) { const UINT8 *source = &m_videoram2[tile_index]; UINT8 attributes = source[0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (attributes & 3) * 256 + source[0], attributes >> 6, 0); @@ -63,8 +61,8 @@ TILE_GET_INFO_MEMBER(renegade_state::get_fg_tilemap_info) void renegade_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(renegade_state::get_bg_tilemap_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(renegade_state::get_fg_tilemap_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(renegade_state::get_bg_tilemap_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(renegade_state::get_fg_tilemap_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scrolldx(256, 0); diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c index 0f2f90cec28..ce545a7cf22 100644 --- a/src/mame/video/retofinv.c +++ b/src/mame/video/retofinv.c @@ -71,8 +71,7 @@ TILEMAP_MAPPER_MEMBER(retofinv_state::tilemap_scan) TILE_GET_INFO_MEMBER(retofinv_state::bg_get_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, m_bg_videoram[tile_index] + 256 * m_bg_bank, m_bg_videoram[0x400 + tile_index] & 0x3f, 0); @@ -84,8 +83,7 @@ TILE_GET_INFO_MEMBER(retofinv_state::fg_get_tile_info) tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fg_videoram[tile_index] + 256 * m_fg_bank, color, 0); @@ -101,8 +99,8 @@ TILE_GET_INFO_MEMBER(retofinv_state::fg_get_tile_info) void retofinv_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(retofinv_state::bg_get_tile_info),this),tilemap_mapper_delegate(FUNC(retofinv_state::tilemap_scan),this),8,8,36,28); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(retofinv_state::fg_get_tile_info),this),tilemap_mapper_delegate(FUNC(retofinv_state::tilemap_scan),this),8,8,36,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(retofinv_state::bg_get_tile_info),this),tilemap_mapper_delegate(FUNC(retofinv_state::tilemap_scan),this),8,8,36,28); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(retofinv_state::fg_get_tile_info),this),tilemap_mapper_delegate(FUNC(retofinv_state::tilemap_scan),this),8,8,36,28); m_palette->configure_tilemap_groups(*m_fg_tilemap, *m_gfxdecode->gfx(0), 0); } diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index 780908d10e2..d6fb349c279 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -108,12 +108,12 @@ TILE_GET_INFO_MEMBER(rocnrope_state::get_bg_tile_info) int color = attr & 0x0f; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x20) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } void rocnrope_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rocnrope_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rocnrope_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void rocnrope_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index d1728c2c38a..5545dd420ec 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -31,8 +31,7 @@ TILE_GET_INFO_MEMBER(rpunch_state::get_bg0_tile_info) if (m_videoflags & 0x0400) code = (data & 0x0fff) | 0x2000; else code = (data & 0x1fff); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, ((m_videoflags & 0x0010) >> 1) | ((data >> 13) & 7), 0); @@ -46,8 +45,7 @@ TILE_GET_INFO_MEMBER(rpunch_state::get_bg1_tile_info) if (m_videoflags & 0x0800) code = (data & 0x0fff) | 0x2000; else code = (data & 0x1fff); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, ((m_videoflags & 0x0020) >> 2) | ((data >> 13) & 7), 0); @@ -71,8 +69,8 @@ TIMER_CALLBACK_MEMBER(rpunch_state::crtc_interrupt_gen) void rpunch_state::video_start() { /* allocate tilemaps for the backgrounds */ - m_background[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rpunch_state::get_bg0_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,64); - m_background[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rpunch_state::get_bg1_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,64); + m_background[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rpunch_state::get_bg0_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,64); + m_background[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rpunch_state::get_bg1_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,64); /* configure the tilemaps */ m_background[1]->set_transparent_pen(15); diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c index 117fdc7512a..4ff4f523e1d 100644 --- a/src/mame/video/runaway.c +++ b/src/mame/video/runaway.c @@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(runaway_state::runaway_get_tile_info) { UINT8 code = m_video_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, ((code & 0x3f) << 1) | ((code & 0x40) >> 6) | (m_tile_bank << 7), 0, (code & 0x80) ? TILE_FLIPY : 0); + SET_TILE_INFO_MEMBER(0, ((code & 0x3f) << 1) | ((code & 0x40) >> 6) | (m_tile_bank << 7), 0, (code & 0x80) ? TILE_FLIPY : 0); } @@ -61,14 +61,14 @@ TILE_GET_INFO_MEMBER(runaway_state::qwak_get_tile_info) { UINT8 code = m_video_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, ((code & 0x7f) << 1) | ((code & 0x80) >> 7), 0, 0); + SET_TILE_INFO_MEMBER(0, ((code & 0x7f) << 1) | ((code & 0x80) >> 7), 0, 0); } void runaway_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(runaway_state::runaway_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(runaway_state::runaway_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 30); save_item(NAME(m_tile_bank)); } @@ -76,7 +76,7 @@ void runaway_state::video_start() VIDEO_START_MEMBER(runaway_state,qwak) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(runaway_state::qwak_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(runaway_state::qwak_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 30); save_item(NAME(m_tile_bank)); } diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index c2ae3151ca7..854e68e7833 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(rungun_state::ttl_get_tile_info) attr = (lvram[BYTE_XOR_LE(tile_index<<2)] & 0xf0) >> 4; code = ((lvram[BYTE_XOR_LE(tile_index<<2)] & 0x0f) << 8) | (lvram[BYTE_XOR_LE((tile_index<<2)+2)]); - SET_TILE_INFO_MEMBER(m_gfxdecode, m_ttl_gfx_index, code, attr, 0); + SET_TILE_INFO_MEMBER(m_ttl_gfx_index, code, attr, 0); } void rng_sprite_callback( running_machine &machine, int *code, int *color, int *priority_mask ) @@ -56,7 +56,7 @@ TILE_GET_INFO_MEMBER(rungun_state::get_rng_936_tile_info) flipx = (m_936_videoram[tile_index * 2 + 1] & 0xc000) >> 14; colour = 0x10 + (m_936_videoram[tile_index * 2] & 0x000f); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, TILE_FLIPYX(flipx)); + SET_TILE_INFO_MEMBER(0, tileno, colour, TILE_FLIPYX(flipx)); } @@ -75,7 +75,7 @@ void rungun_state::video_start() int gfx_index; - m_936_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rungun_state::get_rng_936_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); + m_936_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rungun_state::get_rng_936_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); m_936_tilemap->set_transparent_pen(0); /* find first empty slot to decode gfx */ @@ -90,7 +90,7 @@ void rungun_state::video_start() m_ttl_gfx_index = gfx_index; // create the tilemap - m_ttl_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rungun_state::ttl_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_ttl_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rungun_state::ttl_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_ttl_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index 583459d590d..4a3d9161c99 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(sauro_state::get_tile_info_bg) int color = ((m_colorram[tile_index] >> 4) & 0x0f) | m_palette_bank; int flags = m_colorram[tile_index] & 0x08 ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } TILE_GET_INFO_MEMBER(sauro_state::get_tile_info_fg) @@ -55,7 +55,7 @@ TILE_GET_INFO_MEMBER(sauro_state::get_tile_info_fg) int color = ((m_colorram2[tile_index] >> 4) & 0x0f) | m_palette_bank; int flags = m_colorram2[tile_index] & 0x08 ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } /* Sauro */ @@ -79,10 +79,10 @@ WRITE8_MEMBER(sauro_state::sauro_scroll_fg_w) VIDEO_START_MEMBER(sauro_state,sauro) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_fg),this), TILEMAP_SCAN_COLS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_fg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); @@ -148,7 +148,7 @@ UINT32 sauro_state::screen_update_sauro(screen_device &screen, bitmap_ind16 &bit VIDEO_START_MEMBER(sauro_state,trckydoc) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); } diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index 6ce6343c8d3..ab694b9dae0 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -119,12 +119,12 @@ TILE_GET_INFO_MEMBER(sbasketb_state::get_bg_tile_info) int color = m_colorram[tile_index] & 0x0f; int flags = ((m_colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void sbasketb_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sbasketb_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sbasketb_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); } diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c index f4dab041379..92a42e1e006 100644 --- a/src/mame/video/sbugger.c +++ b/src/mame/video/sbugger.c @@ -10,7 +10,7 @@ TILE_GET_INFO_MEMBER(sbugger_state::get_sbugger_tile_info) tileno = m_videoram[tile_index]; color = m_videoram_attr[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,color,0); + SET_TILE_INFO_MEMBER(0,tileno,color,0); } WRITE8_MEMBER(sbugger_state::sbugger_videoram_w) @@ -27,7 +27,7 @@ WRITE8_MEMBER(sbugger_state::sbugger_videoram_attr_w) void sbugger_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sbugger_state::get_sbugger_tile_info),this), TILEMAP_SCAN_ROWS, 8, 16, 64, 16); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sbugger_state::get_sbugger_tile_info),this), TILEMAP_SCAN_ROWS, 8, 16, 64, 16); } UINT32 sbugger_state::screen_update_sbugger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index bdf57b49c84..6c6040fabb4 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -84,7 +84,7 @@ TILE_GET_INFO_MEMBER(scotrsht_state::scotrsht_get_bg_tile_info) // data & 0x80 -> tile priority? - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flag); + SET_TILE_INFO_MEMBER(0, code, color, flag); } /* Same as Jailbreak + palette bank */ @@ -119,7 +119,7 @@ void scotrsht_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec void scotrsht_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(scotrsht_state::scotrsht_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(scotrsht_state::scotrsht_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_cols(64); } diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index 9d43f66afc9..31de9fc1344 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -10,7 +10,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_tile_info) tileno = m_videoram[tile_index*2]; colour = m_videoram[tile_index*2+1] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno,colour,0); + SET_TILE_INFO_MEMBER(1,tileno,colour,0); } WRITE16_MEMBER(sderby_state::sderby_videoram_w) @@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_md_tile_info) tileno = m_md_videoram[tile_index*2]; colour = m_md_videoram[tile_index*2+1] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno,colour+16,0); + SET_TILE_INFO_MEMBER(1,tileno,colour+16,0); } WRITE16_MEMBER(sderby_state::sderby_md_videoram_w) @@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_fg_tile_info) tileno = m_fg_videoram[tile_index*2]; colour = m_fg_videoram[tile_index*2+1] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour+32,0); + SET_TILE_INFO_MEMBER(0,tileno,colour+32,0); } WRITE16_MEMBER(sderby_state::sderby_fg_videoram_w) @@ -87,12 +87,12 @@ void sderby_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,i void sderby_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sderby_state::get_sderby_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); - m_md_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sderby_state::get_sderby_md_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sderby_state::get_sderby_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); + m_md_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sderby_state::get_sderby_md_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); m_md_tilemap->set_transparent_pen(0); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sderby_state::get_sderby_fg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sderby_state::get_sderby_fg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index c8cb01dbe85..72516ec2e37 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -158,7 +158,7 @@ void segag80r_state::spaceod_bg_init_palette() TILE_GET_INFO_MEMBER(segag80r_state::spaceod_get_tile_info) { int code = memregion("gfx2")->base()[tile_index + 0x1000 * (m_spaceod_bg_control >> 6)]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code + 0x100 * ((m_spaceod_bg_control >> 2) & 1), 0, 0); + SET_TILE_INFO_MEMBER(1, code + 0x100 * ((m_spaceod_bg_control >> 2) & 1), 0, 0); } @@ -173,7 +173,7 @@ TILEMAP_MAPPER_MEMBER(segag80r_state::spaceod_scan_rows) TILE_GET_INFO_MEMBER(segag80r_state::bg_get_tile_info) { int code = memregion("gfx2")->base()[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code + 0x100 * m_bg_char_bank, code >> 4, 0); + SET_TILE_INFO_MEMBER(1, code + 0x100 * m_bg_char_bank, code >> 4, 0); } @@ -212,19 +212,19 @@ void segag80r_state::video_start() /* and one vertically scrolling */ case G80_BACKGROUND_SPACEOD: spaceod_bg_init_palette(); - m_spaceod_bg_htilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segag80r_state::spaceod_get_tile_info),this), tilemap_mapper_delegate(FUNC(segag80r_state::spaceod_scan_rows),this), 8,8, 128,32); - m_spaceod_bg_vtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segag80r_state::spaceod_get_tile_info),this), tilemap_mapper_delegate(FUNC(segag80r_state::spaceod_scan_rows),this), 8,8, 32,128); + m_spaceod_bg_htilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segag80r_state::spaceod_get_tile_info),this), tilemap_mapper_delegate(FUNC(segag80r_state::spaceod_scan_rows),this), 8,8, 128,32); + m_spaceod_bg_vtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segag80r_state::spaceod_get_tile_info),this), tilemap_mapper_delegate(FUNC(segag80r_state::spaceod_scan_rows),this), 8,8, 32,128); break; /* background tilemap is effectively 1 screen x n screens */ case G80_BACKGROUND_MONSTERB: - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segag80r_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,memregion("gfx2")->bytes() / 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segag80r_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,memregion("gfx2")->bytes() / 32); break; /* background tilemap is effectively 4 screens x n screens */ case G80_BACKGROUND_PIGNEWT: case G80_BACKGROUND_SINDBADM: - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segag80r_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 128,memregion("gfx2")->bytes() / 128); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segag80r_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 128,memregion("gfx2")->bytes() / 128); break; } diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c index 825bb17f67e..e276bf084db 100644 --- a/src/mame/video/segaic16.c +++ b/src/mame/video/segaic16.c @@ -644,7 +644,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::segaic16_tilemap_16a_tile_info ) int code = ((data >> 1) & 0x1000) | (data & 0xfff); int color = (data >> 5) & 0x7f; - SET_TILE_INFO_MEMBER(*m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); tileinfo.category = (data >> 12) & 1; } @@ -656,7 +656,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::segaic16_tilemap_16a_text_info ) int color = (data >> 8) & 0x07; int code = data & 0xff; - SET_TILE_INFO_MEMBER(*m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); tileinfo.category = (data >> 11) & 1; } @@ -858,7 +858,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::segaic16_tilemap_16b_tile_info ) code = info->bank[code / info->banksize] * info->banksize + code % info->banksize; - SET_TILE_INFO_MEMBER(*m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); tileinfo.category = (data >> 15) & 1; } @@ -871,7 +871,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::segaic16_tilemap_16b_text_info ) int color = (data >> 9) & 0x07; int code = data & 0x1ff; - SET_TILE_INFO_MEMBER(*m_gfxdecode, 0, bank * info->banksize + code, color, 0); + SET_TILE_INFO_MEMBER(0, bank * info->banksize + code, color, 0); tileinfo.category = (data >> 15) & 1; } @@ -885,7 +885,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::segaic16_tilemap_16b_alt_tile_info code = info->bank[code / info->banksize] * info->banksize + code % info->banksize; - SET_TILE_INFO_MEMBER(*m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); tileinfo.category = (data >> 15) & 1; } @@ -898,7 +898,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::segaic16_tilemap_16b_alt_text_info int color = (data >> 8) & 0x07; int code = data & 0xff; - SET_TILE_INFO_MEMBER(*m_gfxdecode, 0, bank * info->banksize + code, color, 0); + SET_TILE_INFO_MEMBER(0, bank * info->banksize + code, color, 0); tileinfo.category = (data >> 15) & 1; } @@ -1103,7 +1103,7 @@ void segaic16_video_device::segaic16_tilemap_init(running_machine &machine, int } /* create the tilemap for the text layer */ - info->textmap = &machine.tilemap().create(get_text_info, TILEMAP_SCAN_ROWS, 8,8, 64,28); + info->textmap = &machine.tilemap().create(m_gfxdecode, get_text_info, TILEMAP_SCAN_ROWS, 8,8, 64,28); /* configure it */ info->textmap_info.rambase = info->textram; @@ -1119,7 +1119,7 @@ void segaic16_video_device::segaic16_tilemap_init(running_machine &machine, int for (pagenum = 0; pagenum < info->numpages; pagenum++) { /* each page is 64x32 */ - info->tilemaps[pagenum] = &machine.tilemap().create(get_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); + info->tilemaps[pagenum] = &machine.tilemap().create(m_gfxdecode, get_tile_info, TILEMAP_SCAN_ROWS, 8,8, 64,32); /* configure the tilemap */ info->tmap_info[pagenum].rambase = info->tileram + pagenum * 64*32; diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c index 13afaf5de66..c10059c7f93 100644 --- a/src/mame/video/segaic24.c +++ b/src/mame/video/segaic24.c @@ -70,7 +70,7 @@ const gfx_layout segas24_tile::char_layout = { void segas24_tile::tile_info(int offset, tile_data &tileinfo, tilemap_memory_index tile_index) { UINT16 val = tile_ram[tile_index|offset]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, char_gfx_index, val & tile_mask, (val >> 7) & 0xff, 0); + SET_TILE_INFO_MEMBER(char_gfx_index, val & tile_mask, (val >> 7) & 0xff, 0); tileinfo.category = (val & 0x8000) != 0; } @@ -104,10 +104,10 @@ void segas24_tile::device_start() char_ram = auto_alloc_array(machine(), UINT16, 0x80000/2); tile_ram = auto_alloc_array(machine(), UINT16, 0x10000/2); - tile_layer[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_0s),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - tile_layer[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_0w),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - tile_layer[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_1s),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - tile_layer[3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_1w),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + tile_layer[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_0s),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + tile_layer[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_0w),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + tile_layer[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_1s),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + tile_layer[3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_1w),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); tile_layer[0]->set_transparent_pen(0); tile_layer[1]->set_transparent_pen(0); diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index ed89daf5a06..5d55db60794 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -223,7 +223,7 @@ void segas32_state::common_start(int multi32) { struct cache_entry *entry = auto_alloc(machine(), struct cache_entry); - entry->tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas32_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,16); + entry->tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas32_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,16); entry->page = 0xff; entry->bank = 0; entry->next = m_cache_head; @@ -719,7 +719,7 @@ TILE_GET_INFO_MEMBER(segas32_state::get_tile_info) { struct segas32_state::cache_entry *entry = (struct segas32_state::cache_entry *)tilemap.user_data(); UINT16 data = m_system32_videoram[(entry->page & 0x7f) * 0x200 + tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, (entry->bank << 13) + (data & 0x1fff), (data >> 4) & 0x1ff, (data >> 14) & 3); + SET_TILE_INFO_MEMBER(0, (entry->bank << 13) + (data & 0x1fff), (data >> 4) & 0x1ff, (data >> 14) & 3); } diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c index 42cfe6debd1..a360407fcd9 100644 --- a/src/mame/video/seibuspi.c +++ b/src/mame/video/seibuspi.c @@ -545,7 +545,7 @@ TILE_GET_INFO_MEMBER(seibuspi_state::get_text_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } TILE_GET_INFO_MEMBER(seibuspi_state::get_back_tile_info) @@ -557,7 +557,7 @@ TILE_GET_INFO_MEMBER(seibuspi_state::get_back_tile_info) tile &= 0x1fff; tile |= m_rf2_layer_bank << 14 & 0x4000; // (d0) - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color, 0); + SET_TILE_INFO_MEMBER(1, tile, color, 0); } TILE_GET_INFO_MEMBER(seibuspi_state::get_midl_tile_info) @@ -570,7 +570,7 @@ TILE_GET_INFO_MEMBER(seibuspi_state::get_midl_tile_info) tile |= 0x2000; tile |= m_rf2_layer_bank << 13 & 0x4000; // (d1) - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color + 16, 0); + SET_TILE_INFO_MEMBER(1, tile, color + 16, 0); } TILE_GET_INFO_MEMBER(seibuspi_state::get_fore_tile_info) @@ -584,7 +584,7 @@ TILE_GET_INFO_MEMBER(seibuspi_state::get_fore_tile_info) tile |= m_layer_bank >> 14 & 0x2000; // (d27) tile |= m_rf2_layer_bank << 12 & 0x4000; // (d2) - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tile, color + 8, 0); + SET_TILE_INFO_MEMBER(1, tile, color + 8, 0); } @@ -617,10 +617,10 @@ void seibuspi_state::video_start() m_palette_ram = auto_alloc_array_clear(machine(), UINT32, m_palette_ram_size/4); m_sprite_ram = auto_alloc_array_clear(machine(), UINT32, m_sprite_ram_size/4); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seibuspi_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64,32); - m_back_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seibuspi_state::get_back_tile_info),this), TILEMAP_SCAN_COLS, 16,16,32,32); - m_midl_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seibuspi_state::get_midl_tile_info),this), TILEMAP_SCAN_COLS, 16,16,32,32); - m_fore_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seibuspi_state::get_fore_tile_info),this), TILEMAP_SCAN_COLS, 16,16,32,32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seibuspi_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64,32); + m_back_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seibuspi_state::get_back_tile_info),this), TILEMAP_SCAN_COLS, 16,16,32,32); + m_midl_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seibuspi_state::get_midl_tile_info),this), TILEMAP_SCAN_COLS, 16,16,32,32); + m_fore_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seibuspi_state::get_fore_tile_info),this), TILEMAP_SCAN_COLS, 16,16,32,32); m_text_layer->set_transparent_pen(31); m_back_layer->set_transparent_pen(63); diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c index cebdd792dda..2f6050bfa98 100644 --- a/src/mame/video/seicross.c +++ b/src/mame/video/seicross.c @@ -81,12 +81,12 @@ TILE_GET_INFO_MEMBER(seicross_state::get_bg_tile_info) int color = m_colorram[tile_index] & 0x0f; int flags = ((m_colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void seicross_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seicross_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seicross_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c index 32199addd1b..033c4188db0 100644 --- a/src/mame/video/senjyo.c +++ b/src/mame/video/senjyo.c @@ -25,8 +25,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::get_fg_tile_info) if (m_is_senjyo && (tile_index & 0x1f) >= 32-8) flags |= TILE_FORCE_LAYER0; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fgvideoram[tile_index] + ((attr & 0x10) << 4), attr & 0x07, flags); @@ -36,8 +35,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::senjyo_bg1_tile_info) { UINT8 code = m_bg1videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, (code & 0x70) >> 4, 0); @@ -50,8 +48,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::starforc_bg1_tile_info) static const UINT8 colormap[8] = { 0, 2, 4, 6, 1, 3, 5, 7 }; UINT8 code = m_bg1videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, colormap[(code & 0xe0) >> 5], 0); @@ -61,8 +58,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::get_bg2_tile_info) { UINT8 code = m_bg2videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, (code & 0xe0) >> 5, 0); @@ -72,8 +68,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::get_bg3_tile_info) { UINT8 code = m_bg3videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, code, (code & 0xe0) >> 5, 0); @@ -89,19 +84,19 @@ TILE_GET_INFO_MEMBER(senjyo_state::get_bg3_tile_info) void senjyo_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(senjyo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(senjyo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); if (m_is_senjyo) { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(senjyo_state::senjyo_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(senjyo_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 48); /* only 16x32 used by Star Force */ - m_bg3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(senjyo_state::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 56); /* only 16x32 used by Star Force */ + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(senjyo_state::senjyo_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(senjyo_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 48); /* only 16x32 used by Star Force */ + m_bg3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(senjyo_state::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 56); /* only 16x32 used by Star Force */ } else { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(senjyo_state::starforc_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(senjyo_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 32); /* only 16x32 used by Star Force */ - m_bg3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(senjyo_state::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 32); /* only 16x32 used by Star Force */ + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(senjyo_state::starforc_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(senjyo_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 32); /* only 16x32 used by Star Force */ + m_bg3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(senjyo_state::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 32); /* only 16x32 used by Star Force */ } m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 6e94510e2b2..4f54c826a22 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -367,7 +367,7 @@ inline void seta_state::twineagl_tile_info( tile_data &tileinfo, int tile_index, UINT16 attr = vram[ tile_index + 0x800 ]; if ((code & 0x3e00) == 0x3e00) code = (code & 0xc07f) | ((m_twineagl_tilebank[(code & 0x0180) >> 7] >> 1) << 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, (code & 0x3fff), attr & 0x1f, TILE_FLIPXY((code & 0xc000) >> 14) ); + SET_TILE_INFO_MEMBER(1, (code & 0x3fff), attr & 0x1f, TILE_FLIPXY((code & 0xc000) >> 14) ); } TILE_GET_INFO_MEMBER(seta_state::twineagl_get_tile_info_0){ twineagl_tile_info(tileinfo, tile_index, 0x0000 ); } @@ -391,7 +391,7 @@ inline void seta_state::get_tile_info( tile_data &tileinfo, int tile_index, int popmessage("Missing Color Mode = 1 for Layer = %d. Contact MAMETesters.",layer); } - SET_TILE_INFO_MEMBER(m_gfxdecode, gfx, m_tiles_offset + (code & 0x3fff), attr & 0x1f, TILE_FLIPXY((code & 0xc000) >> 14) ); + SET_TILE_INFO_MEMBER(gfx, m_tiles_offset + (code & 0x3fff), attr & 0x1f, TILE_FLIPXY((code & 0xc000) >> 14) ); } TILE_GET_INFO_MEMBER(seta_state::get_tile_info_0){ get_tile_info(tileinfo, tile_index, 0, 0x0000 ); } @@ -442,18 +442,18 @@ VIDEO_START_MEMBER(seta_state,seta_2_layers) at any given time */ /* layer 0 */ - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16,16, 64,32 ); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16,16, 64,32 ); /* layer 1 */ - m_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, + m_tilemap_2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 16,16, 64,32 ); - m_tilemap_3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS, + m_tilemap_3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_3),this), TILEMAP_SCAN_ROWS, 16,16, 64,32 ); m_tilemaps_flip = 0; @@ -484,10 +484,10 @@ VIDEO_START_MEMBER(seta_state,seta_1_layer) at any given time */ /* layer 0 */ - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16,16, 64,32 ); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seta_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16,16, 64,32 ); m_color_mode_shift = 4; @@ -513,10 +513,10 @@ VIDEO_START_MEMBER(seta_state,twineagl_1_layer) at any given time */ /* layer 0 */ - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seta_state::twineagl_get_tile_info_0),this), TILEMAP_SCAN_ROWS, + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seta_state::twineagl_get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16,16, 64,32 ); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seta_state::twineagl_get_tile_info_1),this), TILEMAP_SCAN_ROWS, + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(seta_state::twineagl_get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16,16, 64,32 ); m_tilemap_0->set_transparent_pen(0); diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index c97e63c0f36..c5b1ccbd92d 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -13,8 +13,7 @@ TILE_GET_INFO_MEMBER(sf_state::get_bg_tile_info) int attr = base[0x10000]; int color = base[0]; int code = (base[0x10000 + 1] << 8) | base[1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(attr & 3)); @@ -26,8 +25,7 @@ TILE_GET_INFO_MEMBER(sf_state::get_fg_tile_info) int attr = base[0x10000]; int color = base[0]; int code = (base[0x10000 + 1] << 8) | base[1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, color, TILE_FLIPYX(attr & 3)); @@ -36,8 +34,7 @@ TILE_GET_INFO_MEMBER(sf_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(sf_state::get_tx_tile_info) { int code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, code & 0x3ff, code>>12, TILE_FLIPYX((code & 0xc00)>>10)); @@ -53,9 +50,9 @@ TILE_GET_INFO_MEMBER(sf_state::get_tx_tile_info) void sf_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 2048, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sf_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 2048, 16); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sf_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 2048, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sf_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 2048, 16); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sf_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap->set_transparent_pen(15); m_tx_tilemap->set_transparent_pen(3); diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index 9bd2876a8b5..e5b0461f929 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -9,7 +9,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_shadfrce_fgtile_info) tileno = (m_fgvideoram[tile_index *2] & 0x00ff) | ((m_fgvideoram[tile_index *2+1] & 0x000f) << 8); colour = (m_fgvideoram[tile_index *2+1] & 0x00f0) >>4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour*4,0); + SET_TILE_INFO_MEMBER(0,tileno,colour*4,0); } WRITE16_MEMBER(shadfrce_state::shadfrce_fgvideoram_w) @@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_shadfrce_bg0tile_info) if (colour & 0x10) colour ^= 0x30; /* skip hole */ fyx = (m_bg0videoram[tile_index *2] & 0x00c0) >>6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,tileno,colour,TILE_FLIPYX(fyx)); + SET_TILE_INFO_MEMBER(2,tileno,colour,TILE_FLIPYX(fyx)); } WRITE16_MEMBER(shadfrce_state::shadfrce_bg0videoram_w) @@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_shadfrce_bg1tile_info) tileno = (m_bg1videoram[tile_index] & 0x0fff); colour = (m_bg1videoram[tile_index] & 0xf000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,tileno,colour+64,0); + SET_TILE_INFO_MEMBER(2,tileno,colour+64,0); } WRITE16_MEMBER(shadfrce_state::shadfrce_bg1videoram_w) @@ -58,13 +58,13 @@ WRITE16_MEMBER(shadfrce_state::shadfrce_bg1videoram_w) void shadfrce_state::video_start() { - m_fgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shadfrce_state::get_shadfrce_fgtile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_fgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shadfrce_state::get_shadfrce_fgtile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fgtilemap->set_transparent_pen(0); - m_bg0tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shadfrce_state::get_shadfrce_bg0tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); + m_bg0tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shadfrce_state::get_shadfrce_bg0tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); m_bg0tilemap->set_transparent_pen(0); - m_bg1tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shadfrce_state::get_shadfrce_bg1tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); + m_bg1tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shadfrce_state::get_shadfrce_bg1tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); m_spvideoram_old = auto_alloc_array(machine(), UINT16, m_spvideoram.bytes()/2); } diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index c5a320b429e..5b02af543be 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -20,8 +20,7 @@ TILE_GET_INFO_MEMBER(shangkid_state::get_bg_tile_info){ */ color = attributes>>3; color = (color&0x03)|((color&0x1c)<<1); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, color, (attributes&0x04)?TILE_FLIPX:0); @@ -34,8 +33,7 @@ TILE_GET_INFO_MEMBER(shangkid_state::get_bg_tile_info){ x------- flipx? */ color = (attributes>>2)&0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, color, (attributes&0x80)?TILE_FLIPX:0); @@ -47,7 +45,7 @@ TILE_GET_INFO_MEMBER(shangkid_state::get_bg_tile_info){ VIDEO_START_MEMBER(shangkid_state,shangkid) { - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shangkid_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shangkid_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); } WRITE8_MEMBER(shangkid_state::shangkid_videoram_w) diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index a162fff3918..9e9a6dd5eeb 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -133,12 +133,12 @@ TILE_GET_INFO_MEMBER(shaolins_state::get_bg_tile_info) int color = (attr & 0x0f) + 16 * m_palettebank; int flags = (attr & 0x20) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void shaolins_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shaolins_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shaolins_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index 2578a39cfd7..83a08018f2d 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -46,12 +46,12 @@ TILE_GET_INFO_MEMBER(shisen_state::get_bg_tile_info) int code = m_videoram[offs] + ((m_videoram[offs + 1] & 0x0f) << 8) + (m_gfxbank << 12); int color = (m_videoram[offs + 1] & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void shisen_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shisen_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shisen_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index e72fc32ce86..26ff8eeaf61 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -45,8 +45,7 @@ TILE_GET_INFO_MEMBER(shootout_state::get_bg_tile_info) int tile_number = m_videoram[tile_index] + 256*(attributes&7); int color = attributes>>4; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile_number, color, 0); @@ -58,8 +57,7 @@ TILE_GET_INFO_MEMBER(shootout_state::get_fg_tile_info) int tile_number = m_textram[tile_index] + 256*(attributes&0x3); int color = attributes>>4; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, color, 0); @@ -79,8 +77,8 @@ WRITE8_MEMBER(shootout_state::shootout_textram_w) void shootout_state::video_start() { - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shootout_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shootout_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shootout_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shootout_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_foreground->set_transparent_pen(0 ); } diff --git a/src/mame/video/shuuz.c b/src/mame/video/shuuz.c index c2e1fb20409..c3a3d7e649d 100644 --- a/src/mame/video/shuuz.c +++ b/src/mame/video/shuuz.c @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(shuuz_state::get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) >> 8; int code = data1 & 0x3fff; int color = data2 & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); } diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 5a3bae43475..5b9a3963ab7 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -100,7 +100,7 @@ TILE_GET_INFO_MEMBER(sidearms_state::get_sidearms_bg_tile_info) color = attr>>3 & 0x1f; flags = attr>>1 & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(sidearms_state::get_philko_bg_tile_info) @@ -113,7 +113,7 @@ TILE_GET_INFO_MEMBER(sidearms_state::get_philko_bg_tile_info) color = attr>>3 & 0x0f; flags = attr>>1 & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(sidearms_state::get_fg_tile_info) @@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(sidearms_state::get_fg_tile_info) int code = m_videoram[tile_index] + (attr<<2 & 0x300); int color = attr & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILEMAP_MAPPER_MEMBER(sidearms_state::sidearms_tilemap_scan) @@ -140,17 +140,17 @@ void sidearms_state::video_start() if (!m_gameid) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sidearms_state::get_sidearms_bg_tile_info),this), tilemap_mapper_delegate(FUNC(sidearms_state::sidearms_tilemap_scan),this), + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sidearms_state::get_sidearms_bg_tile_info),this), tilemap_mapper_delegate(FUNC(sidearms_state::sidearms_tilemap_scan),this), 32, 32, 128, 128); m_bg_tilemap->set_transparent_pen(15); } else { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sidearms_state::get_philko_bg_tile_info),this), tilemap_mapper_delegate(FUNC(sidearms_state::sidearms_tilemap_scan),this), 32, 32, 128, 128); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sidearms_state::get_philko_bg_tile_info),this), tilemap_mapper_delegate(FUNC(sidearms_state::sidearms_tilemap_scan),this), 32, 32, 128, 128); } - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sidearms_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sidearms_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap->set_transparent_pen(3); diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 2fb73b3e8fa..1c693b829f6 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -53,8 +53,7 @@ PALETTE_INIT_MEMBER(sidepckt_state, sidepckt) TILE_GET_INFO_MEMBER(sidepckt_state::get_tile_info) { UINT8 attr = m_colorram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index] + ((attr & 0x07) << 8), ((attr & 0x10) >> 3) | ((attr & 0x20) >> 5), TILE_FLIPX); @@ -71,7 +70,7 @@ TILE_GET_INFO_MEMBER(sidepckt_state::get_tile_info) void sidepckt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sidepckt_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sidepckt_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_transmask(0,0xff,0x00); /* split type 0 is totally transparent in front half */ m_bg_tilemap->set_transmask(1,0x01,0xfe); /* split type 1 has pen 0 transparent in front half */ diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index 3f36a84fef4..c78190a822d 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -60,8 +60,7 @@ TILE_GET_INFO_MEMBER(silkroad_state::get_fg_tile_info) code += 0x18000; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(flipx)); @@ -81,8 +80,7 @@ TILE_GET_INFO_MEMBER(silkroad_state::get_fg2_tile_info) int color = ((m_vidram2[tile_index] & 0x000001f)); int flipx = ((m_vidram2[tile_index] & 0x0000080) >> 7); code += 0x18000; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(flipx)); @@ -102,8 +100,7 @@ TILE_GET_INFO_MEMBER(silkroad_state::get_fg3_tile_info) int color = ((m_vidram3[tile_index] & 0x000001f)); int flipx = ((m_vidram3[tile_index] & 0x0000080) >> 7); code += 0x18000; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(flipx)); @@ -119,9 +116,9 @@ WRITE32_MEMBER(silkroad_state::silkroad_fgram3_w) void silkroad_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(silkroad_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(silkroad_state::get_fg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(silkroad_state::get_fg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(silkroad_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(silkroad_state::get_fg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(silkroad_state::get_fg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap->set_transparent_pen(0); m_fg2_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c index 158c3644fd1..653c52f0849 100644 --- a/src/mame/video/skullxbo.c +++ b/src/mame/video/skullxbo.c @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(skullxbo_state::get_alpha_tile_info) int code = (data ^ 0x400) & 0x7ff; int color = (data >> 11) & 0x0f; int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(skullxbo_state::get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) & 0xff; int code = data1 & 0x7fff; int color = data2 & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(1, code, color, (data1 >> 15) & 1); } diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c index 8b92f4134df..b83c7a9036f 100644 --- a/src/mame/video/skydiver.c +++ b/src/mame/video/skydiver.c @@ -38,7 +38,7 @@ void skydiver_state::machine_reset() TILE_GET_INFO_MEMBER(skydiver_state::get_tile_info) { UINT8 code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x3f, code >> 6, 0); + SET_TILE_INFO_MEMBER(0, code & 0x3f, code >> 6, 0); } @@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(skydiver_state::get_tile_info) void skydiver_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skydiver_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skydiver_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); } diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c index 2c9deb38aee..0f6cbf4ab05 100644 --- a/src/mame/video/skykid.c +++ b/src/mame/video/skykid.c @@ -78,8 +78,7 @@ TILE_GET_INFO_MEMBER(skykid_state::tx_get_tile_info) screen is flipped, character flip is done by selecting the 2nd character set. We reproduce this here, but since the tilemap system automatically flips characters when screen is flipped, we have to flip them back. */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code | (flip_screen() ? 0x100 : 0), attr & 0x3f, flip_screen() ? (TILE_FLIPY | TILE_FLIPX) : 0); @@ -91,8 +90,7 @@ TILE_GET_INFO_MEMBER(skykid_state::bg_get_tile_info) int code = m_videoram[tile_index]; int attr = m_videoram[tile_index+0x800]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code + ((attr & 0x01) << 8), ((attr & 0x7e) >> 1) | ((attr & 0x01) << 6), 0); @@ -108,8 +106,8 @@ TILE_GET_INFO_MEMBER(skykid_state::bg_get_tile_info) void skykid_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skykid_state::tx_get_tile_info),this),tilemap_mapper_delegate(FUNC(skykid_state::tx_tilemap_scan),this), 8,8,36,28); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skykid_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skykid_state::tx_get_tile_info),this),tilemap_mapper_delegate(FUNC(skykid_state::tx_tilemap_scan),this), 8,8,36,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skykid_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,64,32); m_tx_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index d7a6bdb305b..09041fe24c3 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -22,8 +22,7 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_pf_tile_info)/* For Performan only */ tile=m_slapfight_videoram[tile_index] + ((m_slapfight_colorram[tile_index] & 0x03) << 8); color=(m_slapfight_colorram[tile_index] >> 3) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -36,8 +35,7 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_pf1_tile_info) tile=m_slapfight_videoram[tile_index] + ((m_slapfight_colorram[tile_index] & 0x0f) << 8); color=(m_slapfight_colorram[tile_index] & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, color, 0); @@ -50,8 +48,7 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_fix_tile_info) tile=m_slapfight_fixvideoram[tile_index] + ((m_slapfight_fixcolorram[tile_index] & 0x03) << 8); color=(m_slapfight_fixcolorram[tile_index] & 0xfc) >> 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -66,15 +63,15 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_fix_tile_info) VIDEO_START_MEMBER(slapfght_state,perfrman) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(slapfght_state::get_pf_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_pf_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_pf1_tilemap->set_transparent_pen(0); } VIDEO_START_MEMBER(slapfght_state,slapfight) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(slapfght_state::get_pf1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(slapfght_state::get_fix_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_pf1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_fix_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fix_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c index 42f1cf458fa..f3098abb88d 100644 --- a/src/mame/video/snk.c +++ b/src/mame/video/snk.c @@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(snk_state::marvins_get_tx_tile_info) int code = m_tx_videoram[tile_index]; int color = code >> 5; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, m_tx_tile_offset + code, color, tile_index & 0x400 ? TILE_FORCE_LAYER0 : 0); @@ -85,7 +85,7 @@ TILE_GET_INFO_MEMBER(snk_state::ikari_get_tx_tile_info) { int code = m_tx_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, m_tx_tile_offset + code, 0, tile_index & 0x400 ? TILE_FORCE_LAYER0 : 0); @@ -95,7 +95,7 @@ TILE_GET_INFO_MEMBER(snk_state::gwar_get_tx_tile_info) { int code = m_tx_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, + SET_TILE_INFO_MEMBER(0, m_tx_tile_offset + code, 0, 0); @@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(snk_state::marvins_get_fg_tile_info) { int code = m_fg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, + SET_TILE_INFO_MEMBER(1, code, 0, 0); @@ -116,7 +116,7 @@ TILE_GET_INFO_MEMBER(snk_state::marvins_get_bg_tile_info) { int code = m_bg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, + SET_TILE_INFO_MEMBER(2, code, 0, 0); @@ -127,7 +127,7 @@ TILE_GET_INFO_MEMBER(snk_state::aso_get_bg_tile_info) { int code = m_bg_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, + SET_TILE_INFO_MEMBER(1, m_bg_tile_offset + code, 0, 0); @@ -139,7 +139,7 @@ TILE_GET_INFO_MEMBER(snk_state::tnk3_get_bg_tile_info) int code = m_bg_videoram[2*tile_index] | ((attr & 0x30) << 4); int color = (attr & 0xf) ^ 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, + SET_TILE_INFO_MEMBER(1, code, color, 0); @@ -151,7 +151,7 @@ TILE_GET_INFO_MEMBER(snk_state::ikari_get_bg_tile_info) int code = m_bg_videoram[2*tile_index] | ((attr & 0x03) << 8); int color = (attr & 0x70) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, + SET_TILE_INFO_MEMBER(1, code, color, 0); @@ -166,7 +166,7 @@ TILE_GET_INFO_MEMBER(snk_state::gwar_get_bg_tile_info) if (m_is_psychos) // psychos has a separate palette bank bit color &= 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, + SET_TILE_INFO_MEMBER(1, code, color, 0); @@ -222,9 +222,9 @@ VIDEO_START_MEMBER(snk_state,marvins) { VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); m_tx_tilemap->set_transparent_pen(15); m_tx_tilemap->set_scrolldy(8, 8); @@ -243,8 +243,8 @@ VIDEO_START_MEMBER(snk_state,jcross) { VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::aso_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::aso_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 64); m_tx_tilemap->set_transparent_pen(15); m_tx_tilemap->set_scrolldy(8, 8); @@ -262,8 +262,8 @@ VIDEO_START_MEMBER(snk_state,sgladiat) { VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::aso_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::aso_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); m_tx_tilemap->set_transparent_pen(15); m_tx_tilemap->set_scrolldy(8, 8); @@ -302,8 +302,8 @@ VIDEO_START_MEMBER(snk_state,tnk3) { VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::tnk3_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::tnk3_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 64); m_tx_tilemap->set_transparent_pen(15); m_tx_tilemap->set_scrolldy(8, 8); @@ -320,8 +320,8 @@ VIDEO_START_MEMBER(snk_state,ikari) { VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::ikari_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::ikari_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::ikari_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::ikari_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_tx_tilemap->set_transparent_pen(15); m_tx_tilemap->set_scrolldy(8, 8); @@ -342,8 +342,8 @@ VIDEO_START_MEMBER(snk_state,gwar) memset(m_empty_tile, 0xf, sizeof(m_empty_tile)); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::gwar_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 50, 32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::gwar_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::gwar_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 50, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::gwar_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_tx_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c index 096aa1debf2..6fae356fd68 100644 --- a/src/mame/video/snk6502.c +++ b/src/mame/video/snk6502.c @@ -154,7 +154,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::get_bg_tile_info) int code = m_videoram[tile_index] + 256 * m_charbank; int color = (m_colorram[tile_index] & 0x38) >> 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } TILE_GET_INFO_MEMBER(snk6502_state::get_fg_tile_info) @@ -162,13 +162,13 @@ TILE_GET_INFO_MEMBER(snk6502_state::get_fg_tile_info) int code = m_videoram2[tile_index]; int color = m_colorram[tile_index] & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(snk6502_state,snk6502) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk6502_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk6502_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); @@ -281,7 +281,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_bg_tile_info) int code = m_videoram[tile_index]; int color = (m_colorram[tile_index] & 0x0c) >> 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_fg_tile_info) @@ -289,13 +289,13 @@ TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_fg_tile_info) int code = m_videoram2[tile_index]; int color = m_colorram[tile_index] & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } VIDEO_START_MEMBER(snk6502_state,satansat) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 5ae4445c971..5491a106252 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -27,7 +27,7 @@ TILE_GET_INFO_MEMBER(snk68_state::get_pow_tile_info) int tile = m_fg_tile_offset + (m_pow_fg_videoram[2*tile_index] & 0xff); int color = m_pow_fg_videoram[2*tile_index+1] & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, 0); + SET_TILE_INFO_MEMBER(0, tile, color, 0); } TILE_GET_INFO_MEMBER(snk68_state::get_searchar_tile_info) @@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(snk68_state::get_searchar_tile_info) // used in the ikari3 intro int flags = (data & 0x8000) ? TILE_FORCE_LAYER0 : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tile, color, flags); + SET_TILE_INFO_MEMBER(0, tile, color, flags); } /*************************************************************************** @@ -58,7 +58,7 @@ void snk68_state::common_video_start() void snk68_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk68_state::get_pow_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk68_state::get_pow_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tile_offset = 0; common_video_start(); @@ -66,7 +66,7 @@ void snk68_state::video_start() VIDEO_START_MEMBER(snk68_state,searchar) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk68_state::get_searchar_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snk68_state::get_searchar_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); common_video_start(); } diff --git a/src/mame/video/snookr10.c b/src/mame/video/snookr10.c index 27114fd5d66..4e80b69f0f8 100644 --- a/src/mame/video/snookr10.c +++ b/src/mame/video/snookr10.c @@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(snookr10_state::get_bg_tile_info) int code = attr & 0xfff; int color = m_colorram[offs] >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -166,7 +166,7 @@ TILE_GET_INFO_MEMBER(snookr10_state::apple10_get_bg_tile_info) int code = BITSWAP16((attr & 0xfff),15,14,13,12,8,9,10,11,0,1,2,3,4,5,6,7); /* encrypted tile matrix */ int color = m_colorram[offs] >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -235,23 +235,23 @@ TILE_GET_INFO_MEMBER(snookr10_state::crystalc_get_bg_tile_info) int code = BITSWAP16((attr & 0xfff),15,14,13,12,0,10,5,1,7,6,9,4,3,2,8,11); /* encrypted tile matrix */ int color = m_colorram[offs] >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void snookr10_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snookr10_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } VIDEO_START_MEMBER(snookr10_state, apple10) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snookr10_state::apple10_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::apple10_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } VIDEO_START_MEMBER(snookr10_state, crystalc) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snookr10_state::crystalc_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::crystalc_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } UINT32 snookr10_state::screen_update_snookr10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index 13d9ed38e6f..f51001aa215 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(solomon_state::get_bg_tile_info) int color = ((attr & 0x70) >> 4); int flags = ((attr & 0x80) ? TILE_FLIPX : 0) | ((attr & 0x08) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(solomon_state::get_fg_tile_info) @@ -50,15 +50,15 @@ TILE_GET_INFO_MEMBER(solomon_state::get_fg_tile_info) int code = m_videoram[tile_index] + 256 * (attr & 0x07); int color = (attr & 0x70) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void solomon_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(solomon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(solomon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(solomon_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(solomon_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index fd239fecb71..ba0335880e4 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -123,12 +123,12 @@ TILE_GET_INFO_MEMBER(sonson_state::get_bg_tile_info) int code = m_videoram[tile_index] + 256 * (attr & 0x03); int color = attr >> 2; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void sonson_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sonson_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sonson_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c index b370589621e..a08cd89ec47 100644 --- a/src/mame/video/spbactn.c +++ b/src/mame/video/spbactn.c @@ -43,7 +43,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_bg_tile_info) { int attr = m_bgvideoram[tile_index]; int tileno = m_bgvideoram[tile_index+0x2000]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, tileno, ((attr & 0x00f0)>>4)+0x80, 0); + SET_TILE_INFO_MEMBER(1, tileno, ((attr & 0x00f0)>>4)+0x80, 0); } @@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_fg_tile_info) else color |= 0x0080; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, color, 0); + SET_TILE_INFO_MEMBER(0, tileno, color, 0); } @@ -77,8 +77,8 @@ VIDEO_START_MEMBER(spbactn_state,spbactn) m_screen->register_screen_bitmap(m_tile_bitmap_bg); m_screen->register_screen_bitmap(m_tile_bitmap_fg); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spbactn_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 64, 128); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spbactn_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 64, 128); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spbactn_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 64, 128); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spbactn_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 64, 128); m_bg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); @@ -88,7 +88,7 @@ VIDEO_START_MEMBER(spbactn_state,spbactnp) { VIDEO_START_CALL_MEMBER(spbactn); // no idea.. - m_extra_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spbactn_state::get_extra_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 16, 16); + m_extra_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spbactn_state::get_extra_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 16, 16); } WRITE16_MEMBER( spbactn_state::spbatnp_90002_w ) { @@ -140,7 +140,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_extra_tile_info) { int tileno = m_extraram[(tile_index*2)+1]; tileno |= m_extraram[(tile_index*2)] << 8; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, tileno, 0, 0); + SET_TILE_INFO_MEMBER(3, tileno, 0, 0); } diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index 9fc467814e5..81856407163 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -55,8 +55,7 @@ TILE_GET_INFO_MEMBER(spdodgeb_state::get_bg_tile_info) { UINT8 code = m_videoram[tile_index]; UINT8 attr = m_videoram[tile_index + 0x800]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((attr & 0x1f) << 8), ((attr & 0xe0) >> 5) + 8 * m_tile_palbank, 0); @@ -71,7 +70,7 @@ TILE_GET_INFO_MEMBER(spdodgeb_state::get_bg_tile_info) void spdodgeb_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spdodgeb_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(spdodgeb_state::background_scan),this),8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spdodgeb_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(spdodgeb_state::background_scan),this),8,8,64,32); } diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c index b88219126dc..9518b6b510d 100644 --- a/src/mame/video/speedbal.c +++ b/src/mame/video/speedbal.c @@ -15,7 +15,7 @@ TILE_GET_INFO_MEMBER(speedbal_state::get_tile_info_bg) int code = m_background_videoram[tile_index*2] + ((m_background_videoram[tile_index*2+1] & 0x30) << 4); int color = m_background_videoram[tile_index*2+1] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); tileinfo.group = (color == 8); } @@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(speedbal_state::get_tile_info_fg) int code = m_foreground_videoram[tile_index*2] + ((m_foreground_videoram[tile_index*2+1] & 0x30) << 4); int color = m_foreground_videoram[tile_index*2+1] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); tileinfo.group = (color == 9); } @@ -36,8 +36,8 @@ TILE_GET_INFO_MEMBER(speedbal_state::get_tile_info_fg) void speedbal_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(speedbal_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(speedbal_state::get_tile_info_fg),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(speedbal_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(speedbal_state::get_tile_info_fg),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); m_bg_tilemap->set_transmask(0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ m_bg_tilemap->set_transmask(1,0x00f7,0x0000); /* split type 1 has pen 0-2, 4-7 transparent in front half */ diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c index fc682c20bf4..e0d7fa412f0 100644 --- a/src/mame/video/speedspn.c +++ b/src/mame/video/speedspn.c @@ -9,13 +9,13 @@ TILE_GET_INFO_MEMBER(speedspn_state::get_speedspn_tile_info) int code = m_vidram[tile_index*2+1] | (m_vidram[tile_index*2] << 8); int attr = m_attram[tile_index^0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,attr & 0x3f,(attr & 0x80) ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(0,code,attr & 0x3f,(attr & 0x80) ? TILE_FLIPX : 0); } void speedspn_state::video_start() { m_vidram = auto_alloc_array(machine(), UINT8, 0x1000 * 2); - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(speedspn_state::get_speedspn_tile_info),this),TILEMAP_SCAN_COLS, 8, 8,64,32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(speedspn_state::get_speedspn_tile_info),this),TILEMAP_SCAN_COLS, 8, 8,64,32); } WRITE8_MEMBER(speedspn_state::speedspn_vidram_w) diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c index d678687befd..a31428220cc 100644 --- a/src/mame/video/splash.c +++ b/src/mame/video/splash.c @@ -44,8 +44,7 @@ TILE_GET_INFO_MEMBER(splash_state::get_tile_info_splash_tilemap0) int attr = data >> 8; int code = data & 0xff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((0x20 + (attr & 0x0f)) << 8), (attr & 0xf0) >> 4, 0); @@ -57,8 +56,7 @@ TILE_GET_INFO_MEMBER(splash_state::get_tile_info_splash_tilemap1) int attr = data >> 8; int code = data & 0xff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, (code >> 2) + ((0x30 + (attr & 0x0f)) << 6), (attr & 0xf0) >> 4, TILE_FLIPXY(code & 0x03)); @@ -165,8 +163,8 @@ void splash_state::draw_bitmap(bitmap_ind16 &bitmap, const rectangle &cliprect) void splash_state::video_start() { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(splash_state::get_tile_info_splash_tilemap0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(splash_state::get_tile_info_splash_tilemap1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(splash_state::get_tile_info_splash_tilemap0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(splash_state::get_tile_info_splash_tilemap1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap[0]->set_transparent_pen(0); m_bg_tilemap[1]->set_transparent_pen(0); diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c index 26f53510ea3..7cd3013d623 100644 --- a/src/mame/video/sprcros2.c +++ b/src/mame/video/sprcros2.c @@ -95,8 +95,7 @@ TILE_GET_INFO_MEMBER(sprcros2_state::get_sprcros2_bgtile_info) tile_number += (attr&0x07)<<8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (attr&0xf0)>>4, (attr&0x08)?TILE_FLIPX:0); @@ -117,8 +116,7 @@ TILE_GET_INFO_MEMBER(sprcros2_state::get_sprcros2_fgtile_info) tile_number += (attr&0x03)<<8; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile_number, color, 0); @@ -126,8 +124,8 @@ TILE_GET_INFO_MEMBER(sprcros2_state::get_sprcros2_fgtile_info) void sprcros2_state::video_start() { - m_bgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sprcros2_state::get_sprcros2_bgtile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sprcros2_state::get_sprcros2_fgtile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sprcros2_state::get_sprcros2_bgtile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sprcros2_state::get_sprcros2_fgtile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_palette->configure_tilemap_groups(*m_fgtilemap, *m_gfxdecode->gfx(2), 0); } diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c index 2d7a9706616..5537d32b056 100644 --- a/src/mame/video/sprint2.c +++ b/src/mame/video/sprint2.c @@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(sprint2_state::get_tile_info) { UINT8 code = m_video_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x3f, code >> 7, 0); + SET_TILE_INFO_MEMBER(0, code & 0x3f, code >> 7, 0); } @@ -43,7 +43,7 @@ void sprint2_state::video_start() { m_screen->register_screen_bitmap(m_helper); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sprint2_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sprint2_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); } diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c index c8e293db728..bdf08372a90 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -38,9 +38,9 @@ TILE_GET_INFO_MEMBER(sprint4_state::sprint4_tile_info) UINT8 code = videoram[tile_index]; if ((code & 0x30) == 0x30) - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & ~0x40, (code >> 6) ^ 3, 0); + SET_TILE_INFO_MEMBER(0, code & ~0x40, (code >> 6) ^ 3, 0); else - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 4, 0); + SET_TILE_INFO_MEMBER(0, code, 4, 0); } @@ -48,7 +48,7 @@ void sprint4_state::video_start() { m_screen->register_screen_bitmap(m_helper); - m_playfield = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sprint4_state::sprint4_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_playfield = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sprint4_state::sprint4_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c index 3c4ff9db92c..2deb778a7b9 100644 --- a/src/mame/video/sprint8.c +++ b/src/mame/video/sprint8.c @@ -81,7 +81,7 @@ TILE_GET_INFO_MEMBER(sprint8_state::get_tile_info1) } - SET_TILE_INFO_MEMBER(m_gfxdecode, code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0); + SET_TILE_INFO_MEMBER(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0); } @@ -96,7 +96,7 @@ TILE_GET_INFO_MEMBER(sprint8_state::get_tile_info2) else color = 17; - SET_TILE_INFO_MEMBER(m_gfxdecode, code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0); + SET_TILE_INFO_MEMBER(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0); } @@ -113,8 +113,8 @@ void sprint8_state::video_start() m_screen->register_screen_bitmap(m_helper1); m_screen->register_screen_bitmap(m_helper2); - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sprint8_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sprint8_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sprint8_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sprint8_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); m_tilemap1->set_scrolly(0, +24); m_tilemap2->set_scrolly(0, +24); diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index 9b11ca5a9ee..99015d8f678 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -19,8 +19,7 @@ TILE_GET_INFO_MEMBER(srumbler_state::get_fg_tile_info) { UINT8 attr = m_foregroundram[2*tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_foregroundram[2*tile_index + 1] + ((attr & 0x03) << 8), (attr & 0x3c) >> 2, (attr & 0x40) ? TILE_FORCE_LAYER0 : 0); @@ -29,8 +28,7 @@ TILE_GET_INFO_MEMBER(srumbler_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(srumbler_state::get_bg_tile_info) { UINT8 attr = m_backgroundram[2*tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_backgroundram[2*tile_index + 1] + ((attr & 0x07) << 8), (attr & 0xe0) >> 5, ((attr & 0x08) ? TILE_FLIPY : 0)); @@ -47,8 +45,8 @@ TILE_GET_INFO_MEMBER(srumbler_state::get_bg_tile_info) void srumbler_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(srumbler_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(srumbler_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS, 16,16,64,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(srumbler_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(srumbler_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS, 16,16,64,64); m_fg_tilemap->set_transparent_pen(3); diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index 18d780f1e16..5bc22c581bc 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -77,7 +77,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_tx_tile_info) int code = m_tx_tileram[tile_index] & 0x0fff; int colr = m_tx_tileram[tile_index] & 0xf000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3,code+0xc000 ,colr >> 12,0); + SET_TILE_INFO_MEMBER(3,code+0xc000 ,colr >> 12,0); } WRITE16_MEMBER(sslam_state::sslam_tx_tileram_w) @@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_md_tile_info) int code = m_md_tileram[tile_index] & 0x0fff; int colr = m_md_tileram[tile_index] & 0xf000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,code+0x2000 ,colr >> 12,0); + SET_TILE_INFO_MEMBER(2,code+0x2000 ,colr >> 12,0); } WRITE16_MEMBER(sslam_state::sslam_md_tileram_w) @@ -109,7 +109,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_bg_tile_info) int code = m_bg_tileram[tile_index] & 0x1fff; int colr = m_bg_tileram[tile_index] & 0xe000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,code ,colr >> 13,0); + SET_TILE_INFO_MEMBER(1,code ,colr >> 13,0); } WRITE16_MEMBER(sslam_state::sslam_bg_tileram_w) @@ -126,7 +126,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_powerbls_bg_tile_info) //(m_bg_tileram[tile_index*2] & 0x0f00) == 0xf000 ??? - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,code,colr,0); + SET_TILE_INFO_MEMBER(1,code,colr,0); } WRITE16_MEMBER(sslam_state::powerbls_bg_tileram_w) @@ -137,9 +137,9 @@ WRITE16_MEMBER(sslam_state::powerbls_bg_tileram_w) VIDEO_START_MEMBER(sslam_state,sslam) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_md_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_md_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_md_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_md_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_md_tilemap->set_transparent_pen(0); m_tx_tilemap->set_transparent_pen(0); @@ -150,7 +150,7 @@ VIDEO_START_MEMBER(sslam_state,sslam) VIDEO_START_MEMBER(sslam_state,powerbls) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sslam_state::get_powerbls_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_powerbls_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_sprites_x_offset = -21; save_item(NAME(m_sprites_x_offset)); diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index d818aa9ca8f..3e0b5277106 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -114,7 +114,7 @@ TILE_GET_INFO_MEMBER(ssozumo_state::get_bg_tile_info) int color = (m_colorram[tile_index] & 0x30) >> 4; int flags = ((tile_index % 32) >= 16) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } TILE_GET_INFO_MEMBER(ssozumo_state::get_fg_tile_info) @@ -122,15 +122,15 @@ TILE_GET_INFO_MEMBER(ssozumo_state::get_fg_tile_info) int code = m_videoram2[tile_index] + 256 * (m_colorram2[tile_index] & 0x07); int color = (m_colorram2[tile_index] & 0x30) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void ssozumo_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssozumo_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ssozumo_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssozumo_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ssozumo_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c index 9561f75da86..8c6e6e7ce8d 100644 --- a/src/mame/video/ssrj.c +++ b/src/mame/video/ssrj.c @@ -13,8 +13,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info1) { int code; code = m_vram1[tile_index<<1] + (m_vram1[(tile_index<<1)+1]<<8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code&0x3ff, (code>>12)&0x3, ((code & 0x8000) ? TILE_FLIPY:0) |( (code & 0x4000) ? TILE_FLIPX:0) ); @@ -32,8 +31,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info2) { int code; code = m_vram2[tile_index<<1] + (m_vram2[(tile_index<<1)+1]<<8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code&0x3ff, ((code>>12)&0x3)+4, ((code & 0x8000) ? TILE_FLIPY:0) |( (code & 0x4000) ? TILE_FLIPX:0) ); @@ -51,8 +49,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info4) { int code; code = m_vram4[tile_index<<1] + (m_vram4[(tile_index<<1)+1]<<8); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code&0x3ff, ((code>>12)&0x3)+12, ((code & 0x8000) ? TILE_FLIPY:0) |( (code & 0x4000) ? TILE_FLIPX:0) ); @@ -221,9 +218,9 @@ static const UINT8 fakecols[4*4][8][3]= void ssrj_state::video_start() { - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info1),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); - m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info2),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); - m_tilemap4 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info4),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info1),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info2),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_tilemap4 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info4),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_tilemap2->set_transparent_pen(0); m_tilemap4->set_transparent_pen(0); diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 3ca102c9bea..66643bf96e9 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -211,7 +211,7 @@ TILE_GET_INFO_MEMBER(ssv_state::get_tile_info_0) { UINT16 tile = m_gdfs_tmapram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tile, 0, TILE_FLIPXY( tile >> 14 )); + SET_TILE_INFO_MEMBER(2, tile, 0, TILE_FLIPXY( tile >> 14 )); } WRITE16_MEMBER(ssv_state::gdfs_tmapram_w) @@ -225,7 +225,7 @@ VIDEO_START_MEMBER(ssv_state,gdfs) ssv_state::video_start(); - m_gdfs_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssv_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16,16, 0x100,0x100); + m_gdfs_tmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ssv_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16,16, 0x100,0x100); m_gdfs_tmap->set_transparent_pen(0); } diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index 19f311a971c..37315fa5f76 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -48,8 +48,7 @@ TILE_GET_INFO_MEMBER(stadhero_state::get_pf1_tile_info) int color=tile >> 12; tile=tile&0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -57,7 +56,7 @@ TILE_GET_INFO_MEMBER(stadhero_state::get_pf1_tile_info) void stadhero_state::video_start() { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stadhero_state::get_pf1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stadhero_state::get_pf1_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); m_pf1_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index fdad6cb2400..9acc7ca0419 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(starshp1_state::get_tile_info) { UINT8 code = m_playfield_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x3f, 0, 0); + SET_TILE_INFO_MEMBER(0, code & 0x3f, 0, 0); } @@ -56,7 +56,7 @@ void starshp1_state::video_start() int i; - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(starshp1_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(starshp1_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c index 424bdcafa05..40f6933ed63 100644 --- a/src/mame/video/stfight.c +++ b/src/mame/video/stfight.c @@ -99,8 +99,7 @@ TILE_GET_INFO_MEMBER(stfight_state::get_fg_tile_info) attr = fgMap[0x8000+tile_index]; tile_base = ((attr & 0x80) << 2) | ((attr & 0x20) << 3); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile_base + fgMap[tile_index], attr & 0x07, 0); @@ -123,8 +122,7 @@ TILE_GET_INFO_MEMBER(stfight_state::get_bg_tile_info) tile_bank = (attr & 0x20) >> 5; tile_base = (attr & 0x80) << 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2+tile_bank, + SET_TILE_INFO_MEMBER(2+tile_bank, tile_base + bgMap[tile_index], attr & 0x07, 0); @@ -137,8 +135,7 @@ TILE_GET_INFO_MEMBER(stfight_state::get_tx_tile_info) tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_text_char_ram[tile_index] + ((attr & 0x80) << 1), attr & 0x0f, TILE_FLIPYX((attr & 0x60) >> 5)); @@ -152,8 +149,7 @@ TILE_GET_INFO_MEMBER(stfight_state::get_cshooter_tx_tile_info) tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (tile << 1) | ((attr & 0x20) >> 5), attr & 0x0f, /*TILE_FLIPYX((attr & 0x60) >> 5)*/0); @@ -168,9 +164,9 @@ TILE_GET_INFO_MEMBER(stfight_state::get_cshooter_tx_tile_info) VIDEO_START_MEMBER(stfight_state,stfight) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stfight_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(stfight_state::bg_scan),this),16,16,128,256); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stfight_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(stfight_state::fg_scan),this),16,16,128,256); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stfight_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stfight_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(stfight_state::bg_scan),this),16,16,128,256); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stfight_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(stfight_state::fg_scan),this),16,16,128,256); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stfight_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); m_fg_tilemap->set_transparent_pen(0x0f); m_palette->configure_tilemap_groups(*m_tx_tilemap, *m_gfxdecode->gfx(0), 0xcf); @@ -178,9 +174,9 @@ VIDEO_START_MEMBER(stfight_state,stfight) VIDEO_START_MEMBER(stfight_state,cshooter) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stfight_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(stfight_state::bg_scan),this),16,16,128,256); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stfight_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(stfight_state::fg_scan),this),16,16,128,256); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stfight_state::get_cshooter_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stfight_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(stfight_state::bg_scan),this),16,16,128,256); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stfight_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(stfight_state::fg_scan),this),16,16,128,256); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stfight_state::get_cshooter_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); m_fg_tilemap->set_transparent_pen(0x0f); m_palette->configure_tilemap_groups(*m_tx_tilemap, *m_gfxdecode->gfx(0), 0xcf); diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index 7b23bff63d0..f1315bafee5 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -12,7 +12,7 @@ TILE_GET_INFO_MEMBER(stlforce_state::get_stlforce_bg_tile_info) tileno = m_bg_videoram[tile_index] & 0x0fff; colour = m_bg_videoram[tile_index] & 0xe000; colour = colour >> 13; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour,0); + SET_TILE_INFO_MEMBER(0,tileno,colour,0); } WRITE16_MEMBER(stlforce_state::stlforce_bg_videoram_w) @@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(stlforce_state::get_stlforce_mlow_tile_info) colour += 8; tileno += 0x1000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour,0); + SET_TILE_INFO_MEMBER(0,tileno,colour,0); } WRITE16_MEMBER(stlforce_state::stlforce_mlow_videoram_w) @@ -54,7 +54,7 @@ TILE_GET_INFO_MEMBER(stlforce_state::get_stlforce_mhigh_tile_info) colour += 16; tileno += 0x2000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour,0); + SET_TILE_INFO_MEMBER(0,tileno,colour,0); } WRITE16_MEMBER(stlforce_state::stlforce_mhigh_videoram_w) @@ -76,7 +76,7 @@ TILE_GET_INFO_MEMBER(stlforce_state::get_stlforce_tx_tile_info) tileno += 0xc000; colour += 24; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno,colour,0); + SET_TILE_INFO_MEMBER(1,tileno,colour,0); } WRITE16_MEMBER(stlforce_state::stlforce_tx_videoram_w) @@ -172,10 +172,10 @@ UINT32 stlforce_state::screen_update_stlforce(screen_device &screen, bitmap_ind1 void stlforce_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_bg_tile_info),this), TILEMAP_SCAN_COLS, 16,16,64,16); - m_mlow_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_mlow_tile_info),this), TILEMAP_SCAN_COLS, 16,16,64,16); - m_mhigh_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_mhigh_tile_info),this),TILEMAP_SCAN_COLS, 16,16,64,16); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_bg_tile_info),this), TILEMAP_SCAN_COLS, 16,16,64,16); + m_mlow_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_mlow_tile_info),this), TILEMAP_SCAN_COLS, 16,16,64,16); + m_mhigh_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_mhigh_tile_info),this),TILEMAP_SCAN_COLS, 16,16,64,16); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,64,32); m_mlow_tilemap->set_transparent_pen(0); m_mhigh_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index 65e3cab2c2f..f356e47f657 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -64,12 +64,12 @@ TILE_GET_INFO_MEMBER(strnskil_state::get_bg_tile_info) int code = videoram[(tile_index * 2) + 1] + ((attr & 0x60) << 3); int color = (attr & 0x1f) | ((attr & 0x80) >> 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void strnskil_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(strnskil_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(strnskil_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index 84fa933863a..b75f7860ab7 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -90,8 +90,7 @@ TILE_GET_INFO_MEMBER(suna8_state::get_tile_info) code = m_spriteram[ 2 * tile_index + 0 ]; attr = m_spriteram[ 2 * tile_index + 1 ]; } - SET_TILE_INFO_MEMBER(m_gfxdecode, - m_page / 8, + SET_TILE_INFO_MEMBER(m_page / 8, ( (attr & 0x03) << 8 ) + code + m_tiles*0x400, (attr >> 2) & 0xf, TILE_FLIPYX( (attr >> 6) & 3 )); @@ -196,7 +195,7 @@ void suna8_state::suna8_vh_start_common(int text_dim, GFXBANK_TYPE_T gfxbank_typ } #if TILEMAPS - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suna8_state::get_tile_info),this), TILEMAP_SCAN_COLS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suna8_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 0x20*(m_text_dim ? 4 : 16), 0x20); diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index 11ffb866385..1002e6c4770 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(superqix_state::pb_get_bg_tile_info) int attr = m_videoram[tile_index + 0x400]; int code = m_videoram[tile_index] + 256 * (attr & 0x7); int color = (attr & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(superqix_state::sqix_get_bg_tile_info) @@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(superqix_state::sqix_get_bg_tile_info) if (bank) code += 1024 * m_gfxbank; - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, 0); + SET_TILE_INFO_MEMBER(bank, code, color, 0); tileinfo.group = (attr & 0x08) >> 3; } @@ -49,14 +49,14 @@ TILE_GET_INFO_MEMBER(superqix_state::sqix_get_bg_tile_info) VIDEO_START_MEMBER(superqix_state,pbillian) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(superqix_state::pb_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(superqix_state::pb_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); } VIDEO_START_MEMBER(superqix_state,superqix) { m_fg_bitmap[0] = auto_bitmap_ind16_alloc(machine(), 256, 256); m_fg_bitmap[1] = auto_bitmap_ind16_alloc(machine(), 256, 256); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(superqix_state::sqix_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(superqix_state::sqix_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transmask(0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ m_bg_tilemap->set_transmask(1,0x0001,0xfffe); /* split type 1 has pen 0 transparent in front half */ diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c index acf2f78b119..815a45b25a7 100644 --- a/src/mame/video/suprloco.c +++ b/src/mame/video/suprloco.c @@ -78,8 +78,7 @@ PALETTE_INIT_MEMBER(suprloco_state, suprloco) TILE_GET_INFO_MEMBER(suprloco_state::get_tile_info) { UINT8 attr = m_videoram[2*tile_index+1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[2*tile_index] | ((attr & 0x03) << 8), (attr & 0x1c) >> 2, 0); @@ -96,7 +95,7 @@ TILE_GET_INFO_MEMBER(suprloco_state::get_tile_info) void suprloco_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprloco_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprloco_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index 534e9c6b160..45366931c79 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -280,8 +280,7 @@ TILE_GET_INFO_MEMBER(skns_state::get_tilemap_A_tile_info) if(m_tilemapA_ram[tile_index] & 0x80000000) flags |= TILE_FLIPX; if(m_tilemapA_ram[tile_index] & 0x40000000) flags |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0+depth, + SET_TILE_INFO_MEMBER(0+depth, code, 0x40+colr, flags); @@ -307,8 +306,7 @@ TILE_GET_INFO_MEMBER(skns_state::get_tilemap_B_tile_info) if(m_tilemapB_ram[tile_index] & 0x80000000) flags |= TILE_FLIPX; if(m_tilemapB_ram[tile_index] & 0x40000000) flags |= TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1+depth, + SET_TILE_INFO_MEMBER(1+depth, code, 0x40+colr, flags); @@ -347,10 +345,10 @@ void skns_state::video_start() { m_spritegen = machine().device("spritegen"); - m_tilemap_A = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skns_state::get_tilemap_A_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64, 64); + m_tilemap_A = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skns_state::get_tilemap_A_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64, 64); m_tilemap_A->set_transparent_pen(0); - m_tilemap_B = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skns_state::get_tilemap_B_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64, 64); + m_tilemap_B = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skns_state::get_tilemap_B_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64, 64); m_tilemap_B->set_transparent_pen(0); m_sprite_bitmap.allocate(1024,1024); diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c index 86e5cd54e2e..54ff6277a14 100644 --- a/src/mame/video/suprridr.c +++ b/src/mame/video/suprridr.c @@ -19,14 +19,14 @@ TILE_GET_INFO_MEMBER(suprridr_state::get_tile_info) { UINT8 code = m_bgram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } TILE_GET_INFO_MEMBER(suprridr_state::get_tile_info2) { UINT8 code = m_fgram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, 0, 0); + SET_TILE_INFO_MEMBER(1, code, 0, 0); } @@ -39,9 +39,9 @@ TILE_GET_INFO_MEMBER(suprridr_state::get_tile_info2) void suprridr_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprridr_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprridr_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); - m_bg_tilemap_noscroll = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprridr_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprridr_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprridr_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_tilemap_noscroll = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprridr_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); m_fg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c index d68f0b19b56..dd705d5e35f 100644 --- a/src/mame/video/suprslam.c +++ b/src/mame/video/suprslam.c @@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(suprslam_state::get_suprslam_tile_info) tileno += m_screen_bank; colour = colour >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour, 0); + SET_TILE_INFO_MEMBER(0, tileno, colour, 0); } @@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(suprslam_state::get_suprslam_bg_tile_info) tileno += m_bg_bank; colour = colour >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, tileno, colour, 0); + SET_TILE_INFO_MEMBER(2, tileno, colour, 0); } @@ -55,8 +55,8 @@ UINT32 suprslam_state::suprslam_tile_callback( UINT32 code ) void suprslam_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprslam_state::get_suprslam_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_screen_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprslam_state::get_suprslam_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprslam_state::get_suprslam_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_screen_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprslam_state::get_suprslam_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_screen_tilemap->set_transparent_pen(15); } diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c index 80a9320b537..94be976d79b 100644 --- a/src/mame/video/system1.c +++ b/src/mame/video/system1.c @@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(system1_state::tile_get_info) UINT32 code = ((tiledata >> 4) & 0x800) | (tiledata & 0x7ff); UINT32 color = (tiledata >> 5) & 0xff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } @@ -129,7 +129,7 @@ void system1_state::video_start_common(int pagecount) /* create the tilemap pages */ for (pagenum = 0; pagenum < pagecount; pagenum++) { - m_tilemap_page[pagenum] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(system1_state::tile_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_tilemap_page[pagenum] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(system1_state::tile_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); m_tilemap_page[pagenum]->set_transparent_pen(0); m_tilemap_page[pagenum]->set_user_data(m_videoram + 0x800 * pagenum); } diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index 8305374727f..413ca857417 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -238,8 +238,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_bg_tile_info) int data = source[tile_index%(64*32)]; int tile_number = (data & 0xfff) + 0x1000 * ((data & m_tilebank_switch) ? m_tile_bank1 : m_tile_bank0); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (data >> 6) & 0x7f, 0); @@ -251,8 +250,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_fg_tile_info) int data = source[tile_index % (64 * 32)]; int tile_number = (data & 0xfff) + 0x1000 * ((data & m_tilebank_switch) ? m_tile_bank1 : m_tile_bank0); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (data >> 6) & 0x7f, 0); @@ -264,8 +262,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_bg2_tile_info) int data = source[tile_index % (64 * 32)]; int tile_number = (data & 0xfff) + 0x1000 * ((data & 0x1000) ? m_tile_bank1 : m_tile_bank0); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (data >> 6) & 0x7f, 0); @@ -277,8 +274,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_fg2_tile_info) int data = source[tile_index % (64 * 32)]; int tile_number = (data & 0xfff) + 0x1000 * ((data & 0x1000) ? m_tile_bank1 : m_tile_bank0); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (data >> 6) & 0x7f, 0); @@ -330,16 +326,14 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_text_tile_info) if (!m_shinobl_kludge) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (tile_number & 0x1ff) + m_tile_bank0 * 0x1000, (tile_number >> 9) % 8, 0); } else { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (tile_number & 0xff) + m_tile_bank0 * 0x1000, (tile_number >> 8) % 8, 0); @@ -376,19 +370,19 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,system16) ); if (!m_bg1_trans) - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), 8,8, 64*2,32*2 ); else - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), 8,8, 64*2,32*2 ); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), 8,8, 64*2,32*2 ); - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_text_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_text_map),this), + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_text_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_text_map),this), 8,8, 40,28 ); @@ -429,11 +423,11 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,system18old) m_bg1_trans = 1; - m_background2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), + m_background2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), 8,8, 64*2,32*2 ); - m_foreground2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_fg2_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), + m_foreground2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_fg2_tile_info),this), tilemap_mapper_delegate(FUNC(segas1x_bootleg_state::sys16_bg_map),this), 8,8, 64*2,32*2 ); @@ -485,8 +479,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_s16a_bootleg_tile_infotxt) data = m_textram[tile_index]; tile_number = data & 0x1ff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, ((data >> 9) & 0x7), 0); @@ -500,8 +493,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_s16a_bootleg_tile_info0) tile_number = data & 0x1fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (data >> 6) & 0x7f, 0); @@ -514,8 +506,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_s16a_bootleg_tile_info1) data = m_bg1_tileram[tile_index]; tile_number = data & 0x1fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, (data >> 6) & 0x7f, 0); @@ -566,11 +557,11 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg) - m_text_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_s16a_bootleg_tile_infotxt),this), TILEMAP_SCAN_ROWS, 8,8, 64,32 ); + m_text_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_s16a_bootleg_tile_infotxt),this), TILEMAP_SCAN_ROWS, 8,8, 64,32 ); // the system16a bootlegs have simple tilemaps instead of the paged system - m_bg_tilemaps[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_s16a_bootleg_tile_info0),this), TILEMAP_SCAN_ROWS, 8,8, 64,32 ); - m_bg_tilemaps[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_s16a_bootleg_tile_info1),this), TILEMAP_SCAN_ROWS, 8,8, 64,32 ); + m_bg_tilemaps[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_s16a_bootleg_tile_info0),this), TILEMAP_SCAN_ROWS, 8,8, 64,32 ); + m_bg_tilemaps[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(segas1x_bootleg_state::get_s16a_bootleg_tile_info1),this), TILEMAP_SCAN_ROWS, 8,8, 64,32 ); m_text_tilemap->set_transparent_pen(0); m_bg_tilemaps[0]->set_transparent_pen(0); diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index f6814ae0596..01b3bd4727a 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -131,12 +131,12 @@ TILE_GET_INFO_MEMBER(tagteam_state::get_bg_tile_info) int code = m_videoram[tile_index] + 256 * m_colorram[tile_index]; int color = m_palettebank << 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void tagteam_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tagteam_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tagteam_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32); } diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index 9843e13114c..c0c1b60e7e3 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -13,8 +13,7 @@ TILE_GET_INFO_MEMBER(tail2nos_state::get_tile_info) { UINT16 code = m_bgvideoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x1fff) + (m_charbank << 13), ((code & 0xe000) >> 13) + m_charpalette * 16, 0); @@ -53,7 +52,7 @@ void tail2nos_state::tail2nos_postload() void tail2nos_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tail2nos_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tail2nos_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index de62e09282c..dff60cefabe 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -411,8 +411,7 @@ inline void taito_f3_state::get_tile_info(tile_data &tileinfo, int tile_index, U // This fixes (at least) the rain in round 6 of Arabian Magic. UINT8 extra_planes = ((tile>>(16+10)) & 3); // 0 = 4bpp, 1 = 5bpp, 2 = unused?, 3 = 6bpp - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile&0xffff, (tile>>16) & 0x1ff & (~extra_planes), TILE_FLIPYX( tile >> 30 )); @@ -471,8 +470,7 @@ TILE_GET_INFO_MEMBER(taito_f3_state::get_tile_info_vram) if (vram_tile&0x0100) flags|=TILE_FLIPX; if (vram_tile&0x8000) flags|=TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, vram_tile&0xff, (vram_tile>>9)&0x3f, flags); @@ -496,8 +494,7 @@ TILE_GET_INFO_MEMBER(taito_f3_state::get_tile_info_pixel) if (vram_tile&0x0100) flags|=TILE_FLIPX; if (vram_tile&0x8000) flags|=TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, tile_index, (vram_tile>>9)&0x3f, flags); @@ -576,10 +573,10 @@ VIDEO_START_MEMBER(taito_f3_state,f3) m_spriteram = auto_alloc_array_clear(machine(), UINT16, 0x10000/2); if (m_f3_game_config->extend) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_pf3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info3),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_pf4_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info4),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pf3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info3),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pf4_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info4),this),TILEMAP_SCAN_ROWS,16,16,64,32); m_f3_pf_data_1=m_f3_pf_data+(0x0000/2); m_f3_pf_data_2=m_f3_pf_data+(0x2000/2); @@ -597,14 +594,14 @@ VIDEO_START_MEMBER(taito_f3_state,f3) } else { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_pf3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info3),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_pf4_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info4),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_pf5_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info5),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_pf6_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info6),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_pf7_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info7),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_pf8_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info8),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info1),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pf3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info3),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pf4_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info4),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pf5_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info5),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pf6_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info6),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pf7_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info7),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pf8_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info8),this),TILEMAP_SCAN_ROWS,16,16,32,32); m_f3_pf_data_1=m_f3_pf_data+(0x0000/2); m_f3_pf_data_2=m_f3_pf_data+(0x1000/2); @@ -632,8 +629,8 @@ VIDEO_START_MEMBER(taito_f3_state,f3) m_spriteram16_buffered = auto_alloc_array(machine(), UINT16, 0x10000/2); m_spritelist = auto_alloc_array(machine(), struct tempsprite, 0x400); m_sprite_end = m_spritelist; - m_vram_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info_vram),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_pixel_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info_pixel),this),TILEMAP_SCAN_COLS,8,8,64,32); + m_vram_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info_vram),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_pixel_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taito_f3_state::get_tile_info_pixel),this),TILEMAP_SCAN_COLS,8,8,64,32); m_pf_line_inf = auto_alloc_array(machine(), struct f3_playfield_line_inf, 5); m_sa_line_inf = auto_alloc_array(machine(), struct f3_spritealpha_line_inf, 1); m_screen->register_screen_bitmap(m_pri_alp_bitmap); diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index 42b3881a451..0570bddaebf 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -15,8 +15,7 @@ TILE_GET_INFO_MEMBER(taitol_state::get_bg18_tile_info) | ((m_bankc[(attr & 0xc) >> 2]) << 10) | (m_horshoes_gfxbank << 12); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr & 0xf0) >> 4, 0); @@ -30,8 +29,7 @@ TILE_GET_INFO_MEMBER(taitol_state::get_bg19_tile_info) | ((m_bankc[(attr & 0xc) >> 2]) << 10) | (m_horshoes_gfxbank << 12); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, (attr & 0xf0) >> 4, 0); @@ -42,8 +40,7 @@ TILE_GET_INFO_MEMBER(taitol_state::get_ch1a_tile_info) int attr = m_rambanks[2 * tile_index + 0xa000 + 1]; int code = m_rambanks[2 * tile_index + 0xa000] | ((attr & 0x01) << 8) | ((attr & 0x04) << 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code, (attr & 0xf0) >> 4, 0); @@ -61,9 +58,9 @@ VIDEO_START_MEMBER(taitol_state,taitol) { int i; - m_bg18_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taitol_state::get_bg18_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg19_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taitol_state::get_bg19_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_ch1a_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taitol_state::get_ch1a_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg18_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taitol_state::get_bg18_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg19_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taitol_state::get_bg19_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_ch1a_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taitol_state::get_ch1a_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg18_tilemap->set_transparent_pen(0); m_ch1a_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index e70b66140e8..f0b60b3599f 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(taitojc_state::taitojc_tile_info) UINT32 val = m_tile_ram[tile_index]; int color = (val >> 22) & 0xff; int tile = (val >> 2) & 0x7f; - SET_TILE_INFO_MEMBER(m_gfxdecode, m_gfx_index, tile, color, 0); + SET_TILE_INFO_MEMBER(m_gfx_index, tile, color, 0); } READ32_MEMBER(taitojc_state::taitojc_palette_r) @@ -307,7 +307,7 @@ void taitojc_state::video_start() assert(m_gfx_index != MAX_GFX_ELEMENTS); - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taitojc_state::taitojc_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taitojc_state::taitojc_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c index bb7861b1d78..8027dbe1ef5 100644 --- a/src/mame/video/tank8.c +++ b/src/mame/video/tank8.c @@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(tank8_state::tank8_get_tile_info) color |= 4; } - SET_TILE_INFO_MEMBER(m_gfxdecode, code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0); + SET_TILE_INFO_MEMBER(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0); } @@ -102,7 +102,7 @@ void tank8_state::video_start() m_screen->register_screen_bitmap(m_helper2); m_screen->register_screen_bitmap(m_helper3); - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tank8_state::tank8_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tank8_state::tank8_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); /* VBLANK starts on scanline #256 and ends on scanline #24 */ diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c index 3a6a91c740f..7383dbc5959 100644 --- a/src/mame/video/tankbatt.c +++ b/src/mame/video/tankbatt.c @@ -69,12 +69,12 @@ TILE_GET_INFO_MEMBER(tankbatt_state::get_bg_tile_info) int code = videoram[tile_index]; int color = videoram[tile_index] | 0x01; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void tankbatt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tankbatt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tankbatt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void tankbatt_state::draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 5a782b2ad5e..1b0e3d54b2e 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(tankbust_state::get_bg_tile_info) /* priority bg/sprites (1 = this bg tile on top of sprites) */ tileinfo.category = (attr & 0x08) >> 3; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, + SET_TILE_INFO_MEMBER(1, code, (color&4) | ((color&2)>>1) | ((color&1)<<1), 0); @@ -61,7 +61,7 @@ TILE_GET_INFO_MEMBER(tankbust_state::get_txt_tile_info) int code = m_txtram[tile_index]; int color = ((code>>6) & 0x03); - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, + SET_TILE_INFO_MEMBER(2, code & 0x3f, ((color&2)>>1) | ((color&1)<<1), 0); @@ -77,10 +77,10 @@ TILE_GET_INFO_MEMBER(tankbust_state::get_txt_tile_info) void tankbust_state::video_start() { /* not scrollable */ - m_txt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tankbust_state::get_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_txt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tankbust_state::get_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); /* scrollable */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tankbust_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tankbust_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_txt_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c index 9c278e87c09..38753c270ff 100644 --- a/src/mame/video/taotaido.c +++ b/src/mame/video/taotaido.c @@ -66,8 +66,7 @@ TILE_GET_INFO_MEMBER(taotaido_state::taotaido_bg_tile_info) code |= m_video_bank_select[bank]*0x200; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, col, 0); @@ -97,7 +96,7 @@ UINT32 taotaido_state::taotaido_tile_callback( UINT32 code ) void taotaido_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(taotaido_state::taotaido_bg_tile_info),this),tilemap_mapper_delegate(FUNC(taotaido_state::taotaido_tilemap_scan_rows),this),16,16,128,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(taotaido_state::taotaido_bg_tile_info),this),tilemap_mapper_delegate(FUNC(taotaido_state::taotaido_tilemap_scan_rows),this),16,16,128,64); m_spriteram_old = auto_alloc_array(machine(), UINT16, 0x2000/2); m_spriteram_older = auto_alloc_array(machine(), UINT16, 0x2000/2); diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c index e5214389467..1c7b8d10e48 100644 --- a/src/mame/video/targeth.c +++ b/src/mame/video/targeth.c @@ -38,7 +38,7 @@ TILE_GET_INFO_MEMBER(targeth_state::get_tile_info_targeth_screen0) int data2 = m_videoram[(tile_index << 1) + 1]; int code = data & 0x3fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, data2 & 0x1f, TILE_FLIPXY((data2 >> 5) & 0x03)); + SET_TILE_INFO_MEMBER(0, code, data2 & 0x1f, TILE_FLIPXY((data2 >> 5) & 0x03)); } TILE_GET_INFO_MEMBER(targeth_state::get_tile_info_targeth_screen1) @@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(targeth_state::get_tile_info_targeth_screen1) int data2 = m_videoram[(0x2000/2) + (tile_index << 1) + 1]; int code = data & 0x3fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, data2 & 0x1f, TILE_FLIPXY((data2 >> 5) & 0x03)); + SET_TILE_INFO_MEMBER(0, code, data2 & 0x1f, TILE_FLIPXY((data2 >> 5) & 0x03)); } /*************************************************************************** @@ -71,8 +71,8 @@ WRITE16_MEMBER(targeth_state::targeth_vram_w) void targeth_state::video_start() { - m_pant[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(targeth_state::get_tile_info_targeth_screen0),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_pant[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(targeth_state::get_tile_info_targeth_screen1),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pant[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(targeth_state::get_tile_info_targeth_screen0),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pant[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(targeth_state::get_tile_info_targeth_screen1),this),TILEMAP_SCAN_ROWS,16,16,64,32); m_pant[0]->set_transparent_pen(0); } diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index 8e92f02113f..7e079e7ff24 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -163,8 +163,7 @@ TILE_GET_INFO_MEMBER(tatsumi_state::get_text_tile_info) { UINT16 *videoram = m_videoram; int tile = videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile & 0xfff, tile >> 12, 0); @@ -174,21 +173,21 @@ TILE_GET_INFO_MEMBER(tatsumi_state::get_tile_info_bigfight_0) { int tile=m_cyclwarr_videoram0[(tile_index+0x400)%0x8000]; int bank = (m_bigfight_a40000[0] >> (((tile&0xc00)>>10)*4))&0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,(tile&0x3ff)+(bank<<10),(tile>>12)&0xf,0); + SET_TILE_INFO_MEMBER(1,(tile&0x3ff)+(bank<<10),(tile>>12)&0xf,0); } TILE_GET_INFO_MEMBER(tatsumi_state::get_tile_info_bigfight_1) { int tile=m_cyclwarr_videoram1[(tile_index+0x400)%0x8000]; int bank = (m_bigfight_a40000[0] >> (((tile&0xc00)>>10)*4))&0xf; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,(tile&0x3ff)+(bank<<10),(tile>>12)&0xf,0); + SET_TILE_INFO_MEMBER(1,(tile&0x3ff)+(bank<<10),(tile>>12)&0xf,0); } /********************************************************************/ VIDEO_START_MEMBER(tatsumi_state,apache3) { - m_tx_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_tx_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_shadow_pen_array = auto_alloc_array_clear(machine(), UINT8, 8192); m_temp_bitmap.allocate(512, 512); m_apache3_road_x_ram = auto_alloc_array(machine(), UINT8, 512); @@ -198,7 +197,7 @@ VIDEO_START_MEMBER(tatsumi_state,apache3) VIDEO_START_MEMBER(tatsumi_state,roundup5) { - m_tx_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); + m_tx_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_shadow_pen_array = auto_alloc_array_clear(machine(), UINT8, 8192); m_roundup5_vram = auto_alloc_array(machine(), UINT16, (0x48000 * 4)/2); @@ -209,21 +208,21 @@ VIDEO_START_MEMBER(tatsumi_state,roundup5) VIDEO_START_MEMBER(tatsumi_state,cyclwarr) { - m_layer0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,64,512); - //m_layer1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,64,512); - m_layer1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,128,256); - m_layer2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_1),this),TILEMAP_SCAN_ROWS,8,8,64,512); - m_layer3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_1),this),TILEMAP_SCAN_ROWS,8,8,64,512); + m_layer0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,64,512); + //m_layer1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,64,512); + m_layer1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,128,256); + m_layer2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_1),this),TILEMAP_SCAN_ROWS,8,8,64,512); + m_layer3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_1),this),TILEMAP_SCAN_ROWS,8,8,64,512); m_shadow_pen_array = auto_alloc_array_clear(machine(), UINT8, 8192); } VIDEO_START_MEMBER(tatsumi_state,bigfight) { - m_layer0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,128,256); - m_layer1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,128,256); - m_layer2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_1),this),TILEMAP_SCAN_ROWS,8,8,128,256); - m_layer3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_1),this),TILEMAP_SCAN_ROWS,8,8,128,256); + m_layer0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,128,256); + m_layer1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_0),this),TILEMAP_SCAN_ROWS,8,8,128,256); + m_layer2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_1),this),TILEMAP_SCAN_ROWS,8,8,128,256); + m_layer3 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_tile_info_bigfight_1),this),TILEMAP_SCAN_ROWS,8,8,128,256); m_shadow_pen_array = auto_alloc_array_clear(machine(), UINT8, 8192); } diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index 2036875fa5d..ac9ab2a7fad 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -16,7 +16,7 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_tx_tile_info) tileno = m_txvideoram[tile_index] | ((m_txvideoram[tile_index+0x800] & 0x07) << 8); col = (m_txvideoram[tile_index+0x800] & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,col,0); + SET_TILE_INFO_MEMBER(0,tileno,col,0); } WRITE8_MEMBER(tbowl_state::tbowl_txvideoram_w) @@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_bg_tile_info) tileno = m_bgvideoram[tile_index] | ((m_bgvideoram[tile_index+0x1000] & 0x0f) << 8); col = (m_bgvideoram[tile_index+0x1000] & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,tileno,col,0); + SET_TILE_INFO_MEMBER(1,tileno,col,0); } WRITE8_MEMBER(tbowl_state::tbowl_bg2videoram_w) @@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_bg2_tile_info) tileno ^= 0x400; col = (m_bg2videoram[tile_index+0x1000] & 0xf0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2,tileno,col,0); + SET_TILE_INFO_MEMBER(2,tileno,col,0); } WRITE8_MEMBER(tbowl_state::tbowl_bgvideoram_w) @@ -109,9 +109,9 @@ WRITE8_MEMBER(tbowl_state::tbowl_bg2yscroll_hi) void tbowl_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tbowl_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tbowl_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,128,32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tbowl_state::get_bg2_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,128,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tbowl_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tbowl_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,128,32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tbowl_state::get_bg2_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,128,32); m_tx_tilemap->set_transparent_pen(0); m_bg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/tc0080vco.c b/src/mame/video/tc0080vco.c index d3d51f00919..5c74cb41b17 100644 --- a/src/mame/video/tc0080vco.c +++ b/src/mame/video/tc0080vco.c @@ -149,8 +149,8 @@ void tc0080vco_device::device_start() 16*8 }; - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0080vco_device::get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0080vco_device::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0080vco_device::get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0080vco_device::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_tilemap[0]->set_transparent_pen(0); m_tilemap[1]->set_transparent_pen(0); @@ -164,7 +164,7 @@ void tc0080vco_device::device_start() m_tilemap[0]->set_scroll_rows(512); /* Perform extra initialisations for text layer */ - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0080vco_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0080vco_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[2]->set_scrolldx(0, 0); m_tilemap[2]->set_scrolldy(48, -448); @@ -228,8 +228,7 @@ TILE_GET_INFO_MEMBER(tc0080vco_device::get_bg0_tile_info) tileinfo.category = 0; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_gfxnum, + SET_TILE_INFO_MEMBER(m_gfxnum, tile, color, TILE_FLIPYX((m_bg0_ram_1[tile_index] & 0x00c0) >> 6)); @@ -244,8 +243,7 @@ TILE_GET_INFO_MEMBER(tc0080vco_device::get_bg1_tile_info) tileinfo.category = 0; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_gfxnum, + SET_TILE_INFO_MEMBER(m_gfxnum, tile, color, TILE_FLIPYX((m_bg1_ram_1[tile_index] & 0x00c0) >> 6)); @@ -272,8 +270,7 @@ TILE_GET_INFO_MEMBER(tc0080vco_device::get_tx_tile_info) tileinfo.category = 0; } - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_txnum, + SET_TILE_INFO_MEMBER(m_txnum, tile, 0x40, 0); /* 0x20<<1 as 3bpp */ diff --git a/src/mame/video/tc0100scn.c b/src/mame/video/tc0100scn.c index cd3a89aebea..d6db084818d 100644 --- a/src/mame/video/tc0100scn.c +++ b/src/mame/video/tc0100scn.c @@ -200,14 +200,14 @@ void tc0100scn_device::device_start() we're safe as it uses single width tilemaps. */ /* Single width versions */ - m_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0100scn_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0100scn_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap[2][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0100scn_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0100scn_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0100scn_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[2][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0100scn_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); /* Double width versions */ - m_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0100scn_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); - m_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0100scn_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); - m_tilemap[2][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0100scn_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); + m_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0100scn_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0100scn_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 64); + m_tilemap[2][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0100scn_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); m_tilemap[0][0]->set_transparent_pen(0); m_tilemap[1][0]->set_transparent_pen(0); @@ -318,8 +318,7 @@ void tc0100scn_device::common_get_bg0_tile_info( tile_data &tileinfo, int tile_i attr = ram[2 * tile_index]; } - SET_TILE_INFO_MEMBER(*m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, code, (((attr * m_bg_col_mult) + m_bg0_colbank) & 0xff) + colbank, TILE_FLIPYX((attr & 0xc000) >> 14)); @@ -341,8 +340,7 @@ void tc0100scn_device::common_get_bg1_tile_info( tile_data &tileinfo, int tile_i attr = ram[2 * tile_index]; } - SET_TILE_INFO_MEMBER(*m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, code, (((attr * m_bg_col_mult) + m_bg1_colbank) & 0xff) + colbank, TILE_FLIPYX((attr & 0xc000) >> 14)); @@ -352,8 +350,7 @@ void tc0100scn_device::common_get_tx_tile_info( tile_data &tileinfo, int tile_in { int attr = ram[tile_index]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, attr & 0xff, ((((attr >> 6) & 0xfc) * m_tx_col_mult + (m_tx_colbank << 2)) & 0x3ff) + colbank * 4, TILE_FLIPYX((attr & 0xc000) >> 14)); diff --git a/src/mame/video/tc0180vcu.c b/src/mame/video/tc0180vcu.c index e6e22b9f0d2..2b69cee162f 100644 --- a/src/mame/video/tc0180vcu.c +++ b/src/mame/video/tc0180vcu.c @@ -59,9 +59,9 @@ void tc0180vcu_device::device_config_complete() void tc0180vcu_device::device_start() { - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0180vcu_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0180vcu_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0180vcu_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0180vcu_device::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0180vcu_device::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0180vcu_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tilemap[1]->set_transparent_pen(0); m_tilemap[2]->set_transparent_pen(0); @@ -231,9 +231,7 @@ TILE_GET_INFO_MEMBER(tc0180vcu_device::get_bg_tile_info) int tile = m_ram[tile_index + m_bg_rambank[0]]; int color = m_ram[tile_index + m_bg_rambank[1]]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - 1, - tile, + SET_TILE_INFO_MEMBER(1, tile, m_bg_color_base + (color & 0x3f), TILE_FLIPYX((color & 0x00c0) >> 6)); } @@ -243,9 +241,7 @@ TILE_GET_INFO_MEMBER(tc0180vcu_device::get_fg_tile_info) int tile = m_ram[tile_index + m_fg_rambank[0]]; int color = m_ram[tile_index + m_fg_rambank[1]]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - 1, - tile, + SET_TILE_INFO_MEMBER(1, tile, m_fg_color_base + (color & 0x3f), TILE_FLIPYX((color & 0x00c0) >> 6)); } @@ -254,8 +250,7 @@ TILE_GET_INFO_MEMBER(tc0180vcu_device::get_tx_tile_info) { int tile = m_ram[tile_index + m_tx_rambank]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (tile & 0x07ff) | ((m_ctrl[4 + ((tile & 0x800) >> 11)]>>8) << 11), m_tx_color_base + ((tile >> 12) & 0x0f), 0); diff --git a/src/mame/video/tc0280grd.c b/src/mame/video/tc0280grd.c index 98b6f633a6c..a4c888c87bd 100644 --- a/src/mame/video/tc0280grd.c +++ b/src/mame/video/tc0280grd.c @@ -71,7 +71,7 @@ void tc0280grd_device::device_config_complete() void tc0280grd_device::device_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0280grd_device::tc0280grd_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0280grd_device::tc0280grd_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap->set_transparent_pen(0); m_ram = auto_alloc_array_clear(machine(), UINT16, TC0280GRD_RAM_SIZE / 2); @@ -99,8 +99,7 @@ void tc0280grd_device::device_reset() TILE_GET_INFO_MEMBER(tc0280grd_device::tc0280grd_get_tile_info) { int attr = m_ram[tile_index]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - m_gfxnum, + SET_TILE_INFO_MEMBER(m_gfxnum, attr & 0x3fff, ((attr & 0xc000) >> 14) + m_base_color, 0); diff --git a/src/mame/video/tc0480scp.c b/src/mame/video/tc0480scp.c index 08656836420..ac945d7f25d 100644 --- a/src/mame/video/tc0480scp.c +++ b/src/mame/video/tc0480scp.c @@ -211,18 +211,18 @@ void tc0480scp_device::device_start() /* Single width versions */ - m_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tilemap[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tilemap[2][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tilemap[3][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); - m_tilemap[4][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap[2][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap[3][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); + m_tilemap[4][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); /* Double width versions */ - m_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_tilemap[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_tilemap[2][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_tilemap[3][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); - m_tilemap[4][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tc0480scp_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tilemap[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tilemap[2][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tilemap[3][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); + m_tilemap[4][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0480scp_device::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); for (i = 0; i < 2; i++) { @@ -314,8 +314,7 @@ void tc0480scp_device::common_get_tc0480bg_tile_info( tile_data &tileinfo, int t { int code = ram[2 * tile_index + 1] & 0x7fff; int attr = ram[2 * tile_index]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, code, (attr & 0xff) + m_col_base, TILE_FLIPYX((attr & 0xc000) >> 14)); @@ -324,8 +323,7 @@ void tc0480scp_device::common_get_tc0480bg_tile_info( tile_data &tileinfo, int t void tc0480scp_device::common_get_tc0480tx_tile_info( tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum ) { int attr = ram[tile_index]; - SET_TILE_INFO_MEMBER(*m_gfxdecode, - gfxnum, + SET_TILE_INFO_MEMBER(gfxnum, attr & 0xff, ((attr & 0x3f00) >> 8) + m_col_base, TILE_FLIPYX((attr & 0xc000) >> 14)); diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index a8f2bb33e72..41a5977f6f5 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -108,7 +108,7 @@ TILE_GET_INFO_MEMBER(tceptor_state::get_tx_tile_info) tileinfo.group = color; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void tceptor_state::tile_mark_dirty(int offset) @@ -165,7 +165,7 @@ TILE_GET_INFO_MEMBER(tceptor_state::get_bg1_tile_info) int code = (data & 0x3ff) | 0x000; int color = (data & 0xfc00) >> 10; - SET_TILE_INFO_MEMBER(m_gfxdecode, m_bg, code, color, 0); + SET_TILE_INFO_MEMBER(m_bg, code, color, 0); } TILE_GET_INFO_MEMBER(tceptor_state::get_bg2_tile_info) @@ -174,7 +174,7 @@ TILE_GET_INFO_MEMBER(tceptor_state::get_bg2_tile_info) int code = (data & 0x3ff) | 0x400; int color = (data & 0xfc00) >> 10; - SET_TILE_INFO_MEMBER(m_gfxdecode, m_bg, code, color, 0); + SET_TILE_INFO_MEMBER(m_bg, code, color, 0); } WRITE8_MEMBER(tceptor_state::tceptor_bg_ram_w) @@ -384,14 +384,14 @@ void tceptor_state::video_start() m_c45_road->set_transparent_color(m_palette->pen_indirect(0xfff)); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tceptor_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 34, 28); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tceptor_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 34, 28); m_tx_tilemap->set_scrollx(0, -2*8); m_tx_tilemap->set_scrolly(0, 0); m_palette->configure_tilemap_groups(*m_tx_tilemap, *m_gfxdecode->gfx(0), 7); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tceptor_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tceptor_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tceptor_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tceptor_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); save_pointer(NAME(m_sprite_ram_buffered), 0x200 / 2); save_item(NAME(m_bg1_scroll_x)); diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c index 4eb8f9e1cfa..ab32854f716 100644 --- a/src/mame/video/tecmo.c +++ b/src/mame/video/tecmo.c @@ -24,8 +24,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::get_bg_tile_info) { UINT8 attr = m_bgvideoram[tile_index+0x200]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, m_bgvideoram[tile_index] + ((attr & 0x07) << 8), attr >> 4, 0); @@ -34,8 +33,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(tecmo_state::get_fg_tile_info) { UINT8 attr = m_fgvideoram[tile_index+0x200]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, m_fgvideoram[tile_index] + ((attr & 0x07) << 8), attr >> 4, 0); @@ -44,8 +42,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(tecmo_state::gemini_get_bg_tile_info) { UINT8 attr = m_bgvideoram[tile_index+0x200]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, m_bgvideoram[tile_index] + ((attr & 0x70) << 4), attr & 0x0f, 0); @@ -54,8 +51,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::gemini_get_bg_tile_info) TILE_GET_INFO_MEMBER(tecmo_state::gemini_get_fg_tile_info) { UINT8 attr = m_fgvideoram[tile_index+0x200]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, m_fgvideoram[tile_index] + ((attr & 0x70) << 4), attr & 0x0f, 0); @@ -64,8 +60,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::gemini_get_fg_tile_info) TILE_GET_INFO_MEMBER(tecmo_state::get_tx_tile_info) { UINT8 attr = m_txvideoram[tile_index+0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_txvideoram[tile_index] + ((attr & 0x03) << 8), attr >> 4, 0); @@ -83,15 +78,15 @@ VIDEO_START_MEMBER(tecmo_state,tecmo) { if (m_video_type == 2) /* gemini */ { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo_state::gemini_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo_state::gemini_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo_state::gemini_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo_state::gemini_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); } else /* rygar, silkworm */ { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,16); } - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); m_bg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c index fe7793ca4ba..7afe88bf4ff 100644 --- a/src/mame/video/tecmo16.c +++ b/src/mame/video/tecmo16.c @@ -22,8 +22,7 @@ TILE_GET_INFO_MEMBER(tecmo16_state::fg_get_tile_info) /* bit 4 controls blending */ tileinfo.category = (m_colorram[tile_index] & 0x10) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, color | (tileinfo.category ? 0x70 : 0x00), 0); @@ -34,8 +33,7 @@ TILE_GET_INFO_MEMBER(tecmo16_state::bg_get_tile_info) int tile = m_videoram2[tile_index] & 0x1fff; int color = (m_colorram2[tile_index] & 0x0f)+0x10; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, color, 0); @@ -44,8 +42,7 @@ TILE_GET_INFO_MEMBER(tecmo16_state::bg_get_tile_info) TILE_GET_INFO_MEMBER(tecmo16_state::tx_get_tile_info) { int tile = m_charram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile & 0x0fff, tile >> 12, 0); @@ -62,9 +59,9 @@ void tecmo16_state::video_start() /* set up sprites */ m_screen->register_screen_bitmap(m_sprite_bitmap); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_transparent_pen(0); @@ -84,9 +81,9 @@ VIDEO_START_MEMBER(tecmo16_state,ginkun) /* set up sprites */ m_screen->register_screen_bitmap(m_sprite_bitmap); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_transparent_pen(0); @@ -104,9 +101,9 @@ VIDEO_START_MEMBER(tecmo16_state,riot) /* set up sprites */ m_screen->register_screen_bitmap(m_sprite_bitmap); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmo16_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmo16_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/tecmosys.c b/src/mame/video/tecmosys.c index c9e0f0daed5..5cdcbab20f8 100644 --- a/src/mame/video/tecmosys.c +++ b/src/mame/video/tecmosys.c @@ -10,8 +10,7 @@ TILE_GET_INFO_MEMBER(tecmosys_state::get_bg0tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_bg0tilemap_ram[2*tile_index+1], (m_bg0tilemap_ram[2*tile_index]&0x3f), TILE_FLIPYX((m_bg0tilemap_ram[2*tile_index]&0xc0)>>6)); @@ -19,8 +18,7 @@ TILE_GET_INFO_MEMBER(tecmosys_state::get_bg0tile_info) TILE_GET_INFO_MEMBER(tecmosys_state::get_bg1tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, m_bg1tilemap_ram[2*tile_index+1], (m_bg1tilemap_ram[2*tile_index]&0x3f), TILE_FLIPYX((m_bg1tilemap_ram[2*tile_index]&0xc0)>>6)); @@ -28,8 +26,7 @@ TILE_GET_INFO_MEMBER(tecmosys_state::get_bg1tile_info) TILE_GET_INFO_MEMBER(tecmosys_state::get_bg2tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, m_bg2tilemap_ram[2*tile_index+1], (m_bg2tilemap_ram[2*tile_index]&0x3f), TILE_FLIPYX((m_bg2tilemap_ram[2*tile_index]&0xc0)>>6)); @@ -37,8 +34,7 @@ TILE_GET_INFO_MEMBER(tecmosys_state::get_bg2tile_info) TILE_GET_INFO_MEMBER(tecmosys_state::get_fg_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_fgtilemap_ram[2*tile_index+1], (m_fgtilemap_ram[2*tile_index]&0x3f), TILE_FLIPYX((m_fgtilemap_ram[2*tile_index]&0xc0)>>6)); @@ -332,15 +328,15 @@ void tecmosys_state::video_start() m_tmp_tilemap_renderbitmap.fill(0x0000); - m_txt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmosys_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32*2,32*2); + m_txt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmosys_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32*2,32*2); m_txt_tilemap->set_transparent_pen(0); - m_bg0tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmosys_state::get_bg0tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_bg0tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmosys_state::get_bg0tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); m_bg0tilemap->set_transparent_pen(0); - m_bg1tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmosys_state::get_bg1tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_bg1tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmosys_state::get_bg1tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); m_bg1tilemap->set_transparent_pen(0); - m_bg2tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tecmosys_state::get_bg2tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_bg2tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmosys_state::get_bg2tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); m_bg2tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c index 54fa3fdfdd8..8d9475378a4 100644 --- a/src/mame/video/tehkanwc.c +++ b/src/mame/video/tehkanwc.c @@ -70,7 +70,7 @@ TILE_GET_INFO_MEMBER(tehkanwc_state::get_bg_tile_info) int color = attr & 0x0f; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, flags); + SET_TILE_INFO_MEMBER(2, code, color, flags); } TILE_GET_INFO_MEMBER(tehkanwc_state::get_fg_tile_info) @@ -82,15 +82,15 @@ TILE_GET_INFO_MEMBER(tehkanwc_state::get_fg_tile_info) tileinfo.category = (attr & 0x20) ? 0 : 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void tehkanwc_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tehkanwc_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tehkanwc_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tehkanwc_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tehkanwc_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c index e4536f62af6..338aac6c0a6 100644 --- a/src/mame/video/terracre.c +++ b/src/mame/video/terracre.c @@ -17,14 +17,14 @@ TILE_GET_INFO_MEMBER(terracre_state::get_bg_tile_info) * ----.--xx.xxxx.xxxx */ unsigned data = m_amazon_videoram[tile_index]; unsigned color = data>>11; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,data&0x3ff,color,0 ); + SET_TILE_INFO_MEMBER(1,data&0x3ff,color,0 ); } TILE_GET_INFO_MEMBER(terracre_state::get_fg_tile_info) { UINT16 *videoram = m_videoram; int data = videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,data&0xff,0,0 ); + SET_TILE_INFO_MEMBER(0,data&0xff,0,0 ); } void terracre_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -181,8 +181,8 @@ WRITE16_MEMBER(terracre_state::amazon_scrollx_w) void terracre_state::video_start() { - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(terracre_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(terracre_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(terracre_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(terracre_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); m_foreground->set_transparent_pen(0xf); /* register for saving */ diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index e6d99b400e4..c0970e4d665 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -113,8 +113,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_bg) { UINT16 code_hi = m_vram_bg[ 2 * tile_index + 0]; UINT16 code_lo = m_vram_bg[ 2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code_hi, code_lo & 0xf, 0); @@ -134,8 +133,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_fg) { UINT16 code_hi = m_vram_fg[ 2 * tile_index + 0]; UINT16 code_lo = m_vram_fg[ 2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, code_hi, code_lo & 0xf, 0); @@ -152,8 +150,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_rot) { UINT16 code_hi = m_vram_rot[ 2 * tile_index + 0]; UINT16 code_lo = m_vram_rot[ 2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code_hi, code_lo & 0xf, 0); @@ -169,8 +166,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_rocknms_sub_bg) { UINT16 code_hi = m_rocknms_sub_vram_bg[ 2 * tile_index + 0]; UINT16 code_lo = m_rocknms_sub_vram_bg[ 2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 5, + SET_TILE_INFO_MEMBER(5, code_hi, code_lo & 0xf, 0); @@ -187,8 +183,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_rocknms_sub_fg) { UINT16 code_hi = m_rocknms_sub_vram_fg[ 2 * tile_index + 0]; UINT16 code_lo = m_rocknms_sub_vram_fg[ 2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 7, + SET_TILE_INFO_MEMBER(7, code_hi, code_lo & 0xf, 0); @@ -205,8 +200,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_rocknms_sub_rot) { UINT16 code_hi = m_rocknms_sub_vram_rot[ 2 * tile_index + 0]; UINT16 code_lo = m_rocknms_sub_vram_rot[ 2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 6, + SET_TILE_INFO_MEMBER(6, code_hi, code_lo & 0xf, 0); @@ -224,9 +218,9 @@ VIDEO_START_MEMBER(tetrisp2_state,tetrisp2) { m_flipscreen_old = -1; - m_tilemap_bg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_bg),this),TILEMAP_SCAN_ROWS,16,16,NX_0,NY_0); - m_tilemap_fg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_fg),this),TILEMAP_SCAN_ROWS,8,8,NX_1,NY_1); - m_tilemap_rot = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rot),this),TILEMAP_SCAN_ROWS,16,16,NX_0*2,NY_0*2); + m_tilemap_bg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_bg),this),TILEMAP_SCAN_ROWS,16,16,NX_0,NY_0); + m_tilemap_fg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_fg),this),TILEMAP_SCAN_ROWS,8,8,NX_1,NY_1); + m_tilemap_rot = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rot),this),TILEMAP_SCAN_ROWS,16,16,NX_0*2,NY_0*2); m_tilemap_bg->set_transparent_pen(0); m_tilemap_fg->set_transparent_pen(0); m_tilemap_rot->set_transparent_pen(0); @@ -246,9 +240,9 @@ VIDEO_START_MEMBER(tetrisp2_state,rockntread) { m_flipscreen_old = -1; - m_tilemap_bg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_bg),this),TILEMAP_SCAN_ROWS,16, 16, 256, 16); // rockn ms(main),1,2,3,4 - m_tilemap_fg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_fg),this),TILEMAP_SCAN_ROWS,8, 8, 64, 64); - m_tilemap_rot = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rot),this),TILEMAP_SCAN_ROWS,16, 16, 128, 128); + m_tilemap_bg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_bg),this),TILEMAP_SCAN_ROWS,16, 16, 256, 16); // rockn ms(main),1,2,3,4 + m_tilemap_fg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_fg),this),TILEMAP_SCAN_ROWS,8, 8, 64, 64); + m_tilemap_rot = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rot),this),TILEMAP_SCAN_ROWS,16, 16, 128, 128); m_tilemap_bg->set_transparent_pen(0); m_tilemap_fg->set_transparent_pen(0); @@ -264,9 +258,9 @@ VIDEO_START_MEMBER(tetrisp2_state,rocknms) { VIDEO_START_CALL_MEMBER( rockntread ); - m_tilemap_sub_bg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_bg),this),TILEMAP_SCAN_ROWS,16, 16, 32, 256); // rockn ms(sub) - m_tilemap_sub_fg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_fg),this),TILEMAP_SCAN_ROWS,8, 8, 64, 64); - m_tilemap_sub_rot = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_rot),this),TILEMAP_SCAN_ROWS,16, 16, 128, 128); + m_tilemap_sub_bg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_bg),this),TILEMAP_SCAN_ROWS,16, 16, 32, 256); // rockn ms(sub) + m_tilemap_sub_fg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_fg),this),TILEMAP_SCAN_ROWS,8, 8, 64, 64); + m_tilemap_sub_rot = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_rot),this),TILEMAP_SCAN_ROWS,16, 16, 128, 128); m_tilemap_sub_bg->set_transparent_pen(0); m_tilemap_sub_fg->set_transparent_pen(0); @@ -717,8 +711,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::stepstag_get_tile_info_fg) code_hi = (code_hi & 0x0f) + (code_hi & 0xf0)*2; code_hi += 0xbd6c; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code_hi, code_lo & 0xf, 0); @@ -728,10 +721,10 @@ VIDEO_START_MEMBER(stepstag_state,stepstag) { m_flipscreen_old = -1; - m_tilemap_bg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_bg),this),TILEMAP_SCAN_ROWS,16,16,NX_0,NY_0); + m_tilemap_bg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_bg),this),TILEMAP_SCAN_ROWS,16,16,NX_0,NY_0); // Temporary hack - m_tilemap_fg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::stepstag_get_tile_info_fg),this),TILEMAP_SCAN_ROWS,8,8,NX_1,NY_1); - m_tilemap_rot = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rot),this),TILEMAP_SCAN_ROWS,16,16,NX_0*2,NY_0*2); + m_tilemap_fg = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::stepstag_get_tile_info_fg),this),TILEMAP_SCAN_ROWS,8,8,NX_1,NY_1); + m_tilemap_rot = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rot),this),TILEMAP_SCAN_ROWS,16,16,NX_0*2,NY_0*2); m_tilemap_bg->set_transparent_pen(0); m_tilemap_fg->set_transparent_pen(0); m_tilemap_rot->set_transparent_pen(0); diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c index 486b24df476..96e31d14cd1 100644 --- a/src/mame/video/thedeep.c +++ b/src/mame/video/thedeep.c @@ -47,8 +47,7 @@ TILE_GET_INFO_MEMBER(thedeep_state::get_tile_info_0) { UINT8 code = m_vram_0[ tile_index * 2 + 0 ]; UINT8 color = m_vram_0[ tile_index * 2 + 1 ]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code + (color << 8), (color & 0xf0) >> 4, TILE_FLIPX ); // why? @@ -58,8 +57,7 @@ TILE_GET_INFO_MEMBER(thedeep_state::get_tile_info_1) { UINT8 code = m_vram_1[ tile_index * 2 + 0 ]; UINT8 color = m_vram_1[ tile_index * 2 + 1 ]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, code + (color << 8), (color & 0xf0) >> 4, 0); @@ -100,8 +98,8 @@ PALETTE_INIT_MEMBER(thedeep_state, thedeep) void thedeep_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(thedeep_state::get_tile_info_0),this),tilemap_mapper_delegate(FUNC(thedeep_state::tilemap_scan_rows_back),this),16,16,0x20,0x20); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(thedeep_state::get_tile_info_1),this),TILEMAP_SCAN_ROWS,8,8,0x20,0x20); + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(thedeep_state::get_tile_info_0),this),tilemap_mapper_delegate(FUNC(thedeep_state::tilemap_scan_rows_back),this),16,16,0x20,0x20); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(thedeep_state::get_tile_info_1),this),TILEMAP_SCAN_ROWS,8,8,0x20,0x20); m_tilemap_0->set_transparent_pen(0 ); m_tilemap_1->set_transparent_pen(0 ); diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index 52133a42b3e..f161373975b 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -112,7 +112,7 @@ TILE_GET_INFO_MEMBER(thepit_state::get_tile_info) { UINT8 fore_color = m_colorram[tile_index] % m_gfxdecode->gfx(0)->colors(); UINT8 code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2 * m_graphics_bank, code, fore_color, 0); + SET_TILE_INFO_MEMBER(2 * m_graphics_bank, code, fore_color, 0); } @@ -125,9 +125,9 @@ TILE_GET_INFO_MEMBER(thepit_state::get_tile_info) void thepit_state::video_start() { - m_solid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(thepit_state::solid_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_solid_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(thepit_state::solid_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(thepit_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(thepit_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_tilemap->set_transparent_pen(0); m_solid_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c index 45130e73ea5..a2fc5535f2c 100644 --- a/src/mame/video/thoop2.c +++ b/src/mame/video/thoop2.c @@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(thoop2_state::get_tile_info_thoop2_screen0) tileinfo.category = (data2 >> 6) & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, data2 & 0x3f, TILE_FLIPYX((data2 >> 14) & 0x03)); + SET_TILE_INFO_MEMBER(1, code, data2 & 0x3f, TILE_FLIPYX((data2 >> 14) & 0x03)); } @@ -56,7 +56,7 @@ TILE_GET_INFO_MEMBER(thoop2_state::get_tile_info_thoop2_screen1) tileinfo.category = (data2 >> 6) & 0x03; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, data2 & 0x3f, TILE_FLIPYX((data2 >> 14) & 0x03)); + SET_TILE_INFO_MEMBER(1, code, data2 & 0x3f, TILE_FLIPYX((data2 >> 14) & 0x03)); } /*************************************************************************** @@ -81,8 +81,8 @@ void thoop2_state::video_start() { int i; - m_pant[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(thoop2_state::get_tile_info_thoop2_screen0),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_pant[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(thoop2_state::get_tile_info_thoop2_screen1),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pant[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(thoop2_state::get_tile_info_thoop2_screen0),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_pant[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(thoop2_state::get_tile_info_thoop2_screen1),this),TILEMAP_SCAN_ROWS,16,16,32,32); m_pant[0]->set_transmask(0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ m_pant[1]->set_transmask(0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c index 8e868b44c5c..cf5f06c87d7 100644 --- a/src/mame/video/thunderj.c +++ b/src/mame/video/thunderj.c @@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(thunderj_state::get_alpha_tile_info) int code = ((data & 0x200) ? (m_alpha_tile_bank * 0x200) : 0) + (data & 0x1ff); int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20); int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(thunderj_state::get_playfield_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) & 0xff; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); tileinfo.category = (data2 >> 4) & 3; } @@ -45,7 +45,7 @@ TILE_GET_INFO_MEMBER(thunderj_state::get_playfield2_tile_info) UINT16 data2 = tilemap.extmem_read(tile_index) >> 8; int code = data1 & 0x7fff; int color = data2 & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data1 >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1); tileinfo.category = (data2 >> 4) & 3; } diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 2a5c1e2325e..93bcf7a4653 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -112,12 +112,12 @@ PALETTE_INIT_MEMBER(tiamc1_state, tiamc1) TILE_GET_INFO_MEMBER(tiamc1_state::get_bg1_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_tileram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, m_tileram[tile_index], 0, 0); } TILE_GET_INFO_MEMBER(tiamc1_state::get_bg2_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, m_tileram[tile_index + 1024], 0, 0); + SET_TILE_INFO_MEMBER(0, m_tileram[tile_index + 1024], 0, 0); } void tiamc1_state::video_start() @@ -136,10 +136,10 @@ void tiamc1_state::video_start() save_pointer(NAME(video_ram), 0x3040); - m_bg_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tiamc1_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tiamc1_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tiamc1_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tiamc1_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_vshift = 0; diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index f76d9aed1cd..5daab8d4d4c 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -118,7 +118,7 @@ TILE_GET_INFO_MEMBER(tigeroad_state::get_bg_tile_info) int color = attr & 0x0f; int flags = (attr & 0x20) ? TILE_FLIPX : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); tileinfo.group = (attr & 0x10) ? 1 : 0; } @@ -131,7 +131,7 @@ TILE_GET_INFO_MEMBER(tigeroad_state::get_fg_tile_info) int color = attr & 0x0f; int flags = (attr & 0x10) ? TILE_FLIPY : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } TILEMAP_MAPPER_MEMBER(tigeroad_state::tigeroad_tilemap_scan) @@ -142,10 +142,10 @@ TILEMAP_MAPPER_MEMBER(tigeroad_state::tigeroad_tilemap_scan) void tigeroad_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tigeroad_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(tigeroad_state::tigeroad_tilemap_scan),this), + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tigeroad_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(tigeroad_state::tigeroad_tilemap_scan),this), 32, 32, 128, 128); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tigeroad_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tigeroad_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0); diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c index 7c7fd65ac5c..58cb2d210dd 100644 --- a/src/mame/video/timelimt.c +++ b/src/mame/video/timelimt.c @@ -56,21 +56,21 @@ PALETTE_INIT_MEMBER(timelimt_state, timelimt){ TILE_GET_INFO_MEMBER(timelimt_state::get_bg_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, m_bg_videoram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(1, m_bg_videoram[tile_index], 0, 0); } TILE_GET_INFO_MEMBER(timelimt_state::get_fg_tile_info) { UINT8 *videoram = m_videoram; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, videoram[tile_index], 0, 0); + SET_TILE_INFO_MEMBER(0, videoram[tile_index], 0, 0); } void timelimt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(timelimt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(timelimt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(timelimt_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(timelimt_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c index 4a7cebe50ef..5b7241572d1 100644 --- a/src/mame/video/timeplt.c +++ b/src/mame/video/timeplt.c @@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(timeplt_state::get_tile_info) int flags = TILE_FLIPYX(attr >> 6); tileinfo.category = (attr & 0x10) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } TILE_GET_INFO_MEMBER(timeplt_state::get_chkun_tile_info) @@ -109,7 +109,7 @@ TILE_GET_INFO_MEMBER(timeplt_state::get_chkun_tile_info) int flags = 0;//TILE_FLIPYX(attr >> 6); tileinfo.category = (attr & 0x80) >> 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } @@ -122,12 +122,12 @@ TILE_GET_INFO_MEMBER(timeplt_state::get_chkun_tile_info) void timeplt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(timeplt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(timeplt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } VIDEO_START_MEMBER(timeplt_state,chkun) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(timeplt_state::get_chkun_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(timeplt_state::get_chkun_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 64ce1171d65..52a2a86e043 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -11,7 +11,7 @@ TILE_GET_INFO_MEMBER(tmnt_state::glfgreat_get_roz_tile_info) code = rom[tile_index + 0x80000] + 256 * rom[tile_index] + 256 * 256 * ((rom[tile_index / 4 + 0x100000] >> (2 * (tile_index & 3))) & 3); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x3fff, code >> 14, 0); + SET_TILE_INFO_MEMBER(0, code & 0x3fff, code >> 14, 0); } TILE_GET_INFO_MEMBER(tmnt_state::prmrsocr_get_roz_tile_info) @@ -19,7 +19,7 @@ TILE_GET_INFO_MEMBER(tmnt_state::prmrsocr_get_roz_tile_info) UINT8 *rom = memregion("user1")->base(); int code = rom[tile_index + 0x20000] + 256 * rom[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code & 0x1fff, code >> 13, 0); + SET_TILE_INFO_MEMBER(0, code & 0x1fff, code >> 13, 0); } @@ -266,7 +266,7 @@ VIDEO_START_MEMBER(tmnt_state,lgtnfght)/* also tmnt2, ssriders */ VIDEO_START_MEMBER(tmnt_state,glfgreat) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tmnt_state::glfgreat_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); + m_roz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tmnt_state::glfgreat_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); m_roz_tilemap->set_transparent_pen(0); m_glfgreat_roz_rom_bank = 0; @@ -279,7 +279,7 @@ VIDEO_START_MEMBER(tmnt_state,glfgreat) VIDEO_START_MEMBER(tmnt_state,prmrsocr) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tmnt_state::prmrsocr_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 256); + m_roz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tmnt_state::prmrsocr_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 256); m_roz_tilemap->set_transparent_pen(0); m_prmrsocr_sprite_bank = 0; diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index 097f987e548..cd0814a5dec 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -142,8 +142,7 @@ TILE_GET_INFO_MEMBER(toaplan1_state::get_pf1_tile_info) tile_number = m_pf1_tilevram16[2*tile_index+1] & 0x7fff; attrib = m_pf1_tilevram16[2*tile_index]; color = attrib & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, color, 0); @@ -159,8 +158,7 @@ TILE_GET_INFO_MEMBER(toaplan1_state::get_pf2_tile_info) tile_number = m_pf2_tilevram16[2*tile_index+1] & 0x7fff; attrib = m_pf2_tilevram16[2*tile_index]; color = attrib & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, color, 0); @@ -176,8 +174,7 @@ TILE_GET_INFO_MEMBER(toaplan1_state::get_pf3_tile_info) tile_number = m_pf3_tilevram16[2*tile_index+1] & 0x7fff; attrib = m_pf3_tilevram16[2*tile_index]; color = attrib & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, color, 0); @@ -193,8 +190,7 @@ TILE_GET_INFO_MEMBER(toaplan1_state::get_pf4_tile_info) tile_number = m_pf4_tilevram16[2*tile_index+1] & 0x7fff; attrib = m_pf4_tilevram16[2*tile_index]; color = attrib & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, color, 0); @@ -211,10 +207,10 @@ TILE_GET_INFO_MEMBER(toaplan1_state::get_pf4_tile_info) void toaplan1_state::toaplan1_create_tilemaps() { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_pf3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_pf4_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf4_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_pf3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_pf4_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf4_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_pf1_tilemap->set_transparent_pen(0); m_pf2_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index f35206310d7..e024425c974 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -41,8 +41,7 @@ TILE_GET_INFO_MEMBER(toaplan2_state::get_text_tile_info) attrib = m_tx_videoram[tile_index]; tile_number = attrib & 0x3ff; color = attrib >> 10; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile_number, color, 0); @@ -57,7 +56,7 @@ TILE_GET_INFO_MEMBER(toaplan2_state::get_text_tile_info) void toaplan2_state::create_tx_tilemap(int dx, int dx_flipped) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan2_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toaplan2_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tx_tilemap->set_scroll_rows(8*32); /* line scrolling */ m_tx_tilemap->set_scroll_cols(1); diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index 51a97405ec8..4324d469032 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -40,8 +40,7 @@ TILE_GET_INFO_MEMBER(toki_state::get_text_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile, color, 0); @@ -54,8 +53,7 @@ TILE_GET_INFO_MEMBER(toki_state::get_back_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile, color, 0); @@ -68,8 +66,7 @@ TILE_GET_INFO_MEMBER(toki_state::get_fore_tile_info) tile &= 0xfff; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, tile, color, 0); @@ -84,9 +81,9 @@ TILE_GET_INFO_MEMBER(toki_state::get_fore_tile_info) void toki_state::video_start() { - m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toki_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); - m_background_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toki_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); - m_foreground_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toki_state::get_fore_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toki_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); + m_background_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toki_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); + m_foreground_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toki_state::get_fore_tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32); m_text_layer->set_transparent_pen(15); m_background_layer->set_transparent_pen(15); diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c index e07a871b090..5b1328a2c67 100644 --- a/src/mame/video/toobin.c +++ b/src/mame/video/toobin.c @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(toobin_state::get_alpha_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = data & 0x3ff; int color = (data >> 12) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, (data >> 10) & 1); + SET_TILE_INFO_MEMBER(2, code, color, (data >> 10) & 1); } @@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(toobin_state::get_playfield_tile_info) UINT32 data = tilemap.basemem_read(tile_index); int code = data & 0x3fff; int color = (data >> 16) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, TILE_FLIPYX(data >> 14)); + SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(data >> 14)); tileinfo.category = (data >> 20) & 3; } diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index 129f289891a..efdc450073c 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -93,8 +93,7 @@ TILEMAP_MAPPER_MEMBER(toypop_state::tilemap_scan) TILE_GET_INFO_MEMBER(toypop_state::get_tile_info) { UINT8 attr = m_videoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], (attr & 0x3f) + 0x40 * m_palettebank, 0); @@ -110,7 +109,7 @@ TILE_GET_INFO_MEMBER(toypop_state::get_tile_info) void toypop_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toypop_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(toypop_state::tilemap_scan),this),8,8,36,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(toypop_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(toypop_state::tilemap_scan),this),8,8,36,28); m_bg_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index 0557df7568e..8c49d6f6527 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -124,7 +124,7 @@ TILE_GET_INFO_MEMBER(tp84_state::get_bg_tile_info) (m_bg_colorram[tile_index] & 0x0f); int flags = TILE_FLIPYX(m_bg_colorram[tile_index] >> 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } TILE_GET_INFO_MEMBER(tp84_state::get_fg_tile_info) @@ -135,14 +135,14 @@ TILE_GET_INFO_MEMBER(tp84_state::get_fg_tile_info) (m_fg_colorram[tile_index] & 0x0f); int flags = TILE_FLIPYX(m_fg_colorram[tile_index] >> 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void tp84_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tp84_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tp84_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tp84_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tp84_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index 7ec3afb0160..0106d864a29 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -165,12 +165,12 @@ TILE_GET_INFO_MEMBER(trackfld_state::get_bg_tile_info) if (m_bg_bank) code |= 0x400; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, flags); + SET_TILE_INFO_MEMBER(1, code, color, flags); } VIDEO_START_MEMBER(trackfld_state,trackfld) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(trackfld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(trackfld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); m_sprites_gfx_banked = 0; } diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index 2980338a487..5581b195e63 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -198,8 +198,7 @@ TILE_GET_INFO_MEMBER(travrusa_state::get_tile_info) tileinfo.group = ((attr & 0x0f) == 0x0f) ? 1 : 0; /* tunnels */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[2 * tile_index] + ((attr & 0xc0) << 2), attr & 0x0f, flags); @@ -217,7 +216,7 @@ void travrusa_state::video_start() { save_item(NAME(m_scrollx)); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(travrusa_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(travrusa_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ m_bg_tilemap->set_transmask(1, 0x3f, 0xc0); /* split type 1 has pens 6 and 7 opaque - tunnels */ diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c index 05e6b94c03a..23af8970307 100644 --- a/src/mame/video/triplhnt.c +++ b/src/mame/video/triplhnt.c @@ -12,7 +12,7 @@ TILE_GET_INFO_MEMBER(triplhnt_state::get_tile_info) { int code = m_playfield_ram[tile_index] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, code == 0x3f ? 1 : 0, 0); + SET_TILE_INFO_MEMBER(2, code, code == 0x3f ? 1 : 0, 0); } @@ -20,7 +20,7 @@ void triplhnt_state::video_start() { m_screen->register_screen_bitmap(m_helper); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(triplhnt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(triplhnt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); } diff --git a/src/mame/video/trucocl.c b/src/mame/video/trucocl.c index 423711a801c..2e3ccb043c2 100644 --- a/src/mame/video/trucocl.c +++ b/src/mame/video/trucocl.c @@ -68,12 +68,12 @@ TILE_GET_INFO_MEMBER(trucocl_state::get_bg_tile_info) code |= ( bank & 2 ) << 8; code += ( bank & 4 ) << 6; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfxsel,code,colour,0); + SET_TILE_INFO_MEMBER(gfxsel,code,colour,0); } void trucocl_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(trucocl_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32 ); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(trucocl_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32 ); } UINT32 trucocl_state::screen_update_trucocl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c index 66677122d07..58c2cce6273 100644 --- a/src/mame/video/tryout.c +++ b/src/mame/video/tryout.c @@ -48,12 +48,12 @@ TILE_GET_INFO_MEMBER(tryout_state::get_fg_tile_info) code |= ((attr & 0x03) << 8); color = ((attr & 0x4)>>2)+6; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(tryout_state::get_bg_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, m_vram[tile_index] & 0x7f, 2, 0); + SET_TILE_INFO_MEMBER(2, m_vram[tile_index] & 0x7f, 2, 0); } READ8_MEMBER(tryout_state::tryout_vram_r) @@ -165,8 +165,8 @@ TILEMAP_MAPPER_MEMBER(tryout_state::get_bg_memory_offset) void tryout_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tryout_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(tryout_state::get_fg_memory_offset),this),8,8,32,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tryout_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(tryout_state::get_bg_memory_offset),this),16,16,64,16); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tryout_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(tryout_state::get_fg_memory_offset),this),8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tryout_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(tryout_state::get_bg_memory_offset),this),16,16,64,16); m_vram=auto_alloc_array(machine(), UINT8, 8 * 0x800); m_vram_gfx=auto_alloc_array(machine(), UINT8, 0x6000); diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c index 27db9fa87d8..97385cd4b65 100644 --- a/src/mame/video/tsamurai.c +++ b/src/mame/video/tsamurai.c @@ -18,8 +18,7 @@ TILE_GET_INFO_MEMBER(tsamurai_state::get_bg_tile_info) int tile_number = m_bg_videoram[2*tile_index]; tile_number += (( attributes & 0xc0 ) >> 6 ) * 256; /* legacy */ tile_number += (( attributes & 0x20 ) >> 5 ) * 1024; /* Mission 660 add-on*/ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, attributes & 0x1f, 0); @@ -30,8 +29,7 @@ TILE_GET_INFO_MEMBER(tsamurai_state::get_fg_tile_info) int tile_number = m_videoram[tile_index]; if (m_textbank1 & 0x01) tile_number += 256; /* legacy */ if (m_textbank2 & 0x01) tile_number += 512; /* Mission 660 add-on */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile_number, m_colorram[((tile_index&0x1f)*2)+1] & 0x1f, 0); @@ -46,8 +44,8 @@ TILE_GET_INFO_MEMBER(tsamurai_state::get_fg_tile_info) VIDEO_START_MEMBER(tsamurai_state,tsamurai) { - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tsamurai_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tsamurai_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_background->set_transparent_pen(0); m_foreground->set_transparent_pen(0); @@ -234,8 +232,7 @@ TILE_GET_INFO_MEMBER(tsamurai_state::get_vsgongf_tile_info) int tile_number = m_videoram[tile_index]; int color = m_vsgongf_color&0x1f; if( m_textbank1 ) tile_number += 0x100; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile_number, color, 0); @@ -243,7 +240,7 @@ TILE_GET_INFO_MEMBER(tsamurai_state::get_vsgongf_tile_info) VIDEO_START_MEMBER(tsamurai_state,vsgongf) { - m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tsamurai_state::get_vsgongf_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_vsgongf_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); } UINT32 tsamurai_state::screen_update_vsgongf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index 4c35796aaa7..3df9ead8713 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -120,8 +120,7 @@ inline void tumbleb_state::get_bg_tile_info( tile_data &tileinfo, int tile_index { int data = gfx_base[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfx_bank, + SET_TILE_INFO_MEMBER(gfx_bank, (data & 0x0fff) | (m_tilebank >> 2), data >> 12, 0); @@ -134,8 +133,7 @@ TILE_GET_INFO_MEMBER(tumbleb_state::get_fg_tile_info) { int data = m_pf1_data[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (data & 0x0fff) | m_tilebank, data >> 12, 0); @@ -146,8 +144,7 @@ inline void tumbleb_state::get_fncywld_bg_tile_info( tile_data &tileinfo, int ti int data = gfx_base[tile_index * 2]; int attr = gfx_base[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfx_bank, + SET_TILE_INFO_MEMBER(gfx_bank, data & 0x1fff, attr & 0x1f, 0); @@ -161,8 +158,7 @@ TILE_GET_INFO_MEMBER(tumbleb_state::get_fncywld_fg_tile_info) int data = m_pf1_data[tile_index * 2]; int attr = m_pf1_data[tile_index * 2 + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, data & 0x1fff, attr & 0x1f, 0); @@ -174,8 +170,7 @@ inline void tumbleb_state::pangpang_get_bg_tile_info( tile_data &tileinfo, int t int data = gfx_base[tile_index * 2 + 1]; int attr = gfx_base[tile_index * 2]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfx_bank, + SET_TILE_INFO_MEMBER(gfx_bank, data & 0x1fff, (attr >>12) & 0xf, 0); @@ -186,8 +181,7 @@ inline void tumbleb_state::pangpang_get_bg2x_tile_info( tile_data &tileinfo, int int data = gfx_base[tile_index * 2 + 1]; int attr = gfx_base[tile_index * 2]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfx_bank, + SET_TILE_INFO_MEMBER(gfx_bank, (data & 0xfff) + 0x1000, (attr >>12) & 0xf, 0); @@ -202,8 +196,7 @@ TILE_GET_INFO_MEMBER(tumbleb_state::pangpang_get_fg_tile_info) int data = m_pf1_data[tile_index * 2 + 1]; int attr = m_pf1_data[tile_index * 2]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, data & 0x1fff, (attr >> 12)& 0x1f, 0); @@ -221,9 +214,9 @@ void tumbleb_state::tumbleb_tilemap_redraw() VIDEO_START_MEMBER(tumbleb_state,pangpang) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_pf1_alt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf1_tilemap->set_transparent_pen(0); m_pf1_alt_tilemap->set_transparent_pen(0); @@ -234,9 +227,9 @@ VIDEO_START_MEMBER(tumbleb_state,pangpang) VIDEO_START_MEMBER(tumbleb_state,tumblepb) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_pf1_alt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf1_tilemap->set_transparent_pen(0); m_pf1_alt_tilemap->set_transparent_pen(0); @@ -246,9 +239,9 @@ VIDEO_START_MEMBER(tumbleb_state,tumblepb) VIDEO_START_MEMBER(tumbleb_state,sdfight) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); // 64*64 to prevent bad tilemap wrapping? - check real behavior - m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); // 64*64 to prevent bad tilemap wrapping? - check real behavior + m_pf1_alt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf1_tilemap->set_transparent_pen(0); m_pf1_alt_tilemap->set_transparent_pen(0); @@ -258,9 +251,9 @@ VIDEO_START_MEMBER(tumbleb_state,sdfight) VIDEO_START_MEMBER(tumbleb_state,fncywld) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_pf1_alt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf1_tilemap->set_transparent_pen(15); m_pf1_alt_tilemap->set_transparent_pen(15); @@ -271,9 +264,9 @@ VIDEO_START_MEMBER(tumbleb_state,fncywld) VIDEO_START_MEMBER(tumbleb_state,suprtrio) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); - m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_pf1_alt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); + m_pf2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf1_alt_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index 2a22bbd562c..d53c021bf1f 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -61,7 +61,7 @@ TILE_GET_INFO_MEMBER(tunhunt_state::get_fg_tile_info) int color = attr >> 6; int flags = color ? TILE_FORCE_LAYER0 : 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } void tunhunt_state::video_start() @@ -74,7 +74,7 @@ void tunhunt_state::video_start() m_tmpbitmap.allocate(256, 64, m_screen->format()); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tunhunt_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tunhunt_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_scrollx(0, 64); diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index ebf44a6a5e0..2f1c11cba3c 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -154,21 +154,21 @@ PALETTE_INIT_MEMBER(turbo_state,buckrog) TILE_GET_INFO_MEMBER(turbo_state::get_fg_tile_info) { int code = m_videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, code >> 2, 0); + SET_TILE_INFO_MEMBER(0, code, code >> 2, 0); } VIDEO_START_MEMBER(turbo_state,turbo) { /* initialize the foreground tilemap */ - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); } VIDEO_START_MEMBER(turbo_state,buckrog) { /* initialize the foreground tilemap */ - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); /* allocate the bitmap RAM */ m_buckrog_bitmap_ram = auto_alloc_array(machine(), UINT8, 0xe000); diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c index 42dae620e54..5cdd1aa67e3 100644 --- a/src/mame/video/twin16.c +++ b/src/mame/video/twin16.c @@ -483,14 +483,14 @@ TILE_GET_INFO_MEMBER(twin16_state::get_text_tile_info) if (attr&0x2000) flags|=TILE_FLIPX; if (attr&0x4000) flags|=TILE_FLIPY; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, flags); + SET_TILE_INFO_MEMBER(0, code, color, flags); } VIDEO_START_MEMBER(twin16_state,twin16) { m_gfx_rom = (UINT16 *)memregion("gfx2")->base(); - m_text_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(twin16_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_text_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(twin16_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_text_tilemap->set_transparent_pen(0); m_palette->set_shadow_factor(0.4); // screenshots estimate diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index 405a523aa0f..db4e7cd537d 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -46,8 +46,7 @@ TILE_GET_INFO_MEMBER(twincobr_state::get_bg_tile_info) code = m_bgvideoram16[tile_index+m_bg_ram_bank]; tile_number = code & 0x0fff; color = (code & 0xf000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile_number, color, 0); @@ -60,8 +59,7 @@ TILE_GET_INFO_MEMBER(twincobr_state::get_fg_tile_info) code = m_fgvideoram16[tile_index]; tile_number = (code & 0x0fff) | m_fg_rom_bank; color = (code & 0xf000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile_number, color, 0); @@ -74,8 +72,7 @@ TILE_GET_INFO_MEMBER(twincobr_state::get_tx_tile_info) code = m_txvideoram16[tile_index]; tile_number = code & 0x07ff; color = (code & 0xf800) >> 11; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tile_number, color, 0); @@ -87,9 +84,9 @@ TILE_GET_INFO_MEMBER(twincobr_state::get_tx_tile_info) void twincobr_state::twincobr_create_tilemaps() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(twincobr_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(twincobr_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(twincobr_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(twincobr_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(twincobr_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(twincobr_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_bg_tilemap->set_scrolldx(-55, -134 ); m_fg_tilemap->set_scrolldx(-55, -134 ); diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index 8c88adaa816..b3db61c62f3 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -38,9 +38,9 @@ TILE_GET_INFO_MEMBER(ultratnk_state::ultratnk_tile_info) UINT8 code = videoram[tile_index]; if (code & 0x20) - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, code >> 6, 0); + SET_TILE_INFO_MEMBER(0, code, code >> 6, 0); else - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 4, 0); + SET_TILE_INFO_MEMBER(0, code, 4, 0); } @@ -48,7 +48,7 @@ void ultratnk_state::video_start() { m_screen->register_screen_bitmap(m_helper); - m_playfield = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ultratnk_state::ultratnk_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_playfield = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ultratnk_state::ultratnk_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c index 0bb94c52c45..684681b80e9 100644 --- a/src/mame/video/unico.c +++ b/src/mame/video/unico.c @@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(unico_state::get_tile_info) UINT16 *vram = (UINT16 *)tilemap.user_data(); UINT16 code = vram[2 * tile_index + 0 ]; UINT16 attr = vram[2 * tile_index + 1 ]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, attr & 0x1f, TILE_FLIPYX( attr >> 5 )); + SET_TILE_INFO_MEMBER(1, code, attr & 0x1f, TILE_FLIPYX( attr >> 5 )); } READ16_MEMBER(unico_state::unico_vram_r) { return m_vram[offset]; } @@ -133,13 +133,13 @@ VIDEO_START_MEMBER(unico_state,unico) save_pointer(NAME(m_scroll), 0x18/2); save_pointer(NAME(m_spriteram), 0x800/2); - m_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(unico_state::get_tile_info),this),TILEMAP_SCAN_ROWS, + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(unico_state::get_tile_info),this),TILEMAP_SCAN_ROWS, 16,16, 0x40, 0x40); - m_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(unico_state::get_tile_info),this),TILEMAP_SCAN_ROWS, + m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(unico_state::get_tile_info),this),TILEMAP_SCAN_ROWS, 16,16, 0x40, 0x40); - m_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(unico_state::get_tile_info),this),TILEMAP_SCAN_ROWS, + m_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(unico_state::get_tile_info),this),TILEMAP_SCAN_ROWS, 16,16, 0x40, 0x40); m_tilemap[0]->set_user_data(&m_vram[0x8000/2]); diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c index 622606e1705..cb48de94f5c 100644 --- a/src/mame/video/usgames.c +++ b/src/mame/video/usgames.c @@ -38,12 +38,12 @@ TILE_GET_INFO_MEMBER(usgames_state::get_usgames_tile_info) tileno = m_videoram[tile_index*2]; colour = m_videoram[tile_index*2+1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,colour,0); + SET_TILE_INFO_MEMBER(0,tileno,colour,0); } void usgames_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(usgames_state::get_usgames_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(usgames_state::get_usgames_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_gfxdecode->gfx(0)->set_source(m_charram); } diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c index 2d5dc52a1c7..b99d6a6e9f2 100644 --- a/src/mame/video/vastar.c +++ b/src/mame/video/vastar.c @@ -24,8 +24,7 @@ TILE_GET_INFO_MEMBER(vastar_state::get_fg_tile_info) code = videoram[tile_index + 0x800] | (videoram[tile_index + 0x400] << 8); color = videoram[tile_index]; fxy = (code & 0xc00) >> 10; // maybe, based on the other layers - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color & 0x3f, TILE_FLIPXY(fxy)); @@ -39,8 +38,7 @@ TILE_GET_INFO_MEMBER(vastar_state::get_bg1_tile_info) code = videoram[tile_index + 0x800] | (videoram[tile_index] << 8); color = videoram[tile_index + 0xc00]; fxy = (code & 0xc00) >> 10; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 4, + SET_TILE_INFO_MEMBER(4, code, color & 0x3f, TILE_FLIPXY(fxy)); @@ -54,8 +52,7 @@ TILE_GET_INFO_MEMBER(vastar_state::get_bg2_tile_info) code = videoram[tile_index + 0x800] | (videoram[tile_index] << 8); color = videoram[tile_index + 0xc00]; fxy = (code & 0xc00) >> 10; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 3, + SET_TILE_INFO_MEMBER(3, code, color & 0x3f, TILE_FLIPXY(fxy)); @@ -70,9 +67,9 @@ TILE_GET_INFO_MEMBER(vastar_state::get_bg2_tile_info) void vastar_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(vastar_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,8,8,32,32); - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(vastar_state::get_bg1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(vastar_state::get_bg2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(vastar_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(vastar_state::get_bg1_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(vastar_state::get_bg2_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_fg_tilemap->set_transparent_pen(0); m_bg1_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c index f619ab6e5d3..caaf71a1538 100644 --- a/src/mame/video/vball.c +++ b/src/mame/video/vball.c @@ -29,8 +29,7 @@ TILE_GET_INFO_MEMBER(vball_state::get_bg_tile_info) { UINT8 code = m_vb_videoram[tile_index]; UINT8 attr = m_vb_attribram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((attr & 0x1f) << 8) + (m_gfxset<<8), (attr >> 5) & 0x7, 0); @@ -39,7 +38,7 @@ TILE_GET_INFO_MEMBER(vball_state::get_bg_tile_info) void vball_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(vball_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(vball_state::background_scan),this), 8, 8,64,64); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(vball_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(vball_state::background_scan),this), 8, 8,64,64); m_bg_tilemap->set_scroll_rows(32); m_gfxset=0; diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c index e90ef24f875..c7e120b41dd 100644 --- a/src/mame/video/videopin.c +++ b/src/mame/video/videopin.c @@ -21,13 +21,13 @@ TILE_GET_INFO_MEMBER(videopin_state::get_tile_info) { UINT8 code = m_video_ram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, (code & 0x40) ? TILE_FLIPY : 0); + SET_TILE_INFO_MEMBER(0, code, 0, (code & 0x40) ? TILE_FLIPY : 0); } void videopin_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(videopin_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(videopin_state::get_memory_offset),this), 8, 8, 48, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(videopin_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(videopin_state::get_memory_offset),this), 8, 8, 48, 32); } diff --git a/src/mame/video/vindictr.c b/src/mame/video/vindictr.c index f1f816eb6e4..e2a10874ffa 100644 --- a/src/mame/video/vindictr.c +++ b/src/mame/video/vindictr.c @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(vindictr_state::get_alpha_tile_info) int code = data & 0x3ff; int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20); int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(vindictr_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = (m_playfield_tile_bank * 0x1000) + (data & 0xfff); int color = 0x10 + 2 * ((data >> 12) & 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c index 3848b55fca7..b79dc112612 100644 --- a/src/mame/video/vulgus.c +++ b/src/mame/video/vulgus.c @@ -81,8 +81,7 @@ TILE_GET_INFO_MEMBER(vulgus_state::get_fg_tile_info) code = m_fgvideoram[tile_index]; color = m_fgvideoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code + ((color & 0x80) << 1), color & 0x3f, 0); @@ -95,8 +94,7 @@ TILE_GET_INFO_MEMBER(vulgus_state::get_bg_tile_info) code = m_bgvideoram[tile_index]; color = m_bgvideoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code + ((color & 0x80) << 1), (color & 0x1f) + (0x20 * m_palette_bank), TILE_FLIPYX((color & 0x60) >> 5)); @@ -111,8 +109,8 @@ TILE_GET_INFO_MEMBER(vulgus_state::get_bg_tile_info) void vulgus_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(vulgus_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(vulgus_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(vulgus_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(vulgus_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); m_palette->configure_tilemap_groups(*m_fg_tilemap, *m_gfxdecode->gfx(0), 47); } diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c index 836644d2c7a..49253f5ea23 100644 --- a/src/mame/video/warpwarp.c +++ b/src/mame/video/warpwarp.c @@ -129,8 +129,7 @@ TILE_GET_INFO_MEMBER(warpwarp_state::geebee_get_tile_info) { int code = m_geebee_videoram[tile_index]; int color = (m_geebee_bgw & 1) | ((code & 0x80) >> 6); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, 0); @@ -140,8 +139,7 @@ TILE_GET_INFO_MEMBER(warpwarp_state::navarone_get_tile_info) { int code = m_geebee_videoram[tile_index]; int color = m_geebee_bgw & 1; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, 0); @@ -149,8 +147,7 @@ TILE_GET_INFO_MEMBER(warpwarp_state::navarone_get_tile_info) TILE_GET_INFO_MEMBER(warpwarp_state::warpwarp_get_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], m_videoram[tile_index + 0x400], 0); @@ -166,17 +163,17 @@ TILE_GET_INFO_MEMBER(warpwarp_state::warpwarp_get_tile_info) VIDEO_START_MEMBER(warpwarp_state,geebee) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(warpwarp_state::geebee_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::geebee_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } VIDEO_START_MEMBER(warpwarp_state,navarone) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(warpwarp_state::navarone_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::navarone_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } VIDEO_START_MEMBER(warpwarp_state,warpwarp) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(warpwarp_state::warpwarp_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::warpwarp_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index 0ecdbc1ca81..761d237cb97 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -13,8 +13,7 @@ TILE_GET_INFO_MEMBER(wc90_state::get_bg_tile_info) int attr = m_bgvideoram[tile_index]; int tile = m_bgvideoram[tile_index + 0x800] + 256 * ((attr & 3) + ((attr >> 1) & 4)); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile, attr >> 4, 0); @@ -25,8 +24,7 @@ TILE_GET_INFO_MEMBER(wc90_state::get_fg_tile_info) int attr = m_fgvideoram[tile_index]; int tile = m_fgvideoram[tile_index + 0x800] + 256 * ((attr & 3) + ((attr >> 1) & 4)); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, attr >> 4, 0); @@ -34,8 +32,7 @@ TILE_GET_INFO_MEMBER(wc90_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(wc90_state::get_tx_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_txvideoram[tile_index + 0x800] + ((m_txvideoram[tile_index] & 0x07) << 8), m_txvideoram[tile_index] >> 4, 0); @@ -46,8 +43,7 @@ TILE_GET_INFO_MEMBER(wc90_state::track_get_bg_tile_info) int attr = m_bgvideoram[tile_index]; int tile = m_bgvideoram[tile_index + 0x800] + 256 * (attr & 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tile, attr >> 4, 0); @@ -58,8 +54,7 @@ TILE_GET_INFO_MEMBER(wc90_state::track_get_fg_tile_info) int attr = m_fgvideoram[tile_index]; int tile = m_fgvideoram[tile_index + 0x800] + 256 * (attr & 7); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, tile, attr >> 4, 0); @@ -74,9 +69,9 @@ TILE_GET_INFO_MEMBER(wc90_state::track_get_fg_tile_info) void wc90_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,64,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fg_tilemap->set_transparent_pen(0); m_tx_tilemap->set_transparent_pen(0); @@ -84,9 +79,9 @@ void wc90_state::video_start() VIDEO_START_MEMBER(wc90_state,wc90t) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90_state::track_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,64,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90_state::track_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::track_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::track_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fg_tilemap->set_transparent_pen(0); m_tx_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c index a7681899839..36050c882c9 100644 --- a/src/mame/video/wc90b.c +++ b/src/mame/video/wc90b.c @@ -12,8 +12,7 @@ TILE_GET_INFO_MEMBER(wc90b_state::get_bg_tile_info) { int attr = m_bgvideoram[tile_index]; int tile = m_bgvideoram[tile_index + 0x800]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 9 + ((attr & 3) + ((attr >> 1) & 4)), + SET_TILE_INFO_MEMBER(9 + ((attr & 3) + ((attr >> 1) & 4)), tile, attr >> 4, 0); @@ -23,8 +22,7 @@ TILE_GET_INFO_MEMBER(wc90b_state::get_fg_tile_info) { int attr = m_fgvideoram[tile_index]; int tile = m_fgvideoram[tile_index + 0x800]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1 + ((attr & 3) + ((attr >> 1) & 4)), + SET_TILE_INFO_MEMBER(1 + ((attr & 3) + ((attr >> 1) & 4)), tile, attr >> 4, 0); @@ -32,8 +30,7 @@ TILE_GET_INFO_MEMBER(wc90b_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(wc90b_state::get_tx_tile_info) { - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_txvideoram[tile_index + 0x800] + ((m_txvideoram[tile_index] & 0x07) << 8), m_txvideoram[tile_index] >> 4, 0); @@ -49,9 +46,9 @@ TILE_GET_INFO_MEMBER(wc90b_state::get_tx_tile_info) void wc90b_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90b_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,64,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90b_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wc90b_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90b_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90b_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90b_state::get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fg_tilemap->set_transparent_pen(15); m_tx_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index 5d9eb0cd0ad..a26dae8ca1e 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -419,7 +419,7 @@ static void sprite_draw(running_machine &machine, _BitmapClass &bitmap, const re TILE_GET_INFO_MEMBER(wecleman_state::wecleman_get_txt_tile_info) { int code = m_txtram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, PAGE_GFX, code&0xfff, (code>>5&0x78)+(code>>12), 0); + SET_TILE_INFO_MEMBER(PAGE_GFX, code&0xfff, (code>>5&0x78)+(code>>12), 0); } WRITE16_MEMBER(wecleman_state::wecleman_txtram_w) @@ -467,7 +467,7 @@ TILE_GET_INFO_MEMBER(wecleman_state::wecleman_get_bg_tile_info) int page = m_bgpage[((tile_index&0x7f)>>6) + ((tile_index>>12)<<1)]; int code = m_pageram[(tile_index&0x3f) + ((tile_index>>7&0x1f)<<6) + (page<<11)]; - SET_TILE_INFO_MEMBER(m_gfxdecode, PAGE_GFX, code&0xfff, (code>>5&0x78)+(code>>12), 0); + SET_TILE_INFO_MEMBER(PAGE_GFX, code&0xfff, (code>>5&0x78)+(code>>12), 0); } /*------------------------------------------------------------------------ @@ -480,7 +480,7 @@ TILE_GET_INFO_MEMBER(wecleman_state::wecleman_get_fg_tile_info) int code = m_pageram[(tile_index&0x3f) + ((tile_index>>7&0x1f)<<6) + (page<<11)]; if (!code || code==0xffff) code = 0x20; - SET_TILE_INFO_MEMBER(m_gfxdecode, PAGE_GFX, code&0xfff, (code>>5&0x78)+(code>>12), 0); + SET_TILE_INFO_MEMBER(PAGE_GFX, code&0xfff, (code>>5&0x78)+(code>>12), 0); } /*------------------------------------------------------------------------ @@ -928,19 +928,19 @@ VIDEO_START_MEMBER(wecleman_state,wecleman) m_sprite_list = auto_alloc_array_clear(machine(), struct sprite, NUM_SPRITES); - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wecleman_state::wecleman_get_bg_tile_info),this), + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wecleman_state::wecleman_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, /* We draw part of the road below */ 8,8, PAGE_NX * 2, PAGE_NY * 2 ); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wecleman_state::wecleman_get_fg_tile_info),this), + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wecleman_state::wecleman_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, PAGE_NX * 2, PAGE_NY * 2); - m_txt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wecleman_state::wecleman_get_txt_tile_info),this), + m_txt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wecleman_state::wecleman_get_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c index 17b9fa22ed9..2568bb590cc 100644 --- a/src/mame/video/welltris.c +++ b/src/mame/video/welltris.c @@ -57,8 +57,7 @@ TILE_GET_INFO_MEMBER(welltris_state::get_welltris_tile_info) UINT16 code = m_charvideoram[tile_index]; int bank = (code & 0x1000) >> 12; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, (code & 0x0fff) + (m_gfxbank[bank] << 12), ((code & 0xe000) >> 13) + (8 * m_charpalettebank), 0); @@ -72,7 +71,7 @@ WRITE16_MEMBER(welltris_state::welltris_charvideoram_w) void welltris_state::video_start() { - m_char_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(welltris_state::get_welltris_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_char_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(welltris_state::get_welltris_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_char_tilemap->set_transparent_pen(15); } diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index 56edd041eea..2bb2439d918 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -9,8 +9,7 @@ inline void wgp_state::common_get_piv_tile_info( tile_data &tileinfo, int tile_i UINT16 tilenum = m_pivram[tile_index + num * 0x1000]; /* 3 blocks of $2000 */ UINT16 attr = m_pivram[tile_index + num * 0x1000 + 0x8000]; /* 3 blocks of $2000 */ - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tilenum & 0x3fff, (attr & 0x3f), /* attr & 0x1 ?? */ TILE_FLIPYX( (attr & 0xc0) >> 6)); @@ -34,9 +33,9 @@ TILE_GET_INFO_MEMBER(wgp_state::get_piv2_tile_info) void wgp_state::wgp_core_vh_start( int piv_xoffs, int piv_yoffs ) { - m_piv_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wgp_state::get_piv0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_piv_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wgp_state::get_piv1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_piv_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wgp_state::get_piv2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_piv_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wgp_state::get_piv0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_piv_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wgp_state::get_piv1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_piv_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wgp_state::get_piv2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_piv_xoffs = piv_xoffs; m_piv_yoffs = piv_yoffs; diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c index 53fce1145ec..869669b4e11 100644 --- a/src/mame/video/williams.c +++ b/src/mame/video/williams.c @@ -138,7 +138,7 @@ VIDEO_START_MEMBER(williams_state,williams2) m_generic_paletteram_8.allocate(0x400 * 2); /* create the tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(williams_state::get_tile_info),this), TILEMAP_SCAN_COLS, 24,16, 128,16); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(williams_state::get_tile_info),this), TILEMAP_SCAN_COLS, 24,16, 128,16); m_bg_tilemap->set_scrolldx(2, 0); state_save_register(); @@ -382,7 +382,7 @@ TILE_GET_INFO_MEMBER(williams_state::get_tile_info) break; } - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, data & mask, color, (data & ~mask) ? TILE_FLIPX : 0); + SET_TILE_INFO_MEMBER(0, data & mask, color, (data & ~mask) ? TILE_FLIPX : 0); } diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c index 806342fe5b7..c96ae34aab1 100644 --- a/src/mame/video/wrally.c +++ b/src/mame/video/wrally.c @@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(wrally_state::get_tile_info_wrally_screen0) tileinfo.category = (data2 >> 5) & 0x01; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, data2 & 0x1f, TILE_FLIPYX((data2 >> 6) & 0x03)); + SET_TILE_INFO_MEMBER(0, code, data2 & 0x1f, TILE_FLIPYX((data2 >> 6) & 0x03)); } TILE_GET_INFO_MEMBER(wrally_state::get_tile_info_wrally_screen1) @@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(wrally_state::get_tile_info_wrally_screen1) tileinfo.category = (data2 >> 5) & 0x01; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, data2 & 0x1f, TILE_FLIPYX((data2 >> 6) & 0x03)); + SET_TILE_INFO_MEMBER(0, code, data2 & 0x1f, TILE_FLIPYX((data2 >> 6) & 0x03)); } /*************************************************************************** @@ -64,8 +64,8 @@ TILE_GET_INFO_MEMBER(wrally_state::get_tile_info_wrally_screen1) void wrally_state::video_start() { - m_pant[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wrally_state::get_tile_info_wrally_screen0),this),TILEMAP_SCAN_ROWS,16,16,64,32); - m_pant[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wrally_state::get_tile_info_wrally_screen1),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pant[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wrally_state::get_tile_info_wrally_screen0),this),TILEMAP_SCAN_ROWS,16,16,64,32); + m_pant[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wrally_state::get_tile_info_wrally_screen1),this),TILEMAP_SCAN_ROWS,16,16,64,32); m_pant[0]->set_transmask(0,0xff01,0x00ff); /* this layer is split in two (pens 1..7, pens 8-15) */ m_pant[1]->set_transparent_pen(0); diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index 9276e62c050..d70832d102b 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -55,8 +55,7 @@ TILE_GET_INFO_MEMBER(wwfsstar_state::get_fg0_tile_info) tilebase = &m_fg0_videoram[tile_index*2]; tileno = (tilebase[1] & 0x00ff) | ((tilebase[0] & 0x000f) << 8); colbank = (tilebase[0] & 0x00f0) >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, tileno, colbank, 0); @@ -92,8 +91,7 @@ TILE_GET_INFO_MEMBER(wwfsstar_state::get_bg0_tile_info) tileno = (tilebase[1] & 0x00ff) | ((tilebase[0] & 0x000f) << 8); colbank = (tilebase[0] & 0x0070) >> 4; flipx = (tilebase[0] & 0x0080) >> 7; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, tileno, colbank, flipx ? TILE_FLIPX : 0); @@ -204,10 +202,10 @@ void wwfsstar_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec void wwfsstar_state::video_start() { - m_fg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wwfsstar_state::get_fg0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_fg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wwfsstar_state::get_fg0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); m_fg0_tilemap->set_transparent_pen(0); - m_bg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wwfsstar_state::get_bg0_tile_info),this),tilemap_mapper_delegate(FUNC(wwfsstar_state::bg0_scan),this), 16, 16,32,32); + m_bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wwfsstar_state::get_bg0_tile_info),this),tilemap_mapper_delegate(FUNC(wwfsstar_state::bg0_scan),this), 16, 16,32,32); m_fg0_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c index f7287b3e158..308a35b6d5a 100644 --- a/src/mame/video/xain.c +++ b/src/mame/video/xain.c @@ -49,8 +49,7 @@ TILEMAP_MAPPER_MEMBER(xain_state::back_scan) TILE_GET_INFO_MEMBER(xain_state::get_bgram0_tile_info) { int attr = m_bgram0[tile_index | 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 2, + SET_TILE_INFO_MEMBER(2, m_bgram0[tile_index] | ((attr & 7) << 8), (attr & 0x70) >> 4, (attr & 0x80) ? TILE_FLIPX : 0); @@ -59,8 +58,7 @@ TILE_GET_INFO_MEMBER(xain_state::get_bgram0_tile_info) TILE_GET_INFO_MEMBER(xain_state::get_bgram1_tile_info) { int attr = m_bgram1[tile_index | 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, m_bgram1[tile_index] | ((attr & 7) << 8), (attr & 0x70) >> 4, (attr & 0x80) ? TILE_FLIPX : 0); @@ -69,8 +67,7 @@ TILE_GET_INFO_MEMBER(xain_state::get_bgram1_tile_info) TILE_GET_INFO_MEMBER(xain_state::get_char_tile_info) { int attr = m_charram[tile_index | 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_charram[tile_index] | ((attr & 3) << 8), (attr & 0xe0) >> 5, 0); @@ -85,9 +82,9 @@ TILE_GET_INFO_MEMBER(xain_state::get_char_tile_info) void xain_state::video_start() { - m_bgram0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xain_state::get_bgram0_tile_info),this),tilemap_mapper_delegate(FUNC(xain_state::back_scan),this),16,16,32,32); - m_bgram1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xain_state::get_bgram1_tile_info),this),tilemap_mapper_delegate(FUNC(xain_state::back_scan),this),16,16,32,32); - m_char_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xain_state::get_char_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); + m_bgram0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xain_state::get_bgram0_tile_info),this),tilemap_mapper_delegate(FUNC(xain_state::back_scan),this),16,16,32,32); + m_bgram1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xain_state::get_bgram1_tile_info),this),tilemap_mapper_delegate(FUNC(xain_state::back_scan),this),16,16,32,32); + m_char_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xain_state::get_char_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); m_bgram0_tilemap->set_transparent_pen(0); m_bgram1_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index 3817313b5d5..350d77228af 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -182,8 +182,7 @@ TILE_GET_INFO_MEMBER(xevious_state::get_fg_tile_info) We reproduce this here, but since the tilemap system automatically flips characters when screen is flipped, we have to flip them back. */ UINT8 color = ((attr & 0x03) << 4) | ((attr & 0x3c) >> 2); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_xevious_fg_videoram[tile_index] | (flip_screen() ? 0x100 : 0), color, TILE_FLIPYX((attr & 0xc0) >> 6) ^ (flip_screen() ? TILE_FLIPX : 0)); @@ -194,8 +193,7 @@ TILE_GET_INFO_MEMBER(xevious_state::get_bg_tile_info) UINT8 code = m_xevious_bg_videoram[tile_index]; UINT8 attr = m_xevious_bg_colorram[tile_index]; UINT8 color = ((attr & 0x3c) >> 2) | ((code & 0x80) >> 3) | ((attr & 0x03) << 5); - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code + ((attr & 0x01) << 8), color, TILE_FLIPYX((attr & 0xc0) >> 6)); @@ -211,8 +209,8 @@ TILE_GET_INFO_MEMBER(xevious_state::get_bg_tile_info) VIDEO_START_MEMBER(xevious_state,xevious) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xevious_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xevious_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xevious_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xevious_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_bg_tilemap->set_scrolldx(-20,288+27); m_bg_tilemap->set_scrolldy(-16,-16); diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c index a7af8dc9648..e843619b2cb 100644 --- a/src/mame/video/xorworld.c +++ b/src/mame/video/xorworld.c @@ -72,12 +72,12 @@ TILE_GET_INFO_MEMBER(xorworld_state::get_bg_tile_info) int data = videoram[tile_index]; int code = data & 0x0fff; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, data >> 12, 0); + SET_TILE_INFO_MEMBER(0, code, data >> 12, 0); } void xorworld_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xorworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xorworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c index 9041eebcf76..28f51b31090 100644 --- a/src/mame/video/xxmissio.c +++ b/src/mame/video/xxmissio.c @@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(xxmissio_state::get_bg_tile_info) int code = ((m_bgram[0x400 | tile_index] & 0xc0) << 2) | m_bgram[0x000 | tile_index]; int color = m_bgram[0x400 | tile_index] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, 0); + SET_TILE_INFO_MEMBER(2, code, color, 0); } TILE_GET_INFO_MEMBER(xxmissio_state::get_fg_tile_info) @@ -56,13 +56,13 @@ TILE_GET_INFO_MEMBER(xxmissio_state::get_fg_tile_info) int code = m_fgram[0x000 | tile_index]; int color = m_fgram[0x400 | tile_index] & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } void xxmissio_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xxmissio_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xxmissio_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xxmissio_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xxmissio_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); m_bg_tilemap->set_scroll_cols(1); m_bg_tilemap->set_scroll_rows(1); diff --git a/src/mame/video/xybots.c b/src/mame/video/xybots.c index 44c494bd82e..f67a57e10ac 100644 --- a/src/mame/video/xybots.c +++ b/src/mame/video/xybots.c @@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(xybots_state::get_alpha_tile_info) int code = data & 0x3ff; int color = (data >> 12) & 7; int opaque = data & 0x8000; - SET_TILE_INFO_MEMBER(m_gfxdecode, 2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); + SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } @@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(xybots_state::get_playfield_tile_info) UINT16 data = tilemap.basemem_read(tile_index); int code = data & 0x1fff; int color = (data >> 11) & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, (data >> 15) & 1); + SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1); } diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c index a723ef2a296..6a656f9eee6 100644 --- a/src/mame/video/xyonix.c +++ b/src/mame/video/xyonix.c @@ -38,7 +38,7 @@ TILE_GET_INFO_MEMBER(xyonix_state::get_xyonix_tile_info) tileno = (m_vidram[tile_index+1] << 0) | ((attr & 0x0f) << 8); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,tileno,attr >> 4,0); + SET_TILE_INFO_MEMBER(0,tileno,attr >> 4,0); } WRITE8_MEMBER(xyonix_state::xyonix_vidram_w) @@ -49,7 +49,7 @@ WRITE8_MEMBER(xyonix_state::xyonix_vidram_w) void xyonix_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xyonix_state::get_xyonix_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 80, 32); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(xyonix_state::get_xyonix_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 80, 32); } UINT32 xyonix_state::screen_update_xyonix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 7357ff50d80..8f4e680acbd 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -134,11 +134,11 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_A_8 ) if( col >= m_page_x ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else if( row >= m_page_y ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else { @@ -209,7 +209,7 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_A_8 ) j += m_namcond1_gfxbank * 0x8000; } - SET_TILE_INFO_MEMBER(m_gfxdecode, set, j, attr & 0x0F, f ); + SET_TILE_INFO_MEMBER(set, j, attr & 0x0F, f ); } } @@ -227,15 +227,15 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_B_8 ) if ((m_regs.s.r7 & r7_md) & MD_1PLANE ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else if (col >= m_page_x) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else if (row >= m_page_y) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else { @@ -306,7 +306,7 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_B_8 ) j += m_namcond1_gfxbank * 0x8000; } - SET_TILE_INFO_MEMBER(m_gfxdecode, set, j, attr, f ); + SET_TILE_INFO_MEMBER(set, j, attr, f ); } } @@ -323,10 +323,10 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_A_16 ) int base = row >> m_base_y_shift; if( col >= m_page_x ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else if( row >= m_page_y ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else { int sx, sy, page; @@ -395,7 +395,7 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_A_16 ) } - SET_TILE_INFO_MEMBER(m_gfxdecode, set, j, attr, f ); + SET_TILE_INFO_MEMBER(set, j, attr, f ); } } @@ -412,13 +412,13 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_B_16 ) int base = row >> m_base_y_shift; if((m_regs.s.r7 & r7_md) & MD_1PLANE ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } if( col >= m_page_x ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else if( row >= m_page_y ) { - SET_TILE_INFO_MEMBER(m_gfxdecode, set, 0, 0, 0 ); + SET_TILE_INFO_MEMBER(set, 0, 0, 0 ); } else { int sx, sy, page; @@ -485,7 +485,7 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_B_16 ) j += m_namcond1_gfxbank * 0x2000; } - SET_TILE_INFO_MEMBER(m_gfxdecode, set, j, attr, f ); + SET_TILE_INFO_MEMBER(set, j, attr, f ); } } @@ -543,21 +543,21 @@ void ygv608_device::device_start() save_item(NAME(m_namcond1_gfxbank)); /* create tilemaps of all sizes and combinations */ - m_tilemap_A_cache_8[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 32,32); - m_tilemap_A_cache_8[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 64,32); - m_tilemap_A_cache_8[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 32,64); + m_tilemap_A_cache_8[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 32,32); + m_tilemap_A_cache_8[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 64,32); + m_tilemap_A_cache_8[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 32,64); - m_tilemap_A_cache_16[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 32,32); - m_tilemap_A_cache_16[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 64,32); - m_tilemap_A_cache_16[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 32,64); + m_tilemap_A_cache_16[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 32,32); + m_tilemap_A_cache_16[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 64,32); + m_tilemap_A_cache_16[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_A_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 32,64); - m_tilemap_B_cache_8[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 32,32); - m_tilemap_B_cache_8[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 64,32); - m_tilemap_B_cache_8[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 32,64); + m_tilemap_B_cache_8[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 32,32); + m_tilemap_B_cache_8[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 64,32); + m_tilemap_B_cache_8[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_8),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 8,8, 32,64); - m_tilemap_B_cache_16[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 32,32); - m_tilemap_B_cache_16[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 64,32); - m_tilemap_B_cache_16[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 32,64); + m_tilemap_B_cache_16[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 32,32); + m_tilemap_B_cache_16[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 64,32); + m_tilemap_B_cache_16[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(ygv608_device::get_tile_info_B_16),this), tilemap_mapper_delegate(FUNC(ygv608_device::get_tile_offset),this), 16,16, 32,64); m_tilemap_A = NULL; m_tilemap_B = NULL; diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index 5fa008e3cc7..2e24c31643a 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -94,12 +94,12 @@ TILE_GET_INFO_MEMBER(yiear_state::get_bg_tile_info) // int color = (attr & 0xf0) >> 4; int flags = ((attr & 0x80) ? TILE_FLIPX : 0) | ((attr & 0x40) ? TILE_FLIPY : 0); - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, flags); + SET_TILE_INFO_MEMBER(0, code, 0, flags); } void yiear_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yiear_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(yiear_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } void yiear_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c index 69ce9cf4081..33a925bbf6d 100644 --- a/src/mame/video/yunsun16.c +++ b/src/mame/video/yunsun16.c @@ -51,8 +51,7 @@ TILE_GET_INFO_MEMBER(yunsun16_state::get_tile_info_0) { UINT16 code = m_vram_0[2 * tile_index + 0]; UINT16 attr = m_vram_0[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - TMAP_GFX, + SET_TILE_INFO_MEMBER(TMAP_GFX, code, attr & 0xf, (attr & 0x20) ? TILE_FLIPX : 0); @@ -62,8 +61,7 @@ TILE_GET_INFO_MEMBER(yunsun16_state::get_tile_info_1) { UINT16 code = m_vram_1[2 * tile_index + 0]; UINT16 attr = m_vram_1[2 * tile_index + 1]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - TMAP_GFX, + SET_TILE_INFO_MEMBER(TMAP_GFX, code, attr & 0xf, (attr & 0x20) ? TILE_FLIPX : 0); @@ -92,9 +90,9 @@ WRITE16_MEMBER(yunsun16_state::yunsun16_vram_1_w) void yunsun16_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yunsun16_state::get_tile_info_0),this),tilemap_mapper_delegate(FUNC(yunsun16_state::yunsun16_tilemap_scan_pages),this), + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(yunsun16_state::get_tile_info_0),this),tilemap_mapper_delegate(FUNC(yunsun16_state::yunsun16_tilemap_scan_pages),this), 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yunsun16_state::get_tile_info_1),this),tilemap_mapper_delegate(FUNC(yunsun16_state::yunsun16_tilemap_scan_pages),this), + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(yunsun16_state::get_tile_info_1),this),tilemap_mapper_delegate(FUNC(yunsun16_state::yunsun16_tilemap_scan_pages),this), 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_tilemap_0->set_scrolldx(-0x34, 0); diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index 51b9aa6e132..735f66324c4 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -134,8 +134,7 @@ TILE_GET_INFO_MEMBER(yunsung8_state::get_tile_info_0) { int code = m_videoram_0[0x1000 + tile_index * 2 + 0] + m_videoram_0[0x1000 + tile_index * 2 + 1] * 256; int color = m_videoram_0[0x0800 + tile_index] & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, code, color, 0); @@ -150,8 +149,7 @@ TILE_GET_INFO_MEMBER(yunsung8_state::get_tile_info_1) { int code = m_videoram_1[0x1000 + tile_index * 2 + 0] + m_videoram_1[0x1000 + tile_index * 2 + 1] * 256; int color = m_videoram_1[0x0800 + tile_index] & 0x3f; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 1, + SET_TILE_INFO_MEMBER(1, code, color, 0); @@ -170,8 +168,8 @@ TILE_GET_INFO_MEMBER(yunsung8_state::get_tile_info_1) void yunsung8_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yunsung8_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, DIM_NX_0, DIM_NY_0 ); - m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yunsung8_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, DIM_NX_1, DIM_NY_1 ); + m_tilemap_0 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(yunsung8_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, DIM_NX_0, DIM_NY_0 ); + m_tilemap_1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(yunsung8_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, DIM_NX_1, DIM_NY_1 ); m_tilemap_1->set_transparent_pen(0); } diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c index 1d687f3e393..d0451f933ab 100644 --- a/src/mame/video/zac2650.c +++ b/src/mame/video/zac2650.c @@ -114,12 +114,12 @@ TILE_GET_INFO_MEMBER(zac2650_state::get_bg_tile_info) UINT8 *videoram = m_videoram; int code = videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, 0, 0); + SET_TILE_INFO_MEMBER(0, code, 0, 0); } void zac2650_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(zac2650_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(zac2650_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 24, 24, 32, 32); m_screen->register_screen_bitmap(m_bitmap); diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c index c7a87df7b0b..ef4e299ed89 100644 --- a/src/mame/video/zaccaria.c +++ b/src/mame/video/zaccaria.c @@ -113,8 +113,7 @@ PALETTE_INIT_MEMBER(zaccaria_state, zaccaria) TILE_GET_INFO_MEMBER(zaccaria_state::get_tile_info) { UINT8 attr = m_videoram[tile_index + 0x400]; - SET_TILE_INFO_MEMBER(m_gfxdecode, - 0, + SET_TILE_INFO_MEMBER(0, m_videoram[tile_index] + ((attr & 0x03) << 8), ((attr & 0x0c) >> 2) + ((m_attributesram[2 * (tile_index % 32) + 1] & 0x07) << 2), 0); @@ -130,7 +129,7 @@ TILE_GET_INFO_MEMBER(zaccaria_state::get_tile_info) void zaccaria_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(zaccaria_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(zaccaria_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap->set_scroll_cols(32); } diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index f3067707ac4..1b2d0514416 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -74,7 +74,7 @@ TILE_GET_INFO_MEMBER(zaxxon_state::get_bg_tile_info) int code = source[eff_index] + 256 * (source[eff_index + size] & 3); int color = source[eff_index + size] >> 4; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1, code, color, 0); + SET_TILE_INFO_MEMBER(1, code, color, 0); } @@ -85,7 +85,7 @@ TILE_GET_INFO_MEMBER(zaxxon_state::zaxxon_get_fg_tile_info) int code = m_videoram[tile_index]; int color = m_color_codes[sx + 32 * (sy / 4)] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color * 2, 0); + SET_TILE_INFO_MEMBER(0, code, color * 2, 0); } @@ -94,7 +94,7 @@ TILE_GET_INFO_MEMBER(zaxxon_state::razmataz_get_fg_tile_info) int code = m_videoram[tile_index]; int color = m_color_codes[code] & 0x0f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color * 2, 0); + SET_TILE_INFO_MEMBER(0, code, color * 2, 0); } @@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(zaxxon_state::congo_get_fg_tile_info) int code = m_videoram[tile_index] + (m_congo_fg_bank << 8); int color = m_colorram[tile_index] & 0x1f; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color * 2, 0); + SET_TILE_INFO_MEMBER(0, code, color * 2, 0); } @@ -126,8 +126,8 @@ void zaxxon_state::video_start_common(tilemap_get_info_delegate fg_tile_info) memset(m_congo_custom, 0, sizeof(m_congo_custom)); /* create a background and foreground tilemap */ - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(zaxxon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,512); - m_fg_tilemap = &machine().tilemap().create(fg_tile_info, TILEMAP_SCAN_ROWS, 8,8, 32,32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(zaxxon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,512); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, fg_tile_info, TILEMAP_SCAN_ROWS, 8,8, 32,32); /* configure the foreground tilemap */ m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/zerozone.c b/src/mame/video/zerozone.c index 583073e8dcd..41cdf85c14a 100644 --- a/src/mame/video/zerozone.c +++ b/src/mame/video/zerozone.c @@ -29,14 +29,14 @@ TILE_GET_INFO_MEMBER(zerozone_state::get_zerozone_tile_info) if (m_vram[tile_index] & 0x0800) tileno += m_tilebank * 0x800; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, tileno, colour >> 12, 0); + SET_TILE_INFO_MEMBER(0, tileno, colour >> 12, 0); } void zerozone_state::video_start() { // i'm not 100% sure it should be opaque, pink title screen looks strange in las vegas girls // but if its transparent other things look incorrect - m_zz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(zerozone_state::get_zerozone_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); + m_zz_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(zerozone_state::get_zerozone_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); } UINT32 zerozone_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index a5a6bd123d4..9dde54eec7a 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -96,7 +96,7 @@ TILE_GET_INFO_MEMBER(zodiack_state::get_bg_tile_info) int code = m_videoram_2[tile_index]; int color = (m_attributeram[(tile_index & 0x1f) << 1 | 1] >> 4) & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0, code, color, 0); + SET_TILE_INFO_MEMBER(0, code, color, 0); } TILE_GET_INFO_MEMBER(zodiack_state::get_fg_tile_info) @@ -104,13 +104,13 @@ TILE_GET_INFO_MEMBER(zodiack_state::get_fg_tile_info) int code = m_videoram[tile_index]; int color = (m_attributeram[(tile_index & 0x1f) << 1 | 1] >> 0) & 0x07; - SET_TILE_INFO_MEMBER(m_gfxdecode, 3, code, color, 0); + SET_TILE_INFO_MEMBER(3, code, color, 0); } void zodiack_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(zodiack_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(zodiack_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(zodiack_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(zodiack_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_scroll_cols(32); diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c index 0f40a073f67..6ce0924db4e 100644 --- a/src/mess/drivers/supracan.c +++ b/src/mess/drivers/supracan.c @@ -344,7 +344,7 @@ void supracan_state::supracan_tilemap_get_info_common(int layer, tile_data &tile int flipxy = (supracan_vram[count] & 0x0c00)>>10; int palette = ((supracan_vram[count] & 0xf000) >> 12) + palette_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, region, tile, palette, TILE_FLIPXY(flipxy)); + SET_TILE_INFO_MEMBER(region, tile, palette, TILE_FLIPXY(flipxy)); } // I wonder how different this really is.. my guess, not at all. @@ -373,7 +373,7 @@ void supracan_state::supracan_tilemap_get_info_roz(int layer, tile_data &tileinf if (count & 0x20) tile ^= 1; tile |= (count & 0xc0)>>2; - SET_TILE_INFO_MEMBER(m_gfxdecode, region, tile, 0, 0); + SET_TILE_INFO_MEMBER(region, tile, 0, 0); return; } @@ -397,7 +397,7 @@ void supracan_state::supracan_tilemap_get_info_roz(int layer, tile_data &tileinf int flipxy = (supracan_vram[count] & 0x0c00)>>10; int palette = ((supracan_vram[count] & 0xf000) >> 12) + palette_bank; - SET_TILE_INFO_MEMBER(m_gfxdecode, region, tile, palette, TILE_FLIPXY(flipxy)); + SET_TILE_INFO_MEMBER(region, tile, palette, TILE_FLIPXY(flipxy)); } @@ -431,25 +431,25 @@ void supracan_state::video_start() m_vram_swapped = (UINT16*)(*memregion("ram_gfx2")); m_vram_addr_swapped = (UINT8*)(*memregion("ram_gfx3")); // hack for 1bpp layer at startup - m_tilemap_sizes[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_tilemap_sizes[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap_sizes[0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); - m_tilemap_sizes[0][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap_sizes[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap_sizes[0][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap_sizes[0][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); + m_tilemap_sizes[0][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap_sizes[1][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_tilemap_sizes[1][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap_sizes[1][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); - m_tilemap_sizes[1][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap_sizes[1][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap_sizes[1][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap_sizes[1][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); + m_tilemap_sizes[1][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap_sizes[2][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_tilemap_sizes[2][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap_sizes[2][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); - m_tilemap_sizes[2][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap_sizes[2][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap_sizes[2][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap_sizes[2][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); + m_tilemap_sizes[2][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - m_tilemap_sizes[3][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_roz_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_tilemap_sizes[3][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_roz_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - m_tilemap_sizes[3][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_roz_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); - m_tilemap_sizes[3][3] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_roz_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + m_tilemap_sizes[3][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_roz_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_tilemap_sizes[3][1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_roz_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + m_tilemap_sizes[3][2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_roz_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); + m_tilemap_sizes[3][3] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_roz_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); } int supracan_state::get_tilemap_dimensions(int &xsize, int &ysize, int layer) diff --git a/src/mess/video/apple1.c b/src/mess/video/apple1.c index 5fb9a91ad46..a7f40ad356f 100644 --- a/src/mess/video/apple1.c +++ b/src/mess/video/apple1.c @@ -82,8 +82,7 @@ TILE_GET_INFO_MEMBER(apple1_state::terminal_gettileinfo) if ((tile_index == m_current_terminal->cur_offset) && !m_current_terminal->cur_hidden && m_current_terminal->getcursorcode) code = m_current_terminal->getcursorcode(code); - SET_TILE_INFO_MEMBER(m_gfxdecode, - gfxfont, /* gfx */ + SET_TILE_INFO_MEMBER(gfxfont, /* gfx */ code, /* character */ color, /* color */ 0); /* flags */ @@ -190,7 +189,7 @@ terminal_t *apple1_state::terminal_create( term = (terminal_t *) auto_alloc_array(machine(), char, sizeof(terminal_t) - sizeof(term->mem) + (num_cols * num_rows * sizeof(termchar_t))); - term->tm = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(apple1_state::terminal_gettileinfo),this), TILEMAP_SCAN_ROWS, + term->tm = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(apple1_state::terminal_gettileinfo),this), TILEMAP_SCAN_ROWS, char_width, char_height, num_cols, num_rows); term->gfx = gfx; diff --git a/src/mess/video/aquarius.c b/src/mess/video/aquarius.c index 0c822afce78..7799a778bc8 100644 --- a/src/mess/video/aquarius.c +++ b/src/mess/video/aquarius.c @@ -83,12 +83,12 @@ TILE_GET_INFO_MEMBER(aquarius_state::aquarius_gettileinfo) int color = m_colorram[tile_index]; int flags = 0; - SET_TILE_INFO_MEMBER(m_gfxdecode, bank, code, color, flags); + SET_TILE_INFO_MEMBER(bank, code, color, flags); } void aquarius_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aquarius_state::aquarius_gettileinfo),this), TILEMAP_SCAN_ROWS, 8, 8, 40, 25); + m_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(aquarius_state::aquarius_gettileinfo),this), TILEMAP_SCAN_ROWS, 8, 8, 40, 25); } UINT32 aquarius_state::screen_update_aquarius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mess/video/microtan.c b/src/mess/video/microtan.c index 46470dd3071..e7630844891 100644 --- a/src/mess/video/microtan.c +++ b/src/mess/video/microtan.c @@ -35,12 +35,12 @@ TILE_GET_INFO_MEMBER(microtan_state::get_bg_tile_info) int gfxn = m_chunky_buffer[tile_index]; int code = videoram[tile_index]; - SET_TILE_INFO_MEMBER(m_gfxdecode, gfxn, code, 0, 0); + SET_TILE_INFO_MEMBER(gfxn, code, 0, 0); } void microtan_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(microtan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, + m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(microtan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 16, 32, 16); m_chunky_buffer = auto_alloc_array(machine(), UINT8, 0x200); diff --git a/src/mess/video/x68k.c b/src/mess/video/x68k.c index 146b07189b5..f34529ee16f 100644 --- a/src/mess/video/x68k.c +++ b/src/mess/video/x68k.c @@ -1058,7 +1058,7 @@ TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg0_tile) int code = m_spriteram[0x3000+tile_index] & 0x00ff; int colour = (m_spriteram[0x3000+tile_index] & 0x0f00) >> 8; int flags = (m_spriteram[0x3000+tile_index] & 0xc000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,colour+16,flags); + SET_TILE_INFO_MEMBER(0,code,colour+16,flags); } TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg1_tile) @@ -1066,7 +1066,7 @@ TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg1_tile) int code = m_spriteram[0x2000+tile_index] & 0x00ff; int colour = (m_spriteram[0x2000+tile_index] & 0x0f00) >> 8; int flags = (m_spriteram[0x2000+tile_index] & 0xc000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, 0,code,colour+16,flags); + SET_TILE_INFO_MEMBER(0,code,colour+16,flags); } TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg0_tile_16) @@ -1074,7 +1074,7 @@ TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg0_tile_16) int code = m_spriteram[0x3000+tile_index] & 0x00ff; int colour = (m_spriteram[0x3000+tile_index] & 0x0f00) >> 8; int flags = (m_spriteram[0x3000+tile_index] & 0xc000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,code,colour+16,flags); + SET_TILE_INFO_MEMBER(1,code,colour+16,flags); } TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg1_tile_16) @@ -1082,7 +1082,7 @@ TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg1_tile_16) int code = m_spriteram[0x2000+tile_index] & 0x00ff; int colour = (m_spriteram[0x2000+tile_index] & 0x0f00) >> 8; int flags = (m_spriteram[0x2000+tile_index] & 0xc000) >> 14; - SET_TILE_INFO_MEMBER(m_gfxdecode, 1,code,colour+16,flags); + SET_TILE_INFO_MEMBER(1,code,colour+16,flags); } VIDEO_START_MEMBER(x68k_state,x68000) @@ -1102,10 +1102,10 @@ VIDEO_START_MEMBER(x68k_state,x68000) m_gfxdecode->gfx(gfx_index)->set_colors(32); /* Tilemaps */ - m_bg0_8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(x68k_state::x68k_get_bg0_tile),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_bg1_8 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(x68k_state::x68k_get_bg1_tile),this),TILEMAP_SCAN_ROWS,8,8,64,64); - m_bg0_16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(x68k_state::x68k_get_bg0_tile_16),this),TILEMAP_SCAN_ROWS,16,16,64,64); - m_bg1_16 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(x68k_state::x68k_get_bg1_tile_16),this),TILEMAP_SCAN_ROWS,16,16,64,64); + m_bg0_8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(x68k_state::x68k_get_bg0_tile),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_bg1_8 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(x68k_state::x68k_get_bg1_tile),this),TILEMAP_SCAN_ROWS,8,8,64,64); + m_bg0_16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(x68k_state::x68k_get_bg0_tile_16),this),TILEMAP_SCAN_ROWS,16,16,64,64); + m_bg1_16 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(x68k_state::x68k_get_bg1_tile_16),this),TILEMAP_SCAN_ROWS,16,16,64,64); m_bg0_8->set_transparent_pen(0); m_bg1_8->set_transparent_pen(0);