diff --git a/src/emu/emupal.c b/src/emu/emupal.c index 7160fcf5790..30677d81ee7 100644 --- a/src/emu/emupal.c +++ b/src/emu/emupal.c @@ -476,7 +476,7 @@ void colortable_configure_tilemap_groups(colortable_t *ctable, tilemap_t *tmap, /* iterate over all colors in the tilemap */ for (color = 0; color < gfx->total_colors; color++) - tilemap_set_transmask(tmap, color, colortable_get_transpen_mask(ctable, gfx, color, transcolor), 0); + tmap->set_transmask(color, colortable_get_transpen_mask(ctable, gfx, color, transcolor), 0); } diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index bde68e5373c..badcf5993a6 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -739,7 +739,7 @@ g_profiler.start(PROFILER_TILEMAP_UPDATE); // call the get info callback for the associated memory index tilemap_memory_index memindex = m_logical_to_memory[logindex]; - m_tile_get_info(&m_tileinfo, memindex, m_user_data); + m_tile_get_info(m_tileinfo, memindex, m_user_data); // apply the global tilemap flip to the returned flip flags UINT32 flags = m_tileinfo.flags ^ (m_attributes & 0x03); diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index 05c4d102108..54ea5795f56 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -210,7 +210,7 @@ // set the category of each tile based on the high bit; this // allows us to draw each category independently - tileinfo->category = category; + tileinfo.category = category; } VIDEO_START( mydriver ) @@ -411,13 +411,13 @@ struct tile_data // modern delegates -typedef delegate tilemap_get_info_delegate; +typedef delegate tilemap_get_info_delegate; typedef delegate tilemap_mapper_delegate; // legacy callbacks -typedef void (*tile_get_info_func)(running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, void *param); -typedef void (*tile_get_info_device_func)(device_t *device, tile_data *tileinfo, tilemap_memory_index tile_index, void *param); +typedef void (*tile_get_info_func)(running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, void *param); +typedef void (*tile_get_info_device_func)(device_t *device, tile_data &tileinfo, tilemap_memory_index tile_index, void *param); typedef tilemap_memory_index (*tilemap_mapper_func)(running_machine &machine, UINT32 col, UINT32 row, UINT32 num_cols, UINT32 num_rows); @@ -463,9 +463,9 @@ public: tilemap_memory_index memory_index(UINT32 col, UINT32 row) { return m_mapper(col, row, m_cols, m_rows); } // setters + void enable(bool enable = true) { m_enable = enable; } void set_user_data(void *user_data) { m_user_data = user_data; } void set_palette_offset(UINT32 offset) { m_palette_offset = offset; } - void set_enable(bool enable) { m_enable = enable; } void set_scrolldx(int dx, int dx_flipped) { m_dx = dx; m_dx_flipped = dx_flipped; } void set_scrolldy(int dy, int dy_flipped) { m_dy = dy; m_dy_flipped = dy_flipped; } void set_scrollx(int which, int value) { if (which < m_scrollrows) m_rowscroll[which] = value; } @@ -643,15 +643,15 @@ private: #define TILEMAP_DRAW_ALPHA(x) (TILEMAP_DRAW_ALPHA_FLAG | (rgb_clamp(x) << 24)) // function definition for a get info callback -#define TILE_GET_INFO(_name) void _name(running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, void *param) -#define TILE_GET_INFO_DEVICE(_name) void _name(device_t *device, tile_data *tileinfo, tilemap_memory_index tile_index, void *param) +#define TILE_GET_INFO(_name) void _name(running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, void *param) +#define TILE_GET_INFO_DEVICE(_name) void _name(device_t *device, tile_data &tileinfo, tilemap_memory_index tile_index, void *param) // function definition for a logical-to-memory mapper #define TILEMAP_MAPPER(_name) tilemap_memory_index _name(running_machine &machine, 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(GFX,CODE,COLOR,FLAGS) tileinfo_set(machine, tileinfo, GFX, CODE, COLOR, FLAGS) -#define SET_TILE_INFO_DEVICE(GFX,CODE,COLOR,FLAGS) tileinfo_set(device->machine(), tileinfo, GFX, CODE, COLOR, FLAGS) +#define SET_TILE_INFO(GFX,CODE,COLOR,FLAGS) tileinfo.set(machine, GFX, CODE, COLOR, FLAGS) +#define SET_TILE_INFO_DEVICE(GFX,CODE,COLOR,FLAGS) tileinfo.set(device->machine(), 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 @@ -676,135 +676,6 @@ inline tilemap_t *tilemap_create(running_machine &machine, tile_get_info_func ti inline tilemap_t *tilemap_create_device(device_t *device, tile_get_info_device_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) { return &device->machine().tilemap().create(tilemap_get_info_delegate(tile_get_info, "", device), tilemap_mapper_delegate(mapper, "", &device->machine()), tilewidth, tileheight, cols, rows); } -// specify a parameter to be passed into the tile_get_info callback -inline void tilemap_set_user_data(tilemap_t *tmap, void *user_data) -{ tmap->set_user_data(user_data); } - -// specify an offset to be added to each pixel before looking up the palette. -inline void tilemap_set_palette_offset(tilemap_t *tmap, UINT32 offset) -{ tmap->set_palette_offset(offset); } - -// set an enable flag for the tilemap; if 0, requests to draw the tilemap are ignored -inline void tilemap_set_enable(tilemap_t *tmap, int enable) -{ tmap->set_enable(enable); } - -// return enable flag for the tilemap -inline int tilemap_get_enable(tilemap_t *tmap) -{ return tmap->enabled(); } - -// set a global flip for the tilemap -inline void tilemap_set_flip(tilemap_t *tmap, UINT32 attributes) -{ tmap->set_flip(attributes); } - -// set a global flip for all tilemaps -inline void tilemap_set_flip_all(running_machine &machine, UINT32 attributes) -{ machine.tilemap().set_flip_all(attributes); } - - - -// ----- dirty tile marking ----- - -// mark a single tile dirty based on its memory index -inline void tilemap_mark_tile_dirty(tilemap_t *tmap, tilemap_memory_index memory_index) -{ tmap->mark_tile_dirty(memory_index); } - -// mark all the tiles dirty in a tilemap -inline void tilemap_mark_all_tiles_dirty(tilemap_t *tmap) -{ tmap->mark_all_dirty(); } - -// mark all the tiles dirty in all tilemaps -inline void tilemap_mark_all_tiles_dirty_all(running_machine &machine) -{ machine.tilemap().mark_all_dirty(); } - - - -// ----- pen-to-layer mapping ----- - -// specify the mapping of one or more pens (where ( & mask == pen) to a layer -inline void tilemap_map_pens_to_layer(tilemap_t *tmap, int group, pen_t pen, pen_t mask, UINT8 layermask) -{ tmap->map_pens_to_layer(group, pen, mask, layermask); } - -// set a single transparent pen into the tilemap, mapping all other pens to layer 0 -inline void tilemap_set_transparent_pen(tilemap_t *tmap, pen_t pen) -{ tmap->set_transparent_pen(pen); } - -// set up the first 32 pens using a foreground (layer 0) mask and a background (layer 1) mask -inline void tilemap_set_transmask(tilemap_t *tmap, int group, UINT32 fgmask, UINT32 bgmask) -{ tmap->set_transmask(group, fgmask, bgmask); } - - - -// ----- tilemap scrolling ----- - -// specify the number of independently scrollable row units; each unit covers height/scroll_rows pixels -inline void tilemap_set_scroll_rows(tilemap_t *tmap, UINT32 scroll_rows) -{ tmap->set_scroll_rows(scroll_rows); } - -// specify the number of independently scrollable column units; each unit covers width/scroll_cols pixels -inline void tilemap_set_scroll_cols(tilemap_t *tmap, UINT32 scroll_cols) -{ tmap->set_scroll_cols(scroll_cols); } - -// specify global horizontal and vertical scroll offsets, for non-flipped and flipped cases -inline void tilemap_set_scrolldx(tilemap_t *tmap, int dx, int dx_if_flipped) -{ tmap->set_scrolldx(dx, dx_if_flipped); } -inline void tilemap_set_scrolldy(tilemap_t *tmap, int dy, int dy_if_flipped) -{ tmap->set_scrolldy(dy, dy_if_flipped); } - -// return the global horizontal or vertical scroll offset, based on current flip state -inline int tilemap_get_scrolldx(tilemap_t *tmap) -{ return tmap->scrolldx(); } -inline int tilemap_get_scrolldy(tilemap_t *tmap) -{ return tmap->scrolldy(); } - -// specify the scroll value for a row/column unit -inline void tilemap_set_scrollx(tilemap_t *tmap, int row, int value) -{ tmap->set_scrollx(row, value); } -inline void tilemap_set_scrolly(tilemap_t *tmap, int col, int value) -{ tmap->set_scrolly(col, value); } - -// return the scroll value for a row/column unit -inline int tilemap_get_scrollx(tilemap_t *tmap, int row) -{ return tmap->scrollx(row); } -inline int tilemap_get_scrolly(tilemap_t *tmap, int col) -{ return tmap->scrolly(col); } - - - -// ----- internal map access ----- - -// return a pointer to the (updated) internal pixmap for a tilemap -inline bitmap_ind16 &tilemap_get_pixmap(tilemap_t *tmap) -{ return tmap->pixmap(); } - -// return a pointer to the (updated) internal flagsmap for a tilemap -inline bitmap_ind8 &tilemap_get_flagsmap(tilemap_t *tmap) -{ return tmap->flagsmap(); } - -// return a pointer to the (updated) internal per-tile flags for a tilemap -inline UINT8 *tilemap_get_tile_flags(tilemap_t *tmap) -{ return tmap->tile_flags(); } - - - -// ----- tilemap rendering ----- - -// draw a tilemap to the destination with clipping; pixels apply priority/priority_mask to the priority bitmap -inline void tilemap_draw_primask(bitmap_ind16 &dest, const rectangle &cliprect, tilemap_t *tmap, UINT32 flags, UINT8 priority, UINT8 priority_mask) -{ tmap->draw(dest, cliprect, flags, priority, priority_mask); } -inline void tilemap_draw_primask(bitmap_rgb32 &dest, const rectangle &cliprect, tilemap_t *tmap, UINT32 flags, UINT8 priority, UINT8 priority_mask) -{ tmap->draw(dest, cliprect, flags, priority, priority_mask); } - -// draw a tilemap to the destination with clipping and arbitrary rotate/zoom; -// pixels apply priority/priority_mask to the priority bitmap -inline void tilemap_draw_roz_primask(bitmap_ind16 &dest, const rectangle &cliprect, tilemap_t *tmap, - UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, - int wraparound, UINT32 flags, UINT8 priority, UINT8 priority_mask) -{ tmap->draw_roz(dest, cliprect, startx, starty, incxx, incxy, incyx, incyy, wraparound, flags, priority, priority_mask); } -inline void tilemap_draw_roz_primask(bitmap_rgb32 &dest, const rectangle &cliprect, tilemap_t *tmap, - UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, - int wraparound, UINT32 flags, UINT8 priority, UINT8 priority_mask) -{ tmap->draw_roz(dest, cliprect, startx, starty, incxx, incxy, incyx, incyy, wraparound, flags, priority, priority_mask); } - // ----- common logical-to-memory mappers ----- @@ -827,45 +698,6 @@ TILEMAP_MAPPER( tilemap_scan_cols_flip_xy ); // INLINE FUNCTIONS //************************************************************************** -/*------------------------------------------------- - tileinfo_set - set the values of a tileinfo - structure --------------------------------------------------*/ - -inline void tileinfo_set(running_machine &machine, tile_data *tileinfo, int gfxnum, int rawcode, int rawcolor, int flags) -{ tileinfo->set(machine, gfxnum, rawcode, rawcolor, flags); } - - -/*------------------------------------------------- - tilemap_map_pen_to_layer - map a single pen - to a layer --------------------------------------------------*/ - -inline void tilemap_map_pen_to_layer(tilemap_t *tmap, int group, pen_t pen, UINT8 layermask) -{ tmap->map_pen_to_layer(group, pen, layermask); } - - -/*------------------------------------------------- - tilemap_draw - shortcut to - tilemap_draw_primask --------------------------------------------------*/ - -template -inline void tilemap_draw(_BitmapClass &dest, const rectangle &cliprect, tilemap_t *tmap, UINT32 flags, UINT8 priority) -{ tmap->draw(dest, cliprect, flags, priority); } - - -/*------------------------------------------------- - tilemap_draw_roz - shortcut to - tilemap_draw_roz_primask --------------------------------------------------*/ - -template -inline void tilemap_draw_roz(_BitmapClass &dest, const rectangle &cliprect, tilemap_t *tmap, - UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, - int wraparound, UINT32 flags, UINT8 priority) -{ tmap->draw_roz(dest, cliprect, startx, starty, incxx, incxy, incyx, incyy, wraparound, flags, priority); } - inline running_machine &tilemap_t::machine() const { diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c index 7d8adb1fc39..c3aa492783f 100644 --- a/src/emu/video/generic.c +++ b/src/emu/video/generic.c @@ -384,7 +384,7 @@ static void updateflip(running_machine &machine) attoseconds_t period = machine.primary_screen->frame_period().attoseconds; rectangle visarea = machine.primary_screen->visible_area(); - tilemap_set_flip_all(machine,(TILEMAP_FLIPX & state->flip_screen_x) | (TILEMAP_FLIPY & state->flip_screen_y)); + machine.tilemap().set_flip_all((TILEMAP_FLIPX & state->flip_screen_x) | (TILEMAP_FLIPY & state->flip_screen_y)); if (state->flip_screen_x) { diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index b8a97f1ab0d..ce7117a2e22 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -74,7 +74,7 @@ static WRITE16_HANDLER( k3_bgram_w ) { k3_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_k3_bg_tile_info ) @@ -119,7 +119,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const static SCREEN_UPDATE_IND16(k3) { k3_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -128,13 +128,13 @@ static SCREEN_UPDATE_IND16(k3) static WRITE16_HANDLER( k3_scrollx_w ) { k3_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); } static WRITE16_HANDLER( k3_scrolly_w ) { k3_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } static WRITE16_HANDLER( k3_soundbanks_w ) diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c index 2db07ef5d93..e0b824ab5cb 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -481,14 +481,14 @@ static WRITE8_HANDLER( fclown_videoram_w ) { _5clown_state *state = space->machine().driver_data<_5clown_state>(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( fclown_colorram_w ) { _5clown_state *state = space->machine().driver_data<_5clown_state>(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -524,7 +524,7 @@ static VIDEO_START(fclown) static SCREEN_UPDATE_IND16( fclown ) { _5clown_state *state = screen.machine().driver_data<_5clown_state>(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index e2d2560e89a..57715ee1e3e 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -177,7 +177,7 @@ static VIDEO_START( acommand ) state->m_ac_vregs = auto_alloc_array(machine, UINT16, 0x80/2); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); + state->m_tx_tilemap->set_transparent_pen(15); } @@ -241,9 +241,9 @@ static void draw_led(bitmap_ind16 &bitmap, int x, int y,UINT8 value) static SCREEN_UPDATE_IND16( acommand ) { acommand_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect,0,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); /*Order might be wrong,but these for sure are the led numbers tested*/ draw_led(bitmap, 0, 20, (state->m_led0 & 0x0f00) >> 8); @@ -261,14 +261,14 @@ static WRITE16_HANDLER( ac_bgvram_w ) { acommand_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_ac_bgvram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( ac_txvram_w ) { acommand_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_ac_txvram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER(ac_bgscroll_w) @@ -276,8 +276,8 @@ static WRITE16_HANDLER(ac_bgscroll_w) acommand_state *state = space->machine().driver_data(); switch(offset) { - case 0: tilemap_set_scrollx(state->m_bg_tilemap,0,data); break; - case 1: tilemap_set_scrolly(state->m_bg_tilemap,0,data); break; + case 0: state->m_bg_tilemap->set_scrollx(0,data); break; + case 1: state->m_bg_tilemap->set_scrolly(0,data); break; case 2: /*BG_TILEMAP priority?*/ break; } } @@ -287,8 +287,8 @@ static WRITE16_HANDLER(ac_txscroll_w) acommand_state *state = space->machine().driver_data(); switch(offset) { - case 0: tilemap_set_scrollx(state->m_tx_tilemap,0,data); break; - case 1: tilemap_set_scrolly(state->m_tx_tilemap,0,data); break; + case 0: state->m_tx_tilemap->set_scrollx(0,data); break; + case 1: state->m_tx_tilemap->set_scrolly(0,data); break; case 2: /*TX_TILEMAP priority?*/ break; } } diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 806fa153e07..3528ca79cb5 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -86,7 +86,7 @@ static VIDEO_START( yumefuda ) static SCREEN_UPDATE_IND16( yumefuda ) { albazg_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -112,14 +112,14 @@ static WRITE8_HANDLER( yumefuda_vram_w ) { albazg_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( yumefuda_cram_w ) { albazg_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } /*Custom RAM (Thrash Protection)*/ diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 37f3743e0ee..32bd0fa408b 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -725,7 +725,7 @@ static WRITE8_HANDLER( blitter_txram_w ) armedf_state *state = space->machine().driver_data(); state->m_text_videoram[offset] = (data & 0xff) | (state->m_text_videoram[offset] & 0xff00); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( fg_scrollx_w ) diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c index e1fe3a42621..c491c2912db 100644 --- a/src/mame/drivers/avt.c +++ b/src/mame/drivers/avt.c @@ -467,14 +467,14 @@ public: WRITE8_MEMBER( avt_state::avt_videoram_w ) { m_videoram[offset] = data; - tilemap_mark_tile_dirty(m_bg_tilemap, offset); + m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER( avt_state::avt_colorram_w ) { m_colorram[offset] = data; - tilemap_mark_tile_dirty(m_bg_tilemap, offset); + m_bg_tilemap->mark_tile_dirty(offset); } @@ -522,7 +522,7 @@ static SCREEN_UPDATE_IND16( avt ) count++; } } - //tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + //state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index 474504d47da..fe88e17f373 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -113,7 +113,7 @@ static WRITE16_HANDLER( latch_w ) if ((oldword ^ state->m_latch_data) & 0x7000) { space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); - tilemap_mark_all_tiles_dirty(state->m_alpha_tilemap); + state->m_alpha_tilemap->mark_all_dirty(); state->m_alpha_tile_bank = (state->m_latch_data >> 12) & 7; } } diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index b25ab9c0db9..968747e9f22 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -98,8 +98,8 @@ static VIDEO_START(bestleag) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,bsb_bg_scan,16,16,128, 64); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,bsb_bg_scan,16,16,128, 64); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); - tilemap_set_transparent_pen(state->m_fg_tilemap,15); + state->m_tx_tilemap->set_transparent_pen(15); + state->m_fg_tilemap->set_transparent_pen(15); } /* @@ -166,34 +166,34 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r static SCREEN_UPDATE_IND16(bestleag) { bestleag_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,(state->m_vregs[0x00/2] & 0xfff) + (state->m_vregs[0x08/2] & 0x7) - 3); - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_vregs[0x02/2]); - tilemap_set_scrollx(state->m_tx_tilemap,0,state->m_vregs[0x04/2]); - tilemap_set_scrolly(state->m_tx_tilemap,0,state->m_vregs[0x06/2]); - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_vregs[0x08/2] & 0xfff8); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_vregs[0x0a/2]); + state->m_bg_tilemap->set_scrollx(0,(state->m_vregs[0x00/2] & 0xfff) + (state->m_vregs[0x08/2] & 0x7) - 3); + state->m_bg_tilemap->set_scrolly(0,state->m_vregs[0x02/2]); + state->m_tx_tilemap->set_scrollx(0,state->m_vregs[0x04/2]); + state->m_tx_tilemap->set_scrolly(0,state->m_vregs[0x06/2]); + state->m_fg_tilemap->set_scrollx(0,state->m_vregs[0x08/2] & 0xfff8); + state->m_fg_tilemap->set_scrolly(0,state->m_vregs[0x0a/2]); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } static SCREEN_UPDATE_IND16(bestleaw) { bestleag_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_vregs[0x08/2]); - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_vregs[0x0a/2]); - tilemap_set_scrollx(state->m_tx_tilemap,0,state->m_vregs[0x00/2]); - tilemap_set_scrolly(state->m_tx_tilemap,0,state->m_vregs[0x02/2]); - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_vregs[0x04/2]); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_vregs[0x06/2]); + state->m_bg_tilemap->set_scrollx(0,state->m_vregs[0x08/2]); + state->m_bg_tilemap->set_scrolly(0,state->m_vregs[0x0a/2]); + state->m_tx_tilemap->set_scrollx(0,state->m_vregs[0x00/2]); + state->m_tx_tilemap->set_scrolly(0,state->m_vregs[0x02/2]); + state->m_fg_tilemap->set_scrollx(0,state->m_vregs[0x04/2]); + state->m_fg_tilemap->set_scrolly(0,state->m_vregs[0x06/2]); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -201,21 +201,21 @@ static WRITE16_HANDLER( bestleag_txram_w ) { bestleag_state *state = space->machine().driver_data(); state->m_txram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( bestleag_bgram_w ) { bestleag_state *state = space->machine().driver_data(); state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( bestleag_fgram_w ) { bestleag_state *state = space->machine().driver_data(); state->m_fgram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE16_DEVICE_HANDLER( oki_bank_w ) diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c index 0ad60ef8be6..5a21af10cba 100644 --- a/src/mame/drivers/blitz.c +++ b/src/mame/drivers/blitz.c @@ -315,14 +315,14 @@ static WRITE8_HANDLER( megadpkr_videoram_w ) { blitz_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( megadpkr_colorram_w ) { blitz_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -355,7 +355,7 @@ static VIDEO_START( megadpkr ) static SCREEN_UPDATE_IND16( megadpkr ) { blitz_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 4b636134038..7fe58777242 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -150,14 +150,14 @@ static WRITE32_HANDLER( ms32_tx0_ram_w ) { bnstars_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_ms32_tx0_ram[offset]); - tilemap_mark_tile_dirty(state->m_ms32_tx_tilemap[0],offset/2); + state->m_ms32_tx_tilemap[0]->mark_tile_dirty(offset/2); } static WRITE32_HANDLER( ms32_tx1_ram_w ) { bnstars_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_ms32_tx1_ram[offset]); - tilemap_mark_tile_dirty(state->m_ms32_tx_tilemap[1],offset/2); + state->m_ms32_tx_tilemap[1]->mark_tile_dirty(offset/2); } /* BG Layers */ @@ -188,14 +188,14 @@ static WRITE32_HANDLER( ms32_bg0_ram_w ) { bnstars_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_ms32_bg0_ram[offset]); - tilemap_mark_tile_dirty(state->m_ms32_bg_tilemap[0],offset/2); + state->m_ms32_bg_tilemap[0]->mark_tile_dirty(offset/2); } static WRITE32_HANDLER( ms32_bg1_ram_w ) { bnstars_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_ms32_bg1_ram[offset]); - tilemap_mark_tile_dirty(state->m_ms32_bg_tilemap[1],offset/2); + state->m_ms32_bg_tilemap[1]->mark_tile_dirty(offset/2); } /* ROZ Layers */ @@ -245,7 +245,7 @@ static void draw_roz(running_machine &machine, bitmap_ind16 &bitmap, const recta if (incxx & 0x10000) incxx |= ~0x1ffff; if (incxy & 0x10000) incxy |= ~0x1ffff; - tilemap_draw_roz(bitmap, &my_clip, state->m_ms32_roz_tilemap, + state->m_ms32_roz_tilemap->draw_roz(bitmap, &my_clip, (start2x+startx+offsx)<<16, (start2y+starty+offsy)<<16, incxx<<8, incxy<<8, 0, 0, 1, // Wrap @@ -277,7 +277,7 @@ static void draw_roz(running_machine &machine, bitmap_ind16 &bitmap, const recta if (incyy & 0x10000) incyy |= ~0x1ffff; if (incyx & 0x10000) incyx |= ~0x1ffff; - tilemap_draw_roz(bitmap, cliprect, state->m_ms32_roz_tilemap[chip], + state->m_ms32_roz_tilemap[chip]->draw_roz(bitmap, cliprect, (startx+offsx)<<16, (starty+offsy)<<16, incxx<<8, incxy<<8, incyx<<8, incyy<<8, 1, // Wrap @@ -312,14 +312,14 @@ static WRITE32_HANDLER( ms32_roz0_ram_w ) { bnstars_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_ms32_roz0_ram[offset]); - tilemap_mark_tile_dirty(state->m_ms32_roz_tilemap[0],offset/2); + state->m_ms32_roz_tilemap[0]->mark_tile_dirty(offset/2); } static WRITE32_HANDLER( ms32_roz1_ram_w ) { bnstars_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_ms32_roz1_ram[offset]); - tilemap_mark_tile_dirty(state->m_ms32_roz_tilemap[1],offset/2); + state->m_ms32_roz_tilemap[1]->mark_tile_dirty(offset/2); } @@ -491,18 +491,18 @@ static VIDEO_START(bnstars) bnstars_state *state = machine.driver_data(); state->m_ms32_tx_tilemap[0] = tilemap_create(machine, get_ms32_tx0_tile_info,tilemap_scan_rows, 8, 8,64,64); state->m_ms32_tx_tilemap[1] = tilemap_create(machine, get_ms32_tx1_tile_info,tilemap_scan_rows, 8, 8,64,64); - tilemap_set_transparent_pen(state->m_ms32_tx_tilemap[0],0); - tilemap_set_transparent_pen(state->m_ms32_tx_tilemap[1],0); + state->m_ms32_tx_tilemap[0]->set_transparent_pen(0); + state->m_ms32_tx_tilemap[1]->set_transparent_pen(0); state->m_ms32_bg_tilemap[0] = tilemap_create(machine, get_ms32_bg0_tile_info,tilemap_scan_rows,16,16,64,64); state->m_ms32_bg_tilemap[1] = tilemap_create(machine, get_ms32_bg1_tile_info,tilemap_scan_rows,16,16,64,64); - tilemap_set_transparent_pen(state->m_ms32_bg_tilemap[0],0); - tilemap_set_transparent_pen(state->m_ms32_bg_tilemap[1],0); + state->m_ms32_bg_tilemap[0]->set_transparent_pen(0); + state->m_ms32_bg_tilemap[1]->set_transparent_pen(0); state->m_ms32_roz_tilemap[0] = tilemap_create(machine, get_ms32_roz0_tile_info,tilemap_scan_rows,16,16,128,128); state->m_ms32_roz_tilemap[1] = tilemap_create(machine, get_ms32_roz1_tile_info,tilemap_scan_rows,16,16,128,128); - tilemap_set_transparent_pen(state->m_ms32_roz_tilemap[0],0); - tilemap_set_transparent_pen(state->m_ms32_roz_tilemap[1],0); + state->m_ms32_roz_tilemap[0]->set_transparent_pen(0); + state->m_ms32_roz_tilemap[1]->set_transparent_pen(0); } @@ -520,15 +520,15 @@ static SCREEN_UPDATE_IND16(bnstars_left) bitmap.fill(0, cliprect); /* bg color */ - tilemap_set_scrollx(state->m_ms32_bg_tilemap[0], 0, state->m_ms32_bg0_scroll[0x00/4] + state->m_ms32_bg0_scroll[0x08/4] + 0x10 ); - tilemap_set_scrolly(state->m_ms32_bg_tilemap[0], 0, state->m_ms32_bg0_scroll[0x0c/4] + state->m_ms32_bg0_scroll[0x14/4] ); - tilemap_draw(bitmap,cliprect,state->m_ms32_bg_tilemap[0],0,1); + state->m_ms32_bg_tilemap[0]->set_scrollx(0, state->m_ms32_bg0_scroll[0x00/4] + state->m_ms32_bg0_scroll[0x08/4] + 0x10 ); + state->m_ms32_bg_tilemap[0]->set_scrolly(0, state->m_ms32_bg0_scroll[0x0c/4] + state->m_ms32_bg0_scroll[0x14/4] ); + state->m_ms32_bg_tilemap[0]->draw(bitmap, cliprect, 0,1); draw_roz(screen.machine(),bitmap,cliprect,2,0); - tilemap_set_scrollx(state->m_ms32_tx_tilemap[0], 0, state->m_ms32_tx0_scroll[0x00/4] + state->m_ms32_tx0_scroll[0x08/4] + 0x18); - tilemap_set_scrolly(state->m_ms32_tx_tilemap[0], 0, state->m_ms32_tx0_scroll[0x0c/4] + state->m_ms32_tx0_scroll[0x14/4]); - tilemap_draw(bitmap,cliprect,state->m_ms32_tx_tilemap[0],0,4); + state->m_ms32_tx_tilemap[0]->set_scrollx(0, state->m_ms32_tx0_scroll[0x00/4] + state->m_ms32_tx0_scroll[0x08/4] + 0x18); + state->m_ms32_tx_tilemap[0]->set_scrolly(0, state->m_ms32_tx0_scroll[0x0c/4] + state->m_ms32_tx0_scroll[0x14/4]); + state->m_ms32_tx_tilemap[0]->draw(bitmap, cliprect, 0,4); draw_sprites(screen.machine(),bitmap,cliprect, state->m_ms32_spram, 0x20000, 0); @@ -545,15 +545,15 @@ static SCREEN_UPDATE_IND16(bnstars_right) bitmap.fill(0x8000+0, cliprect); /* bg color */ - tilemap_set_scrollx(state->m_ms32_bg_tilemap[1], 0, state->m_ms32_bg1_scroll[0x00/4] + state->m_ms32_bg1_scroll[0x08/4] + 0x10 ); - tilemap_set_scrolly(state->m_ms32_bg_tilemap[1], 0, state->m_ms32_bg1_scroll[0x0c/4] + state->m_ms32_bg1_scroll[0x14/4] ); - tilemap_draw(bitmap,cliprect,state->m_ms32_bg_tilemap[1],0,1); + state->m_ms32_bg_tilemap[1]->set_scrollx(0, state->m_ms32_bg1_scroll[0x00/4] + state->m_ms32_bg1_scroll[0x08/4] + 0x10 ); + state->m_ms32_bg_tilemap[1]->set_scrolly(0, state->m_ms32_bg1_scroll[0x0c/4] + state->m_ms32_bg1_scroll[0x14/4] ); + state->m_ms32_bg_tilemap[1]->draw(bitmap, cliprect, 0,1); draw_roz(screen.machine(),bitmap,cliprect,2,1); - tilemap_set_scrollx(state->m_ms32_tx_tilemap[1], 0, state->m_ms32_tx1_scroll[0x00/4] + state->m_ms32_tx1_scroll[0x08/4] + 0x18); - tilemap_set_scrolly(state->m_ms32_tx_tilemap[1], 0, state->m_ms32_tx1_scroll[0x0c/4] + state->m_ms32_tx1_scroll[0x14/4]); - tilemap_draw(bitmap,cliprect,state->m_ms32_tx_tilemap[1],0,4); + state->m_ms32_tx_tilemap[1]->set_scrollx(0, state->m_ms32_tx1_scroll[0x00/4] + state->m_ms32_tx1_scroll[0x08/4] + 0x18); + state->m_ms32_tx_tilemap[1]->set_scrolly(0, state->m_ms32_tx1_scroll[0x0c/4] + state->m_ms32_tx1_scroll[0x14/4]); + state->m_ms32_tx_tilemap[1]->draw(bitmap, cliprect, 0,4); draw_sprites(screen.machine(),bitmap,cliprect, state->m_ms32_spram+(0x20000/4), 0x20000, 4); diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index 3f7e31dff1b..9bcd5c67ee4 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -227,7 +227,7 @@ static WRITE8_DEVICE_HANDLER( bogeyman_colbank_w ) if((data & 1) != (state->m_colbank & 1)) { state->m_colbank = data & 1; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } } diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index 7d49e47f54c..45b72ddd797 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -55,14 +55,14 @@ static WRITE8_HANDLER( bg_scroll_w ) { cabaret_state *state = space->machine().driver_data(); state->m_bg_scroll[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap,offset,data); + state->m_bg_tilemap->set_scrolly(offset,data); } static WRITE8_HANDLER( bg_tile_w ) { cabaret_state *state = space->machine().driver_data(); state->m_bg_tile_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -84,14 +84,14 @@ static WRITE8_HANDLER( fg_tile_w ) { cabaret_state *state = space->machine().driver_data(); state->m_fg_tile_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( fg_color_w ) { cabaret_state *state = space->machine().driver_data(); state->m_fg_color_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static VIDEO_START(cabaret) @@ -99,8 +99,8 @@ static VIDEO_START(cabaret) cabaret_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 32, 64, 8); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 64); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scroll_cols(64); } @@ -109,9 +109,9 @@ static SCREEN_UPDATE_IND16(cabaret) cabaret_state *state = screen.machine().driver_data(); bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 9d551d0d0b5..da9c446e95f 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -136,7 +136,7 @@ static VIDEO_START( calorie ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16( calorie ) @@ -146,12 +146,12 @@ static SCREEN_UPDATE_IND16( calorie ) if (state->m_bg_bank & 0x10) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } else { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); } @@ -202,14 +202,14 @@ static WRITE8_HANDLER( fg_ram_w ) { calorie_state *state = space->machine().driver_data(); state->m_fg_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } static WRITE8_HANDLER( bg_bank_w ) { calorie_state *state = space->machine().driver_data(); if((state->m_bg_bank & ~0x10) != (data & ~0x10)) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_bg_bank = data; } diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c index b7e66c5c30c..9cbff7a9447 100644 --- a/src/mame/drivers/caswin.c +++ b/src/mame/drivers/caswin.c @@ -82,7 +82,7 @@ static VIDEO_START(vvillage) static SCREEN_UPDATE_IND16(vvillage) { caswin_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap,0,0); + state->m_sc0_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -90,14 +90,14 @@ static WRITE8_HANDLER( sc0_vram_w ) { caswin_state *state = space->machine().driver_data(); state->m_sc0_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset); + state->m_sc0_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( sc0_attr_w ) { caswin_state *state = space->machine().driver_data(); state->m_sc0_attr[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset); + state->m_sc0_tilemap->mark_tile_dirty(offset); } /*These two are tested during the two cherry sub-games.I really don't know what is supposed to do...*/ diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index dbda91d7aec..0a947857663 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -365,21 +365,21 @@ static SCREEN_UPDATE_RGB32(cb2001) scroll >>=8; scroll &=0xff; - tilemap_set_scrolly(state->m_reel2_tilemap, i, scroll); + state->m_reel2_tilemap->set_scrolly(i, scroll); scroll = state->m_vram_bg[0x800/2 + i/2]; if (i&1) scroll >>=8; scroll &=0xff; - tilemap_set_scrolly(state->m_reel1_tilemap, i, scroll); + state->m_reel1_tilemap->set_scrolly(i, scroll); scroll = state->m_vram_bg[0xc00/2 + i/2]; if (i&1) scroll >>=8; scroll &=0xff; - tilemap_set_scrolly(state->m_reel3_tilemap, i, scroll); + state->m_reel3_tilemap->set_scrolly(i, scroll); } @@ -388,9 +388,9 @@ static SCREEN_UPDATE_RGB32(cb2001) const rectangle visible2(0*8, (14+48)*8-1, 10*8, (10+7)*8-1); const rectangle visible3(0*8, (14+48)*8-1, 17*8, (17+7)*8-1); - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2, state->m_reel2_tilemap, 0, 0); - tilemap_draw(bitmap, visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel3_tilemap->draw(bitmap, visible3, 0, 0); } } @@ -518,9 +518,9 @@ static VIDEO_START(cb2001) state->m_reel2_tilemap = tilemap_create(machine,get_cb2001_reel2_tile_info,tilemap_scan_rows, 8, 32, 64, 8); state->m_reel3_tilemap = tilemap_create(machine,get_cb2001_reel3_tile_info,tilemap_scan_rows, 8, 32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 64); + state->m_reel1_tilemap->set_scroll_cols(64); + state->m_reel2_tilemap->set_scroll_cols(64); + state->m_reel3_tilemap->set_scroll_cols(64); } WRITE16_HANDLER( cb2001_bg_w ) @@ -532,24 +532,24 @@ WRITE16_HANDLER( cb2001_bg_w ) /* if (offset<0x200/2) { - tilemap_mark_tile_dirty(state->m_reel1_tilemap,(offset&0xff)/2); + state->m_reel1_tilemap->mark_tile_dirty((offset&0xff)/2); } else if (offset<0x400/2) { - tilemap_mark_tile_dirty(state->m_reel2_tilemap,(offset&0xff)/2); + state->m_reel2_tilemap->mark_tile_dirty((offset&0xff)/2); } else if (offset<0x600/2) { - tilemap_mark_tile_dirty(state->m_reel3_tilemap,(offset&0xff)/2); + state->m_reel3_tilemap->mark_tile_dirty((offset&0xff)/2); } else if (offset<0x800/2) { - // tilemap_mark_tile_dirty(reel4_tilemap,(offset&0xff)/2); + // reel4_tilemap->mark_tile_dirty((offset&0xff)/2); } */ - tilemap_mark_all_tiles_dirty (state->m_reel1_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel2_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel3_tilemap); + state->m_reel1_tilemap->mark_all_dirty(); + state->m_reel2_tilemap->mark_all_dirty(); + state->m_reel3_tilemap->mark_all_dirty(); } diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 163b2d70fbc..fed0cea6407 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -39,7 +39,7 @@ static WRITE8_HANDLER( cball_vram_w ) cball_state *state = space->machine().driver_data(); state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -55,7 +55,7 @@ static SCREEN_UPDATE_IND16( cball ) cball_state *state = screen.machine().driver_data(); /* draw playfield */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw sprite */ drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1], diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index 6f9b9e6521b..1db604856c4 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -94,7 +94,7 @@ static WRITE8_HANDLER( chanbara_videoram_w ) chanbara_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( chanbara_colorram_w ) @@ -102,7 +102,7 @@ static WRITE8_HANDLER( chanbara_colorram_w ) chanbara_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( chanbara_videoram2_w ) @@ -110,7 +110,7 @@ static WRITE8_HANDLER( chanbara_videoram2_w ) chanbara_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset); + state->m_bg2_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( chanbara_colorram2_w ) @@ -118,7 +118,7 @@ static WRITE8_HANDLER( chanbara_colorram2_w ) chanbara_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset); + state->m_bg2_tilemap->mark_tile_dirty(offset); } @@ -145,7 +145,7 @@ static VIDEO_START(chanbara ) chanbara_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows,8, 8, 32, 32); state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows,16, 16, 16, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -196,10 +196,10 @@ static SCREEN_UPDATE_IND16( chanbara ) { chanbara_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_scroll | (state->m_scrollhi << 8)); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg2_tilemap->set_scrolly(0, state->m_scroll | (state->m_scrollhi << 8)); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 7af8c660c16..1b7dd1b23f2 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -117,9 +117,9 @@ static VIDEO_START( cntsteer ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 64, 64); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows_flip_x, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); - //tilemap_set_flip(state->m_bg_tilemap, TILEMAP_FLIPX | TILEMAP_FLIPY); + //state->m_bg_tilemap->set_flip(TILEMAP_FLIPX | TILEMAP_FLIPY); } static VIDEO_START( zerotrgt ) @@ -128,9 +128,9 @@ static VIDEO_START( zerotrgt ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows_flip_x, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); - //tilemap_set_flip(state->m_bg_tilemap, TILEMAP_FLIPX | TILEMAP_FLIPY); + //state->m_bg_tilemap->set_flip(TILEMAP_FLIPX | TILEMAP_FLIPY); } /* @@ -290,7 +290,7 @@ static SCREEN_UPDATE_IND16( zerotrgt ) x = -256 - (state->m_scrollx | state->m_scrollx_hi); y = 256 + (state->m_scrolly | state->m_scrolly_hi); - tilemap_draw_roz(bitmap, cliprect, state->m_bg_tilemap, + state->m_bg_tilemap->draw_roz(bitmap, cliprect, (x << 16), (y << 16), p1, p2, p3, p4, @@ -299,7 +299,7 @@ static SCREEN_UPDATE_IND16( zerotrgt ) } zerotrgt_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -339,7 +339,7 @@ static SCREEN_UPDATE_IND16( cntsteer ) x = 256 + (state->m_scrollx | state->m_scrollx_hi); y = 256 - (state->m_scrolly | state->m_scrolly_hi); - tilemap_draw_roz(bitmap, cliprect, state->m_bg_tilemap, + state->m_bg_tilemap->draw_roz(bitmap, cliprect, (x << 16), (y << 16), p1, p2, p3, p4, @@ -348,7 +348,7 @@ static SCREEN_UPDATE_IND16( cntsteer ) } cntsteer_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -380,7 +380,7 @@ static WRITE8_HANDLER(zerotrgt_vregs_w) case 2: state->m_bg_bank = (data & 0x30) << 4; state->m_bg_color_bank = (data & 7); state->m_disable_roz = (data & 0x40); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); break; case 3: state->m_rotation_sign = (data & 1); flip_screen_set(space->machine(), !(data & 4)); @@ -405,7 +405,7 @@ static WRITE8_HANDLER(cntsteer_vregs_w) case 1: state->m_scrollx = data; break; case 2: state->m_bg_bank = (data & 0x01) << 8; state->m_bg_color_bank = (data & 6) >> 1; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); break; case 3: state->m_rotation_sign = (data & 7); state->m_disable_roz = (~data & 0x08); @@ -420,21 +420,21 @@ static WRITE8_HANDLER( cntsteer_foreground_vram_w ) { cntsteer_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( cntsteer_foreground_attr_w ) { cntsteer_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( cntsteer_background_w ) { cntsteer_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } /************************************* diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index f02bbb7fb98..18e8aca9864 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -51,7 +51,7 @@ static WRITE8_HANDLER( quizmstr_bg_w ) videoram[offset] = data; if(offset >= 0x0240) - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset - 0x0240); + state->m_bg_tilemap->mark_tile_dirty(offset - 0x0240); } @@ -97,7 +97,7 @@ static WRITE8_HANDLER( quizmstr_attr1_w ) { // the later games also use attr3 for something.. UINT32 paldata = (state->m_attr_ram1[offset] & 0x7f) | ((state->m_attr_ram2[offset] & 0x7f) << 7); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset - 0x0240); + state->m_bg_tilemap->mark_tile_dirty(offset - 0x0240); coinmstr_set_pal(space->machine(), paldata, offset - 0x240); @@ -113,7 +113,7 @@ static WRITE8_HANDLER( quizmstr_attr2_w ) { // the later games also use attr3 for something.. UINT32 paldata = (state->m_attr_ram1[offset] & 0x7f) | ((state->m_attr_ram2[offset] & 0x7f) << 7); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset - 0x0240); + state->m_bg_tilemap->mark_tile_dirty(offset - 0x0240); coinmstr_set_pal(space->machine(), paldata, offset - 0x240); @@ -126,7 +126,7 @@ static WRITE8_HANDLER( quizmstr_attr3_w ) state->m_attr_ram3[offset] = data; if(offset >= 0x0240) - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset - 0x0240); + state->m_bg_tilemap->mark_tile_dirty(offset - 0x0240); } @@ -917,7 +917,7 @@ static VIDEO_START( coinmstr ) static SCREEN_UPDATE_IND16( coinmstr ) { coinmstr_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index 920e4e6533c..0afe31a7a96 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -140,11 +140,11 @@ static WRITE8_HANDLER( combatsc_vreg_w ) combatsc_state *state = space->machine().driver_data(); if (data != state->m_vreg) { - tilemap_mark_all_tiles_dirty(state->m_textlayer); + state->m_textlayer->mark_all_dirty(); if ((data & 0x0f) != (state->m_vreg & 0x0f)) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[0]); + state->m_bg_tilemap[0]->mark_all_dirty(); if ((data >> 4) != (state->m_vreg >> 4)) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[1]); + state->m_bg_tilemap[1]->mark_all_dirty(); state->m_vreg = data; } } diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index e47eb027a8c..3b439cdcac9 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -125,21 +125,21 @@ static WRITE8_HANDLER(cshooter_txram_w) { cshooter_state *state = space->machine().driver_data(); state->m_txram[offset] = data; - tilemap_mark_tile_dirty(state->m_txtilemap,offset/2); + state->m_txtilemap->mark_tile_dirty(offset/2); } static VIDEO_START(cshooter) { cshooter_state *state = machine.driver_data(); state->m_txtilemap = tilemap_create(machine, get_cstx_tile_info,tilemap_scan_rows, 8,8,32, 32); - tilemap_set_transparent_pen(state->m_txtilemap, 3); + state->m_txtilemap->set_transparent_pen(3); } static SCREEN_UPDATE_IND16(cshooter) { cshooter_state *state = screen.machine().driver_data(); bitmap.fill(0/*get_black_pen(screen.screen.machine(, cliprect))*/); - tilemap_mark_all_tiles_dirty(state->m_txtilemap); + state->m_txtilemap->mark_all_dirty(); //sprites { @@ -178,8 +178,8 @@ static SCREEN_UPDATE_IND16(cshooter) } } - tilemap_mark_all_tiles_dirty(state->m_txtilemap); - tilemap_draw(bitmap,cliprect,state->m_txtilemap,0,0); + state->m_txtilemap->mark_all_dirty(); + state->m_txtilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 461ccc7009e..6dd5533c994 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -73,16 +73,16 @@ static VIDEO_START( cultures ) state->m_bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows, 8, 8, 512, 512); state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows, 8, 8, 512, 512); - tilemap_set_transparent_pen(state->m_bg1_tilemap, 0); - tilemap_set_transparent_pen(state->m_bg0_tilemap, 0); + state->m_bg1_tilemap->set_transparent_pen(0); + state->m_bg0_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg0_tilemap, 502, 10); - tilemap_set_scrolldx(state->m_bg1_tilemap, 502, 10); - tilemap_set_scrolldx(state->m_bg2_tilemap, 502, 10); + state->m_bg0_tilemap->set_scrolldx(502, 10); + state->m_bg1_tilemap->set_scrolldx(502, 10); + state->m_bg2_tilemap->set_scrolldx(502, 10); - tilemap_set_scrolldy(state->m_bg0_tilemap, 255, 0); - tilemap_set_scrolldy(state->m_bg1_tilemap, 255, 0); - tilemap_set_scrolldy(state->m_bg2_tilemap, 255, 0); + state->m_bg0_tilemap->set_scrolldy(255, 0); + state->m_bg1_tilemap->set_scrolldy(255, 0); + state->m_bg2_tilemap->set_scrolldy(255, 0); } static SCREEN_UPDATE_IND16( cultures ) @@ -92,25 +92,25 @@ static SCREEN_UPDATE_IND16( cultures ) // tilemaps attributes attr = (state->m_bg0_regs_x[3] & 1 ? TILEMAP_FLIPX : 0) | (state->m_bg0_regs_y[3] & 1 ? TILEMAP_FLIPY : 0); - tilemap_set_flip(state->m_bg0_tilemap, attr); + state->m_bg0_tilemap->set_flip(attr); attr = (state->m_bg1_regs_x[3] & 1 ? TILEMAP_FLIPX : 0) | (state->m_bg1_regs_y[3] & 1 ? TILEMAP_FLIPY : 0); - tilemap_set_flip(state->m_bg1_tilemap, attr); + state->m_bg1_tilemap->set_flip(attr); attr = (state->m_bg2_regs_x[3] & 1 ? TILEMAP_FLIPX : 0) | (state->m_bg2_regs_y[3] & 1 ? TILEMAP_FLIPY : 0); - tilemap_set_flip(state->m_bg2_tilemap, attr); + state->m_bg2_tilemap->set_flip(attr); // tilemaps scrolls - tilemap_set_scrollx(state->m_bg0_tilemap, 0, (state->m_bg0_regs_x[2] << 8) + state->m_bg0_regs_x[0]); - tilemap_set_scrollx(state->m_bg1_tilemap, 0, (state->m_bg1_regs_x[2] << 8) + state->m_bg1_regs_x[0]); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, (state->m_bg2_regs_x[2] << 8) + state->m_bg2_regs_x[0]); - tilemap_set_scrolly(state->m_bg0_tilemap, 0, (state->m_bg0_regs_y[2] << 8) + state->m_bg0_regs_y[0]); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, (state->m_bg1_regs_y[2] << 8) + state->m_bg1_regs_y[0]); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, (state->m_bg2_regs_y[2] << 8) + state->m_bg2_regs_y[0]); + state->m_bg0_tilemap->set_scrollx(0, (state->m_bg0_regs_x[2] << 8) + state->m_bg0_regs_x[0]); + state->m_bg1_tilemap->set_scrollx(0, (state->m_bg1_regs_x[2] << 8) + state->m_bg1_regs_x[0]); + state->m_bg2_tilemap->set_scrollx(0, (state->m_bg2_regs_x[2] << 8) + state->m_bg2_regs_x[0]); + state->m_bg0_tilemap->set_scrolly(0, (state->m_bg0_regs_y[2] << 8) + state->m_bg0_regs_y[0]); + state->m_bg1_tilemap->set_scrolly(0, (state->m_bg1_regs_y[2] << 8) + state->m_bg1_regs_y[0]); + state->m_bg2_tilemap->set_scrolly(0, (state->m_bg2_regs_y[2] << 8) + state->m_bg2_regs_y[0]); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg0_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg0_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -141,7 +141,7 @@ static WRITE8_HANDLER( bg0_videoram_w ) else { state->m_bg0_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg0_tilemap, offset >> 1); + state->m_bg0_tilemap->mark_tile_dirty(offset >> 1); } } @@ -169,13 +169,13 @@ static WRITE8_HANDLER( bg_bank_w ) if (state->m_bg1_bank != (data & 3)) { state->m_bg1_bank = data & 3; - tilemap_mark_all_tiles_dirty(state->m_bg1_tilemap); + state->m_bg1_tilemap->mark_all_dirty(); } if (state->m_bg2_bank != ((data & 0xc) >> 2)) { state->m_bg2_bank = (data & 0xc) >> 2; - tilemap_mark_all_tiles_dirty(state->m_bg2_tilemap); + state->m_bg2_tilemap->mark_all_dirty(); } coin_counter_w(space->machine(), 0, data & 0x10); } diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index f73f0afe96f..136127c0c83 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -203,7 +203,7 @@ static VIDEO_START( cybertnk ) { cybertnk_state *state = machine.driver_data(); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows,8,8,128,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_tx_tilemap->set_transparent_pen(0); } static void draw_pixel( bitmap_ind16 &bitmap, const rectangle &cliprect, int y, int x, int pen) @@ -216,7 +216,7 @@ static UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const r { cybertnk_state *state = screen.machine().driver_data(); - tilemap_set_scrolldx(state->m_tx_tilemap, screen_shift, screen_shift); + state->m_tx_tilemap->set_scrolldx(screen_shift, screen_shift); bitmap.fill(get_black_pen(screen.machine()), cliprect); @@ -405,7 +405,7 @@ static UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const r } } - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); //0x62 0x9a 1c2d0 @@ -514,7 +514,7 @@ static WRITE16_HANDLER( tx_vram_w ) { cybertnk_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tx_vram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } static READ16_HANDLER( io_r ) diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index de3a25cb68c..83800e31227 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -60,7 +60,7 @@ static VIDEO_START(d9final) static SCREEN_UPDATE_IND16(d9final) { d9final_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap,0,0); + state->m_sc0_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -68,21 +68,21 @@ static WRITE8_HANDLER( sc0_lovram ) { d9final_state *state = space->machine().driver_data(); state->m_lo_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset); + state->m_sc0_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( sc0_hivram ) { d9final_state *state = space->machine().driver_data(); state->m_hi_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset); + state->m_sc0_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( sc0_cram ) { d9final_state *state = space->machine().driver_data(); state->m_cram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset); + state->m_sc0_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( d9final_bank_w ) diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index 997124888f5..7178c84447f 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -89,7 +89,7 @@ static VIDEO_START( dacholer ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static WRITE8_HANDLER( bg_scroll_x_w ) @@ -142,18 +142,18 @@ static SCREEN_UPDATE_IND16(dacholer) if (flip_screen_get(screen.machine())) { - tilemap_set_scrollx(state->m_bg_tilemap, 0, 256 - state->m_scroll_x); - tilemap_set_scrolly(state->m_bg_tilemap, 0, 256 - state->m_scroll_y); + state->m_bg_tilemap->set_scrollx(0, 256 - state->m_scroll_x); + state->m_bg_tilemap->set_scrolly(0, 256 - state->m_scroll_y); } else { - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_x); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll_y); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_x); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll_y); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -161,14 +161,14 @@ static WRITE8_HANDLER( background_w ) { dacholer_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( foreground_w ) { dacholer_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( bg_bank_w ) @@ -177,7 +177,7 @@ static WRITE8_HANDLER( bg_bank_w ) if ((data & 3) != state->m_bg_bank) { state->m_bg_bank = data & 3; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } flip_screen_set(space->machine(), data & 0xc); // probably one bit for flipx and one for flipy diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index b3f6dff8533..81a506093da 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -120,13 +120,13 @@ static WRITE32_HANDLER( darkhors_tmapram_w ) { darkhors_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tmapram[offset]); - tilemap_mark_tile_dirty(state->m_tmap, offset); + state->m_tmap->mark_tile_dirty(offset); } static WRITE32_HANDLER( darkhors_tmapram2_w ) { darkhors_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tmapram2[offset]); - tilemap_mark_tile_dirty(state->m_tmap2, offset); + state->m_tmap2->mark_tile_dirty(offset); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -173,8 +173,8 @@ static VIDEO_START( darkhors ) state->m_tmap2 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 0x40,0x40 ); - tilemap_set_transparent_pen(state->m_tmap, 0); - tilemap_set_transparent_pen(state->m_tmap2, 0); + state->m_tmap->set_transparent_pen(0); + state->m_tmap2->set_transparent_pen(0); machine.gfx[0]->color_granularity = 64; /* 256 colour sprites with palette selectable on 64 colour boundaries */ } @@ -197,13 +197,13 @@ static SCREEN_UPDATE_IND16( darkhors ) bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_set_scrollx(state->m_tmap,0, (state->m_tmapscroll[0] >> 16) - 5); - tilemap_set_scrolly(state->m_tmap,0, (state->m_tmapscroll[0] & 0xffff) - 0xff ); - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, state->m_tmap, TILEMAP_DRAW_OPAQUE, 0); + state->m_tmap->set_scrollx(0, (state->m_tmapscroll[0] >> 16) - 5); + state->m_tmap->set_scrolly(0, (state->m_tmapscroll[0] & 0xffff) - 0xff ); + if (layers_ctrl & 1) state->m_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); - tilemap_set_scrollx(state->m_tmap2,0, (state->m_tmapscroll2[0] >> 16) - 5); - tilemap_set_scrolly(state->m_tmap2,0, (state->m_tmapscroll2[0] & 0xffff) - 0xff ); - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, state->m_tmap2, 0, 0); + state->m_tmap2->set_scrollx(0, (state->m_tmapscroll2[0] >> 16) - 5); + state->m_tmap2->set_scrolly(0, (state->m_tmapscroll2[0] & 0xffff) - 0xff ); + if (layers_ctrl & 2) state->m_tmap2->draw(bitmap, cliprect, 0, 0); if (layers_ctrl & 4) draw_sprites(screen.machine(),bitmap,cliprect); diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 2110a4b420e..20551fe0f0c 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -151,10 +151,10 @@ static WRITE8_HANDLER( ddayjlc_bgram_w ) ddayjlc_state *state = space->machine().driver_data(); if (!offset) - tilemap_set_scrollx(state->m_bg_tilemap, 0, data + 8); + state->m_bg_tilemap->set_scrollx(0, data + 8); state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } static WRITE8_HANDLER( ddayjlc_videoram_w ) @@ -384,7 +384,7 @@ static SCREEN_UPDATE_IND16( ddayjlc ) { ddayjlc_state *state = screen.machine().driver_data(); UINT32 i; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); for (i = 0; i < 0x400; i += 4) { diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index f1db51d2d40..b3c77266f44 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -252,9 +252,9 @@ static void ddealer_draw_video_layer( running_machine &machine, UINT16* vreg_bas static SCREEN_UPDATE_IND16( ddealer ) { ddealer_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_back_tilemap, 0, state->m_flipscreen ? -192 : -64); - tilemap_set_flip(state->m_back_tilemap, state->m_flipscreen ? TILEMAP_FLIPY | TILEMAP_FLIPX : 0); - tilemap_draw(bitmap, cliprect, state->m_back_tilemap, 0, 0); + state->m_back_tilemap->set_scrollx(0, state->m_flipscreen ? -192 : -64); + state->m_back_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPY | TILEMAP_FLIPX : 0); + state->m_back_tilemap->draw(bitmap, cliprect, 0, 0); /* the fg tilemap handling is a little hacky right now, i'm not sure if it should be a single tilemap with @@ -362,7 +362,7 @@ static WRITE16_HANDLER( back_vram_w ) { ddealer_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_back_vram[offset]); - tilemap_mark_tile_dirty(state->m_back_tilemap, offset); + state->m_back_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index 6cc83c00c83..0b3ea0f7b94 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -334,7 +334,7 @@ static VIDEO_START(dderby) dmndrby_state *state = machine.driver_data(); state->m_racetrack_tilemap_rom = machine.region("user1")->base(); state->m_racetrack_tilemap = tilemap_create(machine,get_dmndrby_tile_info,tilemap_scan_rows,16,16, 16, 512); - tilemap_mark_all_tiles_dirty(state->m_racetrack_tilemap); + state->m_racetrack_tilemap->mark_all_dirty(); } diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 26f8e3dcb7f..25f425ef93c 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -219,8 +219,8 @@ static WRITE32_HANDLER( dreamwld_bg_videoram_w ) { dreamwld_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset * 2); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset * 2 + 1); + state->m_bg_tilemap->mark_tile_dirty(offset * 2); + state->m_bg_tilemap->mark_tile_dirty(offset * 2 + 1); } static TILE_GET_INFO( get_dreamwld_bg_tile_info ) @@ -238,8 +238,8 @@ static WRITE32_HANDLER( dreamwld_bg2_videoram_w ) { dreamwld_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg2_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset * 2); - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset * 2 + 1); + state->m_bg2_tilemap->mark_tile_dirty(offset * 2); + state->m_bg2_tilemap->mark_tile_dirty(offset * 2 + 1); } static TILE_GET_INFO( get_dreamwld_bg2_tile_info ) @@ -258,13 +258,13 @@ static VIDEO_START( dreamwld ) state->m_bg_tilemap = tilemap_create(machine, get_dreamwld_bg_tile_info,tilemap_scan_rows, 16, 16, 64,32); state->m_bg2_tilemap = tilemap_create(machine, get_dreamwld_bg2_tile_info,tilemap_scan_rows, 16, 16, 64,32); - tilemap_set_transparent_pen(state->m_bg2_tilemap,0); + state->m_bg2_tilemap->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_bg_tilemap, 256); // line scrolling - tilemap_set_scroll_cols(state->m_bg_tilemap, 1); + state->m_bg_tilemap->set_scroll_rows(256); // line scrolling + state->m_bg_tilemap->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_bg2_tilemap, 256); // line scrolling - tilemap_set_scroll_cols(state->m_bg2_tilemap, 1); + state->m_bg2_tilemap->set_scroll_rows(256); // line scrolling + state->m_bg2_tilemap->set_scroll_cols(1); state->m_spritebuf1 = auto_alloc_array(machine, UINT32, 0x2000 / 4); state->m_spritebuf2 = auto_alloc_array(machine, UINT32, 0x2000 / 4); @@ -302,8 +302,8 @@ static SCREEN_UPDATE_IND16( dreamwld ) UINT32 layer0_ctrl = state->m_vregs[0x412 / 4]; UINT32 layer1_ctrl = state->m_vregs[0x416 / 4]; - tilemap_set_scrolly(tmptilemap0, 0, layer0_scrolly); - tilemap_set_scrolly(tmptilemap1, 0, layer1_scrolly); + tmptilemap0->set_scrolly(0, layer0_scrolly); + tmptilemap1->set_scrolly(0, layer1_scrolly); // not on this hw? #if 0 @@ -340,8 +340,8 @@ static SCREEN_UPDATE_IND16( dreamwld ) x0 = ((UINT16 *)state->m_vregs)[BYTE_XOR_BE(0x000/2 + ((i + layer0_scrolly)&0xff))]; // different handling to psikyo.c? ( + scrolly ) } - tilemap_set_scrollx( - tmptilemap0, + + tmptilemap0->set_scrollx( (i + layer0_scrolly) % 256 /*tilemap_width(tm0size) */, layer0_scrollx + x0 ); @@ -357,8 +357,8 @@ static SCREEN_UPDATE_IND16( dreamwld ) x1 = ((UINT16 *)state->m_vregs)[BYTE_XOR_BE(0x200/2 + ((i + layer1_scrolly)&0xff))]; // different handling to psikyo.c? ( + scrolly ) } - tilemap_set_scrollx( - tmptilemap1, + + tmptilemap1->set_scrollx( (i + layer1_scrolly) % 256 /* tilemap_width(tm1size) */, layer1_scrollx + x1 ); } @@ -370,17 +370,17 @@ static SCREEN_UPDATE_IND16( dreamwld ) if (state->m_tilebank[0] != state->m_tilebankold[0]) { state->m_tilebankold[0] = state->m_tilebank[0]; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } if (state->m_tilebank[1] != state->m_tilebankold[1]) { state->m_tilebankold[1] = state->m_tilebank[1]; - tilemap_mark_all_tiles_dirty(state->m_bg2_tilemap); + state->m_bg2_tilemap->mark_all_dirty(); } - tilemap_draw(bitmap, cliprect, tmptilemap0, 0, 0); - tilemap_draw(bitmap, cliprect, tmptilemap1, 0, 0); + tmptilemap0->draw(bitmap, cliprect, 0, 0); + tmptilemap1->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 4cdf7917bca..9d85e8c62a3 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -120,15 +120,15 @@ static VIDEO_START( drtomy ) state->m_tilemap_bg = tilemap_create(machine, get_tile_info_bg, tilemap_scan_rows, 16, 16, 32, 32); state->m_tilemap_fg = tilemap_create(machine, get_tile_info_fg, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tilemap_fg, 0); + state->m_tilemap_fg->set_transparent_pen(0); } static SCREEN_UPDATE_IND16( drtomy ) { drtomy_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tilemap_bg, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap_fg, 0, 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 0); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -137,14 +137,14 @@ static WRITE16_HANDLER( drtomy_vram_fg_w ) { drtomy_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram_fg[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_fg, offset); + state->m_tilemap_fg->mark_tile_dirty(offset); } static WRITE16_HANDLER( drtomy_vram_bg_w ) { drtomy_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram_bg[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_bg, offset); + state->m_tilemap_bg->mark_tile_dirty(offset); } static WRITE16_DEVICE_HANDLER( drtomy_okibank_w ) diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index b4827baf9bc..8df33b5dcbe 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -134,7 +134,7 @@ static WRITE8_HANDLER( drw80pkr_io_w ) state->m_video_ram[n_offs] += ((data & 0xf0) << 4 ); // high address } - tilemap_mark_tile_dirty(state->m_bg_tilemap, n_offs); + state->m_bg_tilemap->mark_tile_dirty(n_offs); } if (state->m_p2 == 0xc7) @@ -340,7 +340,7 @@ static VIDEO_START( drw80pkr ) static SCREEN_UPDATE_IND16( drw80pkr ) { drw80pkr_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index a7a8aa46820..2e137910fe8 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -122,8 +122,8 @@ static VIDEO_START(dunhuang) state->m_tmap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20); state->m_tmap2 = tilemap_create(machine, get_tile_info2, tilemap_scan_rows, 8,32, 0x40,0x8); - tilemap_set_transparent_pen(state->m_tmap, 0); - tilemap_set_transparent_pen(state->m_tmap2, 0); + state->m_tmap->set_transparent_pen(0); + state->m_tmap2->set_transparent_pen(0); state->save_item(NAME(state->m_videoram)); state->save_item(NAME(state->m_colorram)); @@ -152,16 +152,16 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) switch (state->m_layers) { case 0x04: // girl select: bg over fg - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, state->m_tmap2, TILEMAP_DRAW_OPAQUE, 0); - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, state->m_tmap, 0, 0); + if (layers_ctrl & 2) state->m_tmap2->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 1) state->m_tmap->draw(bitmap, cliprect, 0, 0); break; case 0x05: // dips: must hide fg - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, state->m_tmap, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 1) state->m_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); break; case 0x07: // game,demo: fg over bg default: - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, state->m_tmap, TILEMAP_DRAW_OPAQUE, 0); - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, state->m_tmap2, 0, 0); + if (layers_ctrl & 1) state->m_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 2) state->m_tmap2->draw(bitmap, cliprect, 0, 0); break; } @@ -210,7 +210,7 @@ static WRITE8_HANDLER( dunhuang_tile_w ) case 1: state->m_videoram[addr] = (state->m_videoram[addr] & 0x00ff) | (data<<8); break; case 2: state->m_colorram[addr] = data; break; } - tilemap_mark_tile_dirty(state->m_tmap, addr); + state->m_tmap->mark_tile_dirty(addr); } static WRITE8_HANDLER( dunhuang_tile2_w ) @@ -237,7 +237,7 @@ static WRITE8_HANDLER( dunhuang_tile2_w ) case 1: state->m_videoram2[addr] = (state->m_videoram2[addr] & 0x00ff) | (data<<8); break; case 2: state->m_colorram2[addr] = data; break; } - tilemap_mark_tile_dirty(state->m_tmap2, addr); + state->m_tmap2->mark_tile_dirty(addr); } // Clear a row of tiles (videoram) @@ -258,7 +258,7 @@ static WRITE8_HANDLER( dunhuang_horiz_clear_w ) state->m_videoram[addr] = 0; state->m_colorram[addr] = 0; - tilemap_mark_tile_dirty(state->m_tmap, addr); + state->m_tmap->mark_tile_dirty(addr); } } @@ -275,7 +275,7 @@ static WRITE8_HANDLER( dunhuang_vert_clear_w ) state->m_videoram2[addr] = 1; state->m_colorram2[addr] = 0; - tilemap_mark_tile_dirty(state->m_tmap2, addr); + state->m_tmap2->mark_tile_dirty(addr); } } @@ -351,7 +351,7 @@ static WRITE8_HANDLER( dunhuang_block_h_w ) state->m_videoram[addr] = (tile_addr[1] << 8) | tile_addr[0]; state->m_colorram[addr] = state->m_block_c; - tilemap_mark_tile_dirty(state->m_tmap, addr); + state->m_tmap->mark_tile_dirty(addr); tile_addr += 4; } } @@ -366,7 +366,7 @@ static WRITE8_HANDLER( dunhuang_block_h_w ) state->m_videoram2[addr] = (tile_addr[1] << 8) | tile_addr[0]; state->m_colorram2[addr] = state->m_block_c; - tilemap_mark_tile_dirty(state->m_tmap2, addr); + state->m_tmap2->mark_tile_dirty(addr); tile_addr += 4; } } diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index 2eb1cd560a3..72db3926142 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -62,8 +62,8 @@ static WRITE8_HANDLER( dynadice_videoram_w ) { dynadice_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); - tilemap_mark_all_tiles_dirty(state->m_top_tilemap); + state->m_bg_tilemap->mark_tile_dirty(offset); + state->m_top_tilemap->mark_all_dirty(); } static WRITE8_HANDLER( sound_data_w ) @@ -203,7 +203,7 @@ static VIDEO_START( dynadice ) /* pacman - style videoram layout */ state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_top_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_cols, 8, 8, 2, 32); - tilemap_set_scrollx(state->m_bg_tilemap, 0, -16); + state->m_bg_tilemap->set_scrollx(0, -16); } static SCREEN_UPDATE_IND16( dynadice ) @@ -211,8 +211,8 @@ static SCREEN_UPDATE_IND16( dynadice ) dynadice_state *state = screen.machine().driver_data(); rectangle myclip = cliprect; myclip.max_x = 15; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, myclip, state->m_top_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_top_tilemap->draw(bitmap, myclip, 0, 0); return 0; } diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index d044497d5c8..0231d10f7dc 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -150,7 +150,7 @@ static WRITE8_HANDLER( egghunt_bgram_w ) else { state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } } @@ -158,7 +158,7 @@ static WRITE8_HANDLER( egghunt_atram_w ) { egghunt_state *state = space->machine().driver_data(); state->m_atram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -175,7 +175,7 @@ static VIDEO_START(egghunt) static SCREEN_UPDATE_IND16(egghunt) { egghunt_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -187,7 +187,7 @@ static WRITE8_HANDLER( egghunt_gfx_banking_w ) // data & 0x30 is used for sprites banking state->m_gfx_banking = data & 0x33; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } static WRITE8_HANDLER( egghunt_vidram_bank_w ) diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 6f3df8982d2..6a07bae5d43 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -109,7 +109,7 @@ static WRITE16_HANDLER(hedpanic_platform_w) int offsets = state->m_headpanic_platform_x[0] + 0x40 * state->m_headpanic_platform_y[0]; state->m_vram_1[offsets] = data; - tilemap_mark_tile_dirty(state->m_tilemap_1_16x16, offsets); + state->m_tilemap_1_16x16->mark_tile_dirty(offsets); } diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 140919d4418..92794042942 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -54,20 +54,20 @@ static WRITE8_HANDLER( ettrivia_fg_w ) { ettrivia_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( ettrivia_bg_w ) { ettrivia_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( ettrivia_control_w ) { ettrivia_state *state = space->machine().driver_data(); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); state->m_palreg = (data >> 1) & 3; state->m_gfx_bank = (data >> 2) & 1; @@ -188,7 +188,7 @@ static GFXDECODE_START( ettrivia ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 32*4, 32 ) GFXDECODE_END -INLINE void get_tile_info(running_machine &machine, tile_data *tileinfo, int tile_index, UINT8 *vidram, int gfx_code) +INLINE void get_tile_info(running_machine &machine, tile_data &tileinfo, int tile_index, UINT8 *vidram, int gfx_code) { ettrivia_state *state = machine.driver_data(); int code = vidram[tile_index]; @@ -253,14 +253,14 @@ static VIDEO_START( ettrivia ) state->m_bg_tilemap = tilemap_create( machine, get_tile_info_bg,tilemap_scan_rows,8,8,64,32 ); state->m_fg_tilemap = tilemap_create( machine, get_tile_info_fg,tilemap_scan_rows,8,8,64,32 ); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16( ettrivia ) { ettrivia_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index 532db7becf0..51b801a8d32 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -120,9 +120,9 @@ static void fcrash_update_transmasks( running_machine &machine ) else mask = 0xffff; /* completely transparent if priority masks not defined (mercs, qad) */ - tilemap_set_transmask(state->m_bg_tilemap[0], i, mask, 0x8000); - tilemap_set_transmask(state->m_bg_tilemap[1], i, mask, 0x8000); - tilemap_set_transmask(state->m_bg_tilemap[2], i, mask, 0x8000); + state->m_bg_tilemap[0]->set_transmask(i, mask, 0x8000); + state->m_bg_tilemap[1]->set_transmask(i, mask, 0x8000); + state->m_bg_tilemap[2]->set_transmask(i, mask, 0x8000); } } @@ -171,7 +171,7 @@ static void fcrash_render_layer( running_machine &machine, bitmap_ind16 &bitmap, case 1: case 2: case 3: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[layer - 1], TILEMAP_DRAW_LAYER1, primask); + state->m_bg_tilemap[layer - 1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, primask); break; } } @@ -189,7 +189,7 @@ static void fcrash_render_high_layer( running_machine &machine, bitmap_ind16 &bi case 1: case 2: case 3: - tilemap_draw(dummy_bitmap, cliprect, state->m_bg_tilemap[layer - 1], TILEMAP_DRAW_LAYER0, 1); + state->m_bg_tilemap[layer - 1]->draw(dummy_bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); break; } } @@ -236,8 +236,8 @@ static SCREEN_UPDATE_IND16( fcrash ) fcrash_update_transmasks(screen.machine()); - tilemap_set_scrollx(state->m_bg_tilemap[0], 0, state->m_scroll1x - 62); - tilemap_set_scrolly(state->m_bg_tilemap[0], 0, state->m_scroll1y); + state->m_bg_tilemap[0]->set_scrollx(0, state->m_scroll1x - 62); + state->m_bg_tilemap[0]->set_scrolly(0, state->m_scroll1y); if (videocontrol & 0x01) /* linescroll enable */ { @@ -245,28 +245,28 @@ static SCREEN_UPDATE_IND16( fcrash ) int i; int otheroffs; - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 1024); + state->m_bg_tilemap[1]->set_scroll_rows(1024); otheroffs = state->m_cps_a_regs[CPS1_ROWSCROLL_OFFS]; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg_tilemap[1], (i - scrly) & 0x3ff, state->m_scroll2x + state->m_other[(i + otheroffs) & 0x3ff]); + state->m_bg_tilemap[1]->set_scrollx((i - scrly) & 0x3ff, state->m_scroll2x + state->m_other[(i + otheroffs) & 0x3ff]); } else { - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 1); - tilemap_set_scrollx(state->m_bg_tilemap[1], 0, state->m_scroll2x - 60); + state->m_bg_tilemap[1]->set_scroll_rows(1); + state->m_bg_tilemap[1]->set_scrollx(0, state->m_scroll2x - 60); } - tilemap_set_scrolly(state->m_bg_tilemap[1], 0, state->m_scroll2y); - tilemap_set_scrollx(state->m_bg_tilemap[2], 0, state->m_scroll3x - 64); - tilemap_set_scrolly(state->m_bg_tilemap[2], 0, state->m_scroll3y); + state->m_bg_tilemap[1]->set_scrolly(0, state->m_scroll2y); + state->m_bg_tilemap[2]->set_scrollx(0, state->m_scroll3x - 64); + state->m_bg_tilemap[2]->set_scrolly(0, state->m_scroll3y); /* turn all tilemaps on regardless of settings in get_video_base() */ /* write a custom get_video_base for this bootleg hardware? */ - tilemap_set_enable(state->m_bg_tilemap[0], 1); - tilemap_set_enable(state->m_bg_tilemap[1], 1); - tilemap_set_enable(state->m_bg_tilemap[2], 1); + state->m_bg_tilemap[0]->enable(1); + state->m_bg_tilemap[1]->enable(1); + state->m_bg_tilemap[2]->enable(1); /* Blank screen */ bitmap.fill(0xbff, cliprect); @@ -316,8 +316,8 @@ static SCREEN_UPDATE_IND16( kodb ) fcrash_update_transmasks(screen.machine()); - tilemap_set_scrollx(state->m_bg_tilemap[0], 0, state->m_scroll1x); - tilemap_set_scrolly(state->m_bg_tilemap[0], 0, state->m_scroll1y); + state->m_bg_tilemap[0]->set_scrollx(0, state->m_scroll1x); + state->m_bg_tilemap[0]->set_scrolly(0, state->m_scroll1y); if (videocontrol & 0x01) /* linescroll enable */ { @@ -325,29 +325,29 @@ static SCREEN_UPDATE_IND16( kodb ) int i; int otheroffs; - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 1024); + state->m_bg_tilemap[1]->set_scroll_rows(1024); otheroffs = state->m_cps_a_regs[CPS1_ROWSCROLL_OFFS]; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg_tilemap[1], (i - scrly) & 0x3ff, state->m_scroll2x + state->m_other[(i + otheroffs) & 0x3ff]); + state->m_bg_tilemap[1]->set_scrollx((i - scrly) & 0x3ff, state->m_scroll2x + state->m_other[(i + otheroffs) & 0x3ff]); } else { - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 1); - tilemap_set_scrollx(state->m_bg_tilemap[1], 0, state->m_scroll2x); + state->m_bg_tilemap[1]->set_scroll_rows(1); + state->m_bg_tilemap[1]->set_scrollx(0, state->m_scroll2x); } - tilemap_set_scrolly(state->m_bg_tilemap[1], 0, state->m_scroll2y); - tilemap_set_scrollx(state->m_bg_tilemap[2], 0, state->m_scroll3x); - tilemap_set_scrolly(state->m_bg_tilemap[2], 0, state->m_scroll3y); + state->m_bg_tilemap[1]->set_scrolly(0, state->m_scroll2y); + state->m_bg_tilemap[2]->set_scrollx(0, state->m_scroll3x); + state->m_bg_tilemap[2]->set_scrolly(0, state->m_scroll3y); /* turn all tilemaps on regardless of settings in get_video_base() */ /* write a custom get_video_base for this bootleg hardware? */ - tilemap_set_enable(state->m_bg_tilemap[0], 1); - tilemap_set_enable(state->m_bg_tilemap[1], 1); - tilemap_set_enable(state->m_bg_tilemap[2], 1); + state->m_bg_tilemap[0]->enable(1); + state->m_bg_tilemap[1]->enable(1); + state->m_bg_tilemap[2]->enable(1); /* Blank screen */ bitmap.fill(0xbff, cliprect); diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 2b13568503b..3fc8db3b5b9 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -171,7 +171,7 @@ static WRITE8_HANDLER( tileram_w ) { firefox_state *state = space->machine().driver_data(); state->m_tileram[offset] = data; - tilemap_mark_tile_dirty(state->m_bgtiles, offset); + state->m_bgtiles->mark_tile_dirty(offset); } @@ -179,8 +179,8 @@ static VIDEO_START( firefox ) { firefox_state *state = machine.driver_data(); state->m_bgtiles = tilemap_create(machine, bgtile_get_info, tilemap_scan_rows, 8,8, 64,64); - tilemap_set_transparent_pen(state->m_bgtiles, 0); - tilemap_set_scrolldy(state->m_bgtiles, machine.primary_screen->visible_area().min_y, 0); + state->m_bgtiles->set_transparent_pen(0); + state->m_bgtiles->set_scrolldy(machine.primary_screen->visible_area().min_y, 0); } @@ -215,7 +215,7 @@ static SCREEN_UPDATE_RGB32( firefox ) } } - tilemap_draw( bitmap, cliprect, state->m_bgtiles, 0, 0 ); + state->m_bgtiles->draw(bitmap, cliprect, 0, 0 ); return 0; } diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 79ae63b4484..b7efa8ab542 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -95,10 +95,10 @@ static SCREEN_UPDATE_IND16( flyball ) int x; int y; - tilemap_mark_all_tiles_dirty(state->m_tmap); + state->m_tmap->mark_all_dirty(); /* draw playfield */ - tilemap_draw(bitmap, cliprect, state->m_tmap, 0, 0); + state->m_tmap->draw(bitmap, cliprect, 0, 0); /* draw pitcher */ drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1], state->m_pitcher_pic ^ 0xf, 0, 1, 0, pitcherx, pitchery, 1); diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index 40dc9fe3410..3a1b7af4a89 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -80,7 +80,7 @@ static WRITE16_HANDLER( gaelco_vram_encrypted_w ) data = gaelco_decrypt(space, offset, data, 0x0f, 0x4228); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap[offset >> 11], ((offset << 1) & 0x0fff) >> 2); + state->m_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2); } @@ -103,7 +103,7 @@ static WRITE16_HANDLER( thoop_vram_encrypted_w ) data = gaelco_decrypt(space, offset, data, 0x0e, 0x4228); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap[offset >> 11], ((offset << 1) & 0x0fff) >> 2); + state->m_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2); } static WRITE16_HANDLER(thoop_encrypted_w) diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index b2f57289102..7cf41634321 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -117,35 +117,35 @@ static WRITE16_HANDLER( galaxi_bg1_w ) { galaxi_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg1_ram[offset]); - tilemap_mark_tile_dirty(state->m_bg1_tmap, offset); + state->m_bg1_tmap->mark_tile_dirty(offset); } static WRITE16_HANDLER( galaxi_bg2_w ) { galaxi_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg2_ram[offset]); - tilemap_mark_tile_dirty(state->m_bg2_tmap, offset); + state->m_bg2_tmap->mark_tile_dirty(offset); } static WRITE16_HANDLER( galaxi_bg3_w ) { galaxi_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg3_ram[offset]); - tilemap_mark_tile_dirty(state->m_bg3_tmap, offset); + state->m_bg3_tmap->mark_tile_dirty(offset); } static WRITE16_HANDLER( galaxi_bg4_w ) { galaxi_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg4_ram[offset]); - tilemap_mark_tile_dirty(state->m_bg4_tmap, offset); + state->m_bg4_tmap->mark_tile_dirty(offset); } static WRITE16_HANDLER( galaxi_fg_w ) { galaxi_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_ram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tmap, offset); + state->m_fg_tmap->mark_tile_dirty(offset); } static VIDEO_START(galaxi) @@ -159,14 +159,14 @@ static VIDEO_START(galaxi) state->m_fg_tmap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 0x40, 0x20); - tilemap_set_transparent_pen(state->m_bg1_tmap, 0); - tilemap_set_transparent_pen(state->m_bg2_tmap, 0); - tilemap_set_transparent_pen(state->m_bg3_tmap, 0); - tilemap_set_transparent_pen(state->m_bg4_tmap, 0); + state->m_bg1_tmap->set_transparent_pen(0); + state->m_bg2_tmap->set_transparent_pen(0); + state->m_bg3_tmap->set_transparent_pen(0); + state->m_bg4_tmap->set_transparent_pen(0); - tilemap_set_transparent_pen(state->m_fg_tmap, 0); + state->m_fg_tmap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg3_tmap, -8, 0); + state->m_bg3_tmap->set_scrolldx(-8, 0); } static SCREEN_UPDATE_IND16(galaxi) @@ -187,13 +187,13 @@ static SCREEN_UPDATE_IND16(galaxi) } #endif - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_bg1_tmap, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 1) state->m_bg1_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); else bitmap.fill(get_black_pen(screen.machine()), cliprect); - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_bg2_tmap, 0, 0); - if (layers_ctrl & 4) tilemap_draw(bitmap, cliprect, state->m_bg3_tmap, 0, 0); - if (layers_ctrl & 8) tilemap_draw(bitmap, cliprect, state->m_bg4_tmap, 0, 0); + if (layers_ctrl & 2) state->m_bg2_tmap->draw(bitmap, cliprect, 0, 0); + if (layers_ctrl & 4) state->m_bg3_tmap->draw(bitmap, cliprect, 0, 0); + if (layers_ctrl & 8) state->m_bg4_tmap->draw(bitmap, cliprect, 0, 0); - if (layers_ctrl & 16) tilemap_draw(bitmap, cliprect, state->m_fg_tmap, 0, 0); + if (layers_ctrl & 16) state->m_fg_tmap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index b724643b7d1..3e212f56354 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -32,7 +32,7 @@ static WRITE8_HANDLER( goindol_bankswitch_w ) if (state->m_char_bank != ((data & 0x10) >> 4)) { state->m_char_bank = (data & 0x10) >> 4; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } flip_screen_set(space->machine(), data & 0x20); diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 6578300afd1..ee2a76445d1 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -739,14 +739,14 @@ static WRITE8_HANDLER( goldnpkr_videoram_w ) { goldnpkr_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( goldnpkr_colorram_w ) { goldnpkr_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -803,7 +803,7 @@ static VIDEO_START( wcrdxtnd ) static SCREEN_UPDATE_IND16( goldnpkr ) { goldnpkr_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 64b59efa008..f765d1fc208 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -396,7 +396,7 @@ static WRITE8_HANDLER( magodds_outb850_w ) //popmessage("magodds_outb850_w %02x\n", data); - tilemap_mark_all_tiles_dirty (state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index 0581a385e51..74f9969ab7c 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -57,7 +57,7 @@ static WRITE16_HANDLER( fg_tilemapram_w ) { good_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_tilemapram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_fg_tile_info ) @@ -72,7 +72,7 @@ static WRITE16_HANDLER( bg_tilemapram_w ) { good_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_tilemapram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_bg_tile_info ) @@ -90,14 +90,14 @@ static VIDEO_START( good ) good_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0xf); + state->m_fg_tilemap->set_transparent_pen(0xf); } static SCREEN_UPDATE_IND16( good ) { good_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 04ffa3229d1..1bb12d20cdf 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -216,15 +216,15 @@ static WRITE32_HANDLER( gstream_vram_w ) { if (offset >= 0x000 / 4 && offset < 0x400 / 4) { - tilemap_mark_tile_dirty(state->m_tilemap1, offset - (0x000 / 4)); + state->m_tilemap1->mark_tile_dirty(offset - (0x000 / 4)); } else if (offset >= 0x400 / 4 && offset < 0x800 / 4) { - tilemap_mark_tile_dirty(state->m_tilemap2, offset - (0x400 / 4)); + state->m_tilemap2->mark_tile_dirty(offset - (0x400 / 4)); } else if (offset >= 0x800 / 4 && offset < 0xc00 / 4) { - tilemap_mark_tile_dirty(state->m_tilemap3, offset - (0x800 / 4)); + state->m_tilemap3->mark_tile_dirty(offset - (0x800 / 4)); } } } @@ -469,8 +469,8 @@ static VIDEO_START(gstream) state->m_tilemap2 = tilemap_create(machine, get_gs2_tile_info, tilemap_scan_rows, 32, 32, 16, 16); state->m_tilemap3 = tilemap_create(machine, get_gs3_tile_info, tilemap_scan_rows, 32, 32, 16, 16); - tilemap_set_transparent_pen(state->m_tilemap1, 0); - tilemap_set_transparent_pen(state->m_tilemap2, 0); + state->m_tilemap1->set_transparent_pen(0); + state->m_tilemap2->set_transparent_pen(0); } static SCREEN_UPDATE_IND16(gstream) @@ -494,18 +494,18 @@ static SCREEN_UPDATE_IND16(gstream) //popmessage("(1) %08x %08x (2) %08x %08x (3) %08x %08x", state->m_tmap1_scrollx, state->m_tmap1_scrolly, state->m_tmap2_scrollx, state->m_tmap2_scrolly, state->m_tmap3_scrollx, state->m_tmap3_scrolly ); - tilemap_set_scrollx(state->m_tilemap3, 0, state->m_tmap3_scrollx >> 16); - tilemap_set_scrolly(state->m_tilemap3, 0, state->m_tmap3_scrolly >> 16); + state->m_tilemap3->set_scrollx(0, state->m_tmap3_scrollx >> 16); + state->m_tilemap3->set_scrolly(0, state->m_tmap3_scrolly >> 16); - tilemap_set_scrollx(state->m_tilemap1, 0, state->m_tmap1_scrollx >> 16); - tilemap_set_scrolly(state->m_tilemap1, 0, state->m_tmap1_scrolly >> 16); + state->m_tilemap1->set_scrollx(0, state->m_tmap1_scrollx >> 16); + state->m_tilemap1->set_scrolly(0, state->m_tmap1_scrolly >> 16); - tilemap_set_scrollx(state->m_tilemap2, 0, state->m_tmap2_scrollx >> 16); - tilemap_set_scrolly(state->m_tilemap2, 0, state->m_tmap2_scrolly >> 16); + state->m_tilemap2->set_scrollx(0, state->m_tmap2_scrollx >> 16); + state->m_tilemap2->set_scrolly(0, state->m_tmap2_scrolly >> 16); - tilemap_draw(bitmap, cliprect, state->m_tilemap3, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap2, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap1, 0, 0); + state->m_tilemap3->draw(bitmap, cliprect, 0, 0); + state->m_tilemap2->draw(bitmap, cliprect, 0, 0); + state->m_tilemap1->draw(bitmap, cliprect, 0, 0); for (i = 0x0000 / 4; i < 0x4000 / 4; i += 4) { diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index f7cf9e40705..74adc25850a 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -44,7 +44,7 @@ static WRITE8_HANDLER( hitme_vidram_w ) /* mark this tile dirty */ state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); } @@ -84,7 +84,7 @@ static SCREEN_UPDATE_IND16( hitme ) offs_t offs = 0; /* start by drawing the tilemap */ - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); /* now loop over and invert anything */ for (y = 0; y < 19; y++) @@ -120,7 +120,7 @@ static SCREEN_UPDATE_IND16( hitme ) static SCREEN_UPDATE_IND16( barricad ) { hitme_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 0a4ba22c572..3d29bb81a35 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -160,10 +160,10 @@ static SCREEN_UPDATE_IND16( hvyunit ) #define SY_POS 0 hvyunit_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((state->m_port0_data & 0x40) << 2) + state->m_scrollx + SX_POS); // TODO - tilemap_set_scrolly(state->m_bg_tilemap, 0, ((state->m_port0_data & 0x80) << 1) + state->m_scrolly + SY_POS); // TODO + state->m_bg_tilemap->set_scrollx(0, ((state->m_port0_data & 0x40) << 2) + state->m_scrollx + SX_POS); // TODO + state->m_bg_tilemap->set_scrolly(0, ((state->m_port0_data & 0x80) << 1) + state->m_scrolly + SY_POS); // TODO bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); pandora_update(state->m_pandora, bitmap, cliprect); return 0; @@ -245,7 +245,7 @@ static WRITE8_HANDLER( hu_videoram_w ) hvyunit_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( hu_colorram_w ) @@ -253,7 +253,7 @@ static WRITE8_HANDLER( hu_colorram_w ) hvyunit_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( slave_bankswitch_w ) diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 94bc2fd7c7e..f7e04bdf75b 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -60,7 +60,7 @@ static WRITE8_HANDLER( gp98_reel1_ram_w ) { igs009_state *state = space->machine().driver_data(); state->m_gp98_reel1_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_gp98_reel1_tilemap,offset); + state->m_gp98_reel1_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_jingbell_reel1_tile_info ) @@ -93,7 +93,7 @@ static WRITE8_HANDLER( gp98_reel2_ram_w ) { igs009_state *state = space->machine().driver_data(); state->m_gp98_reel2_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_gp98_reel2_tilemap,offset); + state->m_gp98_reel2_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_jingbell_reel2_tile_info ) @@ -126,7 +126,7 @@ static WRITE8_HANDLER( gp98_reel3_ram_w ) { igs009_state *state = space->machine().driver_data(); state->m_gp98_reel3_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_gp98_reel3_tilemap,offset); + state->m_gp98_reel3_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_jingbell_reel3_tile_info ) @@ -159,7 +159,7 @@ static WRITE8_HANDLER( gp98_reel4_ram_w ) { igs009_state *state = space->machine().driver_data(); state->m_gp98_reel4_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_gp98_reel4_tilemap,offset); + state->m_gp98_reel4_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_jingbell_reel4_tile_info ) @@ -196,7 +196,7 @@ static WRITE8_HANDLER( bg_scroll_w ) { igs009_state *state = space->machine().driver_data(); state->m_bg_scroll[offset] = data; -// tilemap_set_scrolly(bg_tilemap,offset,data); +// bg_tilemap->set_scrolly(offset,data); } @@ -211,31 +211,31 @@ static WRITE8_HANDLER( fg_tile_w ) { igs009_state *state = space->machine().driver_data(); state->m_fg_tile_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( fg_color_w ) { igs009_state *state = space->machine().driver_data(); state->m_fg_color_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static VIDEO_START(jingbell) { igs009_state *state = machine.driver_data(); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 0x80,0x20); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_gp98_reel1_tilemap = tilemap_create(machine,get_jingbell_reel1_tile_info,tilemap_scan_rows,8,32, 128, 8); state->m_gp98_reel2_tilemap = tilemap_create(machine,get_jingbell_reel2_tile_info,tilemap_scan_rows,8,32, 128, 8); state->m_gp98_reel3_tilemap = tilemap_create(machine,get_jingbell_reel3_tile_info,tilemap_scan_rows,8,32, 128, 8); state->m_gp98_reel4_tilemap = tilemap_create(machine,get_jingbell_reel4_tile_info,tilemap_scan_rows,8,32, 128, 8); - tilemap_set_scroll_cols(state->m_gp98_reel1_tilemap, 128); - tilemap_set_scroll_cols(state->m_gp98_reel2_tilemap, 128); - tilemap_set_scroll_cols(state->m_gp98_reel3_tilemap, 128); - tilemap_set_scroll_cols(state->m_gp98_reel4_tilemap, 128); + state->m_gp98_reel1_tilemap->set_scroll_cols(128); + state->m_gp98_reel2_tilemap->set_scroll_cols(128); + state->m_gp98_reel3_tilemap->set_scroll_cols(128); + state->m_gp98_reel4_tilemap->set_scroll_cols(128); } @@ -243,17 +243,17 @@ static VIDEO_START(gp98) { igs009_state *state = machine.driver_data(); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 0x80,0x20); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_gp98_reel1_tilemap = tilemap_create(machine,get_gp98_reel1_tile_info,tilemap_scan_rows,8,32, 128, 8); state->m_gp98_reel2_tilemap = tilemap_create(machine,get_gp98_reel2_tile_info,tilemap_scan_rows,8,32, 128, 8); state->m_gp98_reel3_tilemap = tilemap_create(machine,get_gp98_reel3_tile_info,tilemap_scan_rows,8,32, 128, 8); state->m_gp98_reel4_tilemap = tilemap_create(machine,get_gp98_reel4_tile_info,tilemap_scan_rows,8,32, 128, 8); - tilemap_set_scroll_cols(state->m_gp98_reel1_tilemap, 128); - tilemap_set_scroll_cols(state->m_gp98_reel2_tilemap, 128); - tilemap_set_scroll_cols(state->m_gp98_reel3_tilemap, 128); - tilemap_set_scroll_cols(state->m_gp98_reel4_tilemap, 128); + state->m_gp98_reel1_tilemap->set_scroll_cols(128); + state->m_gp98_reel2_tilemap->set_scroll_cols(128); + state->m_gp98_reel3_tilemap->set_scroll_cols(128); + state->m_gp98_reel4_tilemap->set_scroll_cols(128); } @@ -283,10 +283,10 @@ static SCREEN_UPDATE_IND16(jingbell) for (i= 0;i < 0x80;i++) { - tilemap_set_scrolly(state->m_gp98_reel1_tilemap, i, state->m_bg_scroll[i]*2); - tilemap_set_scrolly(state->m_gp98_reel2_tilemap, i, state->m_bg_scroll[i+0x80]*2); - tilemap_set_scrolly(state->m_gp98_reel3_tilemap, i, state->m_bg_scroll[i+0x100]*2); - tilemap_set_scrolly(state->m_gp98_reel4_tilemap, i, state->m_bg_scroll[i+0x180]*2); + state->m_gp98_reel1_tilemap->set_scrolly(i, state->m_bg_scroll[i]*2); + state->m_gp98_reel2_tilemap->set_scrolly(i, state->m_bg_scroll[i+0x80]*2); + state->m_gp98_reel3_tilemap->set_scrolly(i, state->m_bg_scroll[i+0x100]*2); + state->m_gp98_reel4_tilemap->set_scrolly(i, state->m_bg_scroll[i+0x180]*2); } @@ -304,19 +304,19 @@ static SCREEN_UPDATE_IND16(jingbell) if (rowenable==0) { // 0 and 1 are the same? or is there a global switchoff? - tilemap_draw(bitmap,clip,state->m_gp98_reel1_tilemap,0,0); + state->m_gp98_reel1_tilemap->draw(bitmap, clip, 0,0); } else if (rowenable==1) { - tilemap_draw(bitmap,clip,state->m_gp98_reel2_tilemap,0,0); + state->m_gp98_reel2_tilemap->draw(bitmap, clip, 0,0); } else if (rowenable==2) { - tilemap_draw(bitmap,clip,state->m_gp98_reel3_tilemap,0,0); + state->m_gp98_reel3_tilemap->draw(bitmap, clip, 0,0); } else if (rowenable==3) { - tilemap_draw(bitmap,clip,state->m_gp98_reel4_tilemap,0,0); + state->m_gp98_reel4_tilemap->draw(bitmap, clip, 0,0); } @@ -327,7 +327,7 @@ static SCREEN_UPDATE_IND16(jingbell) else bitmap.fill(get_black_pen(screen.machine()), cliprect); - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + if (layers_ctrl & 2) state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index a4c6a9e66b6..75bb317fdbe 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -128,14 +128,14 @@ static WRITE8_HANDLER( fg_w ) { igs017_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset/4); + state->m_fg_tilemap->mark_tile_dirty(offset/4); } static WRITE8_HANDLER( bg_w ) { igs017_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset/4); + state->m_bg_tilemap->mark_tile_dirty(offset/4); } // 16-bit handlers for an 8-bit chip @@ -204,8 +204,8 @@ static VIDEO_START( igs017 ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0xf); - tilemap_set_transparent_pen(state->m_bg_tilemap,0xf); + state->m_fg_tilemap->set_transparent_pen(0xf); + state->m_bg_tilemap->set_transparent_pen(0xf); state->m_toggle = 0; state->m_debug_addr = 0; @@ -368,11 +368,11 @@ static SCREEN_UPDATE_IND16( igs017 ) if (state->m_video_disable) return 0; - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 1) state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); if (layers_ctrl & 4) draw_sprites(screen.machine(), bitmap, cliprect); - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + if (layers_ctrl & 2) state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index e0db400cb43..21b663b54db 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -100,7 +100,7 @@ static WRITE32_HANDLER( igs_tx_videoram_w ) { igs_m027_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_igs_tx_videoram[offset]); - tilemap_mark_tile_dirty(state->m_igs_tx_tilemap,offset); + state->m_igs_tx_tilemap->mark_tile_dirty(offset); //if(data!=0) //logerror( "TX VIDEO RAM OFFSET %x ,data %x!\n",offset ,state->m_igs_tx_videoram[offset]); } @@ -121,7 +121,7 @@ static WRITE32_HANDLER( igs_bg_videoram_w ) { igs_m027_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_igs_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_igs_bg_tilemap,offset); + state->m_igs_bg_tilemap->mark_tile_dirty(offset); //if(data!=0) logerror("BG VIDEO RAM OFFSET %x ,data %x!\n",offset ,state->m_igs_bg_videoram[offset]); } @@ -156,10 +156,10 @@ static VIDEO_START(igs_majhong) { igs_m027_state *state = machine.driver_data(); state->m_igs_tx_tilemap= tilemap_create(machine, get_tx_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_igs_tx_tilemap,15); + state->m_igs_tx_tilemap->set_transparent_pen(15); state->m_igs_bg_tilemap= tilemap_create(machine, get_bg_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); //state->m_igs_bg_tilemap= tilemap_create(machine, get_bg_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); - //tilemap_set_transparent_pen(state->m_igs_bg_tilemap,15); + //state->m_igs_bg_tilemap->set_transparent_pen(15); logerror("Video START OK!\n"); } @@ -170,12 +170,12 @@ static SCREEN_UPDATE_IND16(igs_majhong) bitmap.fill(get_black_pen(screen.machine()), cliprect); //?????? - tilemap_draw(bitmap,cliprect,state->m_igs_bg_tilemap,0,0); + state->m_igs_bg_tilemap->draw(bitmap, cliprect, 0,0); //CG?????? //?????? - tilemap_draw(bitmap,cliprect,state->m_igs_tx_tilemap,0,0); + state->m_igs_tx_tilemap->draw(bitmap, cliprect, 0,0); //fprintf(stdout,"Video UPDATE OK!\n"); return 0; } diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index a631683dfae..a7a5b7062c5 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -151,21 +151,21 @@ static WRITE8_HANDLER( bg_tile_w ) { igspoker_state *state = space->machine().driver_data(); state->m_bg_tile_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( fg_tile_w ) { igspoker_state *state = space->machine().driver_data(); state->m_fg_tile_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( fg_color_w ) { igspoker_state *state = space->machine().driver_data(); state->m_fg_color_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static VIDEO_START(igs_video) @@ -174,7 +174,7 @@ static VIDEO_START(igs_video) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 32, 64, 8); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16(igs_video) @@ -183,9 +183,9 @@ static SCREEN_UPDATE_IND16(igs_video) bitmap.fill(get_black_pen(screen.machine()), cliprect); // FIX: CSK227IT must have some way to disable background, or wrong gfx? - if (state->m_bg_enable) tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + if (state->m_bg_enable) state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -199,7 +199,7 @@ static VIDEO_START(cpokerpk) static SCREEN_UPDATE_IND16(cpokerpk) { igspoker_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index 30478f81dfb..b96b2890349 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -93,14 +93,14 @@ static WRITE8_HANDLER( fg_tile_w ) { jackie_state *state = space->machine().driver_data(); state->m_fg_tile_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( fg_color_w ) { jackie_state *state = space->machine().driver_data(); state->m_fg_color_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -117,7 +117,7 @@ static WRITE8_HANDLER( jackie_reel1_ram_w ) { jackie_state *state = space->machine().driver_data(); state->m_reel1_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel1_tilemap,offset); + state->m_reel1_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_jackie_reel1_tile_info ) @@ -133,7 +133,7 @@ static WRITE8_HANDLER( jackie_reel2_ram_w ) { jackie_state *state = space->machine().driver_data(); state->m_reel2_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel2_tilemap,offset); + state->m_reel2_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_jackie_reel2_tile_info ) @@ -148,7 +148,7 @@ static WRITE8_HANDLER( jackie_reel3_ram_w ) { jackie_state *state = space->machine().driver_data(); state->m_reel3_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel3_tilemap,offset); + state->m_reel3_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_jackie_reel3_tile_info ) @@ -165,12 +165,12 @@ static VIDEO_START(jackie) state->m_reel2_tilemap = tilemap_create(machine,get_jackie_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); state->m_reel3_tilemap = tilemap_create(machine,get_jackie_reel3_tile_info,tilemap_scan_rows,8,32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 64); + state->m_reel1_tilemap->set_scroll_cols(64); + state->m_reel2_tilemap->set_scroll_cols(64); + state->m_reel3_tilemap->set_scroll_cols(64); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -185,9 +185,9 @@ static SCREEN_UPDATE_IND16(jackie) for (i=0;i < 0x40;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_bg_scroll[i+0x000]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_bg_scroll[i+0x040]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_bg_scroll[i+0x080]); + state->m_reel1_tilemap->set_scrolly(i, state->m_bg_scroll[i+0x000]); + state->m_reel2_tilemap->set_scrolly(i, state->m_bg_scroll[i+0x040]); + state->m_reel3_tilemap->set_scrolly(i, state->m_bg_scroll[i+0x080]); } for (j=0; j < 0x100-1; j++) @@ -200,15 +200,15 @@ static SCREEN_UPDATE_IND16(jackie) if (rowenable==0) { - tilemap_draw(bitmap,clip,state->m_reel1_tilemap,0,0); + state->m_reel1_tilemap->draw(bitmap, clip, 0,0); } else if (rowenable==1) { - tilemap_draw(bitmap,clip,state->m_reel2_tilemap,0,0); + state->m_reel2_tilemap->draw(bitmap, clip, 0,0); } else if (rowenable==2) { - tilemap_draw(bitmap,clip,state->m_reel3_tilemap,0,0); + state->m_reel3_tilemap->draw(bitmap, clip, 0,0); } else if (rowenable==3) { @@ -217,7 +217,7 @@ static SCREEN_UPDATE_IND16(jackie) startclipmin+=1; } - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index aeda3f6fa79..2e934c4c6f3 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -278,25 +278,25 @@ static VIDEO_START( jalmah ) state->m_jm_scrollram = auto_alloc_array(machine, UINT16, 0x80/2); state->m_jm_vregs = auto_alloc_array(machine, UINT16, 0x40/2); - tilemap_set_transparent_pen(state->m_sc0_tilemap_0,15); - tilemap_set_transparent_pen(state->m_sc0_tilemap_1,15); - tilemap_set_transparent_pen(state->m_sc0_tilemap_2,15); - tilemap_set_transparent_pen(state->m_sc0_tilemap_3,15); + state->m_sc0_tilemap_0->set_transparent_pen(15); + state->m_sc0_tilemap_1->set_transparent_pen(15); + state->m_sc0_tilemap_2->set_transparent_pen(15); + state->m_sc0_tilemap_3->set_transparent_pen(15); - tilemap_set_transparent_pen(state->m_sc1_tilemap_0,15); - tilemap_set_transparent_pen(state->m_sc1_tilemap_1,15); - tilemap_set_transparent_pen(state->m_sc1_tilemap_2,15); - tilemap_set_transparent_pen(state->m_sc1_tilemap_3,15); + state->m_sc1_tilemap_0->set_transparent_pen(15); + state->m_sc1_tilemap_1->set_transparent_pen(15); + state->m_sc1_tilemap_2->set_transparent_pen(15); + state->m_sc1_tilemap_3->set_transparent_pen(15); - tilemap_set_transparent_pen(state->m_sc2_tilemap_0,15); - tilemap_set_transparent_pen(state->m_sc2_tilemap_1,15); - tilemap_set_transparent_pen(state->m_sc2_tilemap_2,15); - tilemap_set_transparent_pen(state->m_sc2_tilemap_3,15); + state->m_sc2_tilemap_0->set_transparent_pen(15); + state->m_sc2_tilemap_1->set_transparent_pen(15); + state->m_sc2_tilemap_2->set_transparent_pen(15); + state->m_sc2_tilemap_3->set_transparent_pen(15); - tilemap_set_transparent_pen(state->m_sc3_tilemap_0,15); - //tilemap_set_transparent_pen(state->m_sc3_tilemap_1,15); - tilemap_set_transparent_pen(state->m_sc3_tilemap_2,15); - tilemap_set_transparent_pen(state->m_sc3_tilemap_3,15); + state->m_sc3_tilemap_0->set_transparent_pen(15); + //state->m_sc3_tilemap_1->set_transparent_pen(15); + state->m_sc3_tilemap_2->set_transparent_pen(15); + state->m_sc3_tilemap_3->set_transparent_pen(15); } static VIDEO_START( urashima ) @@ -308,8 +308,8 @@ static VIDEO_START( urashima ) state->m_jm_scrollram = auto_alloc_array(machine, UINT16, 0x80/2); state->m_jm_vregs = auto_alloc_array(machine, UINT16, 0x40/2); - tilemap_set_transparent_pen(state->m_sc0_tilemap_0,15); - tilemap_set_transparent_pen(state->m_sc3_tilemap_0,15); + state->m_sc0_tilemap_0->set_transparent_pen(15); + state->m_sc3_tilemap_0->set_transparent_pen(15); } @@ -352,10 +352,10 @@ static void draw_sc0_layer(running_machine &machine, bitmap_ind16 &bitmap, const jalmah_state *state = machine.driver_data(); switch(state->m_jm_vregs[0] & 3) { - case 0: tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap_0,0,0); break; - case 1: tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap_1,0,0); break; - case 2: tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap_2,0,0); break; - case 3: tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap_3,0,0); break; + case 0: state->m_sc0_tilemap_0->draw(bitmap, cliprect, 0,0); break; + case 1: state->m_sc0_tilemap_1->draw(bitmap, cliprect, 0,0); break; + case 2: state->m_sc0_tilemap_2->draw(bitmap, cliprect, 0,0); break; + case 3: state->m_sc0_tilemap_3->draw(bitmap, cliprect, 0,0); break; } } @@ -364,10 +364,10 @@ static void draw_sc1_layer(running_machine &machine, bitmap_ind16 &bitmap, const jalmah_state *state = machine.driver_data(); switch(state->m_jm_vregs[1] & 3) { - case 0: tilemap_draw(bitmap,cliprect,state->m_sc1_tilemap_0,0,0); break; - case 1: tilemap_draw(bitmap,cliprect,state->m_sc1_tilemap_1,0,0); break; - case 2: tilemap_draw(bitmap,cliprect,state->m_sc1_tilemap_2,0,0); break; - case 3: tilemap_draw(bitmap,cliprect,state->m_sc1_tilemap_3,0,0); break; + case 0: state->m_sc1_tilemap_0->draw(bitmap, cliprect, 0,0); break; + case 1: state->m_sc1_tilemap_1->draw(bitmap, cliprect, 0,0); break; + case 2: state->m_sc1_tilemap_2->draw(bitmap, cliprect, 0,0); break; + case 3: state->m_sc1_tilemap_3->draw(bitmap, cliprect, 0,0); break; } } @@ -376,10 +376,10 @@ static void draw_sc2_layer(running_machine &machine, bitmap_ind16 &bitmap, const jalmah_state *state = machine.driver_data(); switch(state->m_jm_vregs[2] & 3) { - case 0: tilemap_draw(bitmap,cliprect,state->m_sc2_tilemap_0,0,0); break; - case 1: tilemap_draw(bitmap,cliprect,state->m_sc2_tilemap_1,0,0); break; - case 2: tilemap_draw(bitmap,cliprect,state->m_sc2_tilemap_2,0,0); break; - case 3: tilemap_draw(bitmap,cliprect,state->m_sc2_tilemap_3,0,0); break; + case 0: state->m_sc2_tilemap_0->draw(bitmap, cliprect, 0,0); break; + case 1: state->m_sc2_tilemap_1->draw(bitmap, cliprect, 0,0); break; + case 2: state->m_sc2_tilemap_2->draw(bitmap, cliprect, 0,0); break; + case 3: state->m_sc2_tilemap_3->draw(bitmap, cliprect, 0,0); break; } } @@ -389,9 +389,9 @@ static void draw_sc3_layer(running_machine &machine, bitmap_ind16 &bitmap, const switch(state->m_jm_vregs[3] & 3) { case 0: - case 1: tilemap_draw(bitmap,cliprect,state->m_sc3_tilemap_0,0,0); break; - case 2: tilemap_draw(bitmap,cliprect,state->m_sc3_tilemap_2,0,0); break; - case 3: tilemap_draw(bitmap,cliprect,state->m_sc3_tilemap_3,0,0); break; + case 1: state->m_sc3_tilemap_0->draw(bitmap, cliprect, 0,0); break; + case 2: state->m_sc3_tilemap_2->draw(bitmap, cliprect, 0,0); break; + case 3: state->m_sc3_tilemap_3->draw(bitmap, cliprect, 0,0); break; } } @@ -402,46 +402,46 @@ static SCREEN_UPDATE_IND16( jalmah ) UINT8 cur_prin; jalmah_priority_system(screen.machine()); - tilemap_set_scrollx(state->m_sc0_tilemap_0, 0, jm_scrollram[0] & 0xfff); - tilemap_set_scrollx(state->m_sc0_tilemap_1, 0, jm_scrollram[0] & 0x7ff); - tilemap_set_scrollx(state->m_sc0_tilemap_2, 0, jm_scrollram[0] & 0x3ff); - tilemap_set_scrollx(state->m_sc0_tilemap_3, 0, jm_scrollram[0] & 0x1ff); + state->m_sc0_tilemap_0->set_scrollx(0, jm_scrollram[0] & 0xfff); + state->m_sc0_tilemap_1->set_scrollx(0, jm_scrollram[0] & 0x7ff); + state->m_sc0_tilemap_2->set_scrollx(0, jm_scrollram[0] & 0x3ff); + state->m_sc0_tilemap_3->set_scrollx(0, jm_scrollram[0] & 0x1ff); - tilemap_set_scrollx(state->m_sc1_tilemap_0, 0, jm_scrollram[1] & 0xfff); - tilemap_set_scrollx(state->m_sc1_tilemap_1, 0, jm_scrollram[1] & 0x7ff); - tilemap_set_scrollx(state->m_sc1_tilemap_2, 0, jm_scrollram[1] & 0x3ff); - tilemap_set_scrollx(state->m_sc1_tilemap_3, 0, jm_scrollram[1] & 0x1ff); + state->m_sc1_tilemap_0->set_scrollx(0, jm_scrollram[1] & 0xfff); + state->m_sc1_tilemap_1->set_scrollx(0, jm_scrollram[1] & 0x7ff); + state->m_sc1_tilemap_2->set_scrollx(0, jm_scrollram[1] & 0x3ff); + state->m_sc1_tilemap_3->set_scrollx(0, jm_scrollram[1] & 0x1ff); - tilemap_set_scrollx(state->m_sc2_tilemap_0, 0, jm_scrollram[2] & 0xfff); - tilemap_set_scrollx(state->m_sc2_tilemap_1, 0, jm_scrollram[2] & 0x7ff); - tilemap_set_scrollx(state->m_sc2_tilemap_2, 0, jm_scrollram[2] & 0x3ff); - tilemap_set_scrollx(state->m_sc2_tilemap_3, 0, jm_scrollram[2] & 0x1ff); + state->m_sc2_tilemap_0->set_scrollx(0, jm_scrollram[2] & 0xfff); + state->m_sc2_tilemap_1->set_scrollx(0, jm_scrollram[2] & 0x7ff); + state->m_sc2_tilemap_2->set_scrollx(0, jm_scrollram[2] & 0x3ff); + state->m_sc2_tilemap_3->set_scrollx(0, jm_scrollram[2] & 0x1ff); - tilemap_set_scrollx(state->m_sc3_tilemap_0, 0, jm_scrollram[3] & 0x7ff); + state->m_sc3_tilemap_0->set_scrollx(0, jm_scrollram[3] & 0x7ff); // empty - tilemap_set_scrollx(state->m_sc3_tilemap_2, 0, jm_scrollram[3] & 0x3ff); - tilemap_set_scrollx(state->m_sc3_tilemap_3, 0, jm_scrollram[3] & 0x1ff); + state->m_sc3_tilemap_2->set_scrollx(0, jm_scrollram[3] & 0x3ff); + state->m_sc3_tilemap_3->set_scrollx(0, jm_scrollram[3] & 0x1ff); - tilemap_set_scrolly(state->m_sc0_tilemap_0, 0, jm_scrollram[4] & 0x1ff); - tilemap_set_scrolly(state->m_sc0_tilemap_1, 0, jm_scrollram[4] & 0x3ff); - tilemap_set_scrolly(state->m_sc0_tilemap_2, 0, jm_scrollram[4] & 0x7ff); - tilemap_set_scrolly(state->m_sc0_tilemap_3, 0, jm_scrollram[4] & 0xfff); + state->m_sc0_tilemap_0->set_scrolly(0, jm_scrollram[4] & 0x1ff); + state->m_sc0_tilemap_1->set_scrolly(0, jm_scrollram[4] & 0x3ff); + state->m_sc0_tilemap_2->set_scrolly(0, jm_scrollram[4] & 0x7ff); + state->m_sc0_tilemap_3->set_scrolly(0, jm_scrollram[4] & 0xfff); - tilemap_set_scrolly(state->m_sc1_tilemap_0, 0, jm_scrollram[5] & 0x1ff); - tilemap_set_scrolly(state->m_sc1_tilemap_1, 0, jm_scrollram[5] & 0x3ff); - tilemap_set_scrolly(state->m_sc1_tilemap_2, 0, jm_scrollram[5] & 0x7ff); - tilemap_set_scrolly(state->m_sc1_tilemap_3, 0, jm_scrollram[5] & 0xfff); + state->m_sc1_tilemap_0->set_scrolly(0, jm_scrollram[5] & 0x1ff); + state->m_sc1_tilemap_1->set_scrolly(0, jm_scrollram[5] & 0x3ff); + state->m_sc1_tilemap_2->set_scrolly(0, jm_scrollram[5] & 0x7ff); + state->m_sc1_tilemap_3->set_scrolly(0, jm_scrollram[5] & 0xfff); - tilemap_set_scrolly(state->m_sc2_tilemap_0, 0, jm_scrollram[6] & 0x1ff); - tilemap_set_scrolly(state->m_sc2_tilemap_1, 0, jm_scrollram[6] & 0x3ff); - tilemap_set_scrolly(state->m_sc2_tilemap_2, 0, jm_scrollram[6] & 0x7ff); - tilemap_set_scrolly(state->m_sc2_tilemap_3, 0, jm_scrollram[6] & 0xfff); + state->m_sc2_tilemap_0->set_scrolly(0, jm_scrollram[6] & 0x1ff); + state->m_sc2_tilemap_1->set_scrolly(0, jm_scrollram[6] & 0x3ff); + state->m_sc2_tilemap_2->set_scrolly(0, jm_scrollram[6] & 0x7ff); + state->m_sc2_tilemap_3->set_scrolly(0, jm_scrollram[6] & 0xfff); - tilemap_set_scrolly(state->m_sc3_tilemap_0, 0, jm_scrollram[7] & 0xff); + state->m_sc3_tilemap_0->set_scrolly(0, jm_scrollram[7] & 0xff); // empty - tilemap_set_scrolly(state->m_sc3_tilemap_2, 0, jm_scrollram[7] & 0x1ff); - tilemap_set_scrolly(state->m_sc3_tilemap_3, 0, jm_scrollram[7] & 0x3ff); + state->m_sc3_tilemap_2->set_scrolly(0, jm_scrollram[7] & 0x1ff); + state->m_sc3_tilemap_3->set_scrolly(0, jm_scrollram[7] & 0x3ff); bitmap.fill(screen.machine().pens[0xff], cliprect); //selectable by a ram address? @@ -461,14 +461,14 @@ static SCREEN_UPDATE_IND16( urashima ) jalmah_state *state = screen.machine().driver_data(); UINT16 *jm_scrollram = state->m_jm_scrollram; /*this game doesn't use the RANGE register at all.*/ - tilemap_set_scrollx(state->m_sc0_tilemap_0, 0, jm_scrollram[0]); - tilemap_set_scrollx(state->m_sc3_tilemap_0, 0, jm_scrollram[3]); - tilemap_set_scrolly(state->m_sc0_tilemap_0, 0, jm_scrollram[4]); - tilemap_set_scrolly(state->m_sc3_tilemap_0, 0, jm_scrollram[7]); + state->m_sc0_tilemap_0->set_scrollx(0, jm_scrollram[0]); + state->m_sc3_tilemap_0->set_scrollx(0, jm_scrollram[3]); + state->m_sc0_tilemap_0->set_scrolly(0, jm_scrollram[4]); + state->m_sc3_tilemap_0->set_scrolly(0, jm_scrollram[7]); bitmap.fill(screen.machine().pens[0x1ff], cliprect);//selectable by a ram address? - if(state->m_jm_vregs[0] & 1) { tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap_0,0,0); } - if(state->m_jm_vregs[3] & 1) { tilemap_draw(bitmap,cliprect,state->m_sc3_tilemap_0,0,0); } + if(state->m_jm_vregs[0] & 1) { state->m_sc0_tilemap_0->draw(bitmap, cliprect, 0,0); } + if(state->m_jm_vregs[3] & 1) { state->m_sc3_tilemap_0->draw(bitmap, cliprect, 0,0); } return 0; } @@ -477,13 +477,13 @@ static WRITE16_HANDLER( sc0_vram_w ) jalmah_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_sc0_vram[offset]); /*2048x256 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc0_tilemap_0,offset); + state->m_sc0_tilemap_0->mark_tile_dirty(offset); /*1024x512 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc0_tilemap_1,offset); + state->m_sc0_tilemap_1->mark_tile_dirty(offset); /*512x1024 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc0_tilemap_2,offset); + state->m_sc0_tilemap_2->mark_tile_dirty(offset); /*256x2048 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc0_tilemap_3,offset); + state->m_sc0_tilemap_3->mark_tile_dirty(offset); } static WRITE16_HANDLER( sc3_vram_w ) @@ -491,11 +491,11 @@ static WRITE16_HANDLER( sc3_vram_w ) jalmah_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_sc3_vram[offset]); /*2048x256 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc3_tilemap_0,offset); + state->m_sc3_tilemap_0->mark_tile_dirty(offset); /*1024x512 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc3_tilemap_2,offset); + state->m_sc3_tilemap_2->mark_tile_dirty(offset); /*512x1024 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc3_tilemap_3,offset); + state->m_sc3_tilemap_3->mark_tile_dirty(offset); } static WRITE16_HANDLER( sc1_vram_w ) @@ -503,13 +503,13 @@ static WRITE16_HANDLER( sc1_vram_w ) jalmah_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_sc1_vram[offset]); /*2048x256 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc1_tilemap_0,offset); + state->m_sc1_tilemap_0->mark_tile_dirty(offset); /*1024x512 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc1_tilemap_1,offset); + state->m_sc1_tilemap_1->mark_tile_dirty(offset); /*512x1024 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc1_tilemap_2,offset); + state->m_sc1_tilemap_2->mark_tile_dirty(offset); /*256x2048 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc1_tilemap_3,offset); + state->m_sc1_tilemap_3->mark_tile_dirty(offset); } static WRITE16_HANDLER( sc2_vram_w ) @@ -517,13 +517,13 @@ static WRITE16_HANDLER( sc2_vram_w ) jalmah_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_sc2_vram[offset]); /*2048x256 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc2_tilemap_0,offset); + state->m_sc2_tilemap_0->mark_tile_dirty(offset); /*1024x512 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc2_tilemap_1,offset); + state->m_sc2_tilemap_1->mark_tile_dirty(offset); /*512x1024 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc2_tilemap_2,offset); + state->m_sc2_tilemap_2->mark_tile_dirty(offset); /*256x2048 tilemap*/ - tilemap_mark_tile_dirty(state->m_sc2_tilemap_3,offset); + state->m_sc2_tilemap_3->mark_tile_dirty(offset); } static WRITE16_HANDLER( jalmah_tilebank_w ) @@ -539,10 +539,10 @@ static WRITE16_HANDLER( jalmah_tilebank_w ) if (state->m_sc0bank != ((data & 0xf0) >> 4)) { state->m_sc0bank = (data & 0xf0) >> 4; - tilemap_mark_all_tiles_dirty(state->m_sc0_tilemap_0); - tilemap_mark_all_tiles_dirty(state->m_sc0_tilemap_1); - tilemap_mark_all_tiles_dirty(state->m_sc0_tilemap_2); - tilemap_mark_all_tiles_dirty(state->m_sc0_tilemap_3); + state->m_sc0_tilemap_0->mark_all_dirty(); + state->m_sc0_tilemap_1->mark_all_dirty(); + state->m_sc0_tilemap_2->mark_all_dirty(); + state->m_sc0_tilemap_3->mark_all_dirty(); } if (state->m_pri != (data & 0x0f)) state->m_pri = data & 0x0f; @@ -587,9 +587,9 @@ static WRITE16_HANDLER( urashima_bank_w ) if (state->m_sc0bank != (data & 0x0f)) { state->m_sc0bank = (data & 0x0f); - tilemap_mark_all_tiles_dirty(state->m_sc0_tilemap_0); - //tilemap_mark_all_tiles_dirty(state->m_sc0_tilemap_2); - //tilemap_mark_all_tiles_dirty(state->m_sc0_tilemap_3); + state->m_sc0_tilemap_0->mark_all_dirty(); + //state->m_sc0_tilemap_2->mark_all_dirty(); + //state->m_sc0_tilemap_3->mark_all_dirty(); } } } @@ -598,14 +598,14 @@ static WRITE16_HANDLER( urashima_sc0_vram_w ) { jalmah_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_sc0_vram[offset]); - tilemap_mark_tile_dirty(state->m_sc0_tilemap_0,offset); + state->m_sc0_tilemap_0->mark_tile_dirty(offset); } static WRITE16_HANDLER( urashima_sc3_vram_w ) { jalmah_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_sc3_vram[offset]); - tilemap_mark_tile_dirty(state->m_sc3_tilemap_0,offset); + state->m_sc3_tilemap_0->mark_tile_dirty(offset); } /*Urashima Mahjong uses a bigger (and mostly unused/wasted) video register ram.*/ diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index e9d0cbfbf25..6eaf12f8fbc 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -118,7 +118,7 @@ static WRITE8_HANDLER( jokrwild_videoram_w ) { jokrwild_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -126,7 +126,7 @@ static WRITE8_HANDLER( jokrwild_colorram_w ) { jokrwild_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -156,7 +156,7 @@ static VIDEO_START( jokrwild ) static SCREEN_UPDATE_IND16( jokrwild ) { jokrwild_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index fa1119c053d..653ff3c63eb 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -138,7 +138,7 @@ static WRITE8_HANDLER( jollyjgr_videoram_w ) { jollyjgr_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( jollyjgr_attrram_w ) @@ -151,11 +151,11 @@ static WRITE8_HANDLER( jollyjgr_attrram_w ) int i; for (i = offset >> 1; i < 0x0400; i += 32) - tilemap_mark_tile_dirty(state->m_bg_tilemap, i); + state->m_bg_tilemap->mark_tile_dirty(i); } else { - tilemap_set_scrolly(state->m_bg_tilemap, offset >> 1, data); + state->m_bg_tilemap->set_scrolly(offset >> 1, data); } state->m_colorram[offset] = data; @@ -175,7 +175,7 @@ static WRITE8_HANDLER( jollyjgr_misc_w ) state->m_pri = data & 4; - tilemap_set_flip(state->m_bg_tilemap, (state->m_flip_x ? TILEMAP_FLIPX : 0) | (state->m_flip_y ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((state->m_flip_x ? TILEMAP_FLIPX : 0) | (state->m_flip_y ? TILEMAP_FLIPY : 0)); state->m_nmi_enable = data & 0x80; } @@ -441,8 +441,8 @@ static VIDEO_START( jollyjgr ) jollyjgr_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scroll_cols(32); } static void draw_bitmap( running_machine &machine, bitmap_ind16 &bitmap ) @@ -495,11 +495,11 @@ static SCREEN_UPDATE_IND16( jollyjgr ) if(!(state->m_bitmap_disable)) draw_bitmap(screen.machine(), bitmap); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); } else { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if(!(state->m_bitmap_disable)) draw_bitmap(screen.machine(), bitmap); diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c index 107c926f8b1..aca4a22a7c8 100644 --- a/src/mame/drivers/jubilee.c +++ b/src/mame/drivers/jubilee.c @@ -110,7 +110,7 @@ static WRITE8_HANDLER( jubileep_videoram_w ) { jubilee_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -134,7 +134,7 @@ static VIDEO_START( jubileep ) static SCREEN_UPDATE_IND16( jubileep ) { jubilee_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index 28d596c9e2c..3dad2da7314 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -146,7 +146,7 @@ static TILE_GET_INFO( get_sc1_tile_info ) color|0x40, 0); - tileinfo->category = (state->m_attr[tile_index] & 0x08)>>3; + tileinfo.category = (state->m_attr[tile_index] & 0x08)>>3; } static VIDEO_START(kingdrby) @@ -156,7 +156,7 @@ static VIDEO_START(kingdrby) state->m_sc1_tilemap = tilemap_create(machine, get_sc1_tile_info,tilemap_scan_rows,8,8,32,24); state->m_sc0w_tilemap = tilemap_create(machine, get_sc0_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_sc1_tilemap,0); + state->m_sc1_tilemap->set_transparent_pen(0); } static const UINT8 hw_sprite[16] = @@ -215,20 +215,20 @@ static SCREEN_UPDATE_IND16(kingdrby) kingdrby_state *state = screen.machine().driver_data(); const rectangle &visarea = screen.visible_area(); rectangle clip; - tilemap_set_scrollx( state->m_sc0_tilemap,0, state->m_vram[0x342]); - tilemap_set_scrolly( state->m_sc0_tilemap,0, state->m_vram[0x341]); - tilemap_set_scrollx( state->m_sc1_tilemap,0, state->m_vram[0x342]); - tilemap_set_scrolly( state->m_sc1_tilemap,0, state->m_vram[0x341]); - tilemap_set_scrolly( state->m_sc0w_tilemap,0, 32); + state->m_sc0_tilemap->set_scrollx(0, state->m_vram[0x342]); + state->m_sc0_tilemap->set_scrolly(0, state->m_vram[0x341]); + state->m_sc1_tilemap->set_scrollx(0, state->m_vram[0x342]); + state->m_sc1_tilemap->set_scrolly(0, state->m_vram[0x341]); + state->m_sc0w_tilemap->set_scrolly(0, 32); /* maybe it needs two window tilemaps? (one at the top, the other at the bottom)*/ clip.set(visarea.min_x, 256, 192, visarea.max_y); /*TILEMAP_DRAW_CATEGORY + TILEMAP_DRAW_OPAQUE doesn't suit well?*/ - tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap,0,0); + state->m_sc0_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_sc1_tilemap,TILEMAP_DRAW_CATEGORY(1),0); - tilemap_draw(bitmap,clip,state->m_sc0w_tilemap,0,0); + state->m_sc1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1),0); + state->m_sc0w_tilemap->draw(bitmap, clip, 0,0); return 0; } @@ -237,18 +237,18 @@ static WRITE8_HANDLER( sc0_vram_w ) { kingdrby_state *state = space->machine().driver_data(); state->m_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset); - tilemap_mark_tile_dirty(state->m_sc0w_tilemap,offset); - tilemap_mark_tile_dirty(state->m_sc1_tilemap,offset); + state->m_sc0_tilemap->mark_tile_dirty(offset); + state->m_sc0w_tilemap->mark_tile_dirty(offset); + state->m_sc1_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( sc0_attr_w ) { kingdrby_state *state = space->machine().driver_data(); state->m_attr[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset); - tilemap_mark_tile_dirty(state->m_sc0w_tilemap,offset); - tilemap_mark_tile_dirty(state->m_sc1_tilemap,offset); + state->m_sc0_tilemap->mark_tile_dirty(offset); + state->m_sc0w_tilemap->mark_tile_dirty(offset); + state->m_sc1_tilemap->mark_tile_dirty(offset); } /************************************* diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index dd45489dcb5..aac245c0ad1 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -82,14 +82,14 @@ static VIDEO_START( koftball ) state->m_tilemap_1 = tilemap_create(machine, get_t1_tile_info,tilemap_scan_rows,8,8,64,32); state->m_tilemap_2 = tilemap_create(machine, get_t2_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_tilemap_1,0); + state->m_tilemap_1->set_transparent_pen(0); } static SCREEN_UPDATE_IND16( koftball ) { koftball_state *state = screen.machine().driver_data(); - tilemap_draw( bitmap, cliprect, state->m_tilemap_2, 0, 0); - tilemap_draw( bitmap, cliprect, state->m_tilemap_1, 0, 0); + state->m_tilemap_2->draw(bitmap, cliprect, 0, 0); + state->m_tilemap_1->draw(bitmap, cliprect, 0, 0); return 0; } @@ -144,14 +144,14 @@ static WRITE16_HANDLER(bmc_1_videoram_w) { koftball_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bmc_1_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_1, offset); + state->m_tilemap_1->mark_tile_dirty(offset); } static WRITE16_HANDLER(bmc_2_videoram_w) { koftball_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bmc_2_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_2, offset); + state->m_tilemap_2->mark_tile_dirty(offset); } static ADDRESS_MAP_START( koftball_mem, AS_PROGRAM, 16 ) diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index c5884377c93..aa6947b587b 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -135,7 +135,7 @@ static VIDEO_START(koikoi) static SCREEN_UPDATE_IND16(koikoi) { koikoi_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tmap, 0, 0); + state->m_tmap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -149,7 +149,7 @@ static WRITE8_HANDLER( vram_w ) { koikoi_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tmap, offset & 0x3ff); + state->m_tmap->mark_tile_dirty(offset & 0x3ff); } static READ8_DEVICE_HANDLER( input_r ) diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 515ca0b13cd..cda1821f7fe 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -34,12 +34,12 @@ static WRITE8_HANDLER( laserbat_videoram_w ) if (state->m_video_page == 0) { state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } else if (state->m_video_page == 1) { state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); // wrong! + state->m_bg_tilemap->mark_tile_dirty(offset); // wrong! } } @@ -508,7 +508,7 @@ static SCREEN_UPDATE_IND16( laserbat ) laserbat_state *state = screen.machine().driver_data(); int y; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* update the S2636 chips */ bitmap_ind16 &s2636_1_bitmap = s2636_update(state->m_s2636_1, cliprect); diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index bbe77ba77c3..56f1b72e5e0 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -88,21 +88,21 @@ static WRITE32_HANDLER( bg_videoram_w ) { limenko_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE32_HANDLER( md_videoram_w ) { limenko_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_md_videoram[offset]); - tilemap_mark_tile_dirty(state->m_md_tilemap,offset); + state->m_md_tilemap->mark_tile_dirty(offset); } static WRITE32_HANDLER( fg_videoram_w ) { limenko_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE32_HANDLER( spotty_soundlatch_w ) @@ -441,8 +441,8 @@ static VIDEO_START( limenko ) state->m_md_tilemap = tilemap_create(machine, get_md_tile_info,tilemap_scan_rows,8,8,128,64); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,128,64); - tilemap_set_transparent_pen(state->m_md_tilemap,0); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_md_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_sprites_bitmap.allocate(384,240); state->m_sprites_bitmap_pri.allocate(384,240); @@ -455,21 +455,21 @@ static SCREEN_UPDATE_IND16( limenko ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_set_enable(state->m_bg_tilemap, state->m_videoreg[0] & 4); - tilemap_set_enable(state->m_md_tilemap, state->m_videoreg[0] & 2); - tilemap_set_enable(state->m_fg_tilemap, state->m_videoreg[0] & 1); + state->m_bg_tilemap->enable(state->m_videoreg[0] & 4); + state->m_md_tilemap->enable(state->m_videoreg[0] & 2); + state->m_fg_tilemap->enable(state->m_videoreg[0] & 1); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_videoreg[3] & 0xffff); - tilemap_set_scrolly(state->m_md_tilemap, 0, state->m_videoreg[2] & 0xffff); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_videoreg[1] & 0xffff); + state->m_bg_tilemap->set_scrolly(0, state->m_videoreg[3] & 0xffff); + state->m_md_tilemap->set_scrolly(0, state->m_videoreg[2] & 0xffff); + state->m_fg_tilemap->set_scrolly(0, state->m_videoreg[1] & 0xffff); - tilemap_set_scrollx(state->m_bg_tilemap, 0, (state->m_videoreg[3] & 0xffff0000) >> 16); - tilemap_set_scrollx(state->m_md_tilemap, 0, (state->m_videoreg[2] & 0xffff0000) >> 16); - tilemap_set_scrollx(state->m_fg_tilemap, 0, (state->m_videoreg[1] & 0xffff0000) >> 16); + state->m_bg_tilemap->set_scrollx(0, (state->m_videoreg[3] & 0xffff0000) >> 16); + state->m_md_tilemap->set_scrollx(0, (state->m_videoreg[2] & 0xffff0000) >> 16); + state->m_fg_tilemap->set_scrollx(0, (state->m_videoreg[1] & 0xffff0000) >> 16); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_md_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,1); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_md_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,1); if(state->m_videoreg[0] & 8) copy_sprites(screen.machine(), bitmap, state->m_sprites_bitmap, screen.machine().priority_bitmap, cliprect); diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 4dec193f7d3..f64a91a5cdf 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -184,7 +184,7 @@ static VIDEO_START( looping ) state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 32,32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 0x20); + state->m_bg_tilemap->set_scroll_cols(0x20); } @@ -199,7 +199,7 @@ static WRITE8_HANDLER( flip_screen_x_w ) { looping_state *state = space->machine().driver_data(); flip_screen_x_set(space->machine(), ~data & 0x01); - tilemap_set_scrollx(state->m_bg_tilemap, 0, flip_screen_get(space->machine()) ? 128 : 0); + state->m_bg_tilemap->set_scrollx(0, flip_screen_get(space->machine()) ? 128 : 0); } @@ -207,7 +207,7 @@ static WRITE8_HANDLER( flip_screen_y_w ) { looping_state *state = space->machine().driver_data(); flip_screen_y_set(space->machine(), ~data & 0x01); - tilemap_set_scrollx(state->m_bg_tilemap, 0, flip_screen_get(space->machine()) ? 128 : 0); + state->m_bg_tilemap->set_scrollx(0, flip_screen_get(space->machine()) ? 128 : 0); } @@ -215,7 +215,7 @@ static WRITE8_HANDLER( looping_videoram_w ) { looping_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -232,12 +232,12 @@ static WRITE8_HANDLER( looping_colorram_w ) /* mark the whole column dirty */ offs_t offs = (offset/2); for (i = 0; i < 0x20; i++) - tilemap_mark_tile_dirty(state->m_bg_tilemap, i * 0x20 + offs); + state->m_bg_tilemap->mark_tile_dirty(i * 0x20 + offs); } /* even bytes are column scroll */ else - tilemap_set_scrolly(state->m_bg_tilemap, offset/2, data); + state->m_bg_tilemap->set_scrolly(offset/2, data); } @@ -282,7 +282,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r static SCREEN_UPDATE_IND16( looping ) { looping_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 027ce53e133..9f5e4e21701 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -56,14 +56,14 @@ static WRITE8_HANDLER( ltcasino_tile_num_w ) { ltcasino_state *state = space->machine().driver_data(); state->m_tile_num_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset); + state->m_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( ltcasino_tile_atr_w ) { ltcasino_state *state = space->machine().driver_data(); state->m_tile_atr_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset); + state->m_tilemap->mark_tile_dirty(offset); } @@ -635,7 +635,7 @@ GFXDECODE_END static SCREEN_UPDATE_IND16(ltcasino) { ltcasino_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index 001f51588e0..f4762a9cf65 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -118,14 +118,14 @@ static WRITE8_HANDLER( luckgrln_reel1_ram_w ) { luckgrln_state *state = space->machine().driver_data(); state->m_reel1_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel1_tilemap,offset); + state->m_reel1_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( luckgrln_reel1_attr_w ) { luckgrln_state *state = space->machine().driver_data(); state->m_reel1_attr[offset] = data; - tilemap_mark_tile_dirty(state->m_reel1_tilemap,offset); + state->m_reel1_tilemap->mark_tile_dirty(offset); } @@ -152,14 +152,14 @@ static WRITE8_HANDLER( luckgrln_reel2_ram_w ) { luckgrln_state *state = space->machine().driver_data(); state->m_reel2_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel2_tilemap,offset); + state->m_reel2_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( luckgrln_reel2_attr_w ) { luckgrln_state *state = space->machine().driver_data(); state->m_reel2_attr[offset] = data; - tilemap_mark_tile_dirty(state->m_reel2_tilemap,offset); + state->m_reel2_tilemap->mark_tile_dirty(offset); } @@ -184,14 +184,14 @@ static WRITE8_HANDLER( luckgrln_reel3_ram_w ) { luckgrln_state *state = space->machine().driver_data(); state->m_reel3_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel3_tilemap,offset); + state->m_reel3_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( luckgrln_reel3_attr_w ) { luckgrln_state *state = space->machine().driver_data(); state->m_reel3_attr[offset] = data; - tilemap_mark_tile_dirty(state->m_reel3_tilemap,offset); + state->m_reel3_tilemap->mark_tile_dirty(offset); } @@ -215,14 +215,14 @@ static WRITE8_HANDLER( luckgrln_reel4_ram_w ) { luckgrln_state *state = space->machine().driver_data(); state->m_reel4_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel4_tilemap,offset); + state->m_reel4_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( luckgrln_reel4_attr_w ) { luckgrln_state *state = space->machine().driver_data(); state->m_reel4_attr[offset] = data; - tilemap_mark_tile_dirty(state->m_reel4_tilemap,offset); + state->m_reel4_tilemap->mark_tile_dirty(offset); } @@ -250,15 +250,15 @@ static VIDEO_START(luckgrln) state->m_reel3_tilemap = tilemap_create(machine,get_luckgrln_reel3_tile_info,tilemap_scan_rows, 8, 32, 64, 8); state->m_reel4_tilemap = tilemap_create(machine,get_luckgrln_reel4_tile_info,tilemap_scan_rows, 8, 32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel4_tilemap, 64); + state->m_reel1_tilemap->set_scroll_cols(64); + state->m_reel2_tilemap->set_scroll_cols(64); + state->m_reel3_tilemap->set_scroll_cols(64); + state->m_reel4_tilemap->set_scroll_cols(64); - tilemap_set_transparent_pen( state->m_reel1_tilemap, 0 ); - tilemap_set_transparent_pen( state->m_reel2_tilemap, 0 ); - tilemap_set_transparent_pen( state->m_reel3_tilemap, 0 ); - tilemap_set_transparent_pen( state->m_reel4_tilemap, 0 ); + state->m_reel1_tilemap->set_transparent_pen(0 ); + state->m_reel2_tilemap->set_transparent_pen(0 ); + state->m_reel3_tilemap->set_transparent_pen(0 ); + state->m_reel4_tilemap->set_transparent_pen(0 ); } static SCREEN_UPDATE_IND16(luckgrln) @@ -275,10 +275,10 @@ static SCREEN_UPDATE_IND16(luckgrln) for (i= 0;i < 64;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i]); - tilemap_set_scrolly(state->m_reel4_tilemap, i, state->m_reel4_scroll[i]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i]); + state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i]); + state->m_reel4_tilemap->set_scrolly(i, state->m_reel4_scroll[i]); } @@ -330,10 +330,10 @@ static SCREEN_UPDATE_IND16(luckgrln) #if 0 // treat bit as fg enable if (tileattr&0x04) { - if (bgenable==0) tilemap_draw(bitmap, clip, state->m_reel1_tilemap, 0, 0); - if (bgenable==1) tilemap_draw(bitmap, clip, state->m_reel2_tilemap, 0, 0); - if (bgenable==2) tilemap_draw(bitmap, clip, state->m_reel3_tilemap, 0, 0); - if (bgenable==3) tilemap_draw(bitmap, clip, state->m_reel4_tilemap, 0, 0); + if (bgenable==0) state->m_reel1_tilemap->draw(bitmap, clip, 0, 0); + if (bgenable==1) state->m_reel2_tilemap->draw(bitmap, clip, 0, 0); + if (bgenable==2) state->m_reel3_tilemap->draw(bitmap, clip, 0, 0); + if (bgenable==3) state->m_reel4_tilemap->draw(bitmap, clip, 0, 0); } if (tileattr&0x08) drawgfx_transpen(bitmap,clip,screen.machine().gfx[region],tile,col,0,0,x*8,y*8, 0); @@ -343,10 +343,10 @@ static SCREEN_UPDATE_IND16(luckgrln) if (tileattr&0x04) { - if (bgenable==0) tilemap_draw(bitmap, clip, state->m_reel1_tilemap, 0, 0); - if (bgenable==1) tilemap_draw(bitmap, clip, state->m_reel2_tilemap, 0, 0); - if (bgenable==2) tilemap_draw(bitmap, clip, state->m_reel3_tilemap, 0, 0); - if (bgenable==3) tilemap_draw(bitmap, clip, state->m_reel4_tilemap, 0, 0); + if (bgenable==0) state->m_reel1_tilemap->draw(bitmap, clip, 0, 0); + if (bgenable==1) state->m_reel2_tilemap->draw(bitmap, clip, 0, 0); + if (bgenable==2) state->m_reel3_tilemap->draw(bitmap, clip, 0, 0); + if (bgenable==3) state->m_reel4_tilemap->draw(bitmap, clip, 0, 0); } if ((tileattr&0x08)) drawgfx_transpen(bitmap,clip,screen.machine().gfx[region],tile,col,0,0,x*8,y*8, 0); diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index f1d9744d8ba..404c4a219c0 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -124,7 +124,7 @@ static SCREEN_UPDATE_IND16( m14 ) { m14_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_m14_tilemap, 0, 0); + state->m_m14_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -134,7 +134,7 @@ static WRITE8_HANDLER( m14_vram_w ) m14_state *state = space->machine().driver_data(); state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_m14_tilemap, offset); + state->m_m14_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( m14_cram_w ) @@ -142,7 +142,7 @@ static WRITE8_HANDLER( m14_cram_w ) m14_state *state = space->machine().driver_data(); state->m_color_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_m14_tilemap, offset); + state->m_m14_tilemap->mark_tile_dirty(offset); } /************************************* diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 6d4a4bac789..511b6e92961 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -218,7 +218,7 @@ static WRITE8_HANDLER( m63_videoram_w ) m63_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( m63_colorram_w ) @@ -226,7 +226,7 @@ static WRITE8_HANDLER( m63_colorram_w ) m63_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( m63_videoram2_w ) @@ -234,7 +234,7 @@ static WRITE8_HANDLER( m63_videoram2_w ) m63_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( m63_palbank_w ) @@ -244,7 +244,7 @@ static WRITE8_HANDLER( m63_palbank_w ) if (state->m_pal_bank != (data & 0x01)) { state->m_pal_bank = data & 0x01; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -253,7 +253,7 @@ static WRITE8_HANDLER( m63_flipscreen_w ) if (flip_screen_get(space->machine()) != (~data & 0x01)) { flip_screen_set(space->machine(), ~data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -293,8 +293,8 @@ static VIDEO_START( m63 ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_scroll_cols(32); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -345,11 +345,11 @@ static SCREEN_UPDATE_IND16( m63 ) int col; for (col = 0; col < 32; col++) - tilemap_set_scrolly(state->m_bg_tilemap, col, state->m_scrollram[col * 8]); + state->m_bg_tilemap->set_scrolly(col, state->m_scrollram[col * 8]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index f457e9ce0ab..0b15ac3631f 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -111,21 +111,21 @@ static WRITE16_HANDLER( layer0_videoram_w ) { magic10_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_layer0_videoram[offset]); - tilemap_mark_tile_dirty( state->m_layer0_tilemap, offset >> 1); + state->m_layer0_tilemap->mark_tile_dirty(offset >> 1); } static WRITE16_HANDLER( layer1_videoram_w ) { magic10_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_layer1_videoram[offset]); - tilemap_mark_tile_dirty( state->m_layer1_tilemap, offset >> 1); + state->m_layer1_tilemap->mark_tile_dirty(offset >> 1); } static WRITE16_HANDLER( layer2_videoram_w ) { magic10_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_layer2_videoram[offset]); - tilemap_mark_tile_dirty( state->m_layer2_tilemap, offset >> 1); + state->m_layer2_tilemap->mark_tile_dirty(offset >> 1); } static WRITE16_HANDLER( paletteram_w ) @@ -179,27 +179,27 @@ static VIDEO_START( magic10 ) state->m_layer1_tilemap = tilemap_create(machine, get_layer1_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_layer2_tilemap = tilemap_create(machine, get_layer2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_layer1_tilemap, 0); - tilemap_set_transparent_pen(state->m_layer2_tilemap, 0); + state->m_layer1_tilemap->set_transparent_pen(0); + state->m_layer2_tilemap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16( magic10 ) { magic10_state *state = screen.machine().driver_data(); /*TODO: understand where this comes from. */ - tilemap_set_scrollx(state->m_layer2_tilemap, 0, state->m_layer2_offset[0]); - tilemap_set_scrolly(state->m_layer2_tilemap, 0, state->m_layer2_offset[1]); + state->m_layer2_tilemap->set_scrollx(0, state->m_layer2_offset[0]); + state->m_layer2_tilemap->set_scrolly(0, state->m_layer2_offset[1]); /* 4 and 6 are y/x global register writes. 0 and 2 are y/x writes for the scrolling layer. */ - tilemap_set_scrolly(state->m_layer1_tilemap, 0, (state->m_vregs[0/2] - state->m_vregs[4/2])+0); - tilemap_set_scrollx(state->m_layer1_tilemap, 0, (state->m_vregs[2/2] - state->m_vregs[6/2])+4); + state->m_layer1_tilemap->set_scrolly(0, (state->m_vregs[0/2] - state->m_vregs[4/2])+0); + state->m_layer1_tilemap->set_scrollx(0, (state->m_vregs[2/2] - state->m_vregs[6/2])+4); - tilemap_draw(bitmap, cliprect, state->m_layer0_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_layer1_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_layer2_tilemap, 0, 0); + state->m_layer0_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_layer1_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_layer2_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 412177e3fec..b396316b003 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -439,14 +439,14 @@ static WRITE8_HANDLER( magicfly_videoram_w ) { magicfly_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( magicfly_colorram_w ) { magicfly_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_magicfly_tile_info ) @@ -516,7 +516,7 @@ static VIDEO_START( 7mezzo ) static SCREEN_UPDATE_IND16( magicfly ) { magicfly_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c index 01e96f1ed06..7fc843cbae6 100644 --- a/src/mame/drivers/majorpkr.c +++ b/src/mame/drivers/majorpkr.c @@ -513,7 +513,7 @@ static VIDEO_START(majorpkr) state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 16, 8, 36, 28); state->m_fg_tilemap = tilemap_create(machine, fg_get_tile_info, tilemap_scan_rows, 16, 8, 36, 28); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->machine().generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 4 * 0x800); @@ -535,13 +535,13 @@ static SCREEN_UPDATE_IND16(majorpkr) custom_clip = cliprect; custom_clip.max_x -= 16; - tilemap_draw(bitmap, custom_clip, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, custom_clip, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, custom_clip, 0, 0); + state->m_fg_tilemap->draw(bitmap, custom_clip, 0, 0); if (state->m_flip_state == 1) { - tilemap_set_flip(state->m_bg_tilemap, TILEMAP_FLIPX | TILEMAP_FLIPY); - tilemap_set_flip(state->m_fg_tilemap, TILEMAP_FLIPX | TILEMAP_FLIPY); + state->m_bg_tilemap->set_flip(TILEMAP_FLIPX | TILEMAP_FLIPY); + state->m_fg_tilemap->set_flip(TILEMAP_FLIPX | TILEMAP_FLIPY); } return 0; @@ -602,13 +602,13 @@ static WRITE8_HANDLER(vram_w) if (state->m_vram_bank == 0) { - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset >> 1); + state->m_fg_tilemap->mark_tile_dirty(offset >> 1); } else { if (state->m_vram_bank == 1) { - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } else { diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index a4612f6327e..5ea64f1f887 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -138,7 +138,7 @@ static WRITE8_HANDLER( tx_tileram_w ) marinedt_state *state = space->machine().driver_data(); state->m_tx_tileram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } static READ8_HANDLER( marinedt_port1_r ) @@ -287,9 +287,9 @@ static WRITE8_HANDLER( marinedt_pf_w ) mame_printf_debug("tile non-flip\n"); if (data & 0x02) - tilemap_set_flip(state->m_tx_tilemap, TILEMAP_FLIPX | TILEMAP_FLIPY); + state->m_tx_tilemap->set_flip(TILEMAP_FLIPX | TILEMAP_FLIPY); else - tilemap_set_flip(state->m_tx_tilemap, 0); + state->m_tx_tilemap->set_flip(0); } state->m_pf = data; @@ -483,9 +483,9 @@ static VIDEO_START( marinedt ) marinedt_state *state = machine.driver_data(); state->m_tx_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); - tilemap_set_scrolldx(state->m_tx_tilemap, 0, 4*8); - tilemap_set_scrolldy(state->m_tx_tilemap, 0, -4*8); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_scrolldx(0, 4*8); + state->m_tx_tilemap->set_scrolldy(0, -4*8); state->m_tile = auto_bitmap_ind16_alloc(machine, 32 * 8, 32 * 8); state->m_obj1 = auto_bitmap_ind16_alloc(machine, 32, 32); @@ -512,7 +512,7 @@ static SCREEN_UPDATE_IND16( marinedt ) int sx, sy; state->m_tile->fill(0); - tilemap_draw(*state->m_tile, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(*state->m_tile, cliprect, 0, 0); state->m_obj1->fill(0); drawgfx_transpen(*state->m_obj1, state->m_obj1->cliprect(), screen.machine().gfx[1], diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 034ce9f11bf..41482b075ea 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -58,13 +58,13 @@ static WRITE8_HANDLER( mayumi_videoram_w ) { mayumi_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset & 0x7ff); + state->m_tilemap->mark_tile_dirty(offset & 0x7ff); } static SCREEN_UPDATE_IND16( mayumi ) { mayumi_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 58ac2825c6a..e43b7db17b4 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -43,7 +43,7 @@ static WRITE8_HANDLER( mgolf_vram_w ) { mgolf_state *state = space->machine().driver_data(); state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -60,7 +60,7 @@ static SCREEN_UPDATE_IND16( mgolf ) int i; /* draw playfield */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw sprites */ for (i = 0; i < 2; i++) diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 32f27ac2aba..da8a6b6bd62 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -88,7 +88,7 @@ static VIDEO_START( midas ) state->m_tmap = tilemap_create( machine, get_tile_info, tilemap_scan_cols, 8,8, 0x80,0x20 ); - tilemap_set_transparent_pen(state->m_tmap, 0); + state->m_tmap->set_transparent_pen(0); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -193,7 +193,7 @@ static SCREEN_UPDATE_IND16( midas ) bitmap.fill(4095, cliprect); if (layers_ctrl & 2) draw_sprites(screen.machine(), bitmap,cliprect); - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, state->m_tmap, 0, 0); + if (layers_ctrl & 1) state->m_tmap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -232,7 +232,7 @@ static WRITE16_HANDLER( midas_gfxregs_w ) state->m_gfxram[addr] = data; state->m_gfxregs[0] += state->m_gfxregs[2]; - if ( addr >= 0x7000 && addr <= 0x7fff ) tilemap_mark_tile_dirty(state->m_tmap, addr - 0x7000); + if ( addr >= 0x7000 && addr <= 0x7fff ) state->m_tmap->mark_tile_dirty(addr - 0x7000); break; } diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index 52b1d05c366..f4a907c4b9e 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -174,18 +174,18 @@ static VIDEO_START(mil4000) state->m_sc2_tilemap = tilemap_create(machine, get_sc2_tile_info,tilemap_scan_rows,8,8,64,64); state->m_sc3_tilemap = tilemap_create(machine, get_sc3_tile_info,tilemap_scan_rows,8,8,64,64); - tilemap_set_transparent_pen(state->m_sc1_tilemap,0); - tilemap_set_transparent_pen(state->m_sc2_tilemap,0); - tilemap_set_transparent_pen(state->m_sc3_tilemap,0); + state->m_sc1_tilemap->set_transparent_pen(0); + state->m_sc2_tilemap->set_transparent_pen(0); + state->m_sc3_tilemap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16(mil4000) { mil4000_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_sc1_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_sc2_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_sc3_tilemap,0,0); + state->m_sc0_tilemap->draw(bitmap, cliprect, 0,0); + state->m_sc1_tilemap->draw(bitmap, cliprect, 0,0); + state->m_sc2_tilemap->draw(bitmap, cliprect, 0,0); + state->m_sc3_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -216,28 +216,28 @@ static WRITE16_HANDLER( sc0_vram_w ) { mil4000_state *state = space->machine().driver_data(); state->m_sc0_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset/2); + state->m_sc0_tilemap->mark_tile_dirty(offset/2); } static WRITE16_HANDLER( sc1_vram_w ) { mil4000_state *state = space->machine().driver_data(); state->m_sc1_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc1_tilemap,offset/2); + state->m_sc1_tilemap->mark_tile_dirty(offset/2); } static WRITE16_HANDLER( sc2_vram_w ) { mil4000_state *state = space->machine().driver_data(); state->m_sc2_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc2_tilemap,offset/2); + state->m_sc2_tilemap->mark_tile_dirty(offset/2); } static WRITE16_HANDLER( sc3_vram_w ) { mil4000_state *state = space->machine().driver_data(); state->m_sc3_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc3_tilemap,offset/2); + state->m_sc3_tilemap->mark_tile_dirty(offset/2); } /*end of video stuff*/ diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index 942e4bcba6f..221363417b9 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -172,14 +172,14 @@ static WRITE8_HANDLER( miniboy7_videoram_w ) { miniboy7_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( miniboy7_colorram_w ) { miniboy7_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -211,7 +211,7 @@ static VIDEO_START( miniboy7 ) static SCREEN_UPDATE_IND16( miniboy7 ) { miniboy7_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index a735263e4bf..945a97233fd 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -86,13 +86,13 @@ static SCREEN_UPDATE_IND16( mogura ) /* tilemap layout is a bit strange ... */ rectangle clip = visarea; clip.max_x = 256 - 1; - tilemap_set_scrollx(state->m_tilemap, 0, 256); - tilemap_draw(bitmap, clip, state->m_tilemap, 0, 0); + state->m_tilemap->set_scrollx(0, 256); + state->m_tilemap->draw(bitmap, clip, 0, 0); clip.min_x = 256; clip.max_x = 512 - 1; - tilemap_set_scrollx(state->m_tilemap, 0, -128); - tilemap_draw(bitmap, clip, state->m_tilemap, 0, 0); + state->m_tilemap->set_scrollx(0, -128); + state->m_tilemap->draw(bitmap, clip, 0, 0); return 0; } @@ -101,7 +101,7 @@ static WRITE8_HANDLER( mogura_tileram_w ) { mogura_state *state = space->machine().driver_data(); state->m_tileram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset & 0x7ff); + state->m_tilemap->mark_tile_dirty(offset & 0x7ff); } static WRITE8_HANDLER(mogura_dac_w) diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 74710af6503..514fe72cce7 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -104,7 +104,7 @@ static WRITE8_HANDLER( mole_videoram_w ) mole_state *state = space->machine().driver_data(); state->m_tileram[offset] = data | (state->m_tile_bank << 8); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( mole_tilebank_w ) @@ -112,7 +112,7 @@ static WRITE8_HANDLER( mole_tilebank_w ) mole_state *state = space->machine().driver_data(); state->m_tile_bank = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } static WRITE8_HANDLER( mole_flipscreen_w ) @@ -124,7 +124,7 @@ static SCREEN_UPDATE_IND16( mole ) { mole_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index a42396f43e6..ad4817195e2 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -290,7 +290,7 @@ static WRITE16_HANDLER( ms32_rozram_w16 ) { ms32_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_rozram_16[offset]); - tilemap_mark_tile_dirty(state->m_roz_tilemap,offset/2); + state->m_roz_tilemap->mark_tile_dirty(offset/2); } static READ16_HANDLER( ms32_lineram_r16 ) @@ -327,7 +327,7 @@ static WRITE16_HANDLER( ms32_txram_w16 ) { ms32_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_txram_16[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset/2); + state->m_tx_tilemap->mark_tile_dirty(offset/2); } static READ16_HANDLER( ms32_bgram_r16 ) @@ -340,8 +340,8 @@ static WRITE16_HANDLER( ms32_bgram_w16 ) { ms32_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgram_16[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset/2); - tilemap_mark_tile_dirty(state->m_bg_tilemap_alt,offset/2); + state->m_bg_tilemap->mark_tile_dirty(offset/2); + state->m_bg_tilemap_alt->mark_tile_dirty(offset/2); } static WRITE32_HANDLER( pip_w ) @@ -402,7 +402,7 @@ static WRITE16_HANDLER( ms32_extra_w16 ) { ms32_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_f1superb_extraram_16[offset]); - tilemap_mark_tile_dirty(state->m_extra_tilemap,offset/2); + state->m_extra_tilemap->mark_tile_dirty(offset/2); } static READ16_HANDLER( ms32_extra_r16 ) { diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index ed23eb54ffd..444b3e10895 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -205,7 +205,7 @@ static TILE_GET_INFO( get_multfish_tile_info ) int code = state->m_vid[tile_index*2+0x0000] | (state->m_vid[tile_index*2+0x0001] << 8); int attr = state->m_vid[tile_index*2+0x1000] | (state->m_vid[tile_index*2+0x1001] << 8); - tileinfo->category = (attr&0x100)>>8; + tileinfo.category = (attr&0x100)>>8; SET_TILE_INFO( 0, @@ -234,11 +234,11 @@ static VIDEO_START(multfish) state->save_item(NAME(state->m_vid)); state->m_tilemap = tilemap_create(machine,get_multfish_tile_info,tilemap_scan_rows,16,16, 64, 32); - tilemap_set_transparent_pen(state->m_tilemap,255); + state->m_tilemap->set_transparent_pen(255); state->m_reel_tilemap = tilemap_create(machine,get_multfish_reel_tile_info,tilemap_scan_rows,16,16, 64, 64); - tilemap_set_transparent_pen(state->m_reel_tilemap,255); - tilemap_set_scroll_cols(state->m_reel_tilemap, 64); + state->m_reel_tilemap->set_transparent_pen(255); + state->m_reel_tilemap->set_scroll_cols(64); } static SCREEN_UPDATE_IND16(multfish) @@ -251,18 +251,18 @@ static SCREEN_UPDATE_IND16(multfish) if (!state->m_disp_enable) return 0; /* Draw lower part of static tilemap (low pri tiles) */ - tilemap_draw(bitmap,cliprect,state->m_tilemap,TILEMAP_DRAW_CATEGORY(1),0); + state->m_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1),0); /* Setup the column scroll and draw the reels */ for (i=0;i<64;i++) { int colscroll = (state->m_vid[i*2] | state->m_vid[i*2+1] << 8); - tilemap_set_scrolly(state->m_reel_tilemap, i, colscroll ); + state->m_reel_tilemap->set_scrolly(i, colscroll ); } - tilemap_draw(bitmap,cliprect,state->m_reel_tilemap,0,0); + state->m_reel_tilemap->draw(bitmap, cliprect, 0,0); /* Draw upper part of static tilemap (high pri tiles) */ - tilemap_draw(bitmap,cliprect,state->m_tilemap,TILEMAP_DRAW_CATEGORY(0),0); + state->m_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0),0); return 0; } @@ -276,13 +276,13 @@ static WRITE8_HANDLER( multfish_vid_w ) // 0x0000 - 0x1fff is normal tilemap if (offset < 0x2000) { - tilemap_mark_tile_dirty(state->m_tilemap,(offset&0xfff)/2); + state->m_tilemap->mark_tile_dirty((offset&0xfff)/2); } // 0x2000 - 0x2fff is for the reels else if (offset < 0x4000) { - tilemap_mark_tile_dirty(state->m_reel_tilemap,(offset&0x1fff)/2); + state->m_reel_tilemap->mark_tile_dirty((offset&0x1fff)/2); } else if (offset < 0x6000) { diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 895ebc36ded..2761567c382 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -89,7 +89,7 @@ static WRITE16_HANDLER( bg_videoram_w ) mwarr_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( mlow_videoram_w ) @@ -97,7 +97,7 @@ static WRITE16_HANDLER( mlow_videoram_w ) mwarr_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_mlow_videoram[offset]); - tilemap_mark_tile_dirty(state->m_mlow_tilemap,offset); + state->m_mlow_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( mhigh_videoram_w ) @@ -105,7 +105,7 @@ static WRITE16_HANDLER( mhigh_videoram_w ) mwarr_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_mhigh_videoram[offset]); - tilemap_mark_tile_dirty(state->m_mhigh_tilemap,offset); + state->m_mhigh_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( tx_videoram_w ) @@ -113,7 +113,7 @@ static WRITE16_HANDLER( tx_videoram_w ) mwarr_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tx_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } static WRITE16_DEVICE_HANDLER( oki1_bank_w ) @@ -384,13 +384,13 @@ static VIDEO_START( mwarr ) state->m_mhigh_tilemap = tilemap_create(machine, get_mhigh_tile_info, tilemap_scan_cols, 16, 16, 64, 16); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_mlow_tilemap, 0); - tilemap_set_transparent_pen(state->m_mhigh_tilemap, 0); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); + state->m_mlow_tilemap->set_transparent_pen(0); + state->m_mhigh_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_bg_tilemap, 256); - tilemap_set_scroll_rows(state->m_mlow_tilemap, 256); - tilemap_set_scroll_rows(state->m_mhigh_tilemap, 256); + state->m_bg_tilemap->set_scroll_rows(256); + state->m_mlow_tilemap->set_scroll_rows(256); + state->m_mhigh_tilemap->set_scroll_rows(256); state->save_item(NAME(state->m_sprites_buffer)); } @@ -476,47 +476,47 @@ static SCREEN_UPDATE_IND16( mwarr ) if (BIT(state->m_vidattrram[6], 0)) { for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_bg_scrollram[i] + 20); + state->m_bg_tilemap->set_scrollx(i, state->m_bg_scrollram[i] + 20); } else { for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_bg_scrollram[0] + 19); + state->m_bg_tilemap->set_scrollx(i, state->m_bg_scrollram[0] + 19); } if (BIT(state->m_vidattrram[6], 2)) { for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_mlow_tilemap, i, state->m_mlow_scrollram[i] + 19); + state->m_mlow_tilemap->set_scrollx(i, state->m_mlow_scrollram[i] + 19); } else { for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_mlow_tilemap, i, state->m_mlow_scrollram[0] + 19); + state->m_mlow_tilemap->set_scrollx(i, state->m_mlow_scrollram[0] + 19); } if (BIT(state->m_vidattrram[6], 4)) { for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_mhigh_tilemap, i, state->m_mhigh_scrollram[i] + 19); + state->m_mhigh_tilemap->set_scrollx(i, state->m_mhigh_scrollram[i] + 19); } else { for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_mhigh_tilemap, i, state->m_mhigh_scrollram[0] + 19); + state->m_mhigh_tilemap->set_scrollx(i, state->m_mhigh_scrollram[0] + 19); } - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_vidattrram[1] + 1); - tilemap_set_scrolly(state->m_mlow_tilemap, 0, state->m_vidattrram[2] + 1); - tilemap_set_scrolly(state->m_mhigh_tilemap, 0, state->m_vidattrram[3] + 1); + state->m_bg_tilemap->set_scrolly(0, state->m_vidattrram[1] + 1); + state->m_mlow_tilemap->set_scrolly(0, state->m_vidattrram[2] + 1); + state->m_mhigh_tilemap->set_scrolly(0, state->m_vidattrram[3] + 1); - tilemap_set_scrollx(state->m_tx_tilemap, 0, state->m_vidattrram[0] + 16); - tilemap_set_scrolly(state->m_tx_tilemap, 0, state->m_vidattrram[4] + 1); + state->m_tx_tilemap->set_scrollx(0, state->m_vidattrram[0] + 16); + state->m_tx_tilemap->set_scrolly(0, state->m_vidattrram[4] + 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0x01); - tilemap_draw(bitmap, cliprect, state->m_mlow_tilemap, 0, 0x02); - tilemap_draw(bitmap, cliprect, state->m_mhigh_tilemap, 0, 0x04); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0x10); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0x01); + state->m_mlow_tilemap->draw(bitmap, cliprect, 0, 0x02); + state->m_mhigh_tilemap->draw(bitmap, cliprect, 0, 0x04); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0x10); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c index 4b964350b29..ca1895b9fe1 100644 --- a/src/mame/drivers/namcoic.c +++ b/src/mame/drivers/namcoic.c @@ -32,15 +32,15 @@ void namco_tilemap_invalidate( void ) int i; for( i=0; i<6; i++ ) { - tilemap_mark_all_tiles_dirty( mTilemapInfo.tmap[i] ); + mTilemapInfo.tmap[i]->mark_all_dirty(); } } /* namco_tilemap_invalidate */ -INLINE void get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,UINT16 *vram) +INLINE void get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,UINT16 *vram) { int tile, mask; mTilemapInfo.cb( machine, vram[tile_index], &tile, &mask ); - tileinfo->mask_data = mTilemapInfo.maskBaseAddr+mask*8; + tileinfo.mask_data = mTilemapInfo.maskBaseAddr+mask*8; SET_TILE_INFO(mTilemapInfo.gfxbank,tile,0,0); } /* get_tile_info */ @@ -76,15 +76,15 @@ namco_tilemap_init( running_machine &machine, int gfxbank, void *maskBaseAddr, { static const int adj[4] = { 4,2,1,0 }; int dx = 44+adj[i]; - tilemap_set_scrolldx( mTilemapInfo.tmap[i], -dx, -(-384-dx) ); - tilemap_set_scrolldy( mTilemapInfo.tmap[i], -24, 288 ); + mTilemapInfo.tmap[i]->set_scrolldx( -dx, -(-384-dx) ); + mTilemapInfo.tmap[i]->set_scrolldy( -24, 288 ); } - tilemap_set_scrolldx( mTilemapInfo.tmap[4], 0, 96 ); - tilemap_set_scrolldy( mTilemapInfo.tmap[4], 0, 40 ); + mTilemapInfo.tmap[4]->set_scrolldx( 0, 96 ); + mTilemapInfo.tmap[4]->set_scrolldy( 0, 40 ); - tilemap_set_scrolldx( mTilemapInfo.tmap[5], 0, 96 ); - tilemap_set_scrolldy( mTilemapInfo.tmap[5], 0, 40 ); + mTilemapInfo.tmap[5]->set_scrolldx( 0, 96 ); + mTilemapInfo.tmap[5]->set_scrolldy( 0, 40 ); } /* namco_tilemap_init */ @@ -98,8 +98,8 @@ namco_tilemap_draw( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ) if( (mTilemapInfo.control[0x20/2+i]&0xf) == pri ) { int color = mTilemapInfo.control[0x30/2+i] & 0x07; - tilemap_set_palette_offset( mTilemapInfo.tmap[i], color*256 ); - tilemap_draw(bitmap,cliprect,mTilemapInfo.tmap[i],0,0); + mTilemapInfo.tmap[i]->set_palette_offset( color*256 ); + mTilemapInfo.tmap[i]->draw(bitmap,cliprect,0,0); } } } /* namco_tilemap_draw */ @@ -110,17 +110,17 @@ SetTilemapVideoram( int offset, UINT16 newword ) mTilemapInfo.videoram[offset] = newword; if( offset<0x4000 ) { - tilemap_mark_tile_dirty(mTilemapInfo.tmap[offset>>12],offset&0xfff); + mTilemapInfo.tmap[offset>>12]->mark_tile_dirty(offset&0xfff); } else if( offset>=0x8010/2 && offset<0x87f0/2 ) { /* fixed plane#1 */ offset-=0x8010/2; - tilemap_mark_tile_dirty( mTilemapInfo.tmap[4], offset ); + mTilemapInfo.tmap[4]->mark_tile_dirty( offset ); } else if( offset>=0x8810/2 && offset<0x8ff0/2 ) { /* fixed plane#2 */ offset-=0x8810/2; - tilemap_mark_tile_dirty( mTilemapInfo.tmap[5], offset ); + mTilemapInfo.tmap[5]->mark_tile_dirty( offset ); } } /* SetTilemapVideoram */ @@ -149,7 +149,7 @@ SetTilemapControl( int offset, UINT16 newword ) int i; for( i=0; i<=5; i++ ) { - tilemap_set_flip(mTilemapInfo.tmap[i],attrs); + mTilemapInfo.tmap[i]->set_flip(attrs); } } } @@ -161,28 +161,28 @@ SetTilemapControl( int offset, UINT16 newword ) switch( offset ) { case 0x02/2: - tilemap_set_scrollx( mTilemapInfo.tmap[0], 0, newword ); + mTilemapInfo.tmap[0]->set_scrollx( 0, newword ); break; case 0x06/2: - tilemap_set_scrolly( mTilemapInfo.tmap[0], 0, newword ); + mTilemapInfo.tmap[0]->set_scrolly( 0, newword ); break; case 0x0a/2: - tilemap_set_scrollx( mTilemapInfo.tmap[1], 0, newword ); + mTilemapInfo.tmap[1]->set_scrollx( 0, newword ); break; case 0x0e/2: - tilemap_set_scrolly( mTilemapInfo.tmap[1], 0, newword ); + mTilemapInfo.tmap[1]->set_scrolly( 0, newword ); break; case 0x12/2: - tilemap_set_scrollx( mTilemapInfo.tmap[2], 0, newword ); + mTilemapInfo.tmap[2]->set_scrollx( 0, newword ); break; case 0x16/2: - tilemap_set_scrolly( mTilemapInfo.tmap[2], 0, newword ); + mTilemapInfo.tmap[2]->set_scrolly( 0, newword ); break; case 0x1a/2: - tilemap_set_scrollx( mTilemapInfo.tmap[3], 0, newword ); + mTilemapInfo.tmap[3]->set_scrollx( 0, newword ); break; case 0x1e/2: - tilemap_set_scrolly( mTilemapInfo.tmap[3], 0, newword ); + mTilemapInfo.tmap[3]->set_scrolly( 0, newword ); break; } } /* SetTilemapControl */ @@ -1039,7 +1039,7 @@ static const char * mRozMaskRegion; * Graphics ROM addressing varies across games. */ static void -roz_get_info( running_machine &machine, tile_data *tileinfo, int tile_index, int which) +roz_get_info( running_machine &machine, tile_data &tileinfo, int tile_index, int which) { UINT16 tile = rozvideoram16[tile_index]; int bank, mangle; @@ -1100,7 +1100,7 @@ roz_get_info( running_machine &machine, tile_data *tileinfo, int tile_index, int break; } SET_TILE_INFO( mRozGfxBank,mangle,0/*color*/,0/*flag*/ ); - tileinfo->mask_data = 32*tile + (UINT8 *)machine.region( mRozMaskRegion )->base(); + tileinfo.mask_data = 32*tile + (UINT8 *)machine.region( mRozMaskRegion )->base(); } /* roz_get_info */ static @@ -1233,8 +1233,8 @@ DrawRozHelper( (namcos2_gametype != NAMCOFL_FINAL_LAP_R)) { UINT32 size_mask = rozInfo->size-1; - bitmap_ind16 &srcbitmap = tilemap_get_pixmap( tmap ); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap( tmap ); + bitmap_ind16 &srcbitmap = tmap->pixmap(); + bitmap_ind8 &flagsbitmap = tmap->flagsmap(); UINT32 startx = rozInfo->startx + clip.min_x * rozInfo->incxx + clip.min_y * rozInfo->incyx; UINT32 starty = rozInfo->starty + clip.min_x * rozInfo->incxy + clip.min_y * rozInfo->incyy; int sx = clip.min_x; @@ -1266,12 +1266,11 @@ DrawRozHelper( else { - tilemap_set_palette_offset( tmap, rozInfo->color ); + tmap->set_palette_offset( rozInfo->color ); - tilemap_draw_roz( + tmap->draw_roz( bitmap, clip, - tmap, rozInfo->startx, rozInfo->starty, rozInfo->incxx, rozInfo->incxy, rozInfo->incyx, rozInfo->incyy, @@ -1366,7 +1365,7 @@ WRITE16_HANDLER( namco_rozbank16_w ) int i; for( i=0; imark_all_dirty(); } } } /* namco_rozbank16_w */ @@ -1379,7 +1378,7 @@ writerozvideo( int offset, UINT16 data ) rozvideoram16[offset] = data; for( i=0; imark_tile_dirty( offset ); } } /* writerozvideo */ @@ -1564,7 +1563,7 @@ WRITE16_HANDLER( namco_road16_w ) COMBINE_DATA( &mpRoadRAM[offset] ); if( offset<0x10000/2 ) { - tilemap_mark_tile_dirty( mpRoadTilemap, offset ); + mpRoadTilemap->mark_tile_dirty( offset ); } else { @@ -1608,7 +1607,7 @@ namco_road_draw(running_machine &machine, bitmap_ind16 &bitmap, const rectangle unsigned yscroll; int i; - bitmap_ind16 &SourceBitmap = tilemap_get_pixmap(mpRoadTilemap); + bitmap_ind16 &SourceBitmap = mpRoadTilemap->pixmap(); yscroll = mpRoadRAM[0x1fdfe/2]; for( i=cliprect.min_y; i<=cliprect.max_y; i++ ) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 702e609e9bc..0f6fca15c39 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1154,8 +1154,8 @@ static WRITE32_HANDLER( namcos23_textram_w ) { namcos23_state *state = space->machine().driver_data(); COMBINE_DATA( &state->m_textram[offset] ); - tilemap_mark_tile_dirty(state->m_bgtilemap, offset*2); - tilemap_mark_tile_dirty(state->m_bgtilemap, (offset*2)+1); + state->m_bgtilemap->mark_tile_dirty(offset*2); + state->m_bgtilemap->mark_tile_dirty((offset*2)+1); } static WRITE32_HANDLER( s23_txtchar_w ) @@ -1470,11 +1470,11 @@ static WRITE16_HANDLER(s23_c361_w) switch(offset) { case 0: - tilemap_set_scrollx(state->m_bgtilemap, 0, data&0xfff); + state->m_bgtilemap->set_scrollx(0, data&0xfff); break; case 1: - tilemap_set_scrolly(state->m_bgtilemap, 0, data&0xfff); + state->m_bgtilemap->set_scrolly(0, data&0xfff); break; case 4: // interrupt control @@ -2117,18 +2117,18 @@ static VIDEO_START( ss23 ) namcos23_state *state = machine.driver_data(); gfx_element_set_source(machine.gfx[0], (UINT8 *)state->m_charram); state->m_bgtilemap = tilemap_create(machine, TextTilemapGetInfo, tilemap_scan_rows, 16, 16, 64, 64); - tilemap_set_transparent_pen(state->m_bgtilemap, 0xf); + state->m_bgtilemap->set_transparent_pen(0xf); // Gorgon's tilemap offset is 0, S23/SS23's is 860 if ((!strcmp(machine.system().name, "rapidrvr")) || (!strcmp(machine.system().name, "rapidrvr2")) || (!strcmp(machine.system().name, "finlflng"))) { - tilemap_set_scrolldx(state->m_bgtilemap, 0, 0); + state->m_bgtilemap->set_scrolldx(0, 0); } else { - tilemap_set_scrolldx(state->m_bgtilemap, 860, 860); + state->m_bgtilemap->set_scrolldx(860, 860); } state->m_render.polymgr = poly_alloc(machine, 10000, sizeof(namcos23_render_data), POLYFLAG_NO_WORK_QUEUE); } @@ -2143,7 +2143,7 @@ static SCREEN_UPDATE_RGB32( ss23 ) gfx_element *gfx = screen.machine().gfx[0]; memset(gfx->dirty, 1, gfx->total_elements); - tilemap_draw( bitmap, cliprect, state->m_bgtilemap, 0/*flags*/, 0/*priority*/ ); /* opaque */ + state->m_bgtilemap->draw(bitmap, cliprect, 0/*flags*/, 0/*priority*/ ); /* opaque */ return 0; } diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 830cd6a6abd..6a6d7fbc2e6 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -262,14 +262,14 @@ static WRITE16_HANDLER( fg_videoram_w ) { nmg5_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( bg_videoram_w ) { nmg5_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( nmg5_soundlatch_w ) @@ -302,7 +302,7 @@ static WRITE16_HANDLER( gfx_bank_w ) if (state->m_gfx_bank != (data & 3)) { state->m_gfx_bank = data & 3; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -827,7 +827,7 @@ static INPUT_PORTS_START( wondstck ) INPUT_PORTS_END -INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, UINT16 *vram, int color ) +INLINE void get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, UINT16 *vram, int color ) { nmg5_state *state = machine.driver_data(); SET_TILE_INFO(0, vram[tile_index] | (state->m_gfx_bank << 16), color, 0); @@ -842,7 +842,7 @@ static VIDEO_START( nmg5 ) state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->m_fg_tilemap = tilemap_create(machine, fg_get_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -915,40 +915,40 @@ static SCREEN_UPDATE_IND16( nmg5 ) { nmg5_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll_ram[3] + 9); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_ram[2] + 3); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_scroll_ram[1] + 9); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scroll_ram[0] - 1); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll_ram[3] + 9); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_ram[2] + 3); + state->m_fg_tilemap->set_scrolly(0, state->m_scroll_ram[1] + 9); + state->m_fg_tilemap->set_scrollx(0, state->m_scroll_ram[0] - 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_priority_reg == 0) { draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_bitmap(screen.machine(), bitmap); } else if (state->m_priority_reg == 1) { draw_bitmap(screen.machine(), bitmap); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } else if (state->m_priority_reg == 2) { draw_sprites(screen.machine(), bitmap, cliprect); draw_bitmap(screen.machine(), bitmap); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } else if (state->m_priority_reg == 3) { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); draw_bitmap(screen.machine(), bitmap); } else if (state->m_priority_reg == 7) { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_bitmap(screen.machine(), bitmap); draw_sprites(screen.machine(), bitmap, cliprect); } diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c index 084a26ff2b7..3f71e410af8 100644 --- a/src/mame/drivers/nsmpoker.c +++ b/src/mame/drivers/nsmpoker.c @@ -85,7 +85,7 @@ static WRITE8_HANDLER( nsmpoker_videoram_w ) { nsmpoker_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -93,7 +93,7 @@ static WRITE8_HANDLER( nsmpoker_colorram_w ) { nsmpoker_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -125,7 +125,7 @@ static VIDEO_START( nsmpoker ) static SCREEN_UPDATE_IND16( nsmpoker ) { nsmpoker_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 618dbdf46d0..5861c44d8d6 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -120,14 +120,14 @@ static WRITE8_HANDLER( olibochu_videoram_w ) { olibochu_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( olibochu_colorram_w ) { olibochu_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( olibochu_flipscreen_w ) @@ -135,7 +135,7 @@ static WRITE8_HANDLER( olibochu_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x80)) { flip_screen_set(space->machine(), data & 0x80); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* other bits are used, but unknown */ @@ -221,7 +221,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const static SCREEN_UPDATE_IND16( olibochu ) { olibochu_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index cab4f851e5c..dbcb23c829e 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -93,7 +93,7 @@ static VIDEO_START( onetwo ) static SCREEN_UPDATE_IND16( onetwo ) { onetwo_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -107,7 +107,7 @@ static WRITE8_HANDLER( onetwo_fgram_w ) { onetwo_state *state = space->machine().driver_data(); state->m_fgram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } static WRITE8_HANDLER( onetwo_cpubank_w ) diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index e0f6163d320..b84158766df 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -189,7 +189,7 @@ static WRITE8_HANDLER( pacland_flipscreen_w ) int bit = !BIT(offset,11); /* can't use flip_screen_set(space->machine(), ) because the visible area is asymmetrical */ flip_screen_set_no_update(space->machine(), bit); - tilemap_set_flip_all(space->machine(),flip_screen_get(space->machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().set_flip_all(flip_screen_get(space->machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index cc24fb2b258..13a43719c12 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -162,7 +162,7 @@ static TILE_GET_INFO( get_txttile_info ) int attr=videoram[tile_index*4+2]; int color = attr & 0x07; - tileinfo->group = color; + tileinfo.group = color; SET_TILE_INFO( 0, @@ -243,11 +243,11 @@ static SCREEN_UPDATE_IND16( panicr) { panicr_state *state = screen.machine().driver_data(); bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_mark_all_tiles_dirty( state->m_txttilemap ); - tilemap_set_scrollx( state->m_bgtilemap,0, ((state->m_scrollram[0x02]&0x0f)<<12)+((state->m_scrollram[0x02]&0xf0)<<4)+((state->m_scrollram[0x04]&0x7f)<<1)+((state->m_scrollram[0x04]&0x80)>>7) ); - tilemap_draw(bitmap,cliprect,state->m_bgtilemap,0,0); + state->m_txttilemap ->mark_all_dirty(); + state->m_bgtilemap->set_scrollx(0, ((state->m_scrollram[0x02]&0x0f)<<12)+((state->m_scrollram[0x02]&0xf0)<<4)+((state->m_scrollram[0x04]&0x7f)<<1)+((state->m_scrollram[0x04]&0x80)>>7) ); + state->m_bgtilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_txttilemap,0,0); + state->m_txttilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index e6b9837334a..035e6331898 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -341,7 +341,7 @@ static WRITE8_HANDLER( peplus_crtc_display_w ) state->m_palette_ram[state->m_vid_address] = state->m_io_port[1]; state->m_palette_ram2[state->m_vid_address] = state->m_io_port[3]; - tilemap_mark_tile_dirty(state->m_bg_tilemap, state->m_vid_address); + state->m_bg_tilemap->mark_tile_dirty(state->m_vid_address); /* An access here triggers a device read !*/ space->machine().device("crtc")->register_r(*space, 0); @@ -675,7 +675,7 @@ static VIDEO_START( peplus ) static SCREEN_UPDATE_IND16( peplus ) { peplus_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 2b9702dd8ed..ab8900d43ff 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -121,14 +121,14 @@ static VIDEO_START ( pipeline ) state->m_palram=auto_alloc_array(machine, UINT8, 0x1000); state->m_tilemap1 = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,64,32 ); state->m_tilemap2 = tilemap_create( machine, get_tile_info2,tilemap_scan_rows,8,8,64,32 ); - tilemap_set_transparent_pen(state->m_tilemap2,0); + state->m_tilemap2->set_transparent_pen(0); } static SCREEN_UPDATE_IND16( pipeline ) { pipeline_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_tilemap1, 0,0); - tilemap_draw(bitmap,cliprect,state->m_tilemap2, 0,0); + state->m_tilemap1->draw(bitmap, cliprect, 0,0); + state->m_tilemap2->draw(bitmap, cliprect, 0,0); return 0; } @@ -144,7 +144,7 @@ static WRITE8_HANDLER(vram2_w) pipeline_state *state = space->machine().driver_data(); if(!(state->m_vidctrl&1)) { - tilemap_mark_tile_dirty(state->m_tilemap1,offset&0x7ff); + state->m_tilemap1->mark_tile_dirty(offset&0x7ff); state->m_vram2[offset]=data; } else @@ -161,7 +161,7 @@ static WRITE8_HANDLER(vram2_w) static WRITE8_HANDLER(vram1_w) { pipeline_state *state = space->machine().driver_data(); - tilemap_mark_tile_dirty(state->m_tilemap2,offset&0x7ff); + state->m_tilemap2->mark_tile_dirty(offset&0x7ff); state->m_vram1[offset]=data; } diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 21b0a2ed0ab..0eadb59e72f 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -41,21 +41,21 @@ static WRITE16_HANDLER( pkscramble_fgtilemap_w ) { pkscram_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pkscramble_fgtilemap_ram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset >> 1); + state->m_fg_tilemap->mark_tile_dirty(offset >> 1); } static WRITE16_HANDLER( pkscramble_mdtilemap_w ) { pkscram_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pkscramble_mdtilemap_ram[offset]); - tilemap_mark_tile_dirty(state->m_md_tilemap, offset >> 1); + state->m_md_tilemap->mark_tile_dirty(offset >> 1); } static WRITE16_HANDLER( pkscramble_bgtilemap_w ) { pkscram_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pkscramble_bgtilemap_ram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } // input bit 0x20 in port1 should stay low until bit 0x20 is written here, then @@ -234,16 +234,16 @@ static VIDEO_START( pkscramble ) state->m_md_tilemap = tilemap_create(machine, get_md_tile_info, tilemap_scan_rows, 8, 8,32,32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,32,32); - tilemap_set_transparent_pen(state->m_md_tilemap,15); - tilemap_set_transparent_pen(state->m_fg_tilemap,15); + state->m_md_tilemap->set_transparent_pen(15); + state->m_fg_tilemap->set_transparent_pen(15); } static SCREEN_UPDATE_IND16( pkscramble ) { pkscram_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_md_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_md_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 3334ee9b9af..545c1996ebf 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -50,7 +50,7 @@ static WRITE16_HANDLER( magicstk_bgvideoram_w ) playmark_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram1[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( tile_banking_w ) @@ -60,7 +60,7 @@ static WRITE16_HANDLER( tile_banking_w ) if (((data >> 12) & 0x0f) != state->m_tilebank) { state->m_tilebank = (data >> 12) & 0x0f; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -425,14 +425,14 @@ static VIDEO_START( powerbal ) state->m_xoffset = -20; - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_yoffset); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_yoffset); } static SCREEN_UPDATE_IND16( powerbal ) { playmark_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 5dec1fbfffb..3ba2a1784b5 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -155,14 +155,14 @@ static WRITE8_HANDLER( ppmast93_fgram_w ) { ppmast93_state *state = space->machine().driver_data(); state->m_fgram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset/2); + state->m_fg_tilemap->mark_tile_dirty(offset/2); } static WRITE8_HANDLER( ppmast93_bgram_w ) { ppmast93_state *state = space->machine().driver_data(); state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset/2); + state->m_bg_tilemap->mark_tile_dirty(offset/2); } static WRITE8_HANDLER( ppmast93_port4_w ) @@ -346,14 +346,14 @@ static VIDEO_START( ppmast93 ) state->m_bg_tilemap = tilemap_create(machine, get_ppmast93_bg_tile_info,tilemap_scan_rows,8,8,32, 32); state->m_fg_tilemap = tilemap_create(machine, get_ppmast93_fg_tile_info,tilemap_scan_rows,8,8,32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16( ppmast93 ) { ppmast93_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index a7834169eb2..a0890f79d5f 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -141,9 +141,9 @@ static VIDEO_START(pturn) { pturn_state *state = machine.driver_data(); state->m_fgmap = tilemap_create(machine, get_pturn_tile_info,tilemap_scan_rows,8, 8,32,32); - tilemap_set_transparent_pen(state->m_fgmap,0); + state->m_fgmap->set_transparent_pen(0); state->m_bgmap = tilemap_create(machine, get_pturn_bg_tile_info,tilemap_scan_rows,8, 8,32,32*8); - tilemap_set_transparent_pen(state->m_bgmap,0); + state->m_bgmap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16(pturn) @@ -155,7 +155,7 @@ static SCREEN_UPDATE_IND16(pturn) int flipx, flipy; bitmap.fill(state->m_bgcolor, cliprect); - tilemap_draw(bitmap,cliprect,state->m_bgmap,0,0); + state->m_bgmap->draw(bitmap, cliprect, 0,0); for ( offs = 0x80-4 ; offs >=0 ; offs -= 4) { sy=256-spriteram[offs]-16 ; @@ -186,7 +186,7 @@ static SCREEN_UPDATE_IND16(pturn) sx,sy,0); } } - tilemap_draw(bitmap,cliprect,state->m_fgmap,0,0); + state->m_fgmap->draw(bitmap, cliprect, 0,0); return 0; } @@ -207,7 +207,7 @@ static WRITE8_HANDLER( pturn_videoram_w ) pturn_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset]=data; - tilemap_mark_tile_dirty(state->m_fgmap,offset); + state->m_fgmap->mark_tile_dirty(offset); } @@ -238,36 +238,36 @@ static WRITE8_HANDLER(bgcolor_w) static WRITE8_HANDLER(bg_scrollx_w) { pturn_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bgmap, 0, (data>>5)*32*8); + state->m_bgmap->set_scrolly(0, (data>>5)*32*8); state->m_bgpalette=data&0x1f; - tilemap_mark_all_tiles_dirty(state->m_bgmap); + state->m_bgmap->mark_all_dirty(); } static WRITE8_HANDLER(fgpalette_w) { pturn_state *state = space->machine().driver_data(); state->m_fgpalette=data&0x1f; - tilemap_mark_all_tiles_dirty(state->m_fgmap); + state->m_fgmap->mark_all_dirty(); } static WRITE8_HANDLER(bg_scrolly_w) { pturn_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bgmap, 0, data); + state->m_bgmap->set_scrollx(0, data); } static WRITE8_HANDLER(fgbank_w) { pturn_state *state = space->machine().driver_data(); state->m_fgbank=data&1; - tilemap_mark_all_tiles_dirty(state->m_fgmap); + state->m_fgmap->mark_all_dirty(); } static WRITE8_HANDLER(bgbank_w) { pturn_state *state = space->machine().driver_data(); state->m_bgbank=data&1; - tilemap_mark_all_tiles_dirty(state->m_bgmap); + state->m_bgmap->mark_all_dirty(); } static WRITE8_HANDLER(flip_w) diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index 29c7d0c974b..238c3624954 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -61,7 +61,7 @@ static TILE_GET_INFO( get_txt_tile_info ) SET_TILE_INFO(0, tileno, colour, 0); - tileinfo->category = BIT(colour, 3); + tileinfo.category = BIT(colour, 3); } static VIDEO_START( pzletime ) @@ -71,8 +71,8 @@ static VIDEO_START( pzletime ) state->m_mid_tilemap = tilemap_create(machine, get_mid_tile_info, tilemap_scan_cols, 16, 16, 64, 16); state->m_txt_tilemap = tilemap_create(machine, get_txt_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_mid_tilemap, 0); - tilemap_set_transparent_pen(state->m_txt_tilemap, 0); + state->m_mid_tilemap->set_transparent_pen(0); + state->m_txt_tilemap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16( pzletime ) @@ -83,11 +83,11 @@ static SCREEN_UPDATE_IND16( pzletime ) bitmap.fill(screen.machine().pens[0], cliprect); //bg pen - tilemap_set_scrolly(state->m_txt_tilemap, 0, state->m_tilemap_regs[0] - 3); - tilemap_set_scrollx(state->m_txt_tilemap, 0, state->m_tilemap_regs[1]); + state->m_txt_tilemap->set_scrolly(0, state->m_tilemap_regs[0] - 3); + state->m_txt_tilemap->set_scrollx(0, state->m_tilemap_regs[1]); - tilemap_set_scrolly(state->m_mid_tilemap, 0, state->m_tilemap_regs[2] - 3); - tilemap_set_scrollx(state->m_mid_tilemap, 0, state->m_tilemap_regs[3] - 7); + state->m_mid_tilemap->set_scrolly(0, state->m_tilemap_regs[2] - 3); + state->m_mid_tilemap->set_scrollx(0, state->m_tilemap_regs[3] - 7); if (state->m_video_regs[2] & 1) { @@ -105,7 +105,7 @@ static SCREEN_UPDATE_IND16( pzletime ) } } - tilemap_draw(bitmap, cliprect, state->m_mid_tilemap, 0, 0); + state->m_mid_tilemap->draw(bitmap, cliprect, 0, 0); { UINT16 *spriteram = state->m_spriteram; @@ -127,9 +127,9 @@ static SCREEN_UPDATE_IND16( pzletime ) } } - tilemap_draw(bitmap, cliprect, state->m_txt_tilemap, 0, 0); + state->m_txt_tilemap->draw(bitmap, cliprect, 0, 0); if ((screen.frame_number() % 16) != 0) - tilemap_draw(bitmap, cliprect, state->m_txt_tilemap, 1, 0); + state->m_txt_tilemap->draw(bitmap, cliprect, 1, 0); return 0; } @@ -138,14 +138,14 @@ static WRITE16_HANDLER( mid_videoram_w ) { pzletime_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_mid_videoram[offset]); - tilemap_mark_tile_dirty(state->m_mid_tilemap, offset); + state->m_mid_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( txt_videoram_w ) { pzletime_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_txt_videoram[offset]); - tilemap_mark_tile_dirty(state->m_txt_tilemap, offset); + state->m_txt_tilemap->mark_tile_dirty(offset); } static WRITE16_DEVICE_HANDLER( eeprom_w ) diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index 70d6d5ee93c..8c6e6b25249 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -127,14 +127,14 @@ static WRITE8_HANDLER( bg_ram_w ) { quizpun2_state *state = space->machine().driver_data(); state->m_bg_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tmap, offset/2); + state->m_bg_tmap->mark_tile_dirty(offset/2); } static WRITE8_HANDLER( fg_ram_w ) { quizpun2_state *state = space->machine().driver_data(); state->m_fg_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tmap, offset/4); + state->m_fg_tmap->mark_tile_dirty(offset/4); } static VIDEO_START(quizpun2) @@ -143,8 +143,8 @@ static VIDEO_START(quizpun2) state->m_bg_tmap = tilemap_create( machine, get_bg_tile_info, tilemap_scan_rows, 8,16, 0x20,0x20 ); state->m_fg_tmap = tilemap_create( machine, get_fg_tile_info, tilemap_scan_rows, 8,16, 0x20,0x20 ); - tilemap_set_transparent_pen(state->m_bg_tmap, 0); - tilemap_set_transparent_pen(state->m_fg_tmap, 0); + state->m_bg_tmap->set_transparent_pen(0); + state->m_fg_tmap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16(quizpun2) @@ -162,11 +162,11 @@ static SCREEN_UPDATE_IND16(quizpun2) } #endif - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, state->m_bg_tmap, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 1) state->m_bg_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); else bitmap.fill(get_black_pen(screen.machine()), cliprect); bitmap.fill(get_black_pen(screen.machine()), cliprect); - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, state->m_fg_tmap, 0, 0); + if (layers_ctrl & 2) state->m_fg_tmap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index 232d84d19b0..bf160219200 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -173,23 +173,23 @@ static VIDEO_START( rdx_v33 ) fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows,16,16,32,32); tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows,8, 8, 64,32); - tilemap_set_transparent_pen(bg_tilemap, 15); - tilemap_set_transparent_pen(md_tilemap, 15); - tilemap_set_transparent_pen(fg_tilemap, 15); - tilemap_set_transparent_pen(tx_tilemap, 15); + bg_tilemap->set_transparent_pen(15); + md_tilemap->set_transparent_pen(15); + fg_tilemap->set_transparent_pen(15); + tx_tilemap->set_transparent_pen(15); } static SCREEN_UPDATE_IND16( rdx_v33 ) { bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, md_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); + bg_tilemap->draw(bitmap, cliprect, 0, 0); + md_tilemap->draw(bitmap, cliprect, 0, 0); + fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(),bitmap,cliprect,0); - tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); + tx_tilemap->draw(bitmap, cliprect, 0, 0); /* debug DMA processing */ if(0) @@ -223,7 +223,7 @@ static SCREEN_UPDATE_IND16( rdx_v33 ) } popmessage("%08x 1",src_addr); - tilemap_mark_all_tiles_dirty(bg_tilemap); + bg_tilemap->mark_all_dirty(); frame = 0; src_addr+=0x800; } @@ -288,25 +288,25 @@ WRITE16_HANDLER( mcu_prog_offs_w ) static WRITE16_HANDLER( rdx_bg_vram_w ) { COMBINE_DATA(&bg_vram[offset]); - tilemap_mark_tile_dirty(bg_tilemap, offset); + bg_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( rdx_md_vram_w ) { COMBINE_DATA(&md_vram[offset]); - tilemap_mark_tile_dirty(md_tilemap, offset); + md_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( rdx_fg_vram_w ) { COMBINE_DATA(&fg_vram[offset]); - tilemap_mark_tile_dirty(fg_tilemap, offset); + fg_tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( rdx_tx_vram_w ) { COMBINE_DATA(&tx_vram[offset]); - tilemap_mark_tile_dirty(tx_tilemap, offset); + tx_tilemap->mark_tile_dirty(offset); } static READ16_HANDLER( rdx_v33_unknown_r ) diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 9c1fb2079e9..472539af89e 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -115,7 +115,7 @@ public: /* call with tilesize = 0 for 8x8 or 1 for 16x16 */ -INLINE void get_rabbit_tilemap_info(running_machine &machine, tile_data *tileinfo, int tile_index, int whichtilemap, int tilesize) +INLINE void get_rabbit_tilemap_info(running_machine &machine, tile_data &tileinfo, int tile_index, int whichtilemap, int tilesize) { rabbit_state *state = machine.driver_data(); int tileno,colour,flipxy, depth; @@ -147,7 +147,7 @@ INLINE void get_rabbit_tilemap_info(running_machine &machine, tile_data *tileinf tileno >>=(1+tilesize*2); colour&=0x0f; colour+=0x20; - tileinfo->group = 1; + tileinfo.group = 1; SET_TILE_INFO(6+tilesize,tileno,colour,TILE_FLIPXY(flipxy)); } else @@ -155,7 +155,7 @@ INLINE void get_rabbit_tilemap_info(running_machine &machine, tile_data *tileinf tileno >>=(0+tilesize*2); //colour&=0x3f; // fixes status bar.. but breaks other stuff colour+=0x200; - tileinfo->group = 0; + tileinfo.group = 0; SET_TILE_INFO(4+tilesize,tileno,colour,TILE_FLIPXY(flipxy)); } } @@ -186,21 +186,21 @@ static WRITE32_HANDLER( rabbit_tilemap0_w ) { rabbit_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tilemap_ram[0][offset]); - tilemap_mark_tile_dirty(state->m_tilemap[0],offset); + state->m_tilemap[0]->mark_tile_dirty(offset); } static WRITE32_HANDLER( rabbit_tilemap1_w ) { rabbit_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tilemap_ram[1][offset]); - tilemap_mark_tile_dirty(state->m_tilemap[1],offset); + state->m_tilemap[1]->mark_tile_dirty(offset); } static WRITE32_HANDLER( rabbit_tilemap2_w ) { rabbit_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tilemap_ram[2][offset]); - tilemap_mark_tile_dirty(state->m_tilemap[2],offset); + state->m_tilemap[2]->mark_tile_dirty(offset); } @@ -208,7 +208,7 @@ static WRITE32_HANDLER( rabbit_tilemap3_w ) { rabbit_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tilemap_ram[3][offset]); - tilemap_mark_tile_dirty(state->m_tilemap[3],offset); + state->m_tilemap[3]->mark_tile_dirty(offset); } /* @@ -367,14 +367,14 @@ static VIDEO_START(rabbit) state->m_tilemap[3] = tilemap_create(machine, get_rabbit_tilemap3_tile_info,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 */ - tilemap_map_pen_to_layer(state->m_tilemap[0], 0, 15, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_tilemap[0], 1, 255, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_tilemap[1], 0, 15, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_tilemap[1], 1, 255, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_tilemap[2], 0, 15, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_tilemap[2], 1, 255, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_tilemap[3], 0, 15, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_tilemap[3], 1, 255, TILEMAP_PIXEL_TRANSPARENT); + state->m_tilemap[0]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); + state->m_tilemap[0]->map_pen_to_layer(1, 255, TILEMAP_PIXEL_TRANSPARENT); + state->m_tilemap[1]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); + state->m_tilemap[1]->map_pen_to_layer(1, 255, TILEMAP_PIXEL_TRANSPARENT); + state->m_tilemap[2]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); + state->m_tilemap[2]->map_pen_to_layer(1, 255, TILEMAP_PIXEL_TRANSPARENT); + state->m_tilemap[3]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); + state->m_tilemap[3]->map_pen_to_layer(1, 255, TILEMAP_PIXEL_TRANSPARENT); state->m_sprite_bitmap = auto_bitmap_ind16_alloc(machine,0x1000,0x1000); state->m_sprite_clip.set(0, 0x1000-1, 0, 0x1000-1); @@ -420,7 +420,7 @@ static void rabbit_drawtilemap( running_machine &machine, bitmap_ind16 &bitmap, startx/starty are also 16.16 scrolling */ - tilemap_draw_roz(bitmap,cliprect,state->m_tilemap[whichtilemap],startx << 12,starty << 12, + state->m_tilemap[whichtilemap]->draw_roz(bitmap, cliprect, startx << 12,starty << 12, incxx << 5,incxy << 8,incyx << 8,incyy << 5, 1, /* wraparound */ tran ? 0 : TILEMAP_DRAW_OPAQUE,0); @@ -663,7 +663,7 @@ static void rabbit_do_blit(running_machine &machine) blt_source+=2; writeoffs=blt_oddflg+blt_column; state->m_tilemap_ram[blt_tilemp][writeoffs]=(state->m_tilemap_ram[blt_tilemp][writeoffs]&mask)|(blt_value<m_tilemap[blt_tilemp],writeoffs); + state->m_tilemap[blt_tilemp]->mark_tile_dirty(writeoffs); blt_column++; blt_column&=0x7f; @@ -680,7 +680,7 @@ static void rabbit_do_blit(running_machine &machine) { writeoffs=blt_oddflg+blt_column; state->m_tilemap_ram[blt_tilemp][writeoffs]=(state->m_tilemap_ram[blt_tilemp][writeoffs]&mask)|(blt_value<m_tilemap[blt_tilemp],writeoffs); + state->m_tilemap[blt_tilemp]->mark_tile_dirty(writeoffs); blt_column++; blt_column&=0x7f; } diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index b5a48814fc6..fab8916299d 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -724,25 +724,25 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, WRITE16_MEMBER(raiden2_state::raiden2_background_w) { COMBINE_DATA(&back_data[offset]); - tilemap_mark_tile_dirty(background_layer, offset); + background_layer->mark_tile_dirty(offset); } WRITE16_MEMBER(raiden2_state::raiden2_midground_w) { COMBINE_DATA(&mid_data[offset]); - tilemap_mark_tile_dirty(midground_layer,offset); + midground_layer->mark_tile_dirty(offset); } WRITE16_MEMBER(raiden2_state::raiden2_foreground_w) { COMBINE_DATA(&fore_data[offset]); - tilemap_mark_tile_dirty(foreground_layer,offset); + foreground_layer->mark_tile_dirty(offset); } WRITE16_MEMBER(raiden2_state::raiden2_text_w) { COMBINE_DATA(&text_data[offset]); - tilemap_mark_tile_dirty(text_layer, offset); + text_layer->mark_tile_dirty(offset); } WRITE16_MEMBER(raiden2_state::tilemap_enable_w) @@ -762,9 +762,9 @@ WRITE16_MEMBER(raiden2_state::tile_scroll_w) case 2: tm = foreground_layer; break; } if(offset & 1) - tilemap_set_scrolly(tm, 0, data); + tm->set_scrolly(0, data); else - tilemap_set_scrollx(tm, 0, data); + tm->set_scrollx(0, data); } WRITE16_MEMBER(raiden2_state::tile_bank_01_w) @@ -774,13 +774,13 @@ WRITE16_MEMBER(raiden2_state::tile_bank_01_w) new_bank = 0 | ((data & 1)<<1); if(new_bank != bg_bank) { bg_bank = new_bank; - tilemap_mark_all_tiles_dirty(background_layer); + background_layer->mark_all_dirty(); } new_bank = 1 | (data & 2); if(new_bank != mid_bank) { mid_bank = new_bank; - tilemap_mark_all_tiles_dirty(midground_layer); + midground_layer->mark_all_dirty(); } } } @@ -798,7 +798,7 @@ WRITE16_MEMBER(raiden2_state::cop_tile_bank_2_w) int new_bank = 4 | (data >> 14); if(new_bank != fg_bank) { fg_bank = new_bank; - tilemap_mark_all_tiles_dirty(foreground_layer); + foreground_layer->mark_all_dirty(); } } } @@ -811,7 +811,7 @@ WRITE16_MEMBER(raiden2_state::raidendx_cop_bank_2_w) int new_bank = 4 | ((cop_bank >> 10) & 3); if(new_bank != fg_bank) { fg_bank = new_bank; - tilemap_mark_all_tiles_dirty(foreground_layer); + foreground_layer->mark_all_dirty(); } /* probably bit 3 is from 6c9 */ @@ -879,9 +879,9 @@ static VIDEO_START( raiden2 ) state->midground_layer = tilemap_create(machine, get_mid_tile_info, tilemap_scan_rows, 16,16, 32,32 ); state->foreground_layer = tilemap_create(machine, get_fore_tile_info, tilemap_scan_rows, 16,16, 32,32 ); - tilemap_set_transparent_pen(state->midground_layer, 15); - tilemap_set_transparent_pen(state->foreground_layer, 15); - tilemap_set_transparent_pen(state->text_layer, 15); + state->midground_layer->set_transparent_pen(15); + state->foreground_layer->set_transparent_pen(15); + state->text_layer->set_transparent_pen(15); } /* SCREEN_UPDATE_IND16 (move to video file) */ @@ -894,19 +894,19 @@ static SCREEN_UPDATE_IND16( raiden2 ) //if (!screen.machine().input().code_pressed(KEYCODE_Q)) { if (!(state->raiden2_tilemap_enable & 1)) - tilemap_draw(bitmap, cliprect, state->background_layer, 0, 0); + state->background_layer->draw(bitmap, cliprect, 0, 0); } //if (!screen.machine().input().code_pressed(KEYCODE_W)) { if (!(state->raiden2_tilemap_enable & 2)) - tilemap_draw(bitmap, cliprect, state->midground_layer, 0, 0); + state->midground_layer->draw(bitmap, cliprect, 0, 0); } //if (!screen.machine().input().code_pressed(KEYCODE_E)) { if (!(state->raiden2_tilemap_enable & 4)) - tilemap_draw(bitmap, cliprect, state->foreground_layer, 0, 0); + state->foreground_layer->draw(bitmap, cliprect, 0, 0); } //if (!screen.machine().input().code_pressed(KEYCODE_S)) @@ -918,7 +918,7 @@ static SCREEN_UPDATE_IND16( raiden2 ) //if (!screen.machine().input().code_pressed(KEYCODE_A)) { if (!(state->raiden2_tilemap_enable & 8)) - tilemap_draw(bitmap, cliprect, state->text_layer, 0, 0); + state->text_layer->draw(bitmap, cliprect, 0, 0); } return 0; diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index 75e6cf50ea0..2712a919c87 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -247,7 +247,7 @@ static WRITE8_HANDLER( rallyx_latch_w ) case 0x03: /* FLIP */ flip_screen_set_no_update(space->machine(), bit); - tilemap_set_flip_all(space->machine(), bit * (TILEMAP_FLIPX | TILEMAP_FLIPY)); + space->machine().tilemap().set_flip_all(bit * (TILEMAP_FLIPX | TILEMAP_FLIPY)); break; case 0x04: @@ -290,7 +290,7 @@ static WRITE8_HANDLER( locomotn_latch_w ) case 0x03: /* FLIP */ flip_screen_set_no_update(space->machine(), bit); - tilemap_set_flip_all(space->machine(), bit * (TILEMAP_FLIPX | TILEMAP_FLIPY)); + space->machine().tilemap().set_flip_all(bit * (TILEMAP_FLIPX | TILEMAP_FLIPY)); break; case 0x04: /* OUT1 */ diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 4bf5451bf2f..9f56f1816ff 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -53,14 +53,14 @@ static WRITE8_HANDLER( rmhaihai_videoram_w ) { rmhaihai_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( rmhaihai_colorram_w ) { rmhaihai_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -83,7 +83,7 @@ static VIDEO_START( rmhaihai ) static SCREEN_UPDATE_IND16( rmhaihai ) { rmhaihai_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index b6feaabd429..7e2dc6cd5be 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -85,7 +85,7 @@ static WRITE8_HANDLER( ram_w ) else state->m_ram_1[offset] = data; - tilemap_mark_tile_dirty((offset & 0x0400) ? state->m_bg_tilemap : state->m_fg_tilemap, offset & 0x03ff); + ((offset & 0x0400) ? state->m_bg_tilemap : state->m_fg_tilemap)->mark_tile_dirty(offset & 0x03ff); } @@ -103,7 +103,7 @@ static WRITE8_HANDLER( ram_bank_w ) state->m_ram_bank = data & 0x01; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } @@ -190,7 +190,7 @@ static VIDEO_START( safarir ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -198,10 +198,10 @@ static SCREEN_UPDATE_IND16( safarir ) { safarir_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, *state->m_bg_scroll); + state->m_bg_tilemap->set_scrollx(0, *state->m_bg_scroll); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index f711b916ae5..c05d109439a 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -113,7 +113,7 @@ static SCREEN_UPDATE_IND16(sbowling) sbowling_state *state = screen.machine().driver_data(); bitmap.fill(0x18, cliprect); - tilemap_draw(bitmap, cliprect,state->m_sb_tilemap, 0, 0); + state->m_sb_tilemap->draw(bitmap, cliprect, 0, 0); copybitmap_trans(bitmap, *state->m_tmpbitmap, 0, 0, 0, 0, cliprect, state->m_color_prom_address); return 0; } @@ -206,7 +206,7 @@ static WRITE8_HANDLER(graph_control_w) state->m_color_prom_address = ((data&0x07)<<7) | ((data&0xc0)>>3); state->m_bgmap = ((data>>4)^3) & 0x3; - tilemap_mark_all_tiles_dirty(state->m_sb_tilemap); + state->m_sb_tilemap->mark_all_dirty(); } static READ8_HANDLER (controls_r) diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index de532fdd349..0c8136ff420 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -310,7 +310,7 @@ static WRITE8_HANDLER( sbrkout_videoram_w ) sbrkout_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -327,7 +327,7 @@ static SCREEN_UPDATE_IND16( sbrkout ) UINT8 *videoram = state->m_videoram; int ball; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); for (ball = 2; ball >= 0; ball--) { diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index cfca09a69b7..b2949d9468b 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1740,7 +1740,7 @@ static WRITE16_HANDLER( usclssic_lockout_w ) state->m_usclssic_port_select = (data & 0x40) >> 6; if (tiles_offset != state->m_tiles_offset) - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); state->m_tiles_offset = tiles_offset; seta_coin_lockout_w(space->machine(), data); diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index c574fd265fb..a5cfcc25b3e 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -708,35 +708,35 @@ static WRITE8_HANDLER( sfbonus_videoram_w ) if (offset<0x4000) /* 0x0000 - 0x3fff */ { state->m_tilemap_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset/2); + state->m_tilemap->mark_tile_dirty(offset/2); } else if (offset<0x4800) /* 0x4000 - 0x47ff */ { offset-=0x4000; state->m_reel_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_tilemap,offset/2); + state->m_reel_tilemap->mark_tile_dirty(offset/2); } else if (offset<0x5000) /* 0x4800 - 0x4fff */ { offset-=0x4800; state->m_reel2_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel2_tilemap,offset/2); + state->m_reel2_tilemap->mark_tile_dirty(offset/2); } else if (offset<0x5800) /* 0x5000 - 0x57ff */ { offset-=0x5000; state->m_reel3_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel3_tilemap,offset/2); + state->m_reel3_tilemap->mark_tile_dirty(offset/2); } else if (offset<0x6000) /* 0x5800 - 0x5fff */ { offset-=0x5800; state->m_reel4_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel4_tilemap,offset/2); + state->m_reel4_tilemap->mark_tile_dirty(offset/2); } else if (offset<0x8000) { @@ -765,18 +765,18 @@ static VIDEO_START(sfbonus) state->m_reel3_tilemap = tilemap_create(machine,get_sfbonus_reel3_tile_info,tilemap_scan_rows,8,32, 64, 16); state->m_reel4_tilemap = tilemap_create(machine,get_sfbonus_reel4_tile_info,tilemap_scan_rows,8,32, 64, 16); - tilemap_set_transparent_pen(state->m_tilemap,0); - tilemap_set_transparent_pen(state->m_reel_tilemap,255); - tilemap_set_transparent_pen(state->m_reel2_tilemap,255); - tilemap_set_transparent_pen(state->m_reel3_tilemap,255); - tilemap_set_transparent_pen(state->m_reel4_tilemap,255); + state->m_tilemap->set_transparent_pen(0); + state->m_reel_tilemap->set_transparent_pen(255); + state->m_reel2_tilemap->set_transparent_pen(255); + state->m_reel3_tilemap->set_transparent_pen(255); + state->m_reel4_tilemap->set_transparent_pen(255); - tilemap_set_scroll_rows(state->m_tilemap,64); + state->m_tilemap->set_scroll_rows(64); - tilemap_set_scroll_cols(state->m_reel_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel4_tilemap, 64); + state->m_reel_tilemap->set_scroll_cols(64); + state->m_reel2_tilemap->set_scroll_cols(64); + state->m_reel3_tilemap->set_scroll_cols(64); + state->m_reel4_tilemap->set_scroll_cols(64); } @@ -802,16 +802,16 @@ static void sfbonus_draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, { int scroll; scroll = bg_scroll[(i*2)+0x000] | (bg_scroll[(i*2)+0x001]<<8); - tilemap_set_scrolly(state->m_reel_tilemap, i, scroll + globalyscrollreels ); + state->m_reel_tilemap->set_scrolly(i, scroll + globalyscrollreels ); scroll = bg_scroll[(i*2)+0x080] | (bg_scroll[(i*2)+0x081]<<8); - tilemap_set_scrolly(state->m_reel2_tilemap, i, scroll + globalyscrollreels); + state->m_reel2_tilemap->set_scrolly(i, scroll + globalyscrollreels); scroll = bg_scroll[(i*2)+0x100] | (bg_scroll[(i*2)+0x101]<<8); - tilemap_set_scrolly(state->m_reel3_tilemap, i, scroll + globalyscrollreels); + state->m_reel3_tilemap->set_scrolly(i, scroll + globalyscrollreels); scroll = bg_scroll[(i*2)+0x180] | (bg_scroll[(i*2)+0x181]<<8); - tilemap_set_scrolly(state->m_reel4_tilemap, i, scroll + globalyscrollreels); + state->m_reel4_tilemap->set_scrolly(i, scroll + globalyscrollreels); } // printf("------------\n"); @@ -839,73 +839,73 @@ static void sfbonus_draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, { rowscroll = reels_rowscroll[((line/8)*2)+0x000] | (reels_rowscroll[((line/8)*2)+0x001]<<8); xxxscroll = globalxscrollreels + rowscroll; - tilemap_set_scrollx(state->m_reel_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel2_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel3_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel4_tilemap, 0, xxxscroll ); + state->m_reel_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel2_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel3_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel4_tilemap->set_scrollx(0, xxxscroll ); } else if (rowenable==0x1) { rowscroll = reels_rowscroll[((line/8)*2)+0x080] | (reels_rowscroll[((line/8)*2)+0x081]<<8); xxxscroll = globalxscrollreels + rowscroll; - tilemap_set_scrollx(state->m_reel_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel2_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel3_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel4_tilemap, 0, xxxscroll ); + state->m_reel_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel2_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel3_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel4_tilemap->set_scrollx(0, xxxscroll ); } else if (rowenable==0x2) { rowscroll = reels_rowscroll[((line/8)*2)+0x100] | (reels_rowscroll[((line/8)*2)+0x101]<<8); xxxscroll = globalxscrollreels + rowscroll; - tilemap_set_scrollx(state->m_reel_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel2_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel3_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel4_tilemap, 0, xxxscroll ); + state->m_reel_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel2_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel3_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel4_tilemap->set_scrollx(0, xxxscroll ); } else if (rowenable==0x3) { rowscroll = reels_rowscroll[((line/8)*2)+0x180] | (reels_rowscroll[((line/8)*2)+0x181]<<8); xxxscroll = globalxscrollreels + rowscroll; - tilemap_set_scrollx(state->m_reel_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel2_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel3_tilemap, 0, xxxscroll ); - tilemap_set_scrollx(state->m_reel4_tilemap, 0, xxxscroll ); + state->m_reel_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel2_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel3_tilemap->set_scrollx(0, xxxscroll ); + state->m_reel4_tilemap->set_scrollx(0, xxxscroll ); } if (rowenable2==0) { - tilemap_draw(*state->m_temp_reel_bitmap,clip,state->m_reel_tilemap,TILEMAP_DRAW_CATEGORY(catagory),3); + state->m_reel_tilemap->draw(*state->m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),3); } if (rowenable==0) { - tilemap_draw(*state->m_temp_reel_bitmap,clip,state->m_reel_tilemap,TILEMAP_DRAW_CATEGORY(catagory),3); + state->m_reel_tilemap->draw(*state->m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),3); } if (rowenable2==0x1) { - tilemap_draw(*state->m_temp_reel_bitmap,clip,state->m_reel2_tilemap,TILEMAP_DRAW_CATEGORY(catagory),2); + state->m_reel2_tilemap->draw(*state->m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),2); } if (rowenable==0x1) { - tilemap_draw(*state->m_temp_reel_bitmap,clip,state->m_reel2_tilemap,TILEMAP_DRAW_CATEGORY(catagory),2); + state->m_reel2_tilemap->draw(*state->m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),2); } if (rowenable2==0x2) { - tilemap_draw(*state->m_temp_reel_bitmap,clip,state->m_reel3_tilemap,TILEMAP_DRAW_CATEGORY(catagory),1); + state->m_reel3_tilemap->draw(*state->m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),1); } if (rowenable==0x2) { - tilemap_draw(*state->m_temp_reel_bitmap,clip,state->m_reel3_tilemap,TILEMAP_DRAW_CATEGORY(catagory),1); + state->m_reel3_tilemap->draw(*state->m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),1); } if (rowenable2==0x3) { - tilemap_draw(*state->m_temp_reel_bitmap,clip,state->m_reel4_tilemap,TILEMAP_DRAW_CATEGORY(catagory),4); + state->m_reel4_tilemap->draw(*state->m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),4); } if (rowenable==0x3) { - tilemap_draw(*state->m_temp_reel_bitmap,clip,state->m_reel4_tilemap,TILEMAP_DRAW_CATEGORY(catagory),4); + state->m_reel4_tilemap->draw(*state->m_temp_reel_bitmap, clip, TILEMAP_DRAW_CATEGORY(catagory),4); } @@ -954,14 +954,14 @@ static SCREEN_UPDATE_IND16(sfbonus) } /* Normal Tilemap */ - tilemap_set_scrolly(state->m_tilemap, 0, globalyscroll ); + state->m_tilemap->set_scrolly(0, globalyscroll ); for (i=0;i<64;i++) { int scroll; scroll = front_rowscroll[(i*2)+0x000] | (front_rowscroll[(i*2)+0x001]<<8); - tilemap_set_scrollx(state->m_tilemap, i, scroll+globalxscroll ); + state->m_tilemap->set_scrollx(i, scroll+globalxscroll ); } - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); { int y,x; diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 36d31c3650b..80da277bd19 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -67,7 +67,7 @@ static WRITE8_HANDLER( skyarmy_videoram_w ) skyarmy_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset); + state->m_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( skyarmy_colorram_w ) @@ -75,7 +75,7 @@ static WRITE8_HANDLER( skyarmy_colorram_w ) skyarmy_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset); + state->m_tilemap->mark_tile_dirty(offset); } static PALETTE_INIT( skyarmy ) @@ -111,7 +111,7 @@ static VIDEO_START( skyarmy ) skyarmy_state *state = machine.driver_data(); state->m_tilemap = tilemap_create(machine, get_skyarmy_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_tilemap,32); + state->m_tilemap->set_scroll_cols(32); } @@ -123,9 +123,9 @@ static SCREEN_UPDATE_IND16( skyarmy ) int i; for(i=0;i<0x20;i++) - tilemap_set_scrolly( state->m_tilemap,i,state->m_scrollram[i]); + state->m_tilemap->set_scrolly(i,state->m_scrollram[i]); - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); for (offs = 0 ; offs < 0x40; offs+=4) { diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index e0d9917183e..45369f0c55a 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -78,14 +78,14 @@ static WRITE8_HANDLER( skylncr_videoram_w ) { skylncr_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tmap, offset); + state->m_tmap->mark_tile_dirty(offset); } static WRITE8_HANDLER( skylncr_colorram_w ) { skylncr_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_tmap, offset); + state->m_tmap->mark_tile_dirty(offset); } @@ -136,16 +136,16 @@ static VIDEO_START( skylncr ) state->m_reel_3_tilemap = tilemap_create(machine, get_reel_3_tile_info, tilemap_scan_rows, 8, 32, 64, 8 ); state->m_reel_4_tilemap = tilemap_create(machine, get_reel_4_tile_info, tilemap_scan_rows, 8, 32, 64, 8 ); - tilemap_set_scroll_cols(state->m_reel_2_tilemap, 0x40); - tilemap_set_scroll_cols(state->m_reel_3_tilemap, 0x40); - tilemap_set_scroll_cols(state->m_reel_4_tilemap, 0x40); + state->m_reel_2_tilemap->set_scroll_cols(0x40); + state->m_reel_3_tilemap->set_scroll_cols(0x40); + state->m_reel_4_tilemap->set_scroll_cols(0x40); - tilemap_set_transparent_pen(state->m_reel_2_tilemap, 0); - tilemap_set_transparent_pen(state->m_reel_3_tilemap, 0); - tilemap_set_transparent_pen(state->m_reel_4_tilemap, 0); + state->m_reel_2_tilemap->set_transparent_pen(0); + state->m_reel_3_tilemap->set_transparent_pen(0); + state->m_reel_4_tilemap->set_transparent_pen(0); - tilemap_set_transparent_pen(state->m_tmap, 0); + state->m_tmap->set_transparent_pen(0); } @@ -155,7 +155,7 @@ static SCREEN_UPDATE_IND16( skylncr ) int i; bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect, state->m_reel_1_tilemap, 0, 0); + state->m_reel_1_tilemap->draw(bitmap, cliprect, 0, 0); // are these hardcoded, or registers? const rectangle visible1(0*8, (20+48)*8-1, 4*8, (4+7)*8-1); @@ -164,17 +164,17 @@ static SCREEN_UPDATE_IND16( skylncr ) for (i= 0;i < 64;i++) { - tilemap_set_scrolly(state->m_reel_2_tilemap, i, state->m_reelscroll2[i]); - tilemap_set_scrolly(state->m_reel_3_tilemap, i, state->m_reelscroll3[i]); - tilemap_set_scrolly(state->m_reel_4_tilemap, i, state->m_reelscroll4[i]); + state->m_reel_2_tilemap->set_scrolly(i, state->m_reelscroll2[i]); + state->m_reel_3_tilemap->set_scrolly(i, state->m_reelscroll3[i]); + state->m_reel_4_tilemap->set_scrolly(i, state->m_reelscroll4[i]); } - tilemap_draw(bitmap,visible1,state->m_reel_2_tilemap, 0, 0); - tilemap_draw(bitmap,visible2,state->m_reel_3_tilemap, 0, 0); - tilemap_draw(bitmap,visible3,state->m_reel_4_tilemap, 0, 0); + state->m_reel_2_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel_3_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel_4_tilemap->draw(bitmap, visible3, 0, 0); - tilemap_draw(bitmap,cliprect, state->m_tmap, 0, 0); + state->m_tmap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -182,56 +182,56 @@ static WRITE8_HANDLER( reeltiles_1_w ) { skylncr_state *state = space->machine().driver_data(); state->m_reeltiles_1_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_1_tilemap, offset); + state->m_reel_1_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( reeltiles_2_w ) { skylncr_state *state = space->machine().driver_data(); state->m_reeltiles_2_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_2_tilemap, offset); + state->m_reel_2_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( reeltiles_3_w ) { skylncr_state *state = space->machine().driver_data(); state->m_reeltiles_3_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_3_tilemap, offset); + state->m_reel_3_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( reeltiles_4_w ) { skylncr_state *state = space->machine().driver_data(); state->m_reeltiles_4_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_4_tilemap, offset); + state->m_reel_4_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( reeltileshigh_1_w ) { skylncr_state *state = space->machine().driver_data(); state->m_reeltileshigh_1_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_1_tilemap, offset); + state->m_reel_1_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( reeltileshigh_2_w ) { skylncr_state *state = space->machine().driver_data(); state->m_reeltileshigh_2_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_2_tilemap, offset); + state->m_reel_2_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( reeltileshigh_3_w ) { skylncr_state *state = space->machine().driver_data(); state->m_reeltileshigh_3_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_3_tilemap, offset); + state->m_reel_3_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( reeltileshigh_4_w ) { skylncr_state *state = space->machine().driver_data(); state->m_reeltileshigh_4_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel_4_tilemap, offset); + state->m_reel_4_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index b7775f2a63f..125a4adc79b 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -47,7 +47,7 @@ static WRITE8_HANDLER( bg_tile_w ) spoker_state *state = space->machine().driver_data(); state->m_bg_tile_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -69,7 +69,7 @@ static WRITE8_HANDLER( fg_tile_w ) spoker_state *state = space->machine().driver_data(); state->m_fg_tile_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( fg_color_w ) @@ -77,7 +77,7 @@ static WRITE8_HANDLER( fg_color_w ) spoker_state *state = space->machine().driver_data(); state->m_fg_color_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static VIDEO_START(spoker) @@ -86,7 +86,7 @@ static VIDEO_START(spoker) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 32, 128, 8); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 128, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static SCREEN_UPDATE_IND16(spoker) @@ -94,8 +94,8 @@ static SCREEN_UPDATE_IND16(spoker) spoker_state *state = screen.machine().driver_data(); bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index e9a80b79069..49ca1a1ccab 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -130,7 +130,7 @@ static SCREEN_UPDATE_IND16(spool99) { spool99_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_sc0_tilemap,0,0); + state->m_sc0_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -139,7 +139,7 @@ static WRITE8_HANDLER( spool99_vram_w ) spool99_state *state = space->machine().driver_data(); state->m_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset/2); + state->m_sc0_tilemap->mark_tile_dirty(offset/2); } static WRITE8_HANDLER( spool99_cram_w ) @@ -147,7 +147,7 @@ static WRITE8_HANDLER( spool99_cram_w ) spool99_state *state = space->machine().driver_data(); state->m_cram[offset] = data; - tilemap_mark_tile_dirty(state->m_sc0_tilemap,offset/2); + state->m_sc0_tilemap->mark_tile_dirty(offset/2); } diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index 638f644df0e..1b1c68bb3b0 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -79,7 +79,7 @@ static WRITE8_HANDLER( sprcros2_m_port7_w ) if((state->m_port7^data)&0x40) memory_set_bankptr(space->machine(), "bank1",&RAM[0x10000+((data&0x40)<<7)]); - tilemap_set_flip_all( space->machine(),data&0x02?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); + space->machine().tilemap().set_flip_all(data&0x02?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); state->m_port7 = data; } diff --git a/src/mame/drivers/sshot.c b/src/mame/drivers/sshot.c index 3f89c2dd94e..5e9eb0201f3 100644 --- a/src/mame/drivers/sshot.c +++ b/src/mame/drivers/sshot.c @@ -192,7 +192,7 @@ static VIDEO_START( supershot ) static SCREEN_UPDATE_IND16( supershot ) { supershot_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -201,7 +201,7 @@ static WRITE8_HANDLER( supershot_vidram_w ) supershot_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); } /************************************* diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index 74faac9528d..b4b06563e35 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -166,7 +166,7 @@ static WRITE8_HANDLER( statriv2_videoram_w ) statriv2_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset & 0x3ff); + state->m_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -183,7 +183,7 @@ static SCREEN_UPDATE_IND16( statriv2 ) if (tms9927_screen_reset(screen.machine().device("tms"))) bitmap.fill(get_black_pen(screen.machine()), cliprect); else - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index a4fb607b8c3..a921f76c2d4 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -270,7 +270,7 @@ static WRITE8_HANDLER( subsino_tiles_offset_w ) { subsino_state *state = space->machine().driver_data(); state->m_tiles_offset = (data & 1) ? 0x1000: 0; - tilemap_mark_tile_dirty(state->m_tmap, offset); + state->m_tmap->mark_tile_dirty(offset); // popmessage("gfx %02x",data); } @@ -278,14 +278,14 @@ static WRITE8_HANDLER( subsino_videoram_w ) { subsino_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tmap, offset); + state->m_tmap->mark_tile_dirty(offset); } static WRITE8_HANDLER( subsino_colorram_w ) { subsino_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_tmap, offset); + state->m_tmap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_tile_info ) @@ -311,7 +311,7 @@ static VIDEO_START( subsino ) { subsino_state *state = machine.driver_data(); state->m_tmap = tilemap_create( machine, get_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20 ); - tilemap_set_transparent_pen( state->m_tmap, 0 ); + state->m_tmap->set_transparent_pen(0 ); state->m_tiles_offset = 0; } @@ -321,7 +321,7 @@ static WRITE8_HANDLER( subsino_reel1_ram_w ) { subsino_state *state = space->machine().driver_data(); state->m_reel1_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel1_tilemap,offset); + state->m_reel1_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_subsino_reel1_tile_info ) @@ -355,7 +355,7 @@ static WRITE8_HANDLER( subsino_reel2_ram_w ) { subsino_state *state = space->machine().driver_data(); state->m_reel2_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel2_tilemap,offset); + state->m_reel2_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_subsino_reel2_tile_info ) @@ -388,7 +388,7 @@ static WRITE8_HANDLER( subsino_reel3_ram_w ) { subsino_state *state = space->machine().driver_data(); state->m_reel3_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel3_tilemap,offset); + state->m_reel3_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_subsino_reel3_tile_info ) @@ -427,9 +427,9 @@ static VIDEO_START( subsino_reels ) state->m_reel2_tilemap = tilemap_create(machine,get_subsino_reel2_tile_info,tilemap_scan_rows, 8, 32, 64, 8); state->m_reel3_tilemap = tilemap_create(machine,get_subsino_reel3_tile_info,tilemap_scan_rows, 8, 32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 64); + state->m_reel1_tilemap->set_scroll_cols(64); + state->m_reel2_tilemap->set_scroll_cols(64); + state->m_reel3_tilemap->set_scroll_cols(64); } @@ -437,15 +437,15 @@ static VIDEO_START( stisub ) { subsino_state *state = machine.driver_data(); state->m_tmap = tilemap_create( machine, get_stisub_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20 ); - tilemap_set_transparent_pen( state->m_tmap, 0 ); + state->m_tmap->set_transparent_pen(0 ); state->m_reel1_tilemap = tilemap_create(machine,get_stisub_reel1_tile_info,tilemap_scan_rows, 8, 32, 64, 8); state->m_reel2_tilemap = tilemap_create(machine,get_stisub_reel2_tile_info,tilemap_scan_rows, 8, 32, 64, 8); state->m_reel3_tilemap = tilemap_create(machine,get_stisub_reel3_tile_info,tilemap_scan_rows, 8, 32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 64); + state->m_reel1_tilemap->set_scroll_cols(64); + state->m_reel2_tilemap->set_scroll_cols(64); + state->m_reel3_tilemap->set_scroll_cols(64); state->m_out_c = 0x08; } @@ -455,7 +455,7 @@ static SCREEN_UPDATE_IND16( subsino ) { subsino_state *state = screen.machine().driver_data(); bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect, state->m_tmap, 0, 0); + state->m_tmap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -467,9 +467,9 @@ static SCREEN_UPDATE_IND16( subsino_reels ) for (i= 0;i < 64;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i]); + state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i]); } if (state->m_out_c&0x08) @@ -479,12 +479,12 @@ static SCREEN_UPDATE_IND16( subsino_reels ) const rectangle visible2(0*8, (14+48)*8-1, 10*8, (10+7)*8-1); const rectangle visible3(0*8, (14+48)*8-1, 18*8, (18+7)*8-1); - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2, state->m_reel2_tilemap, 0, 0); - tilemap_draw(bitmap, visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel3_tilemap->draw(bitmap, visible3, 0, 0); } - tilemap_draw(bitmap,cliprect, state->m_tmap, 0, 0); + state->m_tmap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -497,16 +497,16 @@ static SCREEN_UPDATE_IND16( stisub_reels ) if (state->m_reel1_attr) { - tilemap_mark_all_tiles_dirty (state->m_reel1_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel2_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel3_tilemap); + state->m_reel1_tilemap->mark_all_dirty(); + state->m_reel2_tilemap->mark_all_dirty(); + state->m_reel3_tilemap->mark_all_dirty(); } for (i= 0;i < 64;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i]); + state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i]); } if (state->m_out_c&0x08) @@ -516,12 +516,12 @@ static SCREEN_UPDATE_IND16( stisub_reels ) const rectangle visible2(0, 511, 88, 143); const rectangle visible3(0, 511, 144, 223); - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2, state->m_reel2_tilemap, 0, 0); - tilemap_draw(bitmap, visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel3_tilemap->draw(bitmap, visible3, 0, 0); } - tilemap_draw(bitmap,cliprect, state->m_tmap, 0, 0); + state->m_tmap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -977,9 +977,9 @@ static WRITE8_HANDLER( subsino_out_c_w ) // c = reel colour bank? state->m_out_c = data; - tilemap_mark_all_tiles_dirty (state->m_reel1_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel2_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel3_tilemap); + state->m_reel1_tilemap->mark_all_dirty(); + state->m_reel2_tilemap->mark_all_dirty(); + state->m_reel3_tilemap->mark_all_dirty(); // popmessage("data %02x\n",data); } diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c index a149a2772b3..141b66ee2a0 100644 --- a/src/mame/drivers/subsino2.c +++ b/src/mame/drivers/subsino2.c @@ -104,7 +104,7 @@ public: Tilemaps Access ***************************************************************************/ -INLINE void ss9601_get_tile_info(layer_t *l, running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, void *param) +INLINE void ss9601_get_tile_info(layer_t *l, running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, void *param) { int addr; UINT16 offs; @@ -153,20 +153,20 @@ INLINE void ss9601_videoram_w(layer_t *l, vram_t vram, address_space *space, off { default: case TILE_8x8: - tilemap_mark_tile_dirty(l->tmap, offset); + l->tmap->mark_tile_dirty(offset); break; case TILE_8x32: offset &= ~0x180; for (int y = 0; y < 0x80*4; y += 0x80) - tilemap_mark_tile_dirty(l->tmap, offset + y); + l->tmap->mark_tile_dirty(offset + y); break; case TILE_64x32: offset &= ~0x187; for (int x = 0; x < 8; x++) for (int y = 0; y < 0x80*4; y += 0x80) - tilemap_mark_tile_dirty(l->tmap, offset + y + x); + l->tmap->mark_tile_dirty(offset + y + x); break; } } @@ -419,7 +419,7 @@ static WRITE8_HANDLER( ss9601_tilesize_w ) if (l->tilesize != sizes[i]) { l->tilesize = sizes[i]; - tilemap_mark_all_tiles_dirty(l->tmap); + l->tmap->mark_all_dirty(); } } } @@ -547,10 +547,10 @@ static VIDEO_START( subsino2 ) l->tmap = tilemap_create(machine, i ? ss9601_get_tile_info_1 : ss9601_get_tile_info_0, tilemap_scan_rows, 8,8, 0x80,0x40); - tilemap_set_transparent_pen(l->tmap, 0); + l->tmap->set_transparent_pen(0); // line scroll - tilemap_set_scroll_rows(l->tmap, 0x200); + l->tmap->set_scroll_rows(0x200); l->videorams[VRAM_HI] = auto_alloc_array(machine, UINT8, 0x80 * 0x40); l->videorams[VRAM_LO] = auto_alloc_array(machine, UINT8, 0x80 * 0x40); @@ -637,9 +637,9 @@ static SCREEN_UPDATE_IND16( subsino2 ) { layer_t *l = &state->m_layers[i]; - tilemap_set_scroll_cols(l->tmap, 1); - tilemap_set_scroll_rows(l->tmap, 0x200); - tilemap_set_scrolly(l->tmap, 0, l->scroll_y + 1); + l->tmap->set_scroll_cols(1); + l->tmap->set_scroll_rows(0x200); + l->tmap->set_scrolly(0, l->scroll_y + 1); // line scroll @@ -649,7 +649,7 @@ static SCREEN_UPDATE_IND16( subsino2 ) if (mask_y[i]) scroll_dx = (l->scrollrams[VRAM_HI][y & mask_y[i]] << 8) + l->scrollrams[VRAM_LO][y & mask_y[i]]; - tilemap_set_scrollx(l->tmap, y, l->scroll_x + scroll_dx); + l->tmap->set_scrollx(y, l->scroll_x + scroll_dx); } } @@ -661,8 +661,8 @@ static SCREEN_UPDATE_IND16( subsino2 ) if (l0_reel) { - tilemap_set_scroll_rows(l->tmap, 1); - tilemap_set_scroll_cols(l->tmap, 1); + l->tmap->set_scroll_rows(1); + l->tmap->set_scroll_cols(1); for (int r = 0; r < 3; r++) { @@ -676,7 +676,7 @@ static SCREEN_UPDATE_IND16( subsino2 ) int reeladdr = (visible.min_y / 0x10) * 0x80 + x; UINT16 reelscroll = (state->m_ss9601_reelrams[VRAM_HI][reeladdr] << 8) + state->m_ss9601_reelrams[VRAM_LO][reeladdr]; - tilemap_set_scrollx(l->tmap, 0, (reelscroll >> 9) * 8 + l->scroll_x - visible.min_x); + l->tmap->set_scrollx(0, (reelscroll >> 9) * 8 + l->scroll_x - visible.min_x); // wrap around at half tilemap (0x100) int reelscroll_y = (reelscroll & 0x100) + ((reelscroll + l->scroll_y - visible.min_y/0x10*0x10 + 1) & 0xff); @@ -689,8 +689,8 @@ static SCREEN_UPDATE_IND16( subsino2 ) { if ( reelwrap_y-1 <= visible.max_y ) tmp.max_y = reelwrap_y-1; - tilemap_set_scrolly(l->tmap, 0, reelscroll_y); - tilemap_draw(bitmap, tmp, l->tmap, 0, 0); + l->tmap->set_scrolly(0, reelscroll_y); + l->tmap->draw(bitmap, tmp, 0, 0); tmp.max_y = visible.max_y; } @@ -699,8 +699,8 @@ static SCREEN_UPDATE_IND16( subsino2 ) { if ( reelwrap_y >= visible.min_y ) tmp.min_y = reelwrap_y; - tilemap_set_scrolly(l->tmap, 0, -((reelwrap_y &0xff) | (reelscroll_y & 0x100))); - tilemap_draw(bitmap, tmp, l->tmap, 0, 0); + l->tmap->set_scrolly(0, -((reelwrap_y &0xff) | (reelscroll_y & 0x100))); + l->tmap->draw(bitmap, tmp, 0, 0); tmp.min_y = visible.min_y; } } @@ -708,11 +708,11 @@ static SCREEN_UPDATE_IND16( subsino2 ) } else { - tilemap_draw(bitmap,cliprect, l->tmap, 0, 0); + l->tmap->draw(bitmap, cliprect, 0, 0); } } - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, state->m_layers[1].tmap, 0, 0); + if (layers_ctrl & 2) state->m_layers[1].tmap->draw(bitmap, cliprect, 0, 0); // popmessage("scrl: %03x,%03x - %03x,%03x dis: %02x siz: %02x ctrl: %02x", state->m_layers[0].scroll_x,state->m_layers[0].scroll_y, state->m_layers[1].scroll_x,state->m_layers[1].scroll_y, state->m_ss9601_disable, state->m_ss9601_tilesize, state->m_ss9601_scrollctrl); @@ -1101,7 +1101,7 @@ static WRITE8_HANDLER( mtrain_tilesize_w ) if (l->tilesize != sizes[i]) { l->tilesize = sizes[i]; - tilemap_mark_all_tiles_dirty(l->tmap); + l->tmap->mark_all_dirty(); } } } diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 644b8fc79ad..5d3909d8e4d 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -62,7 +62,7 @@ static SCREEN_UPDATE_IND16( superdq ) { superdq_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -144,7 +144,7 @@ static WRITE8_HANDLER( superdq_videoram_w ) superdq_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset); + state->m_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( superdq_io_w ) diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c index fac99458695..f6c44f89ed7 100644 --- a/src/mame/drivers/superwng.c +++ b/src/mame/drivers/superwng.c @@ -99,7 +99,7 @@ static VIDEO_START( superwng ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scrollx(state->m_bg_tilemap, 0, 64); + state->m_bg_tilemap->set_scrollx(0, 64); } static SCREEN_UPDATE_IND16( superwng ) @@ -107,18 +107,18 @@ static SCREEN_UPDATE_IND16( superwng ) superwng_state *state = screen.machine().driver_data(); int flip=flip_screen_get(screen.machine()); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); rectangle tmp=cliprect; if(flip) { tmp.min_x+=32; - tilemap_draw(bitmap, tmp, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, tmp, 0, 0); } else { tmp.max_x-=32; - tilemap_draw(bitmap, tmp, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, tmp, 0, 0); } { @@ -234,44 +234,44 @@ static WRITE8_HANDLER(superwng_bg_vram_w) { superwng_state *state = space->machine().driver_data(); state->m_videoram_bg[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER(superwng_bg_cram_w) { superwng_state *state = space->machine().driver_data(); state->m_colorram_bg[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER(superwng_fg_vram_w) { superwng_state *state = space->machine().driver_data(); state->m_videoram_fg[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER(superwng_fg_cram_w) { superwng_state *state = space->machine().driver_data(); state->m_colorram_fg[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER(superwng_tilebank_w) { superwng_state *state = space->machine().driver_data(); state->m_tile_bank = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); + state->m_fg_tilemap->mark_all_dirty(); } static WRITE8_HANDLER( superwng_flip_screen_w ) { superwng_state *state = space->machine().driver_data(); flip_screen_set(space->machine(), ~data & 0x01); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); + state->m_fg_tilemap->mark_all_dirty(); } static WRITE8_HANDLER(superwng_cointcnt1_w) diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index dd474c75366..8551733c715 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -72,7 +72,7 @@ static VIDEO_START( suprgolf ) state->m_bg_fb = auto_alloc_array(machine, UINT16, 0x2000*0x20); state->m_fg_fb = auto_alloc_array(machine, UINT16, 0x2000*0x20); - tilemap_set_transparent_pen(state->m_tilemap,15); + state->m_tilemap->set_transparent_pen(15); } static SCREEN_UPDATE_IND16( suprgolf ) @@ -115,7 +115,7 @@ static SCREEN_UPDATE_IND16( suprgolf ) } } - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -150,7 +150,7 @@ static WRITE8_HANDLER( suprgolf_videoram_w ) else { state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, (offset & 0x7fe) >> 1); + state->m_tilemap->mark_tile_dirty((offset & 0x7fe) >> 1); } } diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index 4214d5c7973..10e3c8384a1 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -56,8 +56,8 @@ static TILE_GET_INFO( get_tile_info ) static SCREEN_UPDATE_IND16( tattack ) { tattack_state *state = screen.machine().driver_data(); - tilemap_mark_all_tiles_dirty(state->m_tmap); - tilemap_draw(bitmap,cliprect,state->m_tmap, 0,0); + state->m_tmap->mark_all_dirty(); + state->m_tmap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index 17ad4e2f8ec..edb2b78c611 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -98,7 +98,7 @@ static WRITE16_HANDLER( latch_w ) if (state->m_alpha_tile_bank != ((data >> 2) & 7)) { space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); - tilemap_mark_all_tiles_dirty(state->m_alpha_tilemap); + state->m_alpha_tilemap->mark_all_dirty(); state->m_alpha_tile_bank = (data >> 2) & 7; } } diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index 40be0f3dc0e..6f11c42a2f5 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -430,7 +430,7 @@ static void tmmjprd_do_blit(running_machine &machine) blt_source+=2; writeoffs=blt_oddflg+blt_column; state->m_tilemap_ram[blt_tilemp][writeoffs]=(state->m_tilemap_ram[blt_tilemp][writeoffs]&mask)|(blt_value<mark_tile_dirty(writeoffs); blt_column++; blt_column&=0x7f; @@ -447,7 +447,7 @@ static void tmmjprd_do_blit(running_machine &machine) { writeoffs=blt_oddflg+blt_column; state->m_tilemap_ram[blt_tilemp][writeoffs]=(state->m_tilemap_ram[blt_tilemp][writeoffs]&mask)|(blt_value<mark_tile_dirty(writeoffs); blt_column++; blt_column&=0x7f; } diff --git a/src/mame/drivers/tmspoker.c b/src/mame/drivers/tmspoker.c index 01a8e15271b..f4073002b71 100644 --- a/src/mame/drivers/tmspoker.c +++ b/src/mame/drivers/tmspoker.c @@ -233,7 +233,7 @@ static WRITE8_HANDLER( tmspoker_videoram_w ) { tmspoker_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -260,7 +260,7 @@ static VIDEO_START( tmspoker ) static SCREEN_UPDATE_IND16( tmspoker ) { tmspoker_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 1047358b95f..d0b9cbd93c7 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -204,7 +204,7 @@ static WRITE8_HANDLER( trvmadns_tileram_w ) } state->m_tileram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } @@ -272,7 +272,7 @@ static TILE_GET_INFO( get_bg_tile_info ) SET_TILE_INFO(0,tile,color,flag); - tileinfo->category = (attr & 0x20)>>5; + tileinfo.category = (attr & 0x20)>>5; } static VIDEO_START( trvmadns ) @@ -280,7 +280,7 @@ static VIDEO_START( trvmadns ) trvmadns_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); -// tilemap_set_transparent_pen(fg_tilemap,1); +// fg_tilemap->set_transparent_pen(1); gfx_element_set_source(machine.gfx[0], state->m_gfxram); } diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c index fd6d9d2e38f..29264b63427 100644 --- a/src/mame/drivers/umipoker.c +++ b/src/mame/drivers/umipoker.c @@ -101,10 +101,10 @@ static VIDEO_START( umipoker ) state->m_tilemap_2 = tilemap_create(machine, get_tile_info_2,tilemap_scan_rows,8,8,64,32); state->m_tilemap_3 = tilemap_create(machine, get_tile_info_3,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_tilemap_0,0); - tilemap_set_transparent_pen(state->m_tilemap_1,0); - tilemap_set_transparent_pen(state->m_tilemap_2,0); - tilemap_set_transparent_pen(state->m_tilemap_3,0); + state->m_tilemap_0->set_transparent_pen(0); + state->m_tilemap_1->set_transparent_pen(0); + state->m_tilemap_2->set_transparent_pen(0); + state->m_tilemap_3->set_transparent_pen(0); } @@ -112,17 +112,17 @@ static SCREEN_UPDATE_IND16( umipoker ) { umipoker_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_tilemap_0, 0, state->m_umipoker_scrolly[0]); - tilemap_set_scrolly(state->m_tilemap_1, 0, state->m_umipoker_scrolly[1]); - tilemap_set_scrolly(state->m_tilemap_2, 0, state->m_umipoker_scrolly[2]); - tilemap_set_scrolly(state->m_tilemap_3, 0, state->m_umipoker_scrolly[3]); + state->m_tilemap_0->set_scrolly(0, state->m_umipoker_scrolly[0]); + state->m_tilemap_1->set_scrolly(0, state->m_umipoker_scrolly[1]); + state->m_tilemap_2->set_scrolly(0, state->m_umipoker_scrolly[2]); + state->m_tilemap_3->set_scrolly(0, state->m_umipoker_scrolly[3]); bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap,cliprect,state->m_tilemap_0,0,0); - tilemap_draw(bitmap,cliprect,state->m_tilemap_1,0,0); - tilemap_draw(bitmap,cliprect,state->m_tilemap_2,0,0); - tilemap_draw(bitmap,cliprect,state->m_tilemap_3,0,0); + state->m_tilemap_0->draw(bitmap, cliprect, 0,0); + state->m_tilemap_1->draw(bitmap, cliprect, 0,0); + state->m_tilemap_2->draw(bitmap, cliprect, 0,0); + state->m_tilemap_3->draw(bitmap, cliprect, 0,0); return 0; } @@ -171,7 +171,7 @@ static WRITE16_HANDLER( umipoker_vram_0_w ) umipoker_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_0[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_0,offset >> 1); + state->m_tilemap_0->mark_tile_dirty(offset >> 1); } static WRITE16_HANDLER( umipoker_vram_1_w ) @@ -179,7 +179,7 @@ static WRITE16_HANDLER( umipoker_vram_1_w ) umipoker_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_1[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_1,offset >> 1); + state->m_tilemap_1->mark_tile_dirty(offset >> 1); } @@ -188,7 +188,7 @@ static WRITE16_HANDLER( umipoker_vram_2_w ) umipoker_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_2[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_2,offset >> 1); + state->m_tilemap_2->mark_tile_dirty(offset >> 1); } static WRITE16_HANDLER( umipoker_vram_3_w ) @@ -196,7 +196,7 @@ static WRITE16_HANDLER( umipoker_vram_3_w ) umipoker_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_3[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_3,offset >> 1); + state->m_tilemap_3->mark_tile_dirty(offset >> 1); } static WRITE16_HANDLER( lamps_w ) diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index c54b266761e..1b042e2a60a 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -496,8 +496,8 @@ static VIDEO_START( vidadcba ) static SCREEN_UPDATE_IND16( videopkr ) { videopkr_state *state = screen.machine().driver_data(); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->mark_all_dirty(); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -600,7 +600,7 @@ static WRITE8_HANDLER( videopkr_io_w ) state->m_n_offs = ((state->m_p1 & 0xc0) << 2 ) + offset; state->m_color_ram[state->m_n_offs] = data & 0x0f; state->m_video_ram[state->m_n_offs] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, state->m_n_offs); + state->m_bg_tilemap->mark_tile_dirty(state->m_n_offs); break; } @@ -617,7 +617,7 @@ static WRITE8_HANDLER( videopkr_io_w ) { state->m_n_offs = ((state->m_p1 & 0xc0) << 2 ) + offset; state->m_color_ram[state->m_n_offs] = data & 0x0f; - tilemap_mark_tile_dirty(state->m_bg_tilemap, state->m_n_offs); + state->m_bg_tilemap->mark_tile_dirty(state->m_n_offs); break; } @@ -628,7 +628,7 @@ static WRITE8_HANDLER( videopkr_io_w ) { state->m_n_offs = ((state->m_p1 & 0xc0) << 2 ) + offset; state->m_video_ram[state->m_n_offs] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, state->m_n_offs); + state->m_bg_tilemap->mark_tile_dirty(state->m_n_offs); break; } diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index b002cb7d3b7..a6a52085794 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -129,21 +129,21 @@ static WRITE16_HANDLER( vmetal_texttileram_w ) { vmetal_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_texttileram[offset]); - tilemap_mark_tile_dirty(state->m_texttilemap, offset); + state->m_texttilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( vmetal_mid1tileram_w ) { vmetal_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_mid1tileram[offset]); - tilemap_mark_tile_dirty(state->m_mid1tilemap, offset); + state->m_mid1tilemap->mark_tile_dirty(offset); } static WRITE16_HANDLER( vmetal_mid2tileram_w ) { vmetal_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_mid2tileram[offset]); - tilemap_mark_tile_dirty(state->m_mid2tilemap, offset); + state->m_mid2tilemap->mark_tile_dirty(offset); } @@ -411,9 +411,9 @@ static VIDEO_START(varia) state->m_mid1tilemap = tilemap_create(machine, get_vmetal_mid1tilemap_tile_info, tilemap_scan_rows, 16, 16, 256, 256); state->m_mid2tilemap = tilemap_create(machine, get_vmetal_mid2tilemap_tile_info, tilemap_scan_rows, 16, 16, 256, 256); - tilemap_set_transparent_pen(state->m_texttilemap, 15); - tilemap_set_transparent_pen(state->m_mid1tilemap, 15); - tilemap_set_transparent_pen(state->m_mid2tilemap, 15); + state->m_texttilemap->set_transparent_pen(15); + state->m_mid1tilemap->set_transparent_pen(15); + state->m_mid2tilemap->set_transparent_pen(15); } static SCREEN_UPDATE_IND16(varia) @@ -423,18 +423,18 @@ static SCREEN_UPDATE_IND16(varia) bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_set_scrollx(state->m_mid2tilemap, 0, state->m_vmetal_videoregs[0x06a/2]-64 /*+ state->m_vmetal_videoregs[0x066/2]*/); - tilemap_set_scrollx(state->m_mid1tilemap, 0, state->m_vmetal_videoregs[0x07a/2]-64 /*+ state->m_vmetal_videoregs[0x076/2]*/); - tilemap_set_scrollx(state->m_texttilemap, 0, -64 /*+ state->m_vmetal_videoregs[0x076/2]*/); + state->m_mid2tilemap->set_scrollx(0, state->m_vmetal_videoregs[0x06a/2]-64 /*+ state->m_vmetal_videoregs[0x066/2]*/); + state->m_mid1tilemap->set_scrollx(0, state->m_vmetal_videoregs[0x07a/2]-64 /*+ state->m_vmetal_videoregs[0x076/2]*/); + state->m_texttilemap->set_scrollx(0, -64 /*+ state->m_vmetal_videoregs[0x076/2]*/); - tilemap_set_scrolly(state->m_mid2tilemap, 0, -64); - tilemap_set_scrolly(state->m_mid1tilemap, 0, -64); - tilemap_set_scrolly(state->m_texttilemap, 0, -64); + state->m_mid2tilemap->set_scrolly(0, -64); + state->m_mid1tilemap->set_scrolly(0, -64); + state->m_texttilemap->set_scrolly(0, -64); - tilemap_draw(bitmap, cliprect, state->m_mid1tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_mid2tilemap, 0, 0); + state->m_mid1tilemap->draw(bitmap, cliprect, 0, 0); + state->m_mid2tilemap->draw(bitmap, cliprect, 0, 0); metro_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_texttilemap, 0, 0); + state->m_texttilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index f0b8439c1dd..203fe0b4846 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -81,14 +81,14 @@ static WRITE8_HANDLER( vroulet_videoram_w ) { vroulet_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( vroulet_colorram_w ) { vroulet_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -111,7 +111,7 @@ static VIDEO_START(vroulet) static SCREEN_UPDATE_IND16(vroulet) { vroulet_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], 0x320, 1, 0, 0, state->m_ball[1], state->m_ball[0] - 12, 0); return 0; diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index 52d98da8e18..649c6dbe14e 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -131,7 +131,7 @@ static WRITE8_HANDLER( wallc_videoram_w ) wallc_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -150,7 +150,7 @@ static VIDEO_START( wallc ) static SCREEN_UPDATE_IND16( wallc ) { wallc_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/warpsped.c b/src/mame/drivers/warpsped.c index 03e573e6769..66b87e3ec6e 100644 --- a/src/mame/drivers/warpsped.c +++ b/src/mame/drivers/warpsped.c @@ -128,16 +128,16 @@ static WRITE8_HANDLER( warpspeed_vidram_w ) warpspeed_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_text_tilemap, offset); + state->m_text_tilemap->mark_tile_dirty(offset); } static VIDEO_START( warpspeed ) { warpspeed_state *state = machine.driver_data(); state->m_text_tilemap = tilemap_create(machine, get_warpspeed_text_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_text_tilemap, 0); + state->m_text_tilemap->set_transparent_pen(0); state->m_starfield_tilemap = tilemap_create(machine, get_warpspeed_starfield_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_mark_all_tiles_dirty(state->m_starfield_tilemap); + state->m_starfield_tilemap->mark_all_dirty(); } static void draw_circle_line(bitmap_ind16 &bitmap, int x, int y, int l, int color) @@ -207,9 +207,9 @@ static SCREEN_UPDATE_IND16( warpspeed ) { warpspeed_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_starfield_tilemap, 0, 0); + state->m_starfield_tilemap->draw(bitmap, cliprect, 0, 0); warpspeed_draw_circles(bitmap, state); - tilemap_draw(bitmap, cliprect, state->m_text_tilemap, 0, 0); + state->m_text_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index 1d03f88806f..5350559e51a 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -214,7 +214,7 @@ static WRITE8_HANDLER( geebee_out7_w ) break; case 5: if( state->m_geebee_bgw != (data & 1) ) - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); state->m_geebee_bgw = data & 1; break; case 6: diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index a70d6e3aecb..0568775019d 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -55,7 +55,7 @@ static VIDEO_START( wink ) static SCREEN_UPDATE_IND16( wink ) { wink_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -64,7 +64,7 @@ static WRITE8_HANDLER( bgram_w ) wink_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( player_mux_w ) @@ -77,7 +77,7 @@ static WRITE8_HANDLER( tile_banking_w ) { wink_state *state = space->machine().driver_data(); state->m_tile_bank = data & 1; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } static WRITE8_HANDLER( wink_coin_counter_w ) diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 81993f344f6..c5e32a66143 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -277,16 +277,16 @@ static WRITE8_HANDLER( gfx0_vram_w ) { witch_state *state = space->machine().driver_data(); state->m_gfx0_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_gfx0a_tilemap,offset); - tilemap_mark_tile_dirty(state->m_gfx0b_tilemap,offset); + state->m_gfx0a_tilemap->mark_tile_dirty(offset); + state->m_gfx0b_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( gfx0_cram_w ) { witch_state *state = space->machine().driver_data(); state->m_gfx0_cram[offset] = data; - tilemap_mark_tile_dirty(state->m_gfx0a_tilemap,offset); - tilemap_mark_tile_dirty(state->m_gfx0b_tilemap,offset); + state->m_gfx0a_tilemap->mark_tile_dirty(offset); + state->m_gfx0b_tilemap->mark_tile_dirty(offset); } static READ8_HANDLER( gfx0_vram_r ) { @@ -308,7 +308,7 @@ static WRITE8_HANDLER( gfx1_vram_w ) witch_state *state = space->machine().driver_data(); FIX_OFFSET(); state->m_gfx1_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_gfx1_tilemap,offset); + state->m_gfx1_tilemap->mark_tile_dirty(offset); } static WRITE8_HANDLER( gfx1_cram_w ) @@ -316,7 +316,7 @@ static WRITE8_HANDLER( gfx1_cram_w ) witch_state *state = space->machine().driver_data(); FIX_OFFSET(); state->m_gfx1_cram[offset] = data; - tilemap_mark_tile_dirty(state->m_gfx1_tilemap,offset); + state->m_gfx1_tilemap->mark_tile_dirty(offset); } static READ8_HANDLER( gfx1_vram_r ) { @@ -701,11 +701,11 @@ static VIDEO_START(witch) state->m_gfx0b_tilemap = tilemap_create(machine, get_gfx0b_tile_info,tilemap_scan_rows,8,8,32,32); state->m_gfx1_tilemap = tilemap_create(machine, get_gfx1_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_gfx0a_tilemap,0); - tilemap_set_transparent_pen(state->m_gfx0b_tilemap,0); - tilemap_set_palette_offset(state->m_gfx0a_tilemap,0x100); - tilemap_set_palette_offset(state->m_gfx0b_tilemap,0x100); - tilemap_set_palette_offset(state->m_gfx1_tilemap,0x200); + state->m_gfx0a_tilemap->set_transparent_pen(0); + state->m_gfx0b_tilemap->set_transparent_pen(0); + state->m_gfx0a_tilemap->set_palette_offset(0x100); + state->m_gfx0b_tilemap->set_palette_offset(0x100); + state->m_gfx1_tilemap->set_palette_offset(0x200); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -759,15 +759,15 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r static SCREEN_UPDATE_IND16(witch) { witch_state *state = screen.machine().driver_data(); - tilemap_set_scrollx( state->m_gfx1_tilemap, 0, state->m_scrollx-7 ); //offset to have it aligned with the sprites - tilemap_set_scrolly( state->m_gfx1_tilemap, 0, state->m_scrolly+8 ); + state->m_gfx1_tilemap->set_scrollx(0, state->m_scrollx-7 ); //offset to have it aligned with the sprites + state->m_gfx1_tilemap->set_scrolly(0, state->m_scrolly+8 ); - tilemap_draw(bitmap,cliprect,state->m_gfx1_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_gfx0a_tilemap,0,0); + state->m_gfx1_tilemap->draw(bitmap, cliprect, 0,0); + state->m_gfx0a_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap,cliprect,state->m_gfx0b_tilemap,0,0); + state->m_gfx0b_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index ea1b1a12541..f5382907795 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -52,7 +52,6 @@ public: void (*m_modify_spritecode)(running_machine &machine, UINT8 *spriteram, int*, int*, int*, int); /* function to call to do sprite banking */ void (*m_modify_color)(UINT8 *color); /* function to call to do modify how the color codes map to the PROM */ void (*m_modify_ypos)(UINT8*); /* function to call to do modify how vertical positioning bits are connected */ - void (*m_tilemap_set_scroll)( tilemap_t *, int col, int value ); UINT8 m_timer_adjusted; UINT8 m_darkplnt_bullet_color; diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index cea2dbfef0d..5b56dfa838d 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -953,13 +953,13 @@ static TIMER_CALLBACK( atarivc_eof_update ) atarimo_set_xscroll(0, state->m_atarivc_state.mo_xscroll); atarimo_set_yscroll(0, state->m_atarivc_state.mo_yscroll); - tilemap_set_scrollx(state->m_playfield_tilemap, 0, state->m_atarivc_state.pf0_xscroll); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, state->m_atarivc_state.pf0_yscroll); + state->m_playfield_tilemap->set_scrollx(0, state->m_atarivc_state.pf0_xscroll); + state->m_playfield_tilemap->set_scrolly(0, state->m_atarivc_state.pf0_yscroll); if (state->m_atarivc_playfields > 1) { - tilemap_set_scrollx(state->m_playfield2_tilemap, 0, state->m_atarivc_state.pf1_xscroll); - tilemap_set_scrolly(state->m_playfield2_tilemap, 0, state->m_atarivc_state.pf1_yscroll); + state->m_playfield2_tilemap->set_scrollx(0, state->m_atarivc_state.pf1_xscroll); + state->m_playfield2_tilemap->set_scrolly(0, state->m_atarivc_state.pf1_yscroll); } timer->adjust(screen.time_until_pos(0)); @@ -1178,7 +1178,7 @@ WRITE16_HANDLER( atarigen_alpha_w ) { atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_alpha[offset]); - tilemap_mark_tile_dirty(state->m_alpha_tilemap, offset); + state->m_alpha_tilemap->mark_tile_dirty(offset); } WRITE32_HANDLER( atarigen_alpha32_w ) @@ -1186,16 +1186,16 @@ WRITE32_HANDLER( atarigen_alpha32_w ) atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_alpha32[offset]); if (ACCESSING_BITS_16_31) - tilemap_mark_tile_dirty(state->m_alpha_tilemap, offset * 2); + state->m_alpha_tilemap->mark_tile_dirty(offset * 2); if (ACCESSING_BITS_0_15) - tilemap_mark_tile_dirty(state->m_alpha_tilemap, offset * 2 + 1); + state->m_alpha_tilemap->mark_tile_dirty(offset * 2 + 1); } WRITE16_HANDLER( atarigen_alpha2_w ) { atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_alpha2[offset]); - tilemap_mark_tile_dirty(state->m_alpha2_tilemap, offset); + state->m_alpha2_tilemap->mark_tile_dirty(offset); } @@ -1225,7 +1225,7 @@ WRITE16_HANDLER( atarigen_playfield_w ) { atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield[offset]); - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offset); + state->m_playfield_tilemap->mark_tile_dirty(offset); } WRITE32_HANDLER( atarigen_playfield32_w ) @@ -1233,16 +1233,16 @@ WRITE32_HANDLER( atarigen_playfield32_w ) atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield32[offset]); if (ACCESSING_BITS_16_31) - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offset * 2); + state->m_playfield_tilemap->mark_tile_dirty(offset * 2); if (ACCESSING_BITS_0_15) - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offset * 2 + 1); + state->m_playfield_tilemap->mark_tile_dirty(offset * 2 + 1); } WRITE16_HANDLER( atarigen_playfield2_w ) { atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield2[offset]); - tilemap_mark_tile_dirty(state->m_playfield2_tilemap, offset); + state->m_playfield2_tilemap->mark_tile_dirty(offset); } @@ -1256,7 +1256,7 @@ WRITE16_HANDLER( atarigen_playfield_large_w ) { atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield[offset]); - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offset / 2); + state->m_playfield_tilemap->mark_tile_dirty(offset / 2); } @@ -1270,7 +1270,7 @@ WRITE16_HANDLER( atarigen_playfield_upper_w ) { atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield_upper[offset]); - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offset); + state->m_playfield_tilemap->mark_tile_dirty(offset); } @@ -1284,8 +1284,8 @@ WRITE16_HANDLER( atarigen_playfield_dual_upper_w ) { atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield_upper[offset]); - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offset); - tilemap_mark_tile_dirty(state->m_playfield2_tilemap, offset); + state->m_playfield_tilemap->mark_tile_dirty(offset); + state->m_playfield2_tilemap->mark_tile_dirty(offset); } @@ -1301,7 +1301,7 @@ WRITE16_HANDLER( atarigen_playfield_latched_lsb_w ) atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield[offset]); - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offset); + state->m_playfield_tilemap->mark_tile_dirty(offset); if (state->m_playfield_latch != -1) state->m_playfield_upper[offset] = (state->m_playfield_upper[offset] & ~0x00ff) | (state->m_playfield_latch & 0x00ff); @@ -1320,7 +1320,7 @@ WRITE16_HANDLER( atarigen_playfield_latched_msb_w ) atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield[offset]); - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offset); + state->m_playfield_tilemap->mark_tile_dirty(offset); if (state->m_playfield_latch != -1) state->m_playfield_upper[offset] = (state->m_playfield_upper[offset] & ~0xff00) | (state->m_playfield_latch & 0xff00); @@ -1339,7 +1339,7 @@ WRITE16_HANDLER( atarigen_playfield2_latched_msb_w ) atarigen_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_playfield2[offset]); - tilemap_mark_tile_dirty(state->m_playfield2_tilemap, offset); + state->m_playfield2_tilemap->mark_tile_dirty(offset); if (state->m_playfield2_latch != -1) state->m_playfield_upper[offset] = (state->m_playfield_upper[offset] & ~0xff00) | (state->m_playfield2_latch & 0xff00); diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c index c1ab95fa3fa..521905e572e 100644 --- a/src/mame/machine/megadriv.c +++ b/src/mame/machine/megadriv.c @@ -5703,12 +5703,12 @@ static int segacd_get_active_stampmap_tilemap(void) #if 0 static void segacd_mark_stampmaps_dirty(void) { - tilemap_mark_all_tiles_dirty(segacd_stampmap[segacd_get_active_stampmap_tilemap()]); + segacd_stampmap[segacd_get_active_stampmap_tilemap(->mark_all_dirty()]); - //tilemap_mark_all_tiles_dirty(segacd_stampmap[0]); - //tilemap_mark_all_tiles_dirty(segacd_stampmap[1]); - //tilemap_mark_all_tiles_dirty(segacd_stampmap[2]); - //tilemap_mark_all_tiles_dirty(segacd_stampmap[3]); + //segacd_stampmap[0]->mark_all_dirty(); + //segacd_stampmap[1]->mark_all_dirty(); + //segacd_stampmap[2]->mark_all_dirty(); + //segacd_stampmap[3]->mark_all_dirty(); } #endif @@ -6514,7 +6514,7 @@ WRITE16_HANDLER( segacd_trace_vector_base_address_w ) int line; - //bitmap_ind16 *srcbitmap = tilemap_get_pixmap(segacd_stampmap[segacd_get_active_stampmap_tilemap()]); + //bitmap_ind16 *srcbitmap = segacd_stampmap[segacd_get_active_stampmap_tilemap(->pixmap()]); bitmap_ind16 *srcbitmap = 0; UINT32 bufferstart = ((segacd_imagebuffer_start_address&0xfff8)*2)<<3; diff --git a/src/mame/machine/nb1414m4.c b/src/mame/machine/nb1414m4.c index aedd88de947..6f9b98b5b5a 100644 --- a/src/mame/machine/nb1414m4.c +++ b/src/mame/machine/nb1414m4.c @@ -300,5 +300,5 @@ void nb_1414m4_exec(address_space *space,UINT16 mcu_cmd,UINT8 *vram,UINT16 &scro } /* mark tiles dirty */ - tilemap_mark_all_tiles_dirty(tilemap); + tilemap->mark_all_dirty(); } diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c index aeb1ab778eb..75307df5a62 100644 --- a/src/mame/machine/wrally.c +++ b/src/mame/machine/wrally.c @@ -24,7 +24,7 @@ WRITE16_HANDLER( wrally_vram_w ) data = gaelco_decrypt(space, offset, data, 0x1f, 0x522a); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_pant[(offset & 0x1fff) >> 12], ((offset << 1) & 0x1fff) >> 2); + state->m_pant[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2); } WRITE16_HANDLER( wrally_flipscreen_w ) diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index f512a0bbfb1..b1d99abf054 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -130,7 +130,7 @@ VIDEO_START( 1942 ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 16); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -145,7 +145,7 @@ WRITE8_HANDLER( c1942_fgvideoram_w ) _1942_state *state = space->machine().driver_data<_1942_state>(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( c1942_bgvideoram_w ) @@ -153,7 +153,7 @@ WRITE8_HANDLER( c1942_bgvideoram_w ) _1942_state *state = space->machine().driver_data<_1942_state>(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, (offset & 0x0f) | ((offset >> 1) & 0x01f0)); + state->m_bg_tilemap->mark_tile_dirty((offset & 0x0f) | ((offset >> 1) & 0x01f0)); } @@ -164,7 +164,7 @@ WRITE8_HANDLER( c1942_palette_bank_w ) if (state->m_palette_bank != data) { state->m_palette_bank = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -173,7 +173,7 @@ WRITE8_HANDLER( c1942_scroll_w ) _1942_state *state = space->machine().driver_data<_1942_state>(); state->m_scroll[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll[0] | (state->m_scroll[1] << 8)); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll[0] | (state->m_scroll[1] << 8)); } @@ -244,8 +244,8 @@ SCREEN_UPDATE_IND16( 1942 ) { _1942_state *state = screen.machine().driver_data<_1942_state>(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index 3d75151a11b..6b6b7c9c908 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -123,7 +123,7 @@ WRITE8_HANDLER( c1943_videoram_w ) _1943_state *state = space->machine().driver_data<_1943_state>(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( c1943_colorram_w ) @@ -131,7 +131,7 @@ WRITE8_HANDLER( c1943_colorram_w ) _1943_state *state = space->machine().driver_data<_1943_state>(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( c1943_c804_w ) @@ -191,7 +191,7 @@ static TILE_GET_INFO( c1943_get_bg_tile_info ) int color = (attr & 0x3c) >> 2; int flags = TILE_FLIPYX((attr & 0xc0) >> 6); - tileinfo->group = color; + tileinfo.group = color; SET_TILE_INFO(1, code, color, flags); } @@ -213,7 +213,7 @@ VIDEO_START( 1943 ) state->m_fg_tilemap = tilemap_create(machine, c1943_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); colortable_configure_tilemap_groups(machine.colortable, state->m_bg_tilemap, machine.gfx[1], 0x0f); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->save_item(NAME(state->m_char_on)); state->save_item(NAME(state->m_obj_on)); @@ -257,12 +257,12 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( 1943 ) { _1943_state *state = screen.machine().driver_data<_1943_state>(); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bgscrollx[0] + 256 * state->m_bgscrollx[1]); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx[0] + 256 * state->m_scrollx[1]); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrolly[0]); + state->m_bg2_tilemap->set_scrollx(0, state->m_bgscrollx[0] + 256 * state->m_bgscrollx[1]); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx[0] + 256 * state->m_scrollx[1]); + state->m_bg_tilemap->set_scrolly(0, state->m_scrolly[0]); if (state->m_bg2_on) - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(get_black_pen(screen.machine()), cliprect); @@ -270,13 +270,13 @@ SCREEN_UPDATE_IND16( 1943 ) draw_sprites(screen.machine(), bitmap, cliprect, 0); if (state->m_bg1_on) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_obj_on) draw_sprites(screen.machine(), bitmap, cliprect, 1); if (state->m_char_on) - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c index a6b9c822c77..50c2f88d9e9 100644 --- a/src/mame/video/40love.c +++ b/src/mame/video/40love.c @@ -90,7 +90,7 @@ static void redraw_pixels(running_machine &machine) { fortyl_state *state = machine.driver_data(); state->m_pix_redraw = 1; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } @@ -113,8 +113,8 @@ VIDEO_START( fortyl ) state->m_xoffset = 128; // this never changes - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_scroll_rows(32); + state->m_bg_tilemap->set_transparent_pen(0); state->save_item(NAME(state->m_flipscreen)); state->save_item(NAME(state->m_pix_color)); @@ -147,7 +147,7 @@ static void fortyl_set_scroll_x( running_machine &machine, int offset ) x &= 0x1ff; if (x & 0x100) x -= 0x200; /* sign extend */ - tilemap_set_scrollx(state->m_bg_tilemap, offset / 2, x); + state->m_bg_tilemap->set_scrollx(offset / 2, x); } WRITE8_HANDLER( fortyl_pixram_sel_w ) @@ -223,7 +223,7 @@ WRITE8_HANDLER( fortyl_bg_videoram_w ) { fortyl_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( fortyl_bg_videoram_r ) @@ -241,7 +241,7 @@ WRITE8_HANDLER( fortyl_bg_colorram_w ) state->m_colorram[offset] = data; for (i = (offset / 2) * 64; i < (offset / 2) * 64 + 64; i++) - tilemap_mark_tile_dirty(state->m_bg_tilemap, i); + state->m_bg_tilemap->mark_tile_dirty(i); fortyl_set_scroll_x(space->machine(), offset); } @@ -363,8 +363,8 @@ SCREEN_UPDATE_IND16( fortyl ) fortyl_state *state = screen.machine().driver_data(); draw_pixram(screen.machine(), bitmap, cliprect); - tilemap_set_scrolldy(state->m_bg_tilemap, - state->m_video_ctrl[1] + 1, - state->m_video_ctrl[1] - 1 ); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrolldy(- state->m_video_ctrl[1] + 1, - state->m_video_ctrl[1] - 1 ); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c index d660f0a4d21..a6e19a30321 100644 --- a/src/mame/video/4enraya.c +++ b/src/mame/video/4enraya.c @@ -15,7 +15,7 @@ WRITE8_HANDLER( fenraya_videoram_w ) state->m_videoram[(offset & 0x3ff) * 2] = data; state->m_videoram[(offset & 0x3ff) * 2 + 1] = (offset & 0xc00) >> 10; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } static TILE_GET_INFO( get_tile_info ) @@ -41,6 +41,6 @@ SCREEN_UPDATE_IND16( 4enraya ) { _4enraya_state *state = screen.machine().driver_data<_4enraya_state>(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c index 36778d9386f..d11a0c18cc4 100644 --- a/src/mame/video/actfancr.c +++ b/src/mame/video/actfancr.c @@ -30,7 +30,7 @@ SCREEN_UPDATE_IND16( actfancr ) /* Draw playfield */ //state->m_flipscreen = state->m_control_2[0] & 0x80; - //tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + //screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); screen.machine().device("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram16, 0x00, 0x00, 0x0f); diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index 9bbf144b7e1..47359ccd6c8 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -45,8 +45,8 @@ VIDEO_START( aeroboto ) aeroboto_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 64); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_scroll_rows(state->m_bg_tilemap, 64); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scroll_rows(64); state->save_item(NAME(state->m_charbank)); state->save_item(NAME(state->m_starsoff)); @@ -94,7 +94,7 @@ WRITE8_HANDLER( aeroboto_3000_w ) /* bit 1 = char bank select */ if (state->m_charbank != ((data & 0x02) >> 1)) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_charbank = (data & 0x02) >> 1; } @@ -107,7 +107,7 @@ WRITE8_HANDLER( aeroboto_videoram_w ) aeroboto_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( aeroboto_tilecolor_w ) @@ -117,7 +117,7 @@ WRITE8_HANDLER( aeroboto_tilecolor_w ) if (state->m_tilecolor[offset] != data) { state->m_tilecolor[offset] = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -214,16 +214,16 @@ SCREEN_UPDATE_IND16( aeroboto ) } for (y = 0; y < 64; y++) - tilemap_set_scrollx(state->m_bg_tilemap, y, state->m_hscroll[y]); + state->m_bg_tilemap->set_scrollx(y, state->m_hscroll[y]); // the playfield is part of a splitscreen and should not overlap with status display - tilemap_set_scrolly(state->m_bg_tilemap, 0, *state->m_vscroll); - tilemap_draw(bitmap, splitrect2, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrolly(0, *state->m_vscroll); + state->m_bg_tilemap->draw(bitmap, splitrect2, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); // the status display behaves more closely to a 40-line splitscreen than an overlay - tilemap_set_scrolly(state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, splitrect1, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrolly(0, 0); + state->m_bg_tilemap->draw(bitmap, splitrect1, 0, 0); return 0; } diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index 150d7296c31..aa0097bed37 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -116,7 +116,7 @@ VIDEO_START( karatblz ) state->m_bg1_tilemap = tilemap_create(machine, karatblz_bg1_tile_info,tilemap_scan_rows, 8,8,64,64); state->m_bg2_tilemap = tilemap_create(machine, karatblz_bg2_tile_info,tilemap_scan_rows,8,8,64,64); - tilemap_set_transparent_pen(state->m_bg2_tilemap, 15); + state->m_bg2_tilemap->set_transparent_pen(15); state->m_spritepalettebank = 0; state->m_sprite_gfx = 2; @@ -131,7 +131,7 @@ VIDEO_START( spinlbrk ) state->m_bg1_tilemap = tilemap_create(machine, spinlbrk_bg1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->m_bg2_tilemap = tilemap_create(machine, karatblz_bg2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_bg2_tilemap, 15); + state->m_bg2_tilemap->set_transparent_pen(15); state->m_spritepalettebank = 0; state->m_sprite_gfx = 2; @@ -160,7 +160,7 @@ VIDEO_START( turbofrc ) state->m_bg1_tilemap = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_bg2_tilemap, 15); + state->m_bg2_tilemap->set_transparent_pen(15); state->m_spritepalettebank = 0; state->m_sprite_gfx = 2; @@ -174,7 +174,7 @@ VIDEO_START( wbbc97 ) state->m_bg1_tilemap = tilemap_create(machine, get_pspikes_tile_info, tilemap_scan_rows, 8, 8, 64, 32); /* no bg2 in this game */ - tilemap_set_transparent_pen(state->m_bg1_tilemap, 15); + state->m_bg1_tilemap->set_transparent_pen(15); state->m_sprite_gfx = 1; @@ -193,14 +193,14 @@ WRITE16_HANDLER( aerofgt_bg1videoram_w ) { aerofgt_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg1videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg1_tilemap, offset); + state->m_bg1_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( aerofgt_bg2videoram_w ) { aerofgt_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg2videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset); + state->m_bg2_tilemap->mark_tile_dirty(offset); } @@ -210,7 +210,7 @@ static void setbank( running_machine &machine, tilemap_t *tmap, int num, int ban if (state->m_gfxbank[num] != bank) { state->m_gfxbank[num] = bank; - tilemap_mark_all_tiles_dirty(tmap); + tmap->mark_all_dirty(); } } @@ -316,7 +316,7 @@ WRITE16_HANDLER( pspikes_palette_bank_w ) if (state->m_charpalettebank != (data & 0x1c) >> 2) { state->m_charpalettebank = (data & 0x1c) >> 2; - tilemap_mark_all_tiles_dirty(state->m_bg1_tilemap); + state->m_bg1_tilemap->mark_all_dirty(); } } } @@ -844,15 +844,15 @@ SCREEN_UPDATE_IND16( pspikes ) aerofgt_state *state = screen.machine().driver_data(); int i, scrolly; - tilemap_set_scroll_rows(state->m_bg1_tilemap, 256); + state->m_bg1_tilemap->set_scroll_rows(256); scrolly = state->m_bg1scrolly; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0xff, state->m_rasterram[i]); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, scrolly); + state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0xff, state->m_rasterram[i]); + state->m_bg1_tilemap->set_scrolly(0, scrolly); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, -1); turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0); return 0; @@ -863,13 +863,13 @@ SCREEN_UPDATE_IND16( pspikesb ) aerofgt_state *state = screen.machine().driver_data(); int i, scrolly; - tilemap_set_scroll_rows(state->m_bg1_tilemap, 256); + state->m_bg1_tilemap->set_scroll_rows(256); scrolly = state->m_bg1scrolly; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0xff, state->m_rasterram[i] + 22); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, scrolly); + state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0xff, state->m_rasterram[i] + 22); + state->m_bg1_tilemap->set_scrolly(0, scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); pspikesb_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -882,14 +882,14 @@ SCREEN_UPDATE_IND16( spikes91 ) int count; const gfx_element *gfx = screen.machine().gfx[0]; - tilemap_set_scroll_rows(state->m_bg1_tilemap, 256); + state->m_bg1_tilemap->set_scroll_rows(256); scrolly = state->m_bg1scrolly; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0xff, state->m_rasterram[i + 0x01f0 / 2] + 0x96 + 0x16); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, scrolly); + state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0xff, state->m_rasterram[i + 0x01f0 / 2] + 0x96 + 0x16); + state->m_bg1_tilemap->set_scrolly(0, scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); spikes91_draw_sprites(screen.machine(), bitmap, cliprect); /* we could use a tilemap, but it's easier to just do it here */ @@ -918,15 +918,15 @@ SCREEN_UPDATE_IND16( spikes91 ) SCREEN_UPDATE_IND16( karatblz ) { aerofgt_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg1_tilemap, 0, state->m_bg1scrollx - 8); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, state->m_bg1scrolly); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bg2scrollx - 4); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2scrolly); + state->m_bg1_tilemap->set_scrollx(0, state->m_bg1scrollx - 8); + state->m_bg1_tilemap->set_scrolly(0, state->m_bg1scrolly); + state->m_bg2_tilemap->set_scrollx(0, state->m_bg2scrollx - 4); + state->m_bg2_tilemap->set_scrolly(0, state->m_bg2scrolly); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); /* we use the priority buffer so sprites are drawn front to back */ turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 1, -1); @@ -941,18 +941,18 @@ SCREEN_UPDATE_IND16( spinlbrk ) aerofgt_state *state = screen.machine().driver_data(); int i, scrolly; - tilemap_set_scroll_rows(state->m_bg1_tilemap, 512); + state->m_bg1_tilemap->set_scroll_rows(512); scrolly = 0; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0x1ff, state->m_rasterram[i] - 8); -// tilemap_set_scrolly(state->m_bg1_tilemap, 0, state->m_bg1scrolly); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bg2scrollx - 4); -// tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2scrolly); + state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0x1ff, state->m_rasterram[i] - 8); +// state->m_bg1_tilemap->set_scrolly(0, state->m_bg1scrolly); + state->m_bg2_tilemap->set_scrollx(0, state->m_bg2scrollx - 4); +// state->m_bg2_tilemap->set_scrolly(0, state->m_bg2scrolly); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 1); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 1); /* we use the priority buffer so sprites are drawn front to back */ spinlbrk_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0); @@ -967,19 +967,19 @@ SCREEN_UPDATE_IND16( turbofrc ) aerofgt_state *state = screen.machine().driver_data(); int i, scrolly; - tilemap_set_scroll_rows(state->m_bg1_tilemap, 512); + state->m_bg1_tilemap->set_scroll_rows(512); scrolly = state->m_bg1scrolly + 2; for (i = 0; i < 256; i++) -// tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0x1ff, state->m_rasterram[i] - 11); - tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0x1ff, state->m_rasterram[7] - 11); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, scrolly); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bg2scrollx - 7); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2scrolly + 2); +// state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0x1ff, state->m_rasterram[i] - 11); + state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0x1ff, state->m_rasterram[7] - 11); + state->m_bg1_tilemap->set_scrolly(0, scrolly); + state->m_bg2_tilemap->set_scrollx(0, state->m_bg2scrollx - 7); + state->m_bg2_tilemap->set_scrolly(0, state->m_bg2scrolly + 2); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 1); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 1); /* we use the priority buffer so sprites are drawn front to back */ turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 1, -1); //ship @@ -992,19 +992,19 @@ SCREEN_UPDATE_IND16( turbofrc ) SCREEN_UPDATE_IND16( aerofgt ) { aerofgt_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg1_tilemap, 0, state->m_rasterram[0x0000] - 18); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, state->m_bg1scrolly); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_rasterram[0x0200] - 20); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2scrolly); + state->m_bg1_tilemap->set_scrollx(0, state->m_rasterram[0x0000] - 18); + state->m_bg1_tilemap->set_scrolly(0, state->m_bg1scrolly); + state->m_bg2_tilemap->set_scrollx(0, state->m_rasterram[0x0200] - 20); + state->m_bg2_tilemap->set_scrolly(0, state->m_bg2scrolly); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); aerofgt_draw_sprites(screen.machine(), bitmap, cliprect, 0); aerofgt_draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); aerofgt_draw_sprites(screen.machine(), bitmap, cliprect, 2); aerofgt_draw_sprites(screen.machine(), bitmap, cliprect, 3); @@ -1017,18 +1017,18 @@ SCREEN_UPDATE_IND16( aerfboot ) aerofgt_state *state = screen.machine().driver_data(); int i, scrolly; - tilemap_set_scroll_rows(state->m_bg1_tilemap, 512); + state->m_bg1_tilemap->set_scroll_rows(512); scrolly = state->m_bg1scrolly + 2; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0x1ff, state->m_rasterram[7] + 174); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, scrolly); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bg2scrollx + 172); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2scrolly + 2); + state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0x1ff, state->m_rasterram[7] + 174); + state->m_bg1_tilemap->set_scrolly(0, scrolly); + state->m_bg2_tilemap->set_scrollx(0, state->m_bg2scrollx + 172); + state->m_bg2_tilemap->set_scrolly(0, state->m_bg2scrolly + 2); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 1); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 1); /* we use the priority buffer so sprites are drawn front to back */ aerfboot_draw_sprites(screen.machine(), bitmap, cliprect); @@ -1040,19 +1040,19 @@ SCREEN_UPDATE_IND16( aerfboo2 ) aerofgt_state *state = screen.machine().driver_data(); int i, scrolly; - tilemap_set_scroll_rows(state->m_bg1_tilemap, 512); + state->m_bg1_tilemap->set_scroll_rows(512); scrolly = state->m_bg1scrolly + 2; for (i = 0; i < 256; i++) -// tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0x1ff, state->m_rasterram[i] - 11); - tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0x1ff, state->m_rasterram[7] - 11); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, scrolly); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bg2scrollx - 7); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2scrolly + 2); +// state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0x1ff, state->m_rasterram[i] - 11); + state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0x1ff, state->m_rasterram[7] - 11); + state->m_bg1_tilemap->set_scrolly(0, scrolly); + state->m_bg2_tilemap->set_scrollx(0, state->m_bg2scrollx - 7); + state->m_bg2_tilemap->set_scrolly(0, state->m_bg2scrolly + 2); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 1); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 1); /* we use the priority buffer so sprites are drawn front to back */ aerfboo2_draw_sprites(screen.machine(), bitmap, cliprect, 1, -1); //ship @@ -1067,22 +1067,22 @@ SCREEN_UPDATE_RGB32( wbbc97 ) aerofgt_state *state = screen.machine().driver_data(); int i, scrolly; - tilemap_set_scroll_rows(state->m_bg1_tilemap, 256); + state->m_bg1_tilemap->set_scroll_rows(256); scrolly = state->m_bg1scrolly; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg1_tilemap, (i + scrolly) & 0xff, state->m_rasterram[i]); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, scrolly); + state->m_bg1_tilemap->set_scrollx((i + scrolly) & 0xff, state->m_rasterram[i]); + state->m_bg1_tilemap->set_scrolly(0, scrolly); screen.machine().priority_bitmap.fill(0, cliprect); if (state->m_wbbc97_bitmap_enable) { wbbc97_draw_bitmap(screen.machine(), bitmap); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); } else { - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); } turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, -1); diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c index 19d34dfdc52..4185e1bb763 100644 --- a/src/mame/video/airbustr.c +++ b/src/mame/video/airbustr.c @@ -38,28 +38,28 @@ WRITE8_HANDLER( airbustr_videoram_w ) { airbustr_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( airbustr_colorram_w ) { airbustr_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( airbustr_videoram2_w ) { airbustr_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( airbustr_colorram2_w ) { airbustr_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } /* Scroll Registers @@ -88,10 +88,10 @@ WRITE8_HANDLER( airbustr_scrollregs_w ) default: logerror("CPU #2 - port %02X written with %02X - PC = %04X\n", offset, data, cpu_get_pc(&space->device())); } - tilemap_set_scrolly(state->m_bg_tilemap, 0, ((state->m_highbits << 5) & 0x100) + state->m_bg_scrolly); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((state->m_highbits << 6) & 0x100) + state->m_bg_scrollx); - tilemap_set_scrolly(state->m_fg_tilemap, 0, ((state->m_highbits << 7) & 0x100) + state->m_fg_scrolly); - tilemap_set_scrollx(state->m_fg_tilemap, 0, ((state->m_highbits << 8) & 0x100) + state->m_fg_scrollx); + state->m_bg_tilemap->set_scrolly(0, ((state->m_highbits << 5) & 0x100) + state->m_bg_scrolly); + state->m_bg_tilemap->set_scrollx(0, ((state->m_highbits << 6) & 0x100) + state->m_bg_scrollx); + state->m_fg_tilemap->set_scrolly(0, ((state->m_highbits << 7) & 0x100) + state->m_fg_scrolly); + state->m_fg_tilemap->set_scrollx(0, ((state->m_highbits << 8) & 0x100) + state->m_fg_scrollx); } static TILE_GET_INFO( get_fg_tile_info ) @@ -122,12 +122,12 @@ VIDEO_START( airbustr ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); machine.primary_screen->register_screen_bitmap(state->m_sprites_bitmap); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg_tilemap, 0x094, 0x06a); - tilemap_set_scrolldy(state->m_bg_tilemap, 0x100, 0x1ff); - tilemap_set_scrolldx(state->m_fg_tilemap, 0x094, 0x06a); - tilemap_set_scrolldy(state->m_fg_tilemap, 0x100, 0x1ff); + state->m_bg_tilemap->set_scrolldx(0x094, 0x06a); + state->m_bg_tilemap->set_scrolldy(0x100, 0x1ff); + state->m_fg_tilemap->set_scrolldx(0x094, 0x06a); + state->m_fg_tilemap->set_scrolldy(0x100, 0x1ff); state->save_item(NAME(state->m_sprites_bitmap)); } @@ -137,8 +137,8 @@ SCREEN_UPDATE_IND16( airbustr ) { airbustr_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); // copy the sprite bitmap to the screen pandora_update(state->m_pandora, bitmap, cliprect); diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index 40c0ef8040f..42ada0e9711 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -61,7 +61,7 @@ WRITE16_HANDLER( alpha68k_videoram_w ) else state->m_videoram[offset] = (data >> 8) & 0xff; - tilemap_mark_tile_dirty(state->m_fix_tilemap, offset / 2); + state->m_fix_tilemap->mark_tile_dirty(offset / 2); } VIDEO_START( alpha68k ) @@ -69,7 +69,7 @@ VIDEO_START( alpha68k ) alpha68k_state *state = machine.driver_data(); state->m_fix_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); } /******************************************************************************/ @@ -133,10 +133,10 @@ SCREEN_UPDATE_IND16( alpha68k_II ) alpha68k_state *state = screen.machine().driver_data(); if (state->m_last_bank != state->m_bank_base) - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); state->m_last_bank = state->m_bank_base; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); bitmap.fill(2047, cliprect); //AT @@ -145,7 +145,7 @@ SCREEN_UPDATE_IND16( alpha68k_II ) draw_sprites(screen.machine(), bitmap, cliprect, 2, 0x0000, 0x0800); draw_sprites(screen.machine(), bitmap, cliprect, 0, 0x0000, 0x07c0); //ZT - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -281,10 +281,10 @@ SCREEN_UPDATE_IND16( alpha68k_V ) UINT16 *spriteram = state->m_spriteram; if (state->m_last_bank != state->m_bank_base) - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); state->m_last_bank = state->m_bank_base; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); bitmap.fill(4095, cliprect); @@ -312,7 +312,7 @@ SCREEN_UPDATE_IND16( alpha68k_V ) draw_sprites_V(screen.machine(), bitmap, cliprect, 0, 0x0000, 0x07c0, 0x8000, 0, 0x7fff); } - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -321,10 +321,10 @@ SCREEN_UPDATE_IND16( alpha68k_V_sb ) alpha68k_state *state = screen.machine().driver_data(); if (state->m_last_bank != state->m_bank_base) - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); state->m_last_bank = state->m_bank_base; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); bitmap.fill(4095, cliprect); @@ -334,7 +334,7 @@ SCREEN_UPDATE_IND16( alpha68k_V_sb ) draw_sprites_V(screen.machine(), bitmap, cliprect, 2, 0x0000, 0x0800, 0x4000, 0x8000, 0x3fff); draw_sprites_V(screen.machine(), bitmap, cliprect, 0, 0x0000, 0x07c0, 0x4000, 0x8000, 0x3fff); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c index e1d9b711448..6a960863479 100644 --- a/src/mame/video/ampoker2.c +++ b/src/mame/video/ampoker2.c @@ -116,7 +116,7 @@ WRITE8_HANDLER( ampoker2_videoram_w ) ampoker2_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_bg_tile_info ) @@ -164,6 +164,6 @@ VIDEO_START(sigma2k) SCREEN_UPDATE_IND16(ampoker2) { ampoker2_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index c10ed0174b5..9b11890793b 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -59,14 +59,14 @@ WRITE8_HANDLER( amspdwy_videoram_w ) { amspdwy_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( amspdwy_colorram_w ) { amspdwy_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -149,7 +149,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( amspdwy ) { amspdwy_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 222aae91228..616d30f1f62 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -28,7 +28,7 @@ WRITE8_HANDLER( angelkds_txvideoram_w ) angelkds_state *state = space->machine().driver_data(); state->m_txvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( angelkds_txbank_write ) @@ -38,7 +38,7 @@ WRITE8_HANDLER( angelkds_txbank_write ) if (state->m_txbank != data) { state->m_txbank = data; - tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); + state->m_tx_tilemap->mark_all_dirty(); } } @@ -62,7 +62,7 @@ WRITE8_HANDLER( angelkds_bgtopvideoram_w ) angelkds_state *state = space->machine().driver_data(); state->m_bgtopvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bgtop_tilemap, offset); + state->m_bgtop_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( angelkds_bgtopbank_write ) @@ -72,7 +72,7 @@ WRITE8_HANDLER( angelkds_bgtopbank_write ) if (state->m_bgtopbank != data) { state->m_bgtopbank = data; - tilemap_mark_all_tiles_dirty(state->m_bgtop_tilemap); + state->m_bgtop_tilemap->mark_all_dirty(); } } @@ -80,7 +80,7 @@ WRITE8_HANDLER( angelkds_bgtopscroll_write ) { angelkds_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bgtop_tilemap, 0, data); + state->m_bgtop_tilemap->set_scrollx(0, data); } /*** Bottom Half Background Tilemap @@ -103,7 +103,7 @@ WRITE8_HANDLER( angelkds_bgbotvideoram_w ) angelkds_state *state = space->machine().driver_data(); state->m_bgbotvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bgbot_tilemap, offset); + state->m_bgbot_tilemap->mark_tile_dirty(offset); } @@ -114,7 +114,7 @@ WRITE8_HANDLER( angelkds_bgbotbank_write ) if (state->m_bgbotbank != data) { state->m_bgbotbank = data; - tilemap_mark_all_tiles_dirty(state->m_bgbot_tilemap); + state->m_bgbot_tilemap->mark_all_dirty(); } } @@ -122,7 +122,7 @@ WRITE8_HANDLER( angelkds_bgbotscroll_write ) { angelkds_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bgbot_tilemap, 0, data); + state->m_bgbot_tilemap->set_scrollx(0, data); } @@ -261,13 +261,13 @@ VIDEO_START( angelkds ) angelkds_state *state = machine.driver_data(); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); + state->m_tx_tilemap->set_transparent_pen(0); state->m_bgbot_tilemap = tilemap_create(machine, get_bgbot_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bgbot_tilemap, 15); + state->m_bgbot_tilemap->set_transparent_pen(15); state->m_bgtop_tilemap = tilemap_create(machine, get_bgtop_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bgtop_tilemap, 15); + state->m_bgtop_tilemap->set_transparent_pen(15); } /* enable bits are uncertain */ @@ -284,23 +284,23 @@ SCREEN_UPDATE_IND16( angelkds ) clip.set(8*0, 8*16-1, visarea.min_y, visarea.max_y); if ((state->m_layer_ctrl & 0x80) == 0x00) - tilemap_draw(bitmap, clip, state->m_bgtop_tilemap, 0, 0); + state->m_bgtop_tilemap->draw(bitmap, clip, 0, 0); draw_sprites(screen.machine(), bitmap, clip, 0x80); if ((state->m_layer_ctrl & 0x20) == 0x00) - tilemap_draw(bitmap, clip, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, clip, 0, 0); /* draw bottom of screen */ clip.set(8*16, 8*32-1, visarea.min_y, visarea.max_y); if ((state->m_layer_ctrl & 0x40) == 0x00) - tilemap_draw(bitmap, clip, state->m_bgbot_tilemap, 0, 0); + state->m_bgbot_tilemap->draw(bitmap, clip, 0, 0); draw_sprites(screen.machine(), bitmap, clip, 0x40); if ((state->m_layer_ctrl & 0x20) == 0x00) - tilemap_draw(bitmap, clip, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, clip, 0, 0); return 0; } diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 1286cebb423..fc4364d029b 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -137,9 +137,9 @@ VIDEO_START( appoooh ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldy(state->m_fg_tilemap, 8, 8); - tilemap_set_scrolldy(state->m_bg_tilemap, 8, 8); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scrolldy(8, 8); + state->m_bg_tilemap->set_scrolldy(8, 8); state->save_item(NAME(state->m_scroll_x)); state->save_item(NAME(state->m_priority)); @@ -156,28 +156,28 @@ WRITE8_HANDLER( appoooh_fg_videoram_w ) { appoooh_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( appoooh_fg_colorram_w ) { appoooh_state *state = space->machine().driver_data(); state->m_fg_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( appoooh_bg_videoram_w ) { appoooh_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( appoooh_bg_colorram_w ) { appoooh_state *state = space->machine().driver_data(); state->m_bg_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( appoooh_out_w ) @@ -273,10 +273,10 @@ static void robowres_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &clip SCREEN_UPDATE_IND16( appoooh ) { appoooh_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_priority == 0) /* fg behind sprites */ - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw sprites */ if (state->m_priority == 1) @@ -295,7 +295,7 @@ SCREEN_UPDATE_IND16( appoooh ) } if (state->m_priority != 0) /* fg in front of sprites */ - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -303,10 +303,10 @@ SCREEN_UPDATE_IND16( appoooh ) SCREEN_UPDATE_IND16( robowres ) { appoooh_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_priority == 0) /* fg behind sprites */ - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw sprites */ if (state->m_priority == 1) @@ -325,7 +325,7 @@ SCREEN_UPDATE_IND16( robowres ) } if (state->m_priority != 0) /* fg in front of sprites */ - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c index b8b0afc0876..ae5b0dbfa2d 100644 --- a/src/mame/video/aquarium.c +++ b/src/mame/video/aquarium.c @@ -100,7 +100,7 @@ WRITE16_HANDLER( aquarium_txt_videoram_w ) { aquarium_state *state = space->machine().driver_data(); state->m_txt_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_txt_tilemap, offset); + state->m_txt_tilemap->mark_tile_dirty(offset); } /* MID Layer */ @@ -115,14 +115,14 @@ static TILE_GET_INFO( get_aquarium_mid_tile_info ) SET_TILE_INFO(1, tileno, colour, flag); - tileinfo->category = (state->m_mid_videoram[tile_index * 2 + 1] & 0x20) >> 5; + tileinfo.category = (state->m_mid_videoram[tile_index * 2 + 1] & 0x20) >> 5; } WRITE16_HANDLER( aquarium_mid_videoram_w ) { aquarium_state *state = space->machine().driver_data(); state->m_mid_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_mid_tilemap, offset / 2); + state->m_mid_tilemap->mark_tile_dirty(offset / 2); } /* BAK Layer */ @@ -137,14 +137,14 @@ static TILE_GET_INFO( get_aquarium_bak_tile_info ) SET_TILE_INFO(3, tileno, colour, flag); - tileinfo->category = (state->m_bak_videoram[tile_index * 2 + 1] & 0x20) >> 5; + tileinfo.category = (state->m_bak_videoram[tile_index * 2 + 1] & 0x20) >> 5; } WRITE16_HANDLER( aquarium_bak_videoram_w ) { aquarium_state *state = space->machine().driver_data(); state->m_bak_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bak_tilemap, offset / 2); + state->m_bak_tilemap->mark_tile_dirty(offset / 2); } VIDEO_START(aquarium) @@ -154,27 +154,27 @@ VIDEO_START(aquarium) state->m_bak_tilemap = tilemap_create(machine, get_aquarium_bak_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_mid_tilemap = tilemap_create(machine, get_aquarium_mid_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_txt_tilemap, 0); - tilemap_set_transparent_pen(state->m_mid_tilemap, 0); + state->m_txt_tilemap->set_transparent_pen(0); + state->m_mid_tilemap->set_transparent_pen(0); } SCREEN_UPDATE_IND16(aquarium) { aquarium_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_mid_tilemap, 0, state->m_scroll[0]); - tilemap_set_scrolly(state->m_mid_tilemap, 0, state->m_scroll[1]); - tilemap_set_scrollx(state->m_bak_tilemap, 0, state->m_scroll[2]); - tilemap_set_scrolly(state->m_bak_tilemap, 0, state->m_scroll[3]); - tilemap_set_scrollx(state->m_txt_tilemap, 0, state->m_scroll[4]); - tilemap_set_scrolly(state->m_txt_tilemap, 0, state->m_scroll[5]); + state->m_mid_tilemap->set_scrollx(0, state->m_scroll[0]); + state->m_mid_tilemap->set_scrolly(0, state->m_scroll[1]); + state->m_bak_tilemap->set_scrollx(0, state->m_scroll[2]); + state->m_bak_tilemap->set_scrolly(0, state->m_scroll[3]); + state->m_txt_tilemap->set_scrollx(0, state->m_scroll[4]); + state->m_txt_tilemap->set_scrolly(0, state->m_scroll[5]); - tilemap_draw(bitmap, cliprect, state->m_bak_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_mid_tilemap, 0, 0); + state->m_bak_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_mid_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 16); - tilemap_draw(bitmap, cliprect, state->m_bak_tilemap, 1, 0); - tilemap_draw(bitmap, cliprect, state->m_mid_tilemap, 1, 0); - tilemap_draw(bitmap, cliprect, state->m_txt_tilemap, 0, 0); + state->m_bak_tilemap->draw(bitmap, cliprect, 1, 0); + state->m_mid_tilemap->draw(bitmap, cliprect, 1, 0); + state->m_txt_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index d6ea8decc4f..8daa5187615 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -283,8 +283,8 @@ VIDEO_START( argus ) state->m_bg1_tilemap = tilemap_create(machine, argus_get_bg1_tile_info, tilemap_scan_cols, 16, 16, 32, 32); state->m_tx_tilemap = tilemap_create(machine, argus_get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg1_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_bg1_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); /* dummy RAM for back ground */ state->m_dummy_bg0ram = auto_alloc_array(machine, UINT8, 0x800); @@ -310,7 +310,7 @@ VIDEO_START( valtric ) state->m_bg1_tilemap = tilemap_create(machine, valtric_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); state->m_tx_tilemap = tilemap_create(machine, valtric_get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_tx_tilemap->set_transparent_pen(15); machine.primary_screen->register_screen_bitmap(state->m_mosaicbitmap); @@ -332,8 +332,8 @@ VIDEO_START( butasan ) state->m_bg1_tilemap = tilemap_create(machine, butasan_get_bg1_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_tx_tilemap = tilemap_create(machine, butasan_get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg1_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_bg1_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); state->m_butasan_pagedram[0] = auto_alloc_array(machine, UINT8, 0x1000); state->m_butasan_pagedram[1] = auto_alloc_array(machine, UINT8, 0x1000); @@ -381,7 +381,7 @@ static void argus_write_dummy_rams(running_machine &machine, int dramoffs, int v { state->m_dummy_bg0ram[dramoffs] = VROM2[voffs]; state->m_dummy_bg0ram[dramoffs + 1] = VROM2[voffs + 1]; - tilemap_mark_tile_dirty(state->m_bg0_tilemap, dramoffs >> 1); + state->m_bg0_tilemap->mark_tile_dirty(dramoffs >> 1); dramoffs += 2; voffs += 2; } @@ -455,7 +455,7 @@ WRITE8_HANDLER( argus_txram_w ) { argus_state *state = space->machine().driver_data(); state->m_txram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset >> 1); + state->m_tx_tilemap->mark_tile_dirty(offset >> 1); } READ8_HANDLER( argus_bg1ram_r ) @@ -468,7 +468,7 @@ WRITE8_HANDLER( argus_bg1ram_w ) { argus_state *state = space->machine().driver_data(); state->m_bg1ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg1_tilemap, offset >> 1); + state->m_bg1_tilemap->mark_tile_dirty(offset >> 1); } WRITE8_HANDLER( argus_bg_status_w ) @@ -525,7 +525,7 @@ WRITE8_HANDLER( butasan_bg1_status_w ) state->m_butasan_bg1_status = data; /* Bank changed */ - tilemap_mark_all_tiles_dirty(state->m_bg1_tilemap); + state->m_bg1_tilemap->mark_all_dirty(); } } @@ -667,7 +667,7 @@ WRITE8_HANDLER( butasan_bg1ram_w ) idx = (offset & 0x00f) | ((offset & 0x200) >> 5) | ((offset & 0x1f0) << 1); idx ^= 0x0f0; - tilemap_mark_tile_dirty(state->m_bg1_tilemap, idx); + state->m_bg1_tilemap->mark_tile_dirty(idx); } WRITE8_HANDLER( butasan_pageselect_w ) @@ -697,13 +697,13 @@ WRITE8_HANDLER( butasan_pagedram_w ) int idx; idx = ((offset & 0x01e) >> 1) | ((offset & 0x400) >> 6) | (offset & 0x3e0); idx ^= 0x1e0; - tilemap_mark_tile_dirty(state->m_bg0_tilemap, idx); + state->m_bg0_tilemap->mark_tile_dirty(idx); } } else { if (offset <= 0x07ff) - tilemap_mark_tile_dirty(state->m_tx_tilemap, (offset ^ 0x7c0) >> 1); + state->m_tx_tilemap->mark_tile_dirty((offset ^ 0x7c0) >> 1); } } @@ -732,27 +732,27 @@ WRITE8_HANDLER( butasan_unknown_w ) static void bg_setting(running_machine &machine) { argus_state *state = machine.driver_data(); - tilemap_set_flip_all(machine, state->m_flipscreen ? TILEMAP_FLIPY|TILEMAP_FLIPX : 0); + machine.tilemap().set_flip_all(state->m_flipscreen ? TILEMAP_FLIPY|TILEMAP_FLIPX : 0); if (!state->m_flipscreen) { if (state->m_bg0_tilemap != NULL) { - tilemap_set_scrollx(state->m_bg0_tilemap, 0, bg0_scrollx & 0x1ff); - tilemap_set_scrolly(state->m_bg0_tilemap, 0, bg0_scrolly & 0x1ff); + state->m_bg0_tilemap->set_scrollx(0, bg0_scrollx & 0x1ff); + state->m_bg0_tilemap->set_scrolly(0, bg0_scrolly & 0x1ff); } - tilemap_set_scrollx(state->m_bg1_tilemap, 0, bg1_scrollx & 0x1ff); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, bg1_scrolly & 0x1ff); + state->m_bg1_tilemap->set_scrollx(0, bg1_scrollx & 0x1ff); + state->m_bg1_tilemap->set_scrolly(0, bg1_scrolly & 0x1ff); } else { if (state->m_bg0_tilemap != NULL) { - tilemap_set_scrollx(state->m_bg0_tilemap, 0, (bg0_scrollx + 256) & 0x1ff); - tilemap_set_scrolly(state->m_bg0_tilemap, 0, (bg0_scrolly + 256) & 0x1ff); + state->m_bg0_tilemap->set_scrollx(0, (bg0_scrollx + 256) & 0x1ff); + state->m_bg0_tilemap->set_scrolly(0, (bg0_scrolly + 256) & 0x1ff); } - tilemap_set_scrollx(state->m_bg1_tilemap, 0, (bg1_scrollx + 256) & 0x1ff); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, (bg1_scrolly + 256) & 0x1ff); + state->m_bg1_tilemap->set_scrollx(0, (bg1_scrollx + 256) & 0x1ff); + state->m_bg1_tilemap->set_scrolly(0, (bg1_scrolly + 256) & 0x1ff); } } @@ -906,10 +906,10 @@ static void valtric_draw_mosaic(screen_device &screen, bitmap_rgb32 &bitmap, con } if (state->m_mosaic==0) - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); else { - tilemap_draw(state->m_mosaicbitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(state->m_mosaicbitmap, cliprect, 0, 0); { int step=state->m_mosaic; UINT32 *dest; @@ -949,10 +949,10 @@ static void valtric_draw_mosaic(screen_device &screen, bitmap_rgb32 &bitmap, con int step = 0x10 - (state->m_valtric_mosaic & 0x0f); if (step == 1) - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); else { - tilemap_draw(state->m_mosaicbitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(state->m_mosaicbitmap, cliprect, 0, 0); { UINT32 *dest; int x,y,xx,yy,c=0; @@ -1197,12 +1197,12 @@ SCREEN_UPDATE_RGB32( argus ) /* scroll BG0 and render tile at proper position */ argus_bg0_scroll_handle(screen.machine()); - tilemap_draw(bitmap, cliprect, state->m_bg0_tilemap, 0, 0); + state->m_bg0_tilemap->draw(bitmap, cliprect, 0, 0); argus_draw_sprites(screen.machine(), bitmap, cliprect, 0); if (state->m_bg_status & 1) /* Backgound enable */ - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); argus_draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -1216,7 +1216,7 @@ SCREEN_UPDATE_RGB32( valtric ) else bitmap.fill(get_black_pen(screen.machine()), cliprect); valtric_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -1226,12 +1226,12 @@ SCREEN_UPDATE_RGB32( butasan ) bg_setting(screen.machine()); if (state->m_bg_status & 1) /* Backgound enable */ - tilemap_draw(bitmap, cliprect, state->m_bg0_tilemap, 0, 0); + state->m_bg0_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(get_black_pen(screen.machine()), cliprect); - if (state->m_butasan_bg1_status & 1) tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + if (state->m_butasan_bg1_status & 1) state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); butasan_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); butasan_log_vram(screen.machine()); return 0; diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index 1922773662d..cdc536ca563 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -14,7 +14,7 @@ WRITE8_HANDLER( arkanoid_videoram_w ) { arkanoid_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( arkanoid_d008_w ) @@ -26,13 +26,13 @@ WRITE8_HANDLER( arkanoid_d008_w ) if (flip_screen_x_get(space->machine()) != (data & 0x01)) { flip_screen_x_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } if (flip_screen_y_get(space->machine()) != (data & 0x02)) { flip_screen_y_set(space->machine(), data & 0x02); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 2 selects the input paddle */ @@ -51,7 +51,7 @@ WRITE8_HANDLER( arkanoid_d008_w ) if (state->m_gfxbank != bank) { state->m_gfxbank = bank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } bank = (data & 0x40) >> 6; @@ -59,7 +59,7 @@ WRITE8_HANDLER( arkanoid_d008_w ) if (state->m_palettebank != bank) { state->m_palettebank = bank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* BM: bit 7 is suspected to be MCU reset, the evidence for this is that @@ -82,13 +82,13 @@ WRITE8_HANDLER( tetrsark_d008_w ) if (flip_screen_x_get(space->machine()) != (data & 0x01)) { flip_screen_x_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } if (flip_screen_y_get(space->machine()) != (data & 0x02)) { flip_screen_y_set(space->machine(), data & 0x02); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 2 selects the input paddle? */ @@ -103,7 +103,7 @@ WRITE8_HANDLER( tetrsark_d008_w ) if (state->m_gfxbank != bank) { state->m_gfxbank = bank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } bank = (data & 0x40) >> 6; @@ -111,7 +111,7 @@ WRITE8_HANDLER( tetrsark_d008_w ) if (state->m_palettebank != bank) { state->m_palettebank = bank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 7 is coin lockout (but not the service coin) */ @@ -128,14 +128,14 @@ WRITE8_HANDLER( hexa_d008_w ) if (flip_screen_x_get(space->machine()) != (data & 0x01)) { flip_screen_x_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 1 = flipy (or x?) */ if (flip_screen_y_get(space->machine()) != (data & 0x02)) { flip_screen_y_set(space->machine(), data & 0x02); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 2 - 3 unknown */ @@ -147,7 +147,7 @@ WRITE8_HANDLER( hexa_d008_w ) if (state->m_gfxbank != ((data & 0x20) >> 5)) { state->m_gfxbank = (data & 0x20) >> 5; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 6 - 7 unknown */ @@ -206,7 +206,7 @@ SCREEN_UPDATE_IND16( arkanoid ) { arkanoid_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -215,6 +215,6 @@ SCREEN_UPDATE_IND16( hexa ) { arkanoid_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index 37c5502789e..376cc3f6241 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -49,7 +49,7 @@ static TILE_GET_INFO( get_nb1414m4_tx_tile_info ) } /* bit 3 controls priority, (0) nb1414m4 has priority over all the other video layers */ - tileinfo->category = (attributes & 0x8) >> 3; + tileinfo.category = (attributes & 0x8) >> 3; SET_TILE_INFO( 0, @@ -76,7 +76,7 @@ static TILE_GET_INFO( get_armedf_tx_tile_info ) //} /* bit 3 controls priority, (0) nb1414m4 has priority over all the other video layers */ - tileinfo->category = (attributes & 0x8) >> 3; + tileinfo.category = (attributes & 0x8) >> 3; SET_TILE_INFO( 0, @@ -128,12 +128,12 @@ VIDEO_START( terraf ) state->m_tx_tilemap = tilemap_create(machine, get_nb1414m4_tx_tile_info, (state->m_scroll_type == 2) ? armedf_scan_type3 : armedf_scan_type2, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0xf); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0xf); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0xf); + state->m_bg_tilemap->set_transparent_pen(0xf); + state->m_fg_tilemap->set_transparent_pen(0xf); + state->m_tx_tilemap->set_transparent_pen(0xf); if (state->m_scroll_type != 1) - tilemap_set_scrollx(state->m_tx_tilemap, 0, -128); + state->m_tx_tilemap->set_scrollx(0, -128); state->m_text_videoram = auto_alloc_array(machine, UINT8, 0x1000); } @@ -149,12 +149,12 @@ VIDEO_START( armedf ) state->m_tx_tilemap = tilemap_create(machine, get_armedf_tx_tile_info, armedf_scan_type1, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0xf); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0xf); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0xf); + state->m_bg_tilemap->set_transparent_pen(0xf); + state->m_fg_tilemap->set_transparent_pen(0xf); + state->m_tx_tilemap->set_transparent_pen(0xf); if (state->m_scroll_type != 1) - tilemap_set_scrollx(state->m_tx_tilemap, 0, -128); + state->m_tx_tilemap->set_scrollx(0, -128); state->m_text_videoram = auto_alloc_array(machine, UINT8, 0x1000); } @@ -177,7 +177,7 @@ WRITE8_HANDLER( nb1414m4_text_videoram_w ) armedf_state *state = space->machine().driver_data(); state->m_text_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset & 0x7ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); } READ8_HANDLER( armedf_text_videoram_r ) @@ -191,21 +191,21 @@ WRITE8_HANDLER( armedf_text_videoram_w ) { armedf_state *state = space->machine().driver_data(); state->m_text_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset & 0x7ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE16_HANDLER( armedf_fg_videoram_w ) { armedf_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( armedf_bg_videoram_w ) { armedf_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( terraf_fg_scrolly_w ) @@ -258,14 +258,14 @@ WRITE16_HANDLER( armedf_bg_scrollx_w ) { armedf_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_scrollx); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); } WRITE16_HANDLER( armedf_bg_scrolly_w ) { armedf_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_scrolly); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); } @@ -388,36 +388,36 @@ SCREEN_UPDATE_IND16( armedf ) armedf_state *state = screen.machine().driver_data(); int sprite_enable = state->m_vreg & 0x200; - tilemap_set_enable(state->m_bg_tilemap, state->m_vreg & 0x800); - tilemap_set_enable(state->m_fg_tilemap, state->m_vreg & 0x400); - tilemap_set_enable(state->m_tx_tilemap, state->m_vreg & 0x100); + state->m_bg_tilemap->enable(state->m_vreg & 0x800); + state->m_fg_tilemap->enable(state->m_vreg & 0x400); + state->m_tx_tilemap->enable(state->m_vreg & 0x100); switch (state->m_scroll_type) { case 0: /* terra force, kozure ookami */ case 2: /* legion */ case 3: /* crazy climber */ - tilemap_set_scrollx(state->m_fg_tilemap, 0, (state->m_fg_scrollx & 0x3ff)); - tilemap_set_scrolly(state->m_fg_tilemap, 0, (state->m_fg_scrolly & 0x3ff)); + state->m_fg_tilemap->set_scrollx(0, (state->m_fg_scrollx & 0x3ff)); + state->m_fg_tilemap->set_scrolly(0, (state->m_fg_scrolly & 0x3ff)); break; case 1: /* armed formation */ - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_fg_scrollx); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_fg_scrolly); + state->m_fg_tilemap->set_scrollx(0, state->m_fg_scrollx); + state->m_fg_tilemap->set_scrolly(0, state->m_fg_scrolly); break; } bitmap.fill(0xff, cliprect ); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, TILEMAP_DRAW_CATEGORY(1), 0); + state->m_tx_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1), 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (sprite_enable) draw_sprites(screen.machine(), bitmap, cliprect, 2); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); if (sprite_enable) draw_sprites(screen.machine(), bitmap, cliprect, 1); @@ -425,7 +425,7 @@ SCREEN_UPDATE_IND16( armedf ) if (sprite_enable) draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, TILEMAP_DRAW_CATEGORY(0), 0); + state->m_tx_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0), 0); return 0; } diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c index ca3c5c50f9b..80bf86f205f 100644 --- a/src/mame/video/ashnojoe.c +++ b/src/mame/video/ashnojoe.c @@ -103,7 +103,7 @@ WRITE16_HANDLER( ashnojoe_tileram_w ) ashnojoe_state *state = space->machine().driver_data(); state->m_tileram[offset] = data; - tilemap_mark_tile_dirty(state->m_joetilemap, offset); + state->m_joetilemap->mark_tile_dirty(offset); } @@ -112,7 +112,7 @@ WRITE16_HANDLER( ashnojoe_tileram2_w ) ashnojoe_state *state = space->machine().driver_data(); state->m_tileram_2[offset] = data; - tilemap_mark_tile_dirty(state->m_joetilemap2, offset / 2); + state->m_joetilemap2->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( ashnojoe_tileram3_w ) @@ -120,7 +120,7 @@ WRITE16_HANDLER( ashnojoe_tileram3_w ) ashnojoe_state *state = space->machine().driver_data(); state->m_tileram_3[offset] = data; - tilemap_mark_tile_dirty(state->m_joetilemap3, offset); + state->m_joetilemap3->mark_tile_dirty(offset); } WRITE16_HANDLER( ashnojoe_tileram4_w ) @@ -128,7 +128,7 @@ WRITE16_HANDLER( ashnojoe_tileram4_w ) ashnojoe_state *state = space->machine().driver_data(); state->m_tileram_4[offset] = data; - tilemap_mark_tile_dirty(state->m_joetilemap4, offset); + state->m_joetilemap4->mark_tile_dirty(offset); } WRITE16_HANDLER( ashnojoe_tileram5_w ) @@ -136,7 +136,7 @@ WRITE16_HANDLER( ashnojoe_tileram5_w ) ashnojoe_state *state = space->machine().driver_data(); state->m_tileram_5[offset] = data; - tilemap_mark_tile_dirty(state->m_joetilemap5, offset / 2); + state->m_joetilemap5->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( ashnojoe_tileram6_w ) @@ -144,7 +144,7 @@ WRITE16_HANDLER( ashnojoe_tileram6_w ) ashnojoe_state *state = space->machine().driver_data(); state->m_tileram_6[offset] = data; - tilemap_mark_tile_dirty(state->m_joetilemap6, offset / 2); + state->m_joetilemap6->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( ashnojoe_tileram7_w ) @@ -152,7 +152,7 @@ WRITE16_HANDLER( ashnojoe_tileram7_w ) ashnojoe_state *state = space->machine().driver_data(); state->m_tileram_7[offset] = data; - tilemap_mark_tile_dirty(state->m_joetilemap7, offset / 2); + state->m_joetilemap7->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( joe_tilemaps_xscroll_w ) @@ -162,20 +162,20 @@ WRITE16_HANDLER( joe_tilemaps_xscroll_w ) switch( offset ) { case 0: - tilemap_set_scrollx(state->m_joetilemap3, 0, data); + state->m_joetilemap3->set_scrollx(0, data); break; case 1: - tilemap_set_scrollx(state->m_joetilemap5, 0, data); + state->m_joetilemap5->set_scrollx(0, data); break; case 2: - tilemap_set_scrollx(state->m_joetilemap2, 0, data); + state->m_joetilemap2->set_scrollx(0, data); break; case 3: - tilemap_set_scrollx(state->m_joetilemap4, 0, data); + state->m_joetilemap4->set_scrollx(0, data); break; case 4: - tilemap_set_scrollx(state->m_joetilemap6, 0, data); - tilemap_set_scrollx(state->m_joetilemap7, 0, data); + state->m_joetilemap6->set_scrollx(0, data); + state->m_joetilemap7->set_scrollx(0, data); break; } } @@ -187,20 +187,20 @@ WRITE16_HANDLER( joe_tilemaps_yscroll_w ) switch( offset ) { case 0: - tilemap_set_scrolly(state->m_joetilemap3, 0, data); + state->m_joetilemap3->set_scrolly(0, data); break; case 1: - tilemap_set_scrolly(state->m_joetilemap5, 0, data); + state->m_joetilemap5->set_scrolly(0, data); break; case 2: - tilemap_set_scrolly(state->m_joetilemap2, 0, data); + state->m_joetilemap2->set_scrolly(0, data); break; case 3: - tilemap_set_scrolly(state->m_joetilemap4, 0, data); + state->m_joetilemap4->set_scrolly(0, data); break; case 4: - tilemap_set_scrolly(state->m_joetilemap6, 0, data); - tilemap_set_scrolly(state->m_joetilemap7, 0, data); + state->m_joetilemap6->set_scrolly(0, data); + state->m_joetilemap7->set_scrolly(0, data); break; } } @@ -217,11 +217,11 @@ VIDEO_START( ashnojoe ) state->m_joetilemap6 = tilemap_create(machine, get_joe_tile_info_6, tilemap_scan_rows, 16, 16, 32, 32); state->m_joetilemap7 = tilemap_create(machine, get_joe_tile_info_7, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_joetilemap, 15); - tilemap_set_transparent_pen(state->m_joetilemap2, 15); - tilemap_set_transparent_pen(state->m_joetilemap3, 15); - tilemap_set_transparent_pen(state->m_joetilemap4, 15); - tilemap_set_transparent_pen(state->m_joetilemap5, 15); + state->m_joetilemap->set_transparent_pen(15); + state->m_joetilemap2->set_transparent_pen(15); + state->m_joetilemap3->set_transparent_pen(15); + state->m_joetilemap4->set_transparent_pen(15); + state->m_joetilemap5->set_transparent_pen(15); } SCREEN_UPDATE_IND16( ashnojoe ) @@ -233,15 +233,15 @@ SCREEN_UPDATE_IND16( ashnojoe ) flip_screen_set(screen.machine(), state->m_tilemap_reg[0] & 1); if(state->m_tilemap_reg[0] & 0x02) - tilemap_draw(bitmap, cliprect, state->m_joetilemap7, 0, 0); + state->m_joetilemap7->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_joetilemap6, 0, 0); + state->m_joetilemap6->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_joetilemap4, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_joetilemap2, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_joetilemap5, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_joetilemap3, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_joetilemap, 0, 0); + state->m_joetilemap4->draw(bitmap, cliprect, 0, 0); + state->m_joetilemap2->draw(bitmap, cliprect, 0, 0); + state->m_joetilemap5->draw(bitmap, cliprect, 0, 0); + state->m_joetilemap3->draw(bitmap, cliprect, 0, 0); + state->m_joetilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index 2fea95c9443..942348e9236 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -14,7 +14,7 @@ * *************************************/ -static void get_tile_info_common( running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, UINT8 *alpha_videoram ) +static void get_tile_info_common( running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, UINT8 *alpha_videoram ) { int code = alpha_videoram[tile_index] & 0x3f; int flip = alpha_videoram[tile_index] & 0x40; @@ -64,7 +64,7 @@ WRITE8_HANDLER( atarifb_alpha1_videoram_w ) atarifb_state *state = space->machine().driver_data(); state->m_alphap1_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_alpha1_tilemap, offset); + state->m_alpha1_tilemap->mark_tile_dirty(offset); } @@ -73,7 +73,7 @@ WRITE8_HANDLER( atarifb_alpha2_videoram_w ) atarifb_state *state = space->machine().driver_data(); state->m_alphap2_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_alpha2_tilemap, offset); + state->m_alpha2_tilemap->mark_tile_dirty(offset); } @@ -82,7 +82,7 @@ WRITE8_HANDLER( atarifb_field_videoram_w ) atarifb_state *state = space->machine().driver_data(); state->m_field_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_field_tilemap, offset); + state->m_field_tilemap->mark_tile_dirty(offset); } @@ -115,9 +115,9 @@ static void draw_playfield_and_alpha( running_machine &machine, bitmap_ind16 &bi scroll_x[0] = - *state->m_scroll_register + 32 + playfield_x_offset; scroll_y[0] = 8 + playfield_y_offset; - copybitmap(bitmap, tilemap_get_pixmap(state->m_alpha1_tilemap), 0, 0, 35*8, 1*8, cliprect); - copybitmap(bitmap, tilemap_get_pixmap(state->m_alpha2_tilemap), 0, 0, 0*8, 1*8, cliprect); - copyscrollbitmap(bitmap, tilemap_get_pixmap(state->m_field_tilemap), 1, scroll_x, 1, scroll_y, bigfield_area); + copybitmap(bitmap, state->m_alpha1_tilemap->pixmap(), 0, 0, 35*8, 1*8, cliprect); + copybitmap(bitmap, state->m_alpha2_tilemap->pixmap(), 0, 0, 0*8, 1*8, cliprect); + copyscrollbitmap(bitmap, state->m_field_tilemap->pixmap(), 1, scroll_x, 1, scroll_y, bigfield_area); } diff --git a/src/mame/video/atarig1.c b/src/mame/video/atarig1.c index 49ca351b389..8e62f8fc69b 100644 --- a/src/mame/video/atarig1.c +++ b/src/mame/video/atarig1.c @@ -59,7 +59,7 @@ VIDEO_START( atarig1 ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* reset statics */ state->m_pfscroll_xoffset = state->m_is_pitfight ? 2 : 0; @@ -116,7 +116,7 @@ void atarig1_scanline_update(screen_device &screen, int scanline) if (newscroll != state->m_playfield_xscroll) { screen.update_partial(MAX(scanline + i - 1, 0)); - tilemap_set_scrollx(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrollx(0, newscroll); state->m_playfield_xscroll = newscroll; } } @@ -130,13 +130,13 @@ void atarig1_scanline_update(screen_device &screen, int scanline) if (newscroll != state->m_playfield_yscroll) { screen.update_partial(MAX(scanline + i - 1, 0)); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrolly(0, newscroll); state->m_playfield_yscroll = newscroll; } if (newbank != state->m_playfield_tile_bank) { screen.update_partial(MAX(scanline + i - 1, 0)); - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); state->m_playfield_tile_bank = newbank; } } @@ -156,13 +156,13 @@ SCREEN_UPDATE_IND16( atarig1 ) atarig1_state *state = screen.machine().driver_data(); /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* copy the motion objects on top */ copybitmap_trans(bitmap, *atarirle_get_vram(state->m_rle, 0), 0, 0, 0, 0, cliprect, 0); /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index 5f50a26c194..0c27cafffa9 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -49,7 +49,7 @@ static TILE_GET_INFO( get_playfield_tile_info ) int code = (state->m_playfield_tile_bank << 12) | (data & 0xfff); int color = (state->m_playfield_base >> 5) + ((state->m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); SET_TILE_INFO(0, code, color, (data >> 15) & 1); - tileinfo->category = (state->m_playfield_color_bank >> 2) & 7; + tileinfo.category = (state->m_playfield_color_bank >> 2) & 7; } @@ -82,7 +82,7 @@ VIDEO_START( atarig42 ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* save states */ state->save_item(NAME(state->m_current_control)); @@ -137,14 +137,14 @@ void atarig42_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrollx(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrollx(0, newscroll); state->m_playfield_xscroll = newscroll; } if (newbank != state->m_playfield_color_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); state->m_playfield_color_bank = newbank; } } @@ -158,14 +158,14 @@ void atarig42_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrolly(0, newscroll); state->m_playfield_yscroll = newscroll; } if (newbank != state->m_playfield_tile_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); state->m_playfield_tile_bank = newbank; } } @@ -187,14 +187,14 @@ SCREEN_UPDATE_IND16( atarig42 ) /* draw the playfield */ priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 1, 1); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 2, 2); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 3, 3); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 4, 4); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 5, 5); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 6, 6); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 7, 7); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 1, 1); + state->m_playfield_tilemap->draw(bitmap, cliprect, 2, 2); + state->m_playfield_tilemap->draw(bitmap, cliprect, 3, 3); + state->m_playfield_tilemap->draw(bitmap, cliprect, 4, 4); + state->m_playfield_tilemap->draw(bitmap, cliprect, 5, 5); + state->m_playfield_tilemap->draw(bitmap, cliprect, 6, 6); + state->m_playfield_tilemap->draw(bitmap, cliprect, 7, 7); /* copy the motion objects on top */ { @@ -223,7 +223,7 @@ SCREEN_UPDATE_IND16( atarig42 ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/atarigt.c b/src/mame/video/atarigt.c index 35f8c2b281b..d0720588979 100644 --- a/src/mame/video/atarigt.c +++ b/src/mame/video/atarigt.c @@ -188,14 +188,14 @@ void atarigt_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrollx(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrollx(0, newscroll); state->m_playfield_xscroll = newscroll; } if (newbank != state->m_playfield_color_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_palette_offset(state->m_playfield_tilemap, (newbank & 0x1f) << 8); + state->m_playfield_tilemap->set_palette_offset((newbank & 0x1f) << 8); state->m_playfield_color_bank = newbank; } } @@ -208,14 +208,14 @@ void atarigt_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrolly(0, newscroll); state->m_playfield_yscroll = newscroll; } if (newbank != state->m_playfield_tile_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); state->m_playfield_tile_bank = newbank; } } @@ -517,10 +517,10 @@ SCREEN_UPDATE_RGB32( atarigt ) int x, y; /* draw the playfield */ - tilemap_draw(*state->m_pf_bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(*state->m_pf_bitmap, cliprect, 0, 0); /* draw the alpha layer */ - tilemap_draw(*state->m_an_bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(*state->m_an_bitmap, cliprect, 0, 0); /* cache pointers */ color_latch = state->m_colorram[0x30000/2]; diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c index ef2c7d50727..bd37c005ea5 100644 --- a/src/mame/video/atarigx2.c +++ b/src/mame/video/atarigx2.c @@ -49,7 +49,7 @@ static TILE_GET_INFO( get_playfield_tile_info ) int code = (state->m_playfield_tile_bank << 12) | (data & 0xfff); int color = (state->m_playfield_base >> 5) + ((state->m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); SET_TILE_INFO(0, code, color, (data >> 15) & 1); - tileinfo->category = (state->m_playfield_color_bank >> 2) & 7; + tileinfo.category = (state->m_playfield_color_bank >> 2) & 7; } @@ -82,7 +82,7 @@ VIDEO_START( atarigx2 ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* save states */ state->save_item(NAME(state->m_current_control)); @@ -136,14 +136,14 @@ void atarigx2_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrollx(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrollx(0, newscroll); state->m_playfield_xscroll = newscroll; } if (newbank != state->m_playfield_color_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); state->m_playfield_color_bank = newbank; } } @@ -156,14 +156,14 @@ void atarigx2_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrolly(0, newscroll); state->m_playfield_yscroll = newscroll; } if (newbank != state->m_playfield_tile_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); state->m_playfield_tile_bank = newbank; } } @@ -185,14 +185,14 @@ SCREEN_UPDATE_IND16( atarigx2 ) /* draw the playfield */ priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 1, 1); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 2, 2); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 3, 3); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 4, 4); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 5, 5); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 6, 6); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 7, 7); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 1, 1); + state->m_playfield_tilemap->draw(bitmap, cliprect, 2, 2); + state->m_playfield_tilemap->draw(bitmap, cliprect, 3, 3); + state->m_playfield_tilemap->draw(bitmap, cliprect, 4, 4); + state->m_playfield_tilemap->draw(bitmap, cliprect, 5, 5); + state->m_playfield_tilemap->draw(bitmap, cliprect, 6, 6); + state->m_playfield_tilemap->draw(bitmap, cliprect, 7, 7); /* copy the motion objects on top */ { @@ -216,7 +216,7 @@ SCREEN_UPDATE_IND16( atarigx2 ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index e118bd2bdac..b5502117125 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -178,7 +178,7 @@ VIDEO_START( atarisy1 ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* modify the motion object code lookup */ codelookup = atarimo_get_code_lookup(0, &size); @@ -242,7 +242,7 @@ WRITE16_HANDLER( atarisy1_bankselect_w ) if (diff & 0x0004) { state->m_playfield_tile_bank = (newselect >> 2) & 1; - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); } /* stash the new value */ @@ -290,7 +290,7 @@ WRITE16_HANDLER( atarisy1_xscroll_w ) space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); /* set the new scroll value */ - tilemap_set_scrollx(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrollx(0, newscroll); /* update the data */ *state->m_xscroll = newscroll; @@ -307,7 +307,7 @@ WRITE16_HANDLER( atarisy1_xscroll_w ) TIMER_DEVICE_CALLBACK( atarisy1_reset_yscroll_callback ) { atarisy1_state *state = timer.machine().driver_data(); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, param); + state->m_playfield_tilemap->set_scrolly(0, param); } @@ -328,7 +328,7 @@ WRITE16_HANDLER( atarisy1_yscroll_w ) adjusted_scroll = newscroll; if (scanline <= space->machine().primary_screen->visible_area().max_y) adjusted_scroll -= (scanline + 1); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, adjusted_scroll); + state->m_playfield_tilemap->set_scrolly(0, adjusted_scroll); /* but since we've adjusted it, we must reset it to the normal value once we hit scanline 0 again */ @@ -508,7 +508,7 @@ SCREEN_UPDATE_IND16( atarisy1 ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -542,7 +542,7 @@ SCREEN_UPDATE_IND16( atarisy1 ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c index 4f8409d9cd7..3f59311cfd1 100644 --- a/src/mame/video/atarisy2.c +++ b/src/mame/video/atarisy2.c @@ -44,7 +44,7 @@ static TILE_GET_INFO( get_playfield_tile_info ) int code = state->m_playfield_tile_bank[(data >> 10) & 1] + (data & 0x3ff); int color = (data >> 11) & 7; SET_TILE_INFO(0, code, color, 0); - tileinfo->category = (~data >> 14) & 3; + tileinfo.category = (~data >> 14) & 3; } @@ -107,7 +107,7 @@ VIDEO_START( atarisy2 ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* reset the statics */ state->m_yscroll_reset_timer = machine.scheduler().timer_alloc(FUNC(reset_yscroll_callback)); @@ -139,13 +139,13 @@ WRITE16_HANDLER( atarisy2_xscroll_w ) space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); /* update the playfield scrolling - hscroll is clocked on the following scanline */ - tilemap_set_scrollx(state->m_playfield_tilemap, 0, newscroll >> 6); + state->m_playfield_tilemap->set_scrollx(0, newscroll >> 6); /* update the playfield banking */ if (state->m_playfield_tile_bank[0] != (newscroll & 0x0f) * 0x400) { state->m_playfield_tile_bank[0] = (newscroll & 0x0f) * 0x400; - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); } /* update the data */ @@ -156,7 +156,7 @@ WRITE16_HANDLER( atarisy2_xscroll_w ) static TIMER_CALLBACK( reset_yscroll_callback ) { atarisy2_state *state = machine.driver_data(); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, param); + state->m_playfield_tilemap->set_scrolly(0, param); } @@ -173,7 +173,7 @@ WRITE16_HANDLER( atarisy2_yscroll_w ) /* if bit 4 is zero, the scroll value is clocked in right away */ if (!(newscroll & 0x10)) - tilemap_set_scrolly(state->m_playfield_tilemap, 0, (newscroll >> 6) - space->machine().primary_screen->vpos()); + state->m_playfield_tilemap->set_scrolly(0, (newscroll >> 6) - space->machine().primary_screen->vpos()); else state->m_yscroll_reset_timer->adjust(space->machine().primary_screen->time_until_pos(0), newscroll >> 6); @@ -181,7 +181,7 @@ WRITE16_HANDLER( atarisy2_yscroll_w ) if (state->m_playfield_tile_bank[1] != (newscroll & 0x0f) * 0x400) { state->m_playfield_tile_bank[1] = (newscroll & 0x0f) * 0x400; - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); } /* update the data */ @@ -283,7 +283,7 @@ WRITE16_HANDLER( atarisy2_videoram_w ) if (offs < 0x0c00) { COMBINE_DATA(&state->m_alpha[offs]); - tilemap_mark_tile_dirty(state->m_alpha_tilemap, offs); + state->m_alpha_tilemap->mark_tile_dirty(offs); } /* spriteram? */ @@ -300,7 +300,7 @@ WRITE16_HANDLER( atarisy2_videoram_w ) { offs -= 0x2000; COMBINE_DATA(&state->m_playfield[offs]); - tilemap_mark_tile_dirty(state->m_playfield_tilemap, offs); + state->m_playfield_tilemap->mark_tile_dirty(offs); } /* generic case */ @@ -328,10 +328,10 @@ SCREEN_UPDATE_IND16( atarisy2 ) /* draw the playfield */ priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 1, 1); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 2, 2); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 3, 3); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 1, 1); + state->m_playfield_tilemap->draw(bitmap, cliprect, 2, 2); + state->m_playfield_tilemap->draw(bitmap, cliprect, 3, 3); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -364,6 +364,6 @@ SCREEN_UPDATE_IND16( atarisy2 ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c index e26283f4e8c..5ede8bcff38 100644 --- a/src/mame/video/atetris.c +++ b/src/mame/video/atetris.c @@ -38,7 +38,7 @@ WRITE8_HANDLER( atetris_videoram_w ) UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -68,6 +68,6 @@ SCREEN_UPDATE_IND16( atetris ) { atetris_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c index e1488760608..06cb4e7b6c4 100644 --- a/src/mame/video/badlands.c +++ b/src/mame/video/badlands.c @@ -99,7 +99,7 @@ WRITE16_HANDLER( badlands_pf_bank_w ) { space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); state->m_playfield_tile_bank = data & 1; - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); } } @@ -119,7 +119,7 @@ SCREEN_UPDATE_IND16( badlands ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c index 4d45053d688..a30cb77f559 100644 --- a/src/mame/video/bagman.c +++ b/src/mame/video/bagman.c @@ -15,14 +15,14 @@ WRITE8_HANDLER( bagman_videoram_w ) { bagman_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bagman_colorram_w ) { bagman_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } /*************************************************************************** @@ -87,7 +87,7 @@ WRITE8_HANDLER( bagman_flipscreen_w ) if ((flip_screen_get(space->machine()) ^ data) & 1) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -107,7 +107,7 @@ VIDEO_START( bagman ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scrolldy(state->m_bg_tilemap, -1, -1); + state->m_bg_tilemap->set_scrolldy(-1, -1); } @@ -153,7 +153,7 @@ SCREEN_UPDATE_IND16( bagman ) if (*state->m_video_enable == 0) return 0; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c index d15403996e1..358afc06067 100644 --- a/src/mame/video/bankp.c +++ b/src/mame/video/bankp.c @@ -92,7 +92,7 @@ WRITE8_HANDLER( bankp_videoram_w ) bankp_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bankp_colorram_w ) @@ -100,7 +100,7 @@ WRITE8_HANDLER( bankp_colorram_w ) bankp_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bankp_videoram2_w ) @@ -108,7 +108,7 @@ WRITE8_HANDLER( bankp_videoram2_w ) bankp_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bankp_colorram2_w ) @@ -116,7 +116,7 @@ WRITE8_HANDLER( bankp_colorram2_w ) bankp_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bankp_out_w ) @@ -145,7 +145,7 @@ static TILE_GET_INFO( get_bg_tile_info ) int flags = (state->m_colorram2[tile_index] & 0x08) ? TILE_FLIPX : 0; SET_TILE_INFO(1, code, color, flags); - tileinfo->group = color; + tileinfo.group = color; } static TILE_GET_INFO( get_fg_tile_info ) @@ -156,7 +156,7 @@ static TILE_GET_INFO( get_fg_tile_info ) int flags = (state->m_colorram[tile_index] & 0x04) ? TILE_FLIPX : 0; SET_TILE_INFO(0, code, color, flags); - tileinfo->group = color; + tileinfo.group = color; } VIDEO_START( bankp ) @@ -179,13 +179,13 @@ SCREEN_UPDATE_IND16( bankp ) if (flip_screen_get(screen.machine())) { - tilemap_set_scrollx(state->m_fg_tilemap, 0, -state->m_scroll_x); - tilemap_set_scrollx(state->m_bg_tilemap, 0, 0); + state->m_fg_tilemap->set_scrollx(0, -state->m_scroll_x); + state->m_bg_tilemap->set_scrollx(0, 0); } else { - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scroll_x); - tilemap_set_scrollx(state->m_bg_tilemap, 0, 0); + state->m_fg_tilemap->set_scrollx(0, state->m_scroll_x); + state->m_bg_tilemap->set_scrollx(0, 0); } @@ -193,20 +193,20 @@ SCREEN_UPDATE_IND16( bankp ) switch (state->m_priority) { case 0: // combat hawk uses this - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); break; case 1: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); break; case 2: - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); break; case 3: - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); // just a guess - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); // just a guess + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); break; } return 0; diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index 7296534e8e0..5ae8aaeab46 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -122,12 +122,12 @@ VIDEO_START( baraduke ) state->m_bg_tilemap[0] = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,8,8,64,32); state->m_bg_tilemap[1] = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,3); - tilemap_set_transparent_pen(state->m_bg_tilemap[0],7); - tilemap_set_transparent_pen(state->m_bg_tilemap[1],7); + state->m_tx_tilemap->set_transparent_pen(3); + state->m_bg_tilemap[0]->set_transparent_pen(7); + state->m_bg_tilemap[1]->set_transparent_pen(7); - tilemap_set_scrolldx(state->m_tx_tilemap,0,512-288); - tilemap_set_scrolldy(state->m_tx_tilemap,16,16); + state->m_tx_tilemap->set_scrolldx(0,512-288); + state->m_tx_tilemap->set_scrolldy(16,16); } @@ -148,7 +148,7 @@ WRITE8_HANDLER( baraduke_videoram_w ) { baraduke_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap[offset/0x1000],(offset&0xfff)/2); + state->m_bg_tilemap[offset/0x1000]->mark_tile_dirty((offset&0xfff)/2); } READ8_HANDLER( baraduke_textram_r ) @@ -161,7 +161,7 @@ WRITE8_HANDLER( baraduke_textram_w ) { baraduke_state *state = space->machine().driver_data(); state->m_textram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset & 0x3ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -307,8 +307,8 @@ static void set_scroll(running_machine &machine, int layer) scrolly = -scrolly; } - tilemap_set_scrollx(state->m_bg_tilemap[layer], 0, scrollx); - tilemap_set_scrolly(state->m_bg_tilemap[layer], 0, scrolly); + state->m_bg_tilemap[layer]->set_scrollx(0, scrollx); + state->m_bg_tilemap[layer]->set_scrolly(0, scrolly); } @@ -321,7 +321,7 @@ SCREEN_UPDATE_IND16( baraduke ) /* flip screen is embedded in the sprite control registers */ /* can't use flip_screen_set(screen.machine(), ) because the visible area is asymmetrical */ flip_screen_set_no_update(screen.machine(), spriteram[0x07f6] & 0x01); - tilemap_set_flip_all(screen.machine(),flip_screen_get(screen.machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + screen.machine().tilemap().set_flip_all(flip_screen_get(screen.machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); set_scroll(screen.machine(), 0); set_scroll(screen.machine(), 1); @@ -330,12 +330,12 @@ SCREEN_UPDATE_IND16( baraduke ) else back = 0; - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap[back],TILEMAP_DRAW_OPAQUE,0); + state->m_bg_tilemap[back]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap[back ^ 1],0,0); + state->m_bg_tilemap[back ^ 1]->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect,1); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c index b96e4d35927..a7828a5becd 100644 --- a/src/mame/video/batman.c +++ b/src/mame/video/batman.c @@ -35,7 +35,7 @@ static TILE_GET_INFO( get_playfield_tile_info ) int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); - tileinfo->category = (data2 >> 4) & 3; + tileinfo.category = (data2 >> 4) & 3; } @@ -47,7 +47,7 @@ static TILE_GET_INFO( get_playfield2_tile_info ) int code = data1 & 0x7fff; int color = data2 & 0x0f; SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); - tileinfo->category = (data2 >> 4) & 3; + tileinfo.category = (data2 >> 4) & 3; } @@ -103,14 +103,14 @@ VIDEO_START( batman ) /* initialize the second playfield */ state->m_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); - tilemap_set_transparent_pen(state->m_playfield2_tilemap, 0); + state->m_playfield2_tilemap->set_transparent_pen(0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); } @@ -149,8 +149,8 @@ void batman_scanline_update(screen_device &screen, int scanline) screen.update_partial(scanline - 1); state->m_atarivc_state.pf1_xscroll_raw = (data >> 7) & 0x1ff; atarivc_update_pf_xscrolls(state); - tilemap_set_scrollx(state->m_playfield_tilemap, 0, state->m_atarivc_state.pf0_xscroll); - tilemap_set_scrollx(state->m_playfield2_tilemap, 0, state->m_atarivc_state.pf1_xscroll); + state->m_playfield_tilemap->set_scrollx(0, state->m_atarivc_state.pf0_xscroll); + state->m_playfield2_tilemap->set_scrollx(0, state->m_atarivc_state.pf1_xscroll); break; case 11: @@ -158,7 +158,7 @@ void batman_scanline_update(screen_device &screen, int scanline) screen.update_partial(scanline - 1); state->m_atarivc_state.pf0_xscroll_raw = (data >> 7) & 0x1ff; atarivc_update_pf_xscrolls(state); - tilemap_set_scrollx(state->m_playfield_tilemap, 0, state->m_atarivc_state.pf0_xscroll); + state->m_playfield_tilemap->set_scrollx(0, state->m_atarivc_state.pf0_xscroll); break; case 13: @@ -172,14 +172,14 @@ void batman_scanline_update(screen_device &screen, int scanline) if (scanline > 0) screen.update_partial(scanline - 1); state->m_atarivc_state.pf1_yscroll = (data >> 7) & 0x1ff; - tilemap_set_scrolly(state->m_playfield2_tilemap, 0, state->m_atarivc_state.pf1_yscroll); + state->m_playfield2_tilemap->set_scrolly(0, state->m_atarivc_state.pf1_yscroll); break; case 15: if (scanline > 0) screen.update_partial(scanline - 1); state->m_atarivc_state.pf0_yscroll = (data >> 7) & 0x1ff; - tilemap_set_scrolly(state->m_playfield_tilemap, 0, state->m_atarivc_state.pf0_yscroll); + state->m_playfield_tilemap->set_scrolly(0, state->m_atarivc_state.pf0_yscroll); break; } } @@ -204,14 +204,14 @@ SCREEN_UPDATE_IND16( batman ) /* draw the playfield */ priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0x00); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 1, 0x01); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 2, 0x02); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 3, 0x03); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 0, 0x80); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 1, 0x84); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 2, 0x88); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 3, 0x8c); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0x00); + state->m_playfield_tilemap->draw(bitmap, cliprect, 1, 0x01); + state->m_playfield_tilemap->draw(bitmap, cliprect, 2, 0x02); + state->m_playfield_tilemap->draw(bitmap, cliprect, 3, 0x03); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 0, 0x80); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 1, 0x84); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 2, 0x88); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 3, 0x8c); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -284,7 +284,7 @@ SCREEN_UPDATE_IND16( batman ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index 92b72f10680..eb9f92fa263 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -48,20 +48,20 @@ WRITE8_HANDLER( battlane_palette_w ) WRITE8_HANDLER( battlane_scrollx_w ) { battlane_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((state->m_video_ctrl & 0x01) << 8) + data); + state->m_bg_tilemap->set_scrollx(0, ((state->m_video_ctrl & 0x01) << 8) + data); } WRITE8_HANDLER( battlane_scrolly_w ) { battlane_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, ((state->m_cpu_control & 0x01) << 8) + data); + state->m_bg_tilemap->set_scrolly(0, ((state->m_cpu_control & 0x01) << 8) + data); } WRITE8_HANDLER( battlane_tileram_w ) { battlane_state *state = space->machine().driver_data(); state->m_tileram[offset] = data; - //tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + //state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( battlane_spriteram_w ) @@ -238,9 +238,9 @@ SCREEN_UPDATE_IND16( battlane ) { battlane_state *state = screen.machine().driver_data(); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); // HACK + state->m_bg_tilemap->mark_all_dirty(); // HACK - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); draw_fg_bitmap(screen.machine(), bitmap); return 0; diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index a23c362586d..549a6bd9427 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -33,7 +33,7 @@ WRITE8_HANDLER( battlex_videoram_w ) { battlex_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( battlex_flipscreen_w ) @@ -44,7 +44,7 @@ WRITE8_HANDLER( battlex_flipscreen_w ) if (flip_screen_get(space->machine()) != (data >> 7)) { flip_screen_set(space->machine(), data & 0x80); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -99,8 +99,8 @@ SCREEN_UPDATE_IND16(battlex) { battlex_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_lsb | (state->m_scroll_msb << 8)); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_lsb | (state->m_scroll_msb << 8)); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index 105477022d3..3c32c8a21d9 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -56,7 +56,7 @@ WRITE16_HANDLER( bbusters_video_w ) bbusters_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fix_tilemap, offset); + state->m_fix_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( bbusters_pf1_w ) @@ -64,7 +64,7 @@ WRITE16_HANDLER( bbusters_pf1_w ) bbusters_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf1_data[offset]); - tilemap_mark_tile_dirty(state->m_pf1_tilemap, offset); + state->m_pf1_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( bbusters_pf2_w ) @@ -72,7 +72,7 @@ WRITE16_HANDLER( bbusters_pf2_w ) bbusters_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf2_data[offset]); - tilemap_mark_tile_dirty(state->m_pf2_tilemap, offset); + state->m_pf2_tilemap->mark_tile_dirty(offset); } /******************************************************************************/ @@ -85,8 +85,8 @@ VIDEO_START( bbuster ) state->m_pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, tilemap_scan_cols, 16, 16, 128, 32); state->m_pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, tilemap_scan_cols, 16, 16, 128, 32); - tilemap_set_transparent_pen(state->m_pf1_tilemap, 15); - tilemap_set_transparent_pen(state->m_fix_tilemap, 15); + state->m_pf1_tilemap->set_transparent_pen(15); + state->m_fix_tilemap->set_transparent_pen(15); } VIDEO_START( mechatt ) @@ -97,8 +97,8 @@ VIDEO_START( mechatt ) state->m_pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, tilemap_scan_cols, 16, 16, 256, 32); state->m_pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, tilemap_scan_cols, 16, 16, 256, 32); - tilemap_set_transparent_pen(state->m_pf1_tilemap, 15); - tilemap_set_transparent_pen(state->m_fix_tilemap, 15); + state->m_pf1_tilemap->set_transparent_pen(15); + state->m_fix_tilemap->set_transparent_pen(15); } /******************************************************************************/ @@ -283,17 +283,17 @@ SCREEN_UPDATE_IND16( bbuster ) { bbusters_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_pf1_scroll_data[0]); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_pf1_scroll_data[1]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_pf2_scroll_data[0]); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_pf2_scroll_data[1]); + state->m_pf1_tilemap->set_scrollx(0, state->m_pf1_scroll_data[0]); + state->m_pf1_tilemap->set_scrolly(0, state->m_pf1_scroll_data[1]); + state->m_pf2_tilemap->set_scrollx(0, state->m_pf2_scroll_data[0]); + state->m_pf2_tilemap->set_scrolly(0, state->m_pf2_scroll_data[1]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); //draw_sprites(screen.machine(), bitmap, screen.machine().generic.buffered_spriteram2.u16, 2, 0x8, 0x8); - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, screen.machine().generic.buffered_spriteram2.u16, 2, 0, 0); draw_sprites(screen.machine(), bitmap, screen.machine().generic.buffered_spriteram.u16, 1, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -301,14 +301,14 @@ SCREEN_UPDATE_IND16( mechatt ) { bbusters_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_pf1_scroll_data[0]); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_pf1_scroll_data[1]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_pf2_scroll_data[0]); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_pf2_scroll_data[1]); + state->m_pf1_tilemap->set_scrollx(0, state->m_pf1_scroll_data[0]); + state->m_pf1_tilemap->set_scrolly(0, state->m_pf1_scroll_data[1]); + state->m_pf2_tilemap->set_scrollx(0, state->m_pf2_scroll_data[0]); + state->m_pf2_tilemap->set_scrolly(0, state->m_pf2_scroll_data[1]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, screen.machine().generic.buffered_spriteram.u16, 1, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index f8a78419dc2..0c103eb23a1 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -218,8 +218,8 @@ SCREEN_UPDATE_IND16( adder2 ) { const rectangle visible1(0, 400-1, 0, 280-1); //minx,maxx, miny,maxy - if (adder2_screen_page_reg & SL_DISPLAY) tilemap_draw(bitmap, visible1, tilemap1, 0, 0); - else tilemap_draw(bitmap, visible1, tilemap0, 0, 0); + if (adder2_screen_page_reg & SL_DISPLAY) tilemap1->draw(bitmap, visible1, 0, 0); + else tilemap0->draw(bitmap, visible1, 0, 0); return 0; } @@ -295,13 +295,13 @@ static WRITE8_HANDLER( screen_ram_w ) if ( adder2_screen_page_reg & SL_ACCESS ) { adder_screen_ram[1][offset] = data; - tilemap_mark_tile_dirty(tilemap1, dirty_off); + tilemap1->mark_tile_dirty(dirty_off); } else { adder_screen_ram[0][offset] = data; - tilemap_mark_tile_dirty(tilemap0, dirty_off); + tilemap0->mark_tile_dirty(dirty_off); } } diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index 66d6d763b5f..9d1a1de98f0 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -74,7 +74,7 @@ WRITE16_HANDLER( bsb_videoram_w ) { bigstrkb_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset); + state->m_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bsb_tile2_info ) @@ -92,7 +92,7 @@ WRITE16_HANDLER( bsb_videoram2_w ) { bigstrkb_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap2,offset); + state->m_tilemap2->mark_tile_dirty(offset); } @@ -111,7 +111,7 @@ WRITE16_HANDLER( bsb_videoram3_w ) { bigstrkb_state *state = space->machine().driver_data(); state->m_videoram3[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap3,offset); + state->m_tilemap3->mark_tile_dirty(offset); } /* Video Start / Update */ @@ -123,9 +123,9 @@ VIDEO_START(bigstrkb) state->m_tilemap2 = tilemap_create(machine, get_bsb_tile2_info,bsb_bg_scan, 16, 16,128,64); state->m_tilemap3 = tilemap_create(machine, get_bsb_tile3_info,bsb_bg_scan, 16, 16,128,64); - tilemap_set_transparent_pen(state->m_tilemap,15); - //tilemap_set_transparent_pen(state->m_tilemap2,15); - tilemap_set_transparent_pen(state->m_tilemap3,15); + state->m_tilemap->set_transparent_pen(15); + //state->m_tilemap2->set_transparent_pen(15); + state->m_tilemap3->set_transparent_pen(15); } SCREEN_UPDATE_IND16(bigstrkb) @@ -134,17 +134,17 @@ SCREEN_UPDATE_IND16(bigstrkb) // bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_set_scrollx(state->m_tilemap2,0, state->m_vidreg1[0]+(256-14)); - tilemap_set_scrolly(state->m_tilemap2,0, state->m_vidreg2[0]); + state->m_tilemap2->set_scrollx(0, state->m_vidreg1[0]+(256-14)); + state->m_tilemap2->set_scrolly(0, state->m_vidreg2[0]); - tilemap_set_scrollx(state->m_tilemap3,0, state->m_vidreg1[1]+(256-14)); - tilemap_set_scrolly(state->m_tilemap3,0, state->m_vidreg2[1]); + state->m_tilemap3->set_scrollx(0, state->m_vidreg1[1]+(256-14)); + state->m_tilemap3->set_scrolly(0, state->m_vidreg2[1]); - tilemap_draw(bitmap,cliprect,state->m_tilemap2,0,0); - tilemap_draw(bitmap,cliprect,state->m_tilemap3,0,0); + state->m_tilemap2->draw(bitmap, cliprect, 0,0); + state->m_tilemap3->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); // popmessage ("Regs %08x %08x %08x %08x",bsb_vidreg2[0],bsb_vidreg2[1],bsb_vidreg2[2],bsb_vidreg2[3]); return 0; diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index ab9eee12fac..2fd13eead8b 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -54,14 +54,14 @@ static TILE_GET_INFO( get_fg_tile_info ) if ((attr & 0xc0) == 0xc0) { - tileinfo->category = 1; - tileinfo->group = 0; + tileinfo.category = 1; + tileinfo.group = 0; flags = 0; } else { - tileinfo->category = 0; - tileinfo->group = (attr & 0x20) >> 5; + tileinfo.category = 0; + tileinfo.group = (attr & 0x20) >> 5; flags = TILE_FLIPXY((attr & 0xc0) >> 6); } @@ -100,10 +100,10 @@ VIDEO_START( bionicc ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_tx_tilemap, 3); - tilemap_set_transmask(state->m_fg_tilemap, 0, 0xffff, 0x8000); /* split type 0 is completely transparent in front half */ - tilemap_set_transmask(state->m_fg_tilemap, 1, 0xffc1, 0x803e); /* split type 1 has pens 1-5 opaque in front half */ - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); + state->m_tx_tilemap->set_transparent_pen(3); + state->m_fg_tilemap->set_transmask(0, 0xffff, 0x8000); /* split type 0 is completely transparent in front half */ + state->m_fg_tilemap->set_transmask(1, 0xffc1, 0x803e); /* split type 1 has pens 1-5 opaque in front half */ + state->m_bg_tilemap->set_transparent_pen(15); } @@ -119,7 +119,7 @@ WRITE16_HANDLER( bionicc_bgvideoram_w ) bionicc_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( bionicc_fgvideoram_w ) @@ -127,7 +127,7 @@ WRITE16_HANDLER( bionicc_fgvideoram_w ) bionicc_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( bionicc_txvideoram_w ) @@ -135,7 +135,7 @@ WRITE16_HANDLER( bionicc_txvideoram_w ) bionicc_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_txvideoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset & 0x3ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE16_HANDLER( bionicc_paletteram_w ) @@ -169,16 +169,16 @@ WRITE16_HANDLER( bionicc_scroll_w ) switch (offset) { case 0: - tilemap_set_scrollx(state->m_fg_tilemap, 0, data); + state->m_fg_tilemap->set_scrollx(0, data); break; case 1: - tilemap_set_scrolly(state->m_fg_tilemap, 0, data); + state->m_fg_tilemap->set_scrolly(0, data); break; case 2: - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); break; case 3: - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); break; } } @@ -191,8 +191,8 @@ WRITE16_HANDLER( bionicc_gfxctrl_w ) { flip_screen_set(space->machine(), data & 0x0100); - tilemap_set_enable(state->m_bg_tilemap, data & 0x2000); /* guess */ - tilemap_set_enable(state->m_fg_tilemap, data & 0x1000); /* guess */ + state->m_bg_tilemap->enable(data & 0x2000); /* guess */ + state->m_fg_tilemap->enable(data & 0x1000); /* guess */ coin_counter_w(space->machine(), 0, data & 0x8000); coin_counter_w(space->machine(), 1, data & 0x4000); @@ -251,12 +251,12 @@ SCREEN_UPDATE_IND16( bionicc ) bionicc_state *state = screen.machine().driver_data(); bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 1 | TILEMAP_DRAW_LAYER1, 0); /* nothing in FRONT */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0 | TILEMAP_DRAW_LAYER1, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER1, 0); /* nothing in FRONT */ + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0 | TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index dae08d176a9..211ce799320 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -133,7 +133,7 @@ WRITE8_HANDLER( bking_cont1_w ) flip_screen_set_no_update(space->machine(), data & 0x04); - tilemap_set_flip_all(space->machine(), flip_screen_get(space->machine()) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + space->machine().tilemap().set_flip_all(flip_screen_get(space->machine()) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); state->m_controller = data & 0x02; @@ -167,7 +167,7 @@ WRITE8_HANDLER( bking_cont3_w ) if (state->m_palette_bank != ((data >> 1) & 0x03)) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } state->m_palette_bank = (data >> 1) & 0x03; @@ -199,7 +199,7 @@ WRITE8_HANDLER( bking_playfield_w ) { bking_state *state = space->machine().driver_data(); state->m_playfield_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -253,7 +253,7 @@ SCREEN_UPDATE_IND16( bking ) { bking_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the balls */ drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[2], @@ -319,13 +319,13 @@ SCREEN_VBLANK( bking ) latch = 0x0400; } - tilemap_set_scrollx(state->m_bg_tilemap, 0, flip_screen_get(screen.machine()) ? -xld : xld); - tilemap_set_scrolly(state->m_bg_tilemap, 0, flip_screen_get(screen.machine()) ? -yld : yld); + state->m_bg_tilemap->set_scrollx(0, flip_screen_get(screen.machine()) ? -xld : xld); + state->m_bg_tilemap->set_scrolly(0, flip_screen_get(screen.machine()) ? -yld : yld); - tilemap_draw(state->m_tmp_bitmap1, rect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(state->m_tmp_bitmap1, rect, 0, 0); - tilemap_set_scrollx(state->m_bg_tilemap, 0, 0); - tilemap_set_scrolly(state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, 0); + state->m_bg_tilemap->set_scrolly(0, 0); if (latch != 0) { diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index 30f2ad6e371..b186b657276 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -43,7 +43,7 @@ static TILE_GET_INFO( get_bg_tile_info ) state->m_scroll_ram[2 * tile_index] + ((attr & 0x07) << 8), color, (attr & 0x80) ? TILE_FLIPX : 0); - tileinfo->group = split_table[color]; + tileinfo.group = split_table[color]; } static TILE_GET_INFO( get_tx_tile_info ) @@ -79,16 +79,16 @@ VIDEO_START( blktiger ) state->m_bg_tilemap8x4 = tilemap_create(machine, get_bg_tile_info, bg8x4_scan, 16, 16, 128, 64); state->m_bg_tilemap4x8 = tilemap_create(machine, get_bg_tile_info, bg4x8_scan, 16, 16, 64, 128); - tilemap_set_transparent_pen(state->m_tx_tilemap, 3); + state->m_tx_tilemap->set_transparent_pen(3); - tilemap_set_transmask(state->m_bg_tilemap8x4, 0, 0xffff, 0x8000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap8x4, 1, 0xfff0, 0x800f); /* split type 1 has pens 4-15 transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap8x4, 2, 0xff00, 0x80ff); /* split type 1 has pens 8-15 transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap8x4, 3, 0xf000, 0x8fff); /* split type 1 has pens 12-15 transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap4x8, 0, 0xffff, 0x8000); - tilemap_set_transmask(state->m_bg_tilemap4x8, 1, 0xfff0, 0x800f); - tilemap_set_transmask(state->m_bg_tilemap4x8, 2, 0xff00, 0x80ff); - tilemap_set_transmask(state->m_bg_tilemap4x8, 3, 0xf000, 0x8fff); + state->m_bg_tilemap8x4->set_transmask(0, 0xffff, 0x8000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap8x4->set_transmask(1, 0xfff0, 0x800f); /* split type 1 has pens 4-15 transparent in front half */ + state->m_bg_tilemap8x4->set_transmask(2, 0xff00, 0x80ff); /* split type 1 has pens 8-15 transparent in front half */ + state->m_bg_tilemap8x4->set_transmask(3, 0xf000, 0x8fff); /* split type 1 has pens 12-15 transparent in front half */ + state->m_bg_tilemap4x8->set_transmask(0, 0xffff, 0x8000); + state->m_bg_tilemap4x8->set_transmask(1, 0xfff0, 0x800f); + state->m_bg_tilemap4x8->set_transmask(2, 0xff00, 0x80ff); + state->m_bg_tilemap4x8->set_transmask(3, 0xf000, 0x8fff); state->save_pointer(NAME(state->m_scroll_ram), BGRAM_BANK_SIZE * BGRAM_BANKS); } @@ -105,7 +105,7 @@ WRITE8_HANDLER( blktiger_txvideoram_w ) { blktiger_state *state = space->machine().driver_data(); state->m_txvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset & 0x3ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } READ8_HANDLER( blktiger_bgvideoram_r ) @@ -120,8 +120,8 @@ WRITE8_HANDLER( blktiger_bgvideoram_w ) offset += state->m_scroll_bank; state->m_scroll_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap8x4, offset / 2); - tilemap_mark_tile_dirty(state->m_bg_tilemap4x8, offset / 2); + state->m_bg_tilemap8x4->mark_tile_dirty(offset / 2); + state->m_bg_tilemap4x8->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( blktiger_bgvideoram_bank_w ) @@ -138,8 +138,8 @@ WRITE8_HANDLER( blktiger_scrolly_w ) state->m_scroll_y[offset] = data; scrolly = state->m_scroll_y[0] | (state->m_scroll_y[1] << 8); - tilemap_set_scrolly(state->m_bg_tilemap8x4, 0, scrolly); - tilemap_set_scrolly(state->m_bg_tilemap4x8, 0, scrolly); + state->m_bg_tilemap8x4->set_scrolly(0, scrolly); + state->m_bg_tilemap4x8->set_scrolly(0, scrolly); } WRITE8_HANDLER( blktiger_scrollx_w ) @@ -149,8 +149,8 @@ WRITE8_HANDLER( blktiger_scrollx_w ) state->m_scroll_x[offset] = data; scrollx = state->m_scroll_x[0] | (state->m_scroll_x[1] << 8); - tilemap_set_scrollx(state->m_bg_tilemap8x4, 0, scrollx); - tilemap_set_scrollx(state->m_bg_tilemap4x8, 0, scrollx); + state->m_bg_tilemap8x4->set_scrollx(0, scrollx); + state->m_bg_tilemap4x8->set_scrollx(0, scrollx); } @@ -187,8 +187,8 @@ WRITE8_HANDLER( blktiger_screen_layout_w ) { blktiger_state *state = space->machine().driver_data(); state->m_screen_layout = data; - tilemap_set_enable(state->m_bg_tilemap8x4, state->m_screen_layout); - tilemap_set_enable(state->m_bg_tilemap4x8, !state->m_screen_layout); + state->m_bg_tilemap8x4->enable(state->m_screen_layout); + state->m_bg_tilemap4x8->enable(!state->m_screen_layout); } @@ -237,16 +237,16 @@ SCREEN_UPDATE_IND16( blktiger ) bitmap.fill(1023, cliprect); if (state->m_bgon) - tilemap_draw(bitmap, cliprect, state->m_screen_layout ? state->m_bg_tilemap8x4 : state->m_bg_tilemap4x8, TILEMAP_DRAW_LAYER1, 0); + (state->m_screen_layout ? state->m_bg_tilemap8x4 : state->m_bg_tilemap4x8)->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); if (state->m_objon) draw_sprites(screen.machine(), bitmap, cliprect); if (state->m_bgon) - tilemap_draw(bitmap, cliprect, state->m_screen_layout ? state->m_bg_tilemap8x4 : state->m_bg_tilemap4x8, TILEMAP_DRAW_LAYER0, 0); + (state->m_screen_layout ? state->m_bg_tilemap8x4 : state->m_bg_tilemap4x8)->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); if (state->m_chon) - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index 8b85eef38de..a4b4032b01a 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -82,7 +82,7 @@ static TILE_GET_INFO( get_tile_info_0 ) attr & 0x1f, TILE_FLIPYX((attr >> 6) & 3)); - tileinfo->category = (attr >> 5) & 1; + tileinfo.category = (attr >> 5) & 1; } static TILE_GET_INFO( get_tile_info_1 ) @@ -96,7 +96,7 @@ static TILE_GET_INFO( get_tile_info_1 ) attr & 0x1f, TILE_FLIPYX((attr >> 6) & 3)); - tileinfo->category = (attr >> 5) & 1; + tileinfo.category = (attr >> 5) & 1; } @@ -104,14 +104,14 @@ WRITE16_HANDLER( blmbycar_vram_0_w ) { blmbycar_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_0[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_0, offset / 2); + state->m_tilemap_0->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( blmbycar_vram_1_w ) { blmbycar_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_1[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_1, offset / 2); + state->m_tilemap_1->mark_tile_dirty(offset / 2); } @@ -130,12 +130,12 @@ VIDEO_START( blmbycar ) state->m_tilemap_0 = tilemap_create(machine, get_tile_info_0, tilemap_scan_rows, 16, 16, DIM_NX, DIM_NY ); state->m_tilemap_1 = tilemap_create(machine, get_tile_info_1, tilemap_scan_rows, 16, 16, DIM_NX, DIM_NY ); - tilemap_set_scroll_rows(state->m_tilemap_0, 1); - tilemap_set_scroll_cols(state->m_tilemap_0, 1); + state->m_tilemap_0->set_scroll_rows(1); + state->m_tilemap_0->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_1, 1); - tilemap_set_scroll_cols(state->m_tilemap_1, 1); - tilemap_set_transparent_pen(state->m_tilemap_1, 0); + state->m_tilemap_1->set_scroll_rows(1); + state->m_tilemap_1->set_scroll_cols(1); + state->m_tilemap_1->set_transparent_pen(0); } @@ -224,11 +224,11 @@ SCREEN_UPDATE_IND16( blmbycar ) blmbycar_state *state = screen.machine().driver_data(); int i, layers_ctrl = -1; - tilemap_set_scrolly(state->m_tilemap_0, 0, state->m_scroll_0[0]); - tilemap_set_scrollx(state->m_tilemap_0, 0, state->m_scroll_0[1]); + state->m_tilemap_0->set_scrolly(0, state->m_scroll_0[0]); + state->m_tilemap_0->set_scrollx(0, state->m_scroll_0[1]); - tilemap_set_scrolly(state->m_tilemap_1, 0, state->m_scroll_1[0] + 1); - tilemap_set_scrollx(state->m_tilemap_1, 0, state->m_scroll_1[1] + 5); + state->m_tilemap_1->set_scrolly(0, state->m_scroll_1[0] + 1); + state->m_tilemap_1->set_scrollx(0, state->m_scroll_1[1] + 5); #ifdef MAME_DEBUG if (screen.machine().input().code_pressed(KEYCODE_Z)) @@ -247,13 +247,13 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) if (layers_ctrl & 1) for (i = 0; i <= 1; i++) - tilemap_draw(bitmap, cliprect, state->m_tilemap_0, i, i); + state->m_tilemap_0->draw(bitmap, cliprect, i, i); else bitmap.fill(0, cliprect); if (layers_ctrl & 2) for (i = 0; i <= 1; i++) - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, i, i); + state->m_tilemap_1->draw(bitmap, cliprect, i, i); if (layers_ctrl & 8) draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c index aa967d61960..0c7b972bea0 100644 --- a/src/mame/video/blockade.c +++ b/src/mame/video/blockade.c @@ -5,7 +5,7 @@ WRITE8_HANDLER( blockade_videoram_w ) { blockade_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); if (input_port_read(space->machine(), "IN3") & 0x80) { @@ -32,6 +32,6 @@ SCREEN_UPDATE_IND16( blockade ) { blockade_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c index 04dbf331307..cb87c3121bd 100644 --- a/src/mame/video/bloodbro.c +++ b/src/mame/video/bloodbro.c @@ -62,8 +62,8 @@ VIDEO_START( bloodbro ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,32,16); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,15); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); } @@ -78,21 +78,21 @@ WRITE16_HANDLER( bloodbro_bgvideoram_w ) { bloodbro_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( bloodbro_fgvideoram_w ) { bloodbro_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( bloodbro_txvideoram_w ) { bloodbro_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_txvideoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } @@ -235,34 +235,34 @@ static void weststry_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap SCREEN_UPDATE_IND16( bloodbro ) { bloodbro_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scroll[0x10]); /* ? */ - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scroll[0x11]); /* ? */ - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scroll[0x12]); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scroll[0x13]); + state->m_bg_tilemap->set_scrollx(0,state->m_scroll[0x10]); /* ? */ + state->m_bg_tilemap->set_scrolly(0,state->m_scroll[0x11]); /* ? */ + state->m_fg_tilemap->set_scrollx(0,state->m_scroll[0x12]); + state->m_fg_tilemap->set_scrolly(0,state->m_scroll[0x13]); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,1); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,1); bloodbro_draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } SCREEN_UPDATE_IND16( weststry ) { bloodbro_state *state = screen.machine().driver_data(); -// tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scroll[0x10]); /* ? */ -// tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scroll[0x11]); /* ? */ -// tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scroll[0x12]); -// tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scroll[0x13]); +// state->m_bg_tilemap->set_scrollx(0,state->m_scroll[0x10]); /* ? */ +// state->m_bg_tilemap->set_scrolly(0,state->m_scroll[0x11]); /* ? */ +// state->m_fg_tilemap->set_scrollx(0,state->m_scroll[0x12]); +// state->m_fg_tilemap->set_scrolly(0,state->m_scroll[0x13]); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,1); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,1); weststry_draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -270,17 +270,17 @@ SCREEN_UPDATE_IND16( weststry ) SCREEN_UPDATE_IND16( skysmash ) { bloodbro_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scroll[0x08]); - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scroll[0x09]); /* ? */ - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scroll[0x0a]); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scroll[0x0b]); /* ? */ + state->m_bg_tilemap->set_scrollx(0,state->m_scroll[0x08]); + state->m_bg_tilemap->set_scrolly(0,state->m_scroll[0x09]); /* ? */ + state->m_fg_tilemap->set_scrollx(0,state->m_scroll[0x0a]); + state->m_fg_tilemap->set_scrolly(0,state->m_scroll[0x0b]); /* ? */ screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,1); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,1); bloodbro_draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c index 9dc488476a5..fcaa14282ee 100644 --- a/src/mame/video/blstroid.c +++ b/src/mame/video/blstroid.c @@ -152,7 +152,7 @@ SCREEN_UPDATE_IND16( blstroid ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index 769dab4c5ee..fa038203e4c 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -51,7 +51,7 @@ WRITE8_HANDLER( blueprnt_videoram_w ) blueprnt_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( blueprnt_colorram_w ) @@ -59,7 +59,7 @@ WRITE8_HANDLER( blueprnt_colorram_w ) blueprnt_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( blueprnt_flipscreen_w ) @@ -71,7 +71,7 @@ WRITE8_HANDLER( blueprnt_flipscreen_w ) if (state->m_gfx_bank != ((data & 0x04) >> 2)) { state->m_gfx_bank = ((data & 0x04) >> 2); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -82,7 +82,7 @@ static TILE_GET_INFO( get_bg_tile_info ) int code = state->m_videoram[tile_index] + 256 * state->m_gfx_bank; int color = attr & 0x7f; - tileinfo->category = (attr & 0x80) ? 1 : 0; + tileinfo.category = (attr & 0x80) ? 1 : 0; SET_TILE_INFO(0, code, color, 0); } @@ -92,8 +92,8 @@ VIDEO_START( blueprnt ) blueprnt_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_x, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scroll_cols(32); state->save_item(NAME(state->m_gfx_bank)); } @@ -131,14 +131,14 @@ SCREEN_UPDATE_IND16( blueprnt ) if (flip_screen_get(screen.machine())) for (i = 0; i < 32; i++) - tilemap_set_scrolly(state->m_bg_tilemap, i, state->m_scrollram[32 - i]); + state->m_bg_tilemap->set_scrolly(i, state->m_scrollram[32 - i]); else for (i = 0; i < 32; i++) - tilemap_set_scrolly(state->m_bg_tilemap, i, state->m_scrollram[30 - i]); + state->m_bg_tilemap->set_scrolly(i, state->m_scrollram[30 - i]); bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); return 0; } diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index 461df52400f..ee4e518af12 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -40,7 +40,7 @@ WRITE8_HANDLER( bogeyman_videoram_w ) bogeyman_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bogeyman_colorram_w ) @@ -48,7 +48,7 @@ WRITE8_HANDLER( bogeyman_colorram_w ) bogeyman_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bogeyman_videoram2_w ) @@ -56,7 +56,7 @@ WRITE8_HANDLER( bogeyman_videoram2_w ) bogeyman_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bogeyman_colorram2_w ) @@ -64,7 +64,7 @@ WRITE8_HANDLER( bogeyman_colorram2_w ) bogeyman_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bogeyman_paletteram_w ) @@ -101,7 +101,7 @@ VIDEO_START( bogeyman ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -155,8 +155,8 @@ SCREEN_UPDATE_IND16( bogeyman ) { bogeyman_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index 8f144618c60..b661c3b0acf 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -13,14 +13,14 @@ WRITE8_HANDLER( bombjack_videoram_w ) { bombjack_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bombjack_colorram_w ) { bombjack_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( bombjack_background_w ) @@ -30,7 +30,7 @@ WRITE8_HANDLER( bombjack_background_w ) if (state->m_background_image != data) { state->m_background_image = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -39,7 +39,7 @@ WRITE8_HANDLER( bombjack_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -72,7 +72,7 @@ VIDEO_START( bombjack ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -136,8 +136,8 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( bombjack ) { bombjack_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index b61eb2b0ba3..4834b7f94b8 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -91,13 +91,13 @@ static TILEMAP_MAPPER( fg_tilemap_scan ) } -INLINE void get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,int ram_offs) +INLINE void get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,int ram_offs) { bosco_state *state = machine.driver_data(); UINT8 attr = state->m_videoram[ram_offs + tile_index + 0x800]; - tileinfo->category = (attr & 0x20) >> 5; - tileinfo->group = attr & 0x3f; + tileinfo.category = (attr & 0x20) >> 5; + tileinfo.group = attr & 0x3f; SET_TILE_INFO( 0, state->m_videoram[ram_offs + tile_index], @@ -133,7 +133,7 @@ VIDEO_START( bosco ) colortable_configure_tilemap_groups(machine.colortable, state->m_bg_tilemap, machine.gfx[0], 0x1f); colortable_configure_tilemap_groups(machine.colortable, state->m_fg_tilemap, machine.gfx[0], 0x1f); - tilemap_set_scrolldx(state->m_bg_tilemap,3,3); + state->m_bg_tilemap->set_scrolldx(3,3); machine.generic.spriteram_size = 0x0c; machine.generic.spriteram.u8 = state->m_videoram + 0x03d4; @@ -159,22 +159,22 @@ WRITE8_HANDLER( bosco_videoram_w ) state->m_videoram[offset] = data; if (offset & 0x400) - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); else - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( bosco_scrollx_w ) { bosco_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,data); + state->m_bg_tilemap->set_scrollx(0,data); } WRITE8_HANDLER( bosco_scrolly_w ) { bosco_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap,0,data); + state->m_bg_tilemap->set_scrolly(0,data); } WRITE8_HANDLER( bosco_starclr_w ) @@ -302,14 +302,14 @@ SCREEN_UPDATE_IND16( bosco ) bitmap.fill(get_black_pen(screen.machine()), cliprect); draw_stars(screen.machine(),bitmap,cliprect,flip_screen_get(screen.machine())); - tilemap_draw(bitmap,bg_clip,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,fg_clip,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, bg_clip, 0,0); + state->m_fg_tilemap->draw(bitmap, fg_clip, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); /* draw the high priority characters */ - tilemap_draw(bitmap,bg_clip,state->m_bg_tilemap,1,0); - tilemap_draw(bitmap,fg_clip,state->m_fg_tilemap,1,0); + state->m_bg_tilemap->draw(bitmap, bg_clip, 1,0); + state->m_fg_tilemap->draw(bitmap, fg_clip, 1,0); draw_bullets(screen.machine(), bitmap,cliprect); diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index 02db2be83d3..ca047782e62 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -91,7 +91,7 @@ WRITE8_HANDLER( brkthru_bgram_w ) brkthru_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -107,7 +107,7 @@ WRITE8_HANDLER( brkthru_fgram_w ) brkthru_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } VIDEO_START( brkthru ) @@ -117,8 +117,8 @@ VIDEO_START( brkthru ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 16); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transparent_pen(0); } @@ -137,15 +137,15 @@ WRITE8_HANDLER( brkthru_1800_w ) if (((data & 0x38) >> 2) != state->m_bgbasecolor) { state->m_bgbasecolor = (data & 0x38) >> 2; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 6 = screen flip */ if (state->m_flipscreen != (data & 0x40)) { state->m_flipscreen = data & 0x40; - tilemap_set_flip(state->m_bg_tilemap, state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(state->m_fg_tilemap, state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_bg_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_fg_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } @@ -254,20 +254,20 @@ SCREEN_UPDATE_IND16( brkthru ) { brkthru_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bgscroll); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_bgscroll); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); /* low priority sprites */ draw_sprites(screen.machine(), bitmap, cliprect, 0x01); /* draw background over low priority sprites */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* high priority sprites */ draw_sprites(screen.machine(), bitmap, cliprect, 0x09); /* fg layer */ - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); /* show_register(bitmap, 8, 8, (UINT32)state->m_flipscreen); */ diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index 3e418c1ebea..dec01839228 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -13,7 +13,7 @@ WRITE8_HANDLER( bsktball_videoram_w ) bsktball_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -57,7 +57,7 @@ SCREEN_UPDATE_IND16( bsktball ) { bsktball_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 9c0753bf50f..98caa72f588 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -65,7 +65,7 @@ WRITE8_HANDLER( bwing_videoram_w ) { bwing_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_charmap, offset); + state->m_charmap->mark_tile_dirty(offset); } @@ -92,9 +92,9 @@ WRITE8_HANDLER( bwing_scrollram_w ) { offs = state->m_srxlat[offset]; if (offs >> 12) - tilemap_mark_tile_dirty(state->m_bgmap, offs & 0xfff); + state->m_bgmap->mark_tile_dirty(offs & 0xfff); else - tilemap_mark_tile_dirty(state->m_fgmap, offs & 0xfff); + state->m_fgmap->mark_tile_dirty(offs & 0xfff); } else { @@ -179,15 +179,15 @@ WRITE8_HANDLER( bwing_paletteram_w ) static TILE_GET_INFO( get_fgtileinfo ) { bwing_state *state = machine.driver_data(); - tileinfo->pen_data = gfx_element_get_data(machine.gfx[2], state->m_fgdata[tile_index] & (BW_NTILES - 1)); - tileinfo->palette_base = machine.gfx[2]->color_base + ((state->m_fgdata[tile_index] >> 7) << 3); + tileinfo.pen_data = gfx_element_get_data(machine.gfx[2], state->m_fgdata[tile_index] & (BW_NTILES - 1)); + tileinfo.palette_base = machine.gfx[2]->color_base + ((state->m_fgdata[tile_index] >> 7) << 3); } static TILE_GET_INFO( get_bgtileinfo ) { bwing_state *state = machine.driver_data(); - tileinfo->pen_data = gfx_element_get_data(machine.gfx[3], state->m_bgdata[tile_index] & (BW_NTILES - 1)); - tileinfo->palette_base = machine.gfx[3]->color_base + ((state->m_bgdata[tile_index] >> 7) << 3); + tileinfo.pen_data = gfx_element_get_data(machine.gfx[3], state->m_bgdata[tile_index] & (BW_NTILES - 1)); + tileinfo.palette_base = machine.gfx[3]->color_base + ((state->m_bgdata[tile_index] >> 7) << 3); } static TILE_GET_INFO( get_charinfo ) @@ -212,8 +212,8 @@ VIDEO_START( bwing ) state->m_fgmap = tilemap_create(machine, get_fgtileinfo, bwing_scan_cols, 16, 16, 64, 64); state->m_bgmap = tilemap_create(machine, get_bgtileinfo, bwing_scan_cols, 16, 16, 64, 64); - tilemap_set_transparent_pen(state->m_charmap, 0); - tilemap_set_transparent_pen(state->m_fgmap, 0); + state->m_charmap->set_transparent_pen(0); + state->m_fgmap->set_transparent_pen(0); state->m_srxlat = auto_alloc_array(machine, int, 0x2000); state->save_pointer(NAME(state->m_srxlat), 0x2000); @@ -308,12 +308,12 @@ SCREEN_UPDATE_IND16( bwing ) // draw background if (!(state->m_mapmask & 1)) { - tilemap_set_flip(state->m_bgmap, state->m_mapflip); + state->m_bgmap->set_flip(state->m_mapflip); x = ((state->m_sreg[1]<<2 & 0x300) + state->m_sreg[2] + shiftx) & 0x3ff; - tilemap_set_scrollx(state->m_bgmap, 0, x); + state->m_bgmap->set_scrollx(0, x); y = (state->m_sreg[1]<<4 & 0x300) + state->m_sreg[3]; - tilemap_set_scrolly(state->m_bgmap, 0, y); - tilemap_draw(bitmap, cliprect, state->m_bgmap, 0, 0); + state->m_bgmap->set_scrolly(0, y); + state->m_bgmap->draw(bitmap, cliprect, 0, 0); } else bitmap.fill(get_black_pen(screen.machine()), cliprect); @@ -324,12 +324,12 @@ SCREEN_UPDATE_IND16( bwing ) // draw foreground if (!(state->m_mapmask & 2)) { - tilemap_set_flip(state->m_fgmap, state->m_mapflip); + state->m_fgmap->set_flip(state->m_mapflip); x = ((state->m_sreg[1] << 6 & 0x300) + state->m_sreg[4] + shiftx) & 0x3ff; - tilemap_set_scrollx(state->m_fgmap, 0, x); + state->m_fgmap->set_scrollx(0, x); y = (state->m_sreg[1] << 8 & 0x300) + state->m_sreg[5]; - tilemap_set_scrolly(state->m_fgmap, 0, y); - tilemap_draw(bitmap, cliprect, state->m_fgmap, 0, 0); + state->m_fgmap->set_scrolly(0, y); + state->m_fgmap->draw(bitmap, cliprect, 0, 0); } // draw high priority sprites @@ -338,8 +338,8 @@ SCREEN_UPDATE_IND16( bwing ) // draw text layer // if (state->m_mapmask & 4) { - tilemap_set_flip(state->m_charmap, state->m_mapflip); - tilemap_draw(bitmap, cliprect, state->m_charmap, 0, 0); + state->m_charmap->set_flip(state->m_mapflip); + state->m_charmap->draw(bitmap, cliprect, 0, 0); } return 0; } diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index ca12e432e09..c7c608b8c28 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -49,8 +49,8 @@ VIDEO_START( cabal ) state->m_background_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_rows,16,16,16,16); state->m_text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8,8,32,32); - tilemap_set_transparent_pen(state->m_text_layer,3); - tilemap_set_transparent_pen(state->m_background_layer,15); + state->m_text_layer->set_transparent_pen(3); + state->m_background_layer->set_transparent_pen(15); } @@ -62,8 +62,8 @@ WRITE16_HANDLER( cabal_flipscreen_w ) { cabal_state *state = space->machine().driver_data(); int flip = (data & 0x20) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; - tilemap_set_flip(state->m_background_layer,flip); - tilemap_set_flip(state->m_text_layer,flip); + state->m_background_layer->set_flip(flip); + state->m_text_layer->set_flip(flip); flip_screen_set(space->machine(), data & 0x20); } @@ -73,14 +73,14 @@ WRITE16_HANDLER( cabal_background_videoram16_w ) { cabal_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_background_layer,offset); + state->m_background_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( cabal_text_videoram16_w ) { cabal_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_colorram[offset]); - tilemap_mark_tile_dirty(state->m_text_layer,offset); + state->m_text_layer->mark_tile_dirty(offset); } @@ -149,9 +149,9 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( cabal ) { cabal_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_background_layer,TILEMAP_DRAW_OPAQUE,0); + state->m_background_layer->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_text_layer,0,0); + state->m_text_layer->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c index 32d8b74c702..66f866b2915 100644 --- a/src/mame/video/calomega.c +++ b/src/mame/video/calomega.c @@ -21,14 +21,14 @@ WRITE8_HANDLER( calomega_videoram_w ) { calomega_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( calomega_colorram_w ) { calomega_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -66,7 +66,7 @@ VIDEO_START( calomega ) SCREEN_UPDATE_IND16( calomega ) { calomega_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index a6974224c0a..52302a03054 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -12,7 +12,7 @@ WRITE8_HANDLER( canyon_videoram_w ) { canyon_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -77,7 +77,7 @@ SCREEN_UPDATE_IND16( canyon ) { canyon_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index 1f07ef80111..8f5895e3df8 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -47,7 +47,7 @@ WRITE8_HANDLER( carjmbre_flipscreen_w ) carjmbre_state *state = space->machine().driver_data(); state->m_flipscreen = (data & 1) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; - tilemap_set_flip_all(space->machine(), state->m_flipscreen); + space->machine().tilemap().set_flip_all(state->m_flipscreen); } WRITE8_HANDLER( carjmbre_bgcolor_w ) @@ -80,7 +80,7 @@ WRITE8_HANDLER( carjmbre_videoram_w ) carjmbre_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_cj_tilemap, offset & 0x3ff); + state->m_cj_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -119,7 +119,7 @@ SCREEN_UPDATE_IND16( carjmbre ) //-xxx---- unused //----xxxx colour - tilemap_draw(bitmap, cliprect, state->m_cj_tilemap, 0, 0); + state->m_cj_tilemap->draw(bitmap, cliprect, 0, 0); //spriteram[offs] //+0 y pos diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index 538ca59eb8f..0beca5bef3b 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -224,7 +224,7 @@ static void set_pens( running_machine &machine ) ***************************************************************************/ -INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int GFX ) +INLINE void get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int GFX ) { cave_state *state = machine.driver_data(); UINT16 *VRAM = state->m_vram[GFX]; @@ -253,7 +253,7 @@ INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int ti } SET_TILE_INFO( GFX, code, color, 0 ); - tileinfo->category = pri; + tileinfo.category = pri; } @@ -265,7 +265,7 @@ void sailormn_tilebank_w( running_machine &machine, int bank ) if (state->m_sailormn_tilebank != bank) { state->m_sailormn_tilebank = bank; - tilemap_mark_all_tiles_dirty(state->m_tilemap[2]); + state->m_tilemap[2]->mark_all_dirty(); } } @@ -299,7 +299,7 @@ static TILE_GET_INFO( sailormn_get_tile_info_2 ) } SET_TILE_INFO( 2, code, color, 0 ); - tileinfo->category = pri; + tileinfo.category = pri; } @@ -317,13 +317,13 @@ INLINE void vram_w( address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED if (offset < 0x1000 / 4) // 16x16 tilemap { offset = (offset % (512 / 16)) * 2 + (offset / (512 / 16)) * (512 / 8) * 2; - tilemap_mark_tile_dirty(TILEMAP, offset + 0); - tilemap_mark_tile_dirty(TILEMAP, offset + 1); - tilemap_mark_tile_dirty(TILEMAP, offset + 0 + 512 / 8); - tilemap_mark_tile_dirty(TILEMAP, offset + 1 + 512 / 8); + TILEMAP->mark_tile_dirty(offset + 0); + TILEMAP->mark_tile_dirty(offset + 1); + TILEMAP->mark_tile_dirty(offset + 0 + 512 / 8); + TILEMAP->mark_tile_dirty(offset + 1 + 512 / 8); } else if (offset >= 0x4000 / 4) // 8x8 tilemap - tilemap_mark_tile_dirty(TILEMAP, offset - 0x4000 / 4); + TILEMAP->mark_tile_dirty(offset - 0x4000 / 4); } /* Some games, that only ever use the 8x8 tiles and no line scroll, @@ -343,7 +343,7 @@ INLINE void vram_8x8_w( address_space *space, ATTR_UNUSED offs_t offset, ATTR_UN COMBINE_DATA(&VRAM[offset + 0x0000 / 2]); COMBINE_DATA(&VRAM[offset + 0x4000 / 2]); - tilemap_mark_tile_dirty(TILEMAP,offset / 2); + TILEMAP->mark_tile_dirty(offset / 2); } @@ -399,33 +399,33 @@ static void cave_vh_start( running_machine &machine, int num ) { case 4: state->m_tilemap[3] = tilemap_create(machine, get_tile_info_3, tilemap_scan_rows, 8, 8, 512 / 8, 512 / 8); - tilemap_set_transparent_pen(state->m_tilemap[3], 0); - tilemap_set_scroll_rows(state->m_tilemap[3], 1); - tilemap_set_scroll_cols(state->m_tilemap[3], 1); + state->m_tilemap[3]->set_transparent_pen(0); + state->m_tilemap[3]->set_scroll_rows(1); + state->m_tilemap[3]->set_scroll_cols(1); state->save_item(NAME(state->m_tiledim[3])); state->save_item(NAME(state->m_old_tiledim[3])); case 3: state->m_tilemap[2] = tilemap_create(machine, get_tile_info_2, tilemap_scan_rows, 8, 8, 512 / 8, 512 / 8); - tilemap_set_transparent_pen(state->m_tilemap[2], 0); - tilemap_set_scroll_rows(state->m_tilemap[2], 1); - tilemap_set_scroll_cols(state->m_tilemap[2], 1); + state->m_tilemap[2]->set_transparent_pen(0); + state->m_tilemap[2]->set_scroll_rows(1); + state->m_tilemap[2]->set_scroll_cols(1); state->save_item(NAME(state->m_tiledim[2])); state->save_item(NAME(state->m_old_tiledim[2])); case 2: state->m_tilemap[1] = tilemap_create(machine, get_tile_info_1, tilemap_scan_rows, 8, 8, 512 / 8, 512 / 8); - tilemap_set_transparent_pen(state->m_tilemap[1], 0); - tilemap_set_scroll_rows(state->m_tilemap[1], 1); - tilemap_set_scroll_cols(state->m_tilemap[1], 1); + state->m_tilemap[1]->set_transparent_pen(0); + state->m_tilemap[1]->set_scroll_rows(1); + state->m_tilemap[1]->set_scroll_cols(1); state->save_item(NAME(state->m_tiledim[1])); state->save_item(NAME(state->m_old_tiledim[1])); case 1: state->m_tilemap[0] = tilemap_create(machine, get_tile_info_0, tilemap_scan_rows, 8, 8, 512 / 8, 512 / 8); - tilemap_set_transparent_pen(state->m_tilemap[0], 0); - tilemap_set_scroll_rows(state->m_tilemap[0], 1); - tilemap_set_scroll_cols(state->m_tilemap[0], 1); + state->m_tilemap[0]->set_transparent_pen(0); + state->m_tilemap[0]->set_scroll_rows(1); + state->m_tilemap[0]->set_scroll_cols(1); state->save_item(NAME(state->m_tiledim[0])); state->save_item(NAME(state->m_old_tiledim[0])); @@ -474,9 +474,9 @@ VIDEO_START( sailormn_3_layers ) /* Layer 2 (8x8) needs to be handled differently */ state->m_tilemap[2] = tilemap_create(machine, sailormn_get_tile_info_2, tilemap_scan_rows, 8, 8, 512 / 8, 512 / 8 ); - tilemap_set_transparent_pen(state->m_tilemap[2], 0); - tilemap_set_scroll_rows(state->m_tilemap[2], 1); - tilemap_set_scroll_cols(state->m_tilemap[2], 1); + state->m_tilemap[2]->set_transparent_pen(0); + state->m_tilemap[2]->set_scroll_rows(1); + state->m_tilemap[2]->set_scroll_cols(1); } /*************************************************************************** @@ -1434,7 +1434,7 @@ INLINE void cave_tilemap_draw( flipx = ~VCTRL[0] & 0x8000; flipy = ~VCTRL[1] & 0x8000; - tilemap_set_flip(TILEMAP, (flipx ? TILEMAP_FLIPX : 0) | (flipy ? TILEMAP_FLIPY : 0) ); + TILEMAP->set_flip((flipx ? TILEMAP_FLIPX : 0) | (flipy ? TILEMAP_FLIPY : 0) ); offs_x = state->m_layers_offs_x; offs_y = state->m_layers_offs_y; @@ -1475,7 +1475,7 @@ INLINE void cave_tilemap_draw( for(endline = startline + 1; endline <= cliprect.max_y; endline++) if((++vramdata1) != VRAM[(0x1002 + (((sy + offs_row + endline) * 4) & 0x7ff)) / 2]) break; - tilemap_set_scrolly(TILEMAP, 0, vramdata0 - startline); + TILEMAP->set_scrolly(0, vramdata0 - startline); if (VCTRL[0] & 0x4000) // row-scroll, row-select { @@ -1489,15 +1489,15 @@ INLINE void cave_tilemap_draw( tilemap_draw just once. */ - tilemap_set_scroll_rows(TILEMAP, 512); + TILEMAP->set_scroll_rows(512); for(line = startline; line < endline; line++) - tilemap_set_scrollx(TILEMAP, (vramdata0 - startline + line) & 511, + TILEMAP->set_scrollx((vramdata0 - startline + line) & 511, sx + VRAM[(0x1000 + (((sy + offs_row + line) * 4) & 0x7ff)) / 2]); } else // no row-scroll, row-select { - tilemap_set_scroll_rows(TILEMAP, 1); - tilemap_set_scrollx(TILEMAP, 0, sx); + TILEMAP->set_scroll_rows(1); + TILEMAP->set_scrollx(0, sx); } if (flipy) @@ -1511,7 +1511,7 @@ INLINE void cave_tilemap_draw( clip.max_y = endline - 1; } - tilemap_draw(bitmap, clip, TILEMAP, flags, priority); + TILEMAP->draw(bitmap, clip, flags, priority); startline = endline; } @@ -1519,21 +1519,21 @@ INLINE void cave_tilemap_draw( else if (VCTRL[0] & 0x4000) // row-scroll, no row-select { int line; - tilemap_set_scroll_rows(TILEMAP, 512); + TILEMAP->set_scroll_rows(512); for(line = cliprect.min_y; line <= cliprect.max_y; line++) - tilemap_set_scrollx(TILEMAP, (line + sy) & 511, + TILEMAP->set_scrollx((line + sy) & 511, sx + VRAM[(0x1000+(((sy + offs_row + line) * 4) & 0x7ff)) / 2] ); - tilemap_set_scrolly(TILEMAP, 0, sy); - tilemap_draw(bitmap, cliprect, TILEMAP, flags, priority); + TILEMAP->set_scrolly(0, sy); + TILEMAP->draw(bitmap, cliprect, flags, priority); } else { /* DEF_STR( Normal ) scrolling */ - tilemap_set_scroll_rows(TILEMAP, 1); - tilemap_set_scroll_cols(TILEMAP, 1); - tilemap_set_scrollx(TILEMAP, 0, sx); - tilemap_set_scrolly(TILEMAP, 0, sy); - tilemap_draw(bitmap, cliprect, TILEMAP, flags, priority); + TILEMAP->set_scroll_rows(1); + TILEMAP->set_scroll_cols(1); + TILEMAP->set_scrollx(0, sx); + TILEMAP->set_scrolly(0, sy); + TILEMAP->draw(bitmap, cliprect, flags, priority); } } @@ -1556,7 +1556,7 @@ SCREEN_UPDATE_IND16( cave ) { state->m_tiledim[GFX] = state->m_vctrl[GFX][1] & 0x2000; if (state->m_tiledim[GFX] != state->m_old_tiledim[GFX]) - tilemap_mark_all_tiles_dirty(state->m_tilemap[GFX]); + state->m_tilemap[GFX]->mark_all_dirty(); state->m_old_tiledim[GFX] = state->m_tiledim[GFX]; } } diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index c6a0252e8d0..39cdbc5e7e6 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -48,7 +48,7 @@ VIDEO_START( cbasebal ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 3); + state->m_fg_tilemap->set_transparent_pen(3); state->save_pointer(NAME(state->m_textram), 0x1000); state->save_pointer(NAME(state->m_scrollram), 0x1000); @@ -67,7 +67,7 @@ WRITE8_HANDLER( cbasebal_textram_w ) cbasebal_state *state = space->machine().driver_data(); state->m_textram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x7ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x7ff); } READ8_HANDLER( cbasebal_textram_r ) @@ -81,7 +81,7 @@ WRITE8_HANDLER( cbasebal_scrollram_w ) cbasebal_state *state = space->machine().driver_data(); state->m_scrollram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } READ8_HANDLER( cbasebal_scrollram_r ) @@ -98,7 +98,7 @@ WRITE8_HANDLER( cbasebal_gfxctrl_w ) /* bit 1 is flip screen */ state->m_flipscreen = data & 0x02; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* bit 2 is unknown - unused? */ @@ -106,7 +106,7 @@ WRITE8_HANDLER( cbasebal_gfxctrl_w ) if (state->m_tilebank != ((data & 0x08) >> 3)) { state->m_tilebank = (data & 0x08) >> 3; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 4 is sprite bank */ @@ -126,14 +126,14 @@ WRITE8_HANDLER( cbasebal_scrollx_w ) { cbasebal_state *state = space->machine().driver_data(); state->m_scroll_x[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_x[0] + 256 * state->m_scroll_x[1]); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_x[0] + 256 * state->m_scroll_x[1]); } WRITE8_HANDLER( cbasebal_scrolly_w ) { cbasebal_state *state = space->machine().driver_data(); state->m_scroll_y[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll_y[0] + 256 * state->m_scroll_y[1]); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll_y[0] + 256 * state->m_scroll_y[1]); } @@ -183,7 +183,7 @@ SCREEN_UPDATE_IND16( cbasebal ) cbasebal_state *state = screen.machine().driver_data(); if (state->m_bg_on) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(768, cliprect); @@ -191,6 +191,6 @@ SCREEN_UPDATE_IND16( cbasebal ) draw_sprites(screen.machine(), bitmap, cliprect); if (state->m_text_on) - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index 97d12fd3211..58cb7f43a38 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -400,7 +400,7 @@ static TILE_GET_INFO( cclimber_get_bs_tile_info ) int code, color; /* only the lower right is visible */ - tileinfo->group = ((tile_index & 0x210) == 0x210) ? 0 : 1; + tileinfo.group = ((tile_index & 0x210) == 0x210) ? 0 : 1; /* the address doesn't use A4 of the coordinates, giving a 16x16 map */ tile_index = ((tile_index & 0x1e0) >> 1) | (tile_index & 0x0f); @@ -418,7 +418,7 @@ static TILE_GET_INFO( toprollr_get_bs_tile_info ) int code, color; /* only the lower right is visible */ - tileinfo->group = ((tile_index & 0x210) == 0x210) ? 0 : 1; + tileinfo.group = ((tile_index & 0x210) == 0x210) ? 0 : 1; /* the address doesn't use A4 of the coordinates, giving a 16x16 map */ tile_index = ((tile_index & 0x1e0) >> 1) | (tile_index & 0x0f); @@ -444,14 +444,14 @@ VIDEO_START( cclimber ) { cclimber_state *state = machine.driver_data(); state->m_pf_tilemap = tilemap_create(machine, cclimber_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_pf_tilemap, 0); - tilemap_set_scroll_cols(state->m_pf_tilemap, 32); + state->m_pf_tilemap->set_transparent_pen(0); + state->m_pf_tilemap->set_scroll_cols(32); state->m_bs_tilemap = tilemap_create(machine, cclimber_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bs_tilemap, 1); - tilemap_set_scroll_rows(state->m_bs_tilemap, 1); - tilemap_set_transmask(state->m_bs_tilemap, 0, 0x01, 0); /* pen 0 is transaprent */ - tilemap_set_transmask(state->m_bs_tilemap, 1, 0x0f, 0); /* all 4 pens are transparent */ + state->m_bs_tilemap->set_scroll_cols(1); + state->m_bs_tilemap->set_scroll_rows(1); + state->m_bs_tilemap->set_transmask(0, 0x01, 0); /* pen 0 is transaprent */ + state->m_bs_tilemap->set_transmask(1, 0x0f, 0); /* all 4 pens are transparent */ } @@ -459,14 +459,14 @@ VIDEO_START( swimmer ) { cclimber_state *state = machine.driver_data(); state->m_pf_tilemap = tilemap_create(machine, swimmer_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_pf_tilemap, 0); - tilemap_set_scroll_cols(state->m_pf_tilemap, 32); + state->m_pf_tilemap->set_transparent_pen(0); + state->m_pf_tilemap->set_scroll_cols(32); state->m_bs_tilemap = tilemap_create(machine, cclimber_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bs_tilemap, 1); - tilemap_set_scroll_rows(state->m_bs_tilemap, 1); - tilemap_set_transmask(state->m_bs_tilemap, 0, 0x01, 0); /* pen 0 is transaprent */ - tilemap_set_transmask(state->m_bs_tilemap, 1, 0xff, 0); /* all 8 pens are transparent */ + state->m_bs_tilemap->set_scroll_cols(1); + state->m_bs_tilemap->set_scroll_rows(1); + state->m_bs_tilemap->set_transmask(0, 0x01, 0); /* pen 0 is transaprent */ + state->m_bs_tilemap->set_transmask(1, 0xff, 0); /* all 8 pens are transparent */ } @@ -474,16 +474,16 @@ VIDEO_START( toprollr ) { cclimber_state *state = machine.driver_data(); state->m_pf_tilemap = tilemap_create(machine, toprollr_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_pf_tilemap, 0); + state->m_pf_tilemap->set_transparent_pen(0); state->m_toproller_bg_tilemap = tilemap_create(machine, toproller_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_toproller_bg_tilemap, 1); + state->m_toproller_bg_tilemap->set_scroll_rows(1); state->m_bs_tilemap = tilemap_create(machine, toprollr_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bs_tilemap, 1); - tilemap_set_scroll_rows(state->m_bs_tilemap, 1); - tilemap_set_transmask(state->m_bs_tilemap, 0, 0x01, 0); /* pen 0 is transaprent */ - tilemap_set_transmask(state->m_bs_tilemap, 1, 0x0f, 0); /* all 4 pens are transparent */ + state->m_bs_tilemap->set_scroll_cols(1); + state->m_bs_tilemap->set_scroll_rows(1); + state->m_bs_tilemap->set_transmask(0, 0x01, 0); /* pen 0 is transaprent */ + state->m_bs_tilemap->set_transmask(1, 0x0f, 0); /* all 4 pens are transparent */ } @@ -492,13 +492,13 @@ static void draw_playfield(running_machine &machine, bitmap_ind16 &bitmap, const cclimber_state *state = machine.driver_data(); int i; - tilemap_mark_all_tiles_dirty(state->m_pf_tilemap); - tilemap_set_flip(state->m_pf_tilemap, (CCLIMBER_FLIP_X ? TILEMAP_FLIPX : 0) | + state->m_pf_tilemap->mark_all_dirty(); + state->m_pf_tilemap->set_flip((CCLIMBER_FLIP_X ? TILEMAP_FLIPX : 0) | (CCLIMBER_FLIP_Y ? TILEMAP_FLIPY : 0)); for (i = 0; i < 32; i++) - tilemap_set_scrolly(state->m_pf_tilemap, i, state->m_column_scroll[i]); + state->m_pf_tilemap->set_scrolly(i, state->m_column_scroll[i]); - tilemap_draw(bitmap, cliprect, state->m_pf_tilemap, 0, 0); + state->m_pf_tilemap->draw(bitmap, cliprect, 0, 0); } @@ -516,15 +516,15 @@ static void cclimber_draw_bigsprite(running_machine &machine, bitmap_ind16 &bitm if (bigsprite_flip_y) y = 0x80 - y; - tilemap_mark_all_tiles_dirty(state->m_bs_tilemap); + state->m_bs_tilemap->mark_all_dirty(); - tilemap_set_flip(state->m_bs_tilemap, (bigsprite_flip_x ? TILEMAP_FLIPX : 0) | + state->m_bs_tilemap->set_flip((bigsprite_flip_x ? TILEMAP_FLIPX : 0) | (CCLIMBER_FLIP_Y ^ bigsprite_flip_y ? TILEMAP_FLIPY : 0)); - tilemap_set_scrollx(state->m_bs_tilemap, 0, x); - tilemap_set_scrolly(state->m_bs_tilemap, 0, y); + state->m_bs_tilemap->set_scrollx(0, x); + state->m_bs_tilemap->set_scrolly(0, y); - tilemap_draw(bitmap, cliprect, state->m_bs_tilemap, 0, 0); + state->m_bs_tilemap->draw(bitmap, cliprect, 0, 0); } @@ -534,14 +534,14 @@ static void toprollr_draw_bigsprite(running_machine &machine, bitmap_ind16 &bitm UINT8 x = state->m_bigsprite_control[3] - 8; UINT8 y = state->m_bigsprite_control[2]; - tilemap_mark_all_tiles_dirty(state->m_bs_tilemap); + state->m_bs_tilemap->mark_all_dirty(); - tilemap_set_flip(state->m_bs_tilemap, CCLIMBER_FLIP_Y ? TILEMAP_FLIPY : 0); + state->m_bs_tilemap->set_flip(CCLIMBER_FLIP_Y ? TILEMAP_FLIPY : 0); - tilemap_set_scrollx(state->m_bs_tilemap, 0, x); - tilemap_set_scrolly(state->m_bs_tilemap, 0, y); + state->m_bs_tilemap->set_scrollx(0, x); + state->m_bs_tilemap->set_scrolly(0, y); - tilemap_draw(bitmap, cliprect, state->m_bs_tilemap, 0, 0); + state->m_bs_tilemap->draw(bitmap, cliprect, 0, 0); } @@ -783,11 +783,11 @@ SCREEN_UPDATE_IND16( toprollr ) bitmap.fill(CCLIMBER_BG_PEN, cliprect); - tilemap_set_scrollx(state->m_toproller_bg_tilemap, 0, state->m_toprollr_bg_videoram[0]); - tilemap_set_flip(state->m_toproller_bg_tilemap, (CCLIMBER_FLIP_X ? TILEMAP_FLIPX : 0) | + state->m_toproller_bg_tilemap->set_scrollx(0, state->m_toprollr_bg_videoram[0]); + state->m_toproller_bg_tilemap->set_flip((CCLIMBER_FLIP_X ? TILEMAP_FLIPX : 0) | (CCLIMBER_FLIP_Y ? TILEMAP_FLIPY : 0)); - tilemap_mark_all_tiles_dirty(state->m_toproller_bg_tilemap); - tilemap_draw(bitmap, scroll_area_clip, state->m_toproller_bg_tilemap, 0, 0); + state->m_toproller_bg_tilemap->mark_all_dirty(); + state->m_toproller_bg_tilemap->draw(bitmap, scroll_area_clip, 0, 0); /* draw the "big sprite" over the regular sprites */ if ((state->m_bigsprite_control[1] & 0x20)) @@ -803,10 +803,10 @@ SCREEN_UPDATE_IND16( toprollr ) toprollr_draw_sprites(bitmap, scroll_area_clip, screen.machine().gfx[1]); } - tilemap_mark_all_tiles_dirty(state->m_pf_tilemap); - tilemap_set_flip(state->m_pf_tilemap, (CCLIMBER_FLIP_X ? TILEMAP_FLIPX : 0) | + state->m_pf_tilemap->mark_all_dirty(); + state->m_pf_tilemap->set_flip((CCLIMBER_FLIP_X ? TILEMAP_FLIPX : 0) | (CCLIMBER_FLIP_Y ? TILEMAP_FLIPY : 0)); - tilemap_draw(bitmap, cliprect, state->m_pf_tilemap, 0, 0); + state->m_pf_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index c80d2dd50fc..7da4ac8e521 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -153,7 +153,7 @@ WRITE8_HANDLER( centiped_videoram_w ) UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -184,7 +184,7 @@ WRITE8_HANDLER( bullsdrt_tilesbank_w ) centiped_state *state = space->machine().driver_data(); state->m_bullsdrt_tiles_bankram[offset] = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } @@ -437,7 +437,7 @@ SCREEN_UPDATE_IND16( centiped ) int offs; /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* apply the sprite clip */ if (state->m_flipscreen) @@ -472,12 +472,12 @@ SCREEN_UPDATE_IND16( warlords ) if (state->m_flipscreen != upright_mode) { state->m_flipscreen = upright_mode; - tilemap_set_flip(state->m_bg_tilemap, upright_mode ? TILEMAP_FLIPX : 0); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->set_flip(upright_mode ? TILEMAP_FLIPX : 0); + state->m_bg_tilemap->mark_all_dirty(); } /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ for (offs = 0; offs < 0x10; offs++) @@ -516,7 +516,7 @@ SCREEN_UPDATE_IND16( bullsdrt ) int offs; /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* apply the sprite clip */ if (state->m_flipscreen) @@ -550,7 +550,7 @@ SCREEN_UPDATE_IND16( milliped ) int offs; /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* apply the sprite clip */ if (state->m_flipscreen) diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index f6cac111b50..c209e3a7d9c 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -63,8 +63,8 @@ static void tx_tilemap_mark_all_dirty( running_machine &machine ) { chaknpop_state *state = machine.driver_data(); - tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); - tilemap_set_flip(state->m_tx_tilemap, state->m_flip_x | state->m_flip_y); + state->m_tx_tilemap->mark_all_dirty(); + state->m_tx_tilemap->set_flip(state->m_flip_x | state->m_flip_y); } READ8_HANDLER( chaknpop_gfxmode_r ) @@ -106,7 +106,7 @@ WRITE8_HANDLER( chaknpop_txram_w ) chaknpop_state *state = space->machine().driver_data(); state->m_tx_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( chaknpop_attrram_w ) @@ -262,7 +262,7 @@ SCREEN_UPDATE_IND16( chaknpop ) { chaknpop_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); draw_bitmap(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index 55ea7fecc06..469ce7705c7 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -165,7 +165,7 @@ WRITE8_HANDLER( champbas_bg_videoram_w ) { champbas_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( champbas_gfxbank_w ) @@ -175,7 +175,7 @@ WRITE8_HANDLER( champbas_gfxbank_w ) if (state->m_gfx_bank != data) { state->m_gfx_bank = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -183,7 +183,7 @@ WRITE8_HANDLER( champbas_palette_bank_w ) { champbas_state *state = space->machine().driver_data(); state->m_palette_bank = data & 1; - tilemap_set_palette_offset(state->m_bg_tilemap, state->m_palette_bank << 8); + state->m_bg_tilemap->set_palette_offset(state->m_palette_bank << 8); } WRITE8_HANDLER( champbas_flipscreen_w ) @@ -285,7 +285,7 @@ static void exctsccr_draw_sprites( running_machine &machine, bitmap_ind16 &bitma SCREEN_UPDATE_IND16( champbas ) { champbas_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); champbas_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -293,7 +293,7 @@ SCREEN_UPDATE_IND16( champbas ) SCREEN_UPDATE_IND16( exctsccr ) { champbas_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); exctsccr_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index c5a49923abc..e826fb2ae5d 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -104,7 +104,7 @@ VIDEO_START( cheekyms ) state->m_bitmap_buffer = auto_bitmap_ind16_alloc(machine, width, height); state->m_cm_tilemap = tilemap_create(machine, cheekyms_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_cm_tilemap, 0); + state->m_cm_tilemap->set_transparent_pen(0); } @@ -155,8 +155,8 @@ SCREEN_UPDATE_IND16( cheekyms ) int scrolly = ((*state->m_port_80 >> 3) & 0x07); int flip = *state->m_port_80 & 0x80; - tilemap_mark_all_tiles_dirty_all(screen.machine()); - tilemap_set_flip_all(screen.machine(), flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + screen.machine().tilemap().mark_all_dirty(); + screen.machine().tilemap().set_flip_all(flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); bitmap.fill(0, cliprect); state->m_bitmap_buffer->fill(0, cliprect); @@ -165,7 +165,7 @@ SCREEN_UPDATE_IND16( cheekyms ) draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().gfx[1], flip); /* draw the tilemap to a temp bitmap */ - tilemap_draw(*state->m_bitmap_buffer, cliprect, state->m_cm_tilemap, 0, 0); + state->m_cm_tilemap->draw(*state->m_bitmap_buffer, cliprect, 0, 0); /* draw the tilemap to the final bitmap applying the scroll to the man character */ for (y = cliprect.min_y; y <= cliprect.max_y; y++) diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c index 2f11d6a6ced..dceeb8437f9 100644 --- a/src/mame/video/circus.c +++ b/src/mame/video/circus.c @@ -15,7 +15,7 @@ WRITE8_HANDLER( circus_videoram_w ) { circus_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( circus_clown_x_w ) @@ -116,7 +116,7 @@ static void circus_draw_fg( running_machine &machine, bitmap_ind16 &bitmap, cons SCREEN_UPDATE_IND16( circus ) { circus_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); circus_draw_fg(screen.machine(), bitmap, cliprect); draw_sprite_collision(screen.machine(), bitmap, cliprect); return 0; @@ -187,7 +187,7 @@ static void robotbwl_draw_ball( running_machine &machine, bitmap_ind16 &bitmap, SCREEN_UPDATE_IND16( robotbwl ) { circus_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); robotbwl_draw_scoreboard(bitmap, cliprect); robotbwl_draw_bowling_alley(bitmap, cliprect); robotbwl_draw_ball(screen.machine(), bitmap, cliprect); @@ -208,7 +208,7 @@ static void crash_draw_car( running_machine &machine, bitmap_ind16 &bitmap, cons SCREEN_UPDATE_IND16( crash ) { circus_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); crash_draw_car(screen.machine(), bitmap, cliprect); return 0; } @@ -216,7 +216,7 @@ SCREEN_UPDATE_IND16( crash ) SCREEN_UPDATE_IND16( ripcord ) { circus_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprite_collision(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c index 848de4704fc..2f064e6403a 100644 --- a/src/mame/video/circusc.c +++ b/src/mame/video/circusc.c @@ -102,7 +102,7 @@ static TILE_GET_INFO( get_tile_info ) { circusc_state *state = machine.driver_data(); UINT8 attr = state->m_colorram[tile_index]; - tileinfo->category = (attr & 0x10) >> 4; + tileinfo.category = (attr & 0x10) >> 4; SET_TILE_INFO(0, state->m_videoram[tile_index] + ((attr & 0x20) << 3), @@ -123,7 +123,7 @@ VIDEO_START( circusc ) circusc_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); } @@ -138,14 +138,14 @@ WRITE8_HANDLER( circusc_videoram_w ) { circusc_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( circusc_colorram_w ) { circusc_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( circusc_flipscreen_w ) @@ -204,13 +204,13 @@ SCREEN_UPDATE_IND16( circusc ) int i; for (i = 0; i < 10; i++) - tilemap_set_scrolly(state->m_bg_tilemap, i, 0); + state->m_bg_tilemap->set_scrolly(i, 0); for (i = 10; i < 32; i++) - tilemap_set_scrolly(state->m_bg_tilemap, i, *state->m_scroll); + state->m_bg_tilemap->set_scrolly(i, *state->m_scroll); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index 2006ca4b21c..c6b137e3bae 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -91,14 +91,14 @@ Note: if MAME_DEBUG is defined, pressing Z or X with: #define cischeat_tmap_SET_SCROLL(_n_) \ if (state->m_tmap[_n_]) \ { \ - tilemap_set_scrollx(state->m_tmap[_n_], 0, state->m_scrollx[_n_]); \ - tilemap_set_scrolly(state->m_tmap[_n_], 0, state->m_scrolly[_n_]); \ + state->m_tmap[_n_]->set_scrollx(0, state->m_scrollx[_n_]); \ + state->m_tmap[_n_]->set_scrolly(0, state->m_scrolly[_n_]); \ } #define cischeat_tmap_DRAW(_n_) \ if ( (state->m_tmap[_n_]) && (state->m_active_layers & (1 << _n_) ) ) \ { \ - tilemap_draw(bitmap, cliprect, state->m_tmap[_n_], flag, 0 ); \ + state->m_tmap[_n_]->draw(bitmap, cliprect, flag, 0 ); \ flag = 0; \ } @@ -137,14 +137,14 @@ INLINE void scrollram_w(address_space *space, offs_t offset, UINT16 data, UINT16 { if (state->m_scroll_flag[which] & 0x10) /* tiles are 8x8 */ { - tilemap_mark_tile_dirty(state->m_tmap[which], offset); + state->m_tmap[which]->mark_tile_dirty(offset); } else { - tilemap_mark_tile_dirty(state->m_tmap[which], offset*4 + 0); - tilemap_mark_tile_dirty(state->m_tmap[which], offset*4 + 1); - tilemap_mark_tile_dirty(state->m_tmap[which], offset*4 + 2); - tilemap_mark_tile_dirty(state->m_tmap[which], offset*4 + 3); + state->m_tmap[which]->mark_tile_dirty(offset*4 + 0); + state->m_tmap[which]->mark_tile_dirty(offset*4 + 1); + state->m_tmap[which]->mark_tile_dirty(offset*4 + 2); + state->m_tmap[which]->mark_tile_dirty(offset*4 + 3); } } } @@ -213,8 +213,8 @@ static void create_tilemaps(running_machine &machine) /* set user data and transparency */ for (i = 0; i < 8; i++) { - tilemap_set_user_data(state->m_tilemap[layer][i/4][i%4], (void *)(FPTR)layer); - tilemap_set_transparent_pen(state->m_tilemap[layer][i/4][i%4], 15); + state->m_tilemap[layer][i/4][i%4]->set_user_data((void *)(FPTR)layer); + state->m_tilemap[layer][i/4][i%4]->set_transparent_pen(15); } } } @@ -225,7 +225,7 @@ static void cischeat_set_vreg_flag(cischeat_state *state, int which, int data) { state->m_scroll_flag[which] = data; state->m_tmap[which] = state->m_tilemap[which][(data >> 4) & 1][data & 3]; - tilemap_mark_all_tiles_dirty(state->m_tmap[which]); + state->m_tmap[which]->mark_all_dirty(); } } diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index d83384e041b..1a07b4f5c6c 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -58,8 +58,8 @@ VIDEO_START( citycon ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, citycon_scan, 8, 8, 128, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, citycon_scan, 8, 8, 128, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scroll_rows(state->m_fg_tilemap, 32); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scroll_rows(32); } @@ -74,7 +74,7 @@ WRITE8_HANDLER( citycon_videoram_w ) { citycon_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -93,7 +93,7 @@ WRITE8_HANDLER( citycon_background_w ) if (state->m_bg_image != (data >> 4)) { state->m_bg_image = (data >> 4); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 0 flips screen */ @@ -157,12 +157,12 @@ SCREEN_UPDATE_IND16( citycon ) scroll = state->m_scroll[0] * 256 + state->m_scroll[1]; - tilemap_set_scrollx(state->m_bg_tilemap, 0, scroll >> 1); + state->m_bg_tilemap->set_scrollx(0, scroll >> 1); for (offs = 6; offs < 32; offs++) - tilemap_set_scrollx(state->m_fg_tilemap, offs, scroll); + state->m_fg_tilemap->set_scrollx(offs, scroll); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index 82a6fc1345f..a67b7d412e9 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -150,7 +150,7 @@ WRITE8_HANDLER( cloak_videoram_w ) UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( cloak_flipscreen_w ) @@ -233,7 +233,7 @@ SCREEN_UPDATE_IND16( cloak ) { cloak_state *state = screen.machine().driver_data(); set_pens(screen.machine()); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_bitmap(screen.machine(), bitmap, cliprect); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c index 9990c7e66f0..d20270c66f6 100644 --- a/src/mame/video/clshroad.c +++ b/src/mame/video/clshroad.c @@ -136,8 +136,8 @@ WRITE8_HANDLER( clshroad_vram_0_w ) int tile_index = offset / 2; int tile = (tile_index & 0x1f) + (tile_index & ~0x3f)/2; state->m_vram_0[offset] = data; - if (tile_index & 0x20) tilemap_mark_tile_dirty(state->m_tilemap_0a, tile); - else tilemap_mark_tile_dirty(state->m_tilemap_0b, tile); + if (tile_index & 0x20) state->m_tilemap_0a->mark_tile_dirty(tile); + else state->m_tilemap_0b->mark_tile_dirty(tile); } /*************************************************************************** @@ -180,7 +180,7 @@ static TILE_GET_INFO( get_tile_info_fb1 ) clshroad_state *state = machine.driver_data(); UINT8 code = state->m_vram_1[ tile_index + 0x000 ]; UINT8 color = state->m_vram_1[ tile_index + 0x400 ] & 0x3f; - tileinfo->group = color; + tileinfo.group = color; SET_TILE_INFO( 2, code, @@ -204,7 +204,7 @@ WRITE8_HANDLER( clshroad_vram_1_w ) { clshroad_state *state = space->machine().driver_data(); state->m_vram_1[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_1, offset % 0x400); + state->m_tilemap_1->mark_tile_dirty(offset % 0x400); } @@ -217,18 +217,18 @@ VIDEO_START( firebatl ) /* Text (No scrolling) */ state->m_tilemap_1 = tilemap_create(machine, get_tile_info_fb1,tilemap_scan_rows_extra,8,8,0x24,0x20); - tilemap_set_scroll_rows( state->m_tilemap_0a, 1); - tilemap_set_scroll_rows( state->m_tilemap_0b, 1); - tilemap_set_scroll_rows( state->m_tilemap_1, 1); + state->m_tilemap_0a->set_scroll_rows(1); + state->m_tilemap_0b->set_scroll_rows(1); + state->m_tilemap_1->set_scroll_rows(1); - tilemap_set_scroll_cols( state->m_tilemap_0a, 1); - tilemap_set_scroll_cols( state->m_tilemap_0b, 1); - tilemap_set_scroll_cols( state->m_tilemap_1, 1); + state->m_tilemap_0a->set_scroll_cols(1); + state->m_tilemap_0b->set_scroll_cols(1); + state->m_tilemap_1->set_scroll_cols(1); - tilemap_set_scrolldx( state->m_tilemap_0a, -0x30, -0xb5); - tilemap_set_scrolldx( state->m_tilemap_0b, -0x30, -0xb5); + state->m_tilemap_0a->set_scrolldx(-0x30, -0xb5); + state->m_tilemap_0b->set_scrolldx(-0x30, -0xb5); - tilemap_set_transparent_pen( state->m_tilemap_0b, 0 ); + state->m_tilemap_0b->set_transparent_pen(0 ); colortable_configure_tilemap_groups(machine.colortable, state->m_tilemap_1, machine.gfx[2], 0x0f); } @@ -241,19 +241,19 @@ VIDEO_START( clshroad ) /* Text (No scrolling) */ state->m_tilemap_1 = tilemap_create(machine, get_tile_info_1,tilemap_scan_rows_extra,8,8,0x24,0x20); - tilemap_set_scroll_rows( state->m_tilemap_0a, 1); - tilemap_set_scroll_rows( state->m_tilemap_0b, 1); - tilemap_set_scroll_rows( state->m_tilemap_1, 1); + state->m_tilemap_0a->set_scroll_rows(1); + state->m_tilemap_0b->set_scroll_rows(1); + state->m_tilemap_1->set_scroll_rows(1); - tilemap_set_scroll_cols( state->m_tilemap_0a, 1); - tilemap_set_scroll_cols( state->m_tilemap_0b, 1); - tilemap_set_scroll_cols( state->m_tilemap_1, 1); + state->m_tilemap_0a->set_scroll_cols(1); + state->m_tilemap_0b->set_scroll_cols(1); + state->m_tilemap_1->set_scroll_cols(1); - tilemap_set_scrolldx( state->m_tilemap_0a, -0x30, -0xb5); - tilemap_set_scrolldx( state->m_tilemap_0b, -0x30, -0xb5); + state->m_tilemap_0a->set_scrolldx(-0x30, -0xb5); + state->m_tilemap_0b->set_scrolldx(-0x30, -0xb5); - tilemap_set_transparent_pen( state->m_tilemap_0b, 0x0f ); - tilemap_set_transparent_pen( state->m_tilemap_1, 0x0f ); + state->m_tilemap_0b->set_transparent_pen(0x0f ); + state->m_tilemap_1->set_transparent_pen(0x0f ); } @@ -334,12 +334,12 @@ SCREEN_UPDATE_IND16( clshroad ) // int priority = state->m_vregs[ 2 ]; /* Only horizontal scrolling (these 2 layers use the same value) */ - tilemap_set_scrollx(state->m_tilemap_0a, 0, scrollx); - tilemap_set_scrollx(state->m_tilemap_0b, 0, scrollx); + state->m_tilemap_0a->set_scrollx(0, scrollx); + state->m_tilemap_0b->set_scrollx(0, scrollx); - tilemap_draw(bitmap,cliprect,state->m_tilemap_0a,0,0); // Opaque - tilemap_draw(bitmap,cliprect,state->m_tilemap_0b,0,0); + state->m_tilemap_0a->draw(bitmap, cliprect, 0,0); // Opaque + state->m_tilemap_0b->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tilemap_1,0,0); + state->m_tilemap_1->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index d38d1fc55d5..ba76d978b15 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -143,7 +143,7 @@ static TILE_GET_INFO( get_tile_info0 ) number, color, 0); - tileinfo->category = (attributes & 0x40) >> 6; + tileinfo.category = (attributes & 0x40) >> 6; } static TILE_GET_INFO( get_tile_info1 ) @@ -178,7 +178,7 @@ static TILE_GET_INFO( get_tile_info1 ) number, color, 0); - tileinfo->category = (attributes & 0x40) >> 6; + tileinfo.category = (attributes & 0x40) >> 6; } static TILE_GET_INFO( get_text_info ) @@ -293,11 +293,11 @@ VIDEO_START( combatsc ) state->m_spriteram[0] = auto_alloc_array_clear(machine, UINT8, 0x800); state->m_spriteram[1] = auto_alloc_array_clear(machine, UINT8, 0x800); - tilemap_set_transparent_pen(state->m_bg_tilemap[0], 0); - tilemap_set_transparent_pen(state->m_bg_tilemap[1], 0); - tilemap_set_transparent_pen(state->m_textlayer, 0); + state->m_bg_tilemap[0]->set_transparent_pen(0); + state->m_bg_tilemap[1]->set_transparent_pen(0); + state->m_textlayer->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_textlayer, 32); + state->m_textlayer->set_scroll_rows(32); state->save_pointer(NAME(state->m_spriteram[0]), 0x800); state->save_pointer(NAME(state->m_spriteram[1]), 0x800); @@ -314,12 +314,12 @@ VIDEO_START( combatscb ) state->m_spriteram[0] = auto_alloc_array_clear(machine, UINT8, 0x800); state->m_spriteram[1] = auto_alloc_array_clear(machine, UINT8, 0x800); - tilemap_set_transparent_pen(state->m_bg_tilemap[0], 0); - tilemap_set_transparent_pen(state->m_bg_tilemap[1], 0); - tilemap_set_transparent_pen(state->m_textlayer, 0); + state->m_bg_tilemap[0]->set_transparent_pen(0); + state->m_bg_tilemap[1]->set_transparent_pen(0); + state->m_textlayer->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_bg_tilemap[0], 32); - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 32); + state->m_bg_tilemap[0]->set_scroll_rows(32); + state->m_bg_tilemap[1]->set_scroll_rows(32); state->save_pointer(NAME(state->m_spriteram[0]), 0x800); state->save_pointer(NAME(state->m_spriteram[1]), 0x800); @@ -345,13 +345,13 @@ WRITE8_HANDLER( combatsc_video_w ) if (offset < 0x800) { if (state->m_video_circuit) - tilemap_mark_tile_dirty(state->m_bg_tilemap[1], offset & 0x3ff); + state->m_bg_tilemap[1]->mark_tile_dirty(offset & 0x3ff); else - tilemap_mark_tile_dirty(state->m_bg_tilemap[0], offset & 0x3ff); + state->m_bg_tilemap[0]->mark_tile_dirty(offset & 0x3ff); } else if (offset < 0x1000 && state->m_video_circuit == 0) { - tilemap_mark_tile_dirty(state->m_textlayer, offset & 0x3ff); + state->m_textlayer->mark_tile_dirty(offset & 0x3ff); } } @@ -362,7 +362,7 @@ WRITE8_HANDLER( combatsc_pf_control_w ) k007121_ctrl_w(k007121, offset, data); if (offset == 7) - tilemap_set_flip(state->m_bg_tilemap[state->m_video_circuit],(data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_bg_tilemap[state->m_video_circuit]->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (offset == 3) { @@ -412,39 +412,39 @@ SCREEN_UPDATE_IND16( combatsc ) if (k007121_ctrlram_r(state->m_k007121_1, 1) & 0x02) { - tilemap_set_scroll_rows(state->m_bg_tilemap[0], 32); + state->m_bg_tilemap[0]->set_scroll_rows(32); for (i = 0; i < 32; i++) - tilemap_set_scrollx(state->m_bg_tilemap[0], i, state->m_scrollram0[i]); + state->m_bg_tilemap[0]->set_scrollx(i, state->m_scrollram0[i]); } else { - tilemap_set_scroll_rows(state->m_bg_tilemap[0], 1); - tilemap_set_scrollx(state->m_bg_tilemap[0], 0, k007121_ctrlram_r(state->m_k007121_1, 0) | ((k007121_ctrlram_r(state->m_k007121_1, 1) & 0x01) << 8)); + state->m_bg_tilemap[0]->set_scroll_rows(1); + state->m_bg_tilemap[0]->set_scrollx(0, k007121_ctrlram_r(state->m_k007121_1, 0) | ((k007121_ctrlram_r(state->m_k007121_1, 1) & 0x01) << 8)); } if (k007121_ctrlram_r(state->m_k007121_2, 1) & 0x02) { - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 32); + state->m_bg_tilemap[1]->set_scroll_rows(32); for (i = 0; i < 32; i++) - tilemap_set_scrollx(state->m_bg_tilemap[1], i, state->m_scrollram1[i]); + state->m_bg_tilemap[1]->set_scrollx(i, state->m_scrollram1[i]); } else { - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 1); - tilemap_set_scrollx(state->m_bg_tilemap[1], 0, k007121_ctrlram_r(state->m_k007121_2, 0) | ((k007121_ctrlram_r(state->m_k007121_2, 1) & 0x01) << 8)); + state->m_bg_tilemap[1]->set_scroll_rows(1); + state->m_bg_tilemap[1]->set_scrollx(0, k007121_ctrlram_r(state->m_k007121_2, 0) | ((k007121_ctrlram_r(state->m_k007121_2, 1) & 0x01) << 8)); } - tilemap_set_scrolly(state->m_bg_tilemap[0], 0, k007121_ctrlram_r(state->m_k007121_1, 2)); - tilemap_set_scrolly(state->m_bg_tilemap[1], 0, k007121_ctrlram_r(state->m_k007121_2, 2)); + state->m_bg_tilemap[0]->set_scrolly(0, k007121_ctrlram_r(state->m_k007121_1, 2)); + state->m_bg_tilemap[1]->set_scrolly(0, k007121_ctrlram_r(state->m_k007121_2, 2)); screen.machine().priority_bitmap.fill(0, cliprect); if (state->m_priority == 0) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[1], TILEMAP_DRAW_OPAQUE | 0, 4); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[1], TILEMAP_DRAW_OPAQUE | 1, 8); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[0], 0, 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[0], 1, 2); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 0, 4); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 1, 8); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, 0, 1); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, 1, 2); /* we use the priority buffer so sprites are drawn front to back */ draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram[1], 1, 0x0f00); @@ -452,10 +452,10 @@ SCREEN_UPDATE_IND16( combatsc ) } else { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[0], TILEMAP_DRAW_OPAQUE | 0, 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[0], TILEMAP_DRAW_OPAQUE | 1, 2); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[1], 1, 4); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[1], 0, 8); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 0, 1); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 1, 2); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, 1, 4); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, 0, 8); /* we use the priority buffer so sprites are drawn front to back */ draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram[1], 1, 0x0f00); @@ -466,8 +466,8 @@ SCREEN_UPDATE_IND16( combatsc ) { for (i = 0; i < 32; i++) { - tilemap_set_scrollx(state->m_textlayer, i, state->m_scrollram0[0x20 + i] ? 0 : TILE_LINE_DISABLED); - tilemap_draw(bitmap, cliprect, state->m_textlayer, 0, 0); + state->m_textlayer->set_scrollx(i, state->m_scrollram0[0x20 + i] ? 0 : TILE_LINE_DISABLED); + state->m_textlayer->draw(bitmap, cliprect, 0, 0); } } @@ -570,27 +570,27 @@ SCREEN_UPDATE_IND16( combatscb ) for (i = 0; i < 32; i++) { - tilemap_set_scrollx(state->m_bg_tilemap[0], i, state->m_io_ram[0x040 + i] + 5); - tilemap_set_scrollx(state->m_bg_tilemap[1], i, state->m_io_ram[0x060 + i] + 3); + state->m_bg_tilemap[0]->set_scrollx(i, state->m_io_ram[0x040 + i] + 5); + state->m_bg_tilemap[1]->set_scrollx(i, state->m_io_ram[0x060 + i] + 3); } - tilemap_set_scrolly(state->m_bg_tilemap[0], 0, state->m_io_ram[0x000] + 1); - tilemap_set_scrolly(state->m_bg_tilemap[1], 0, state->m_io_ram[0x020] + 1); + state->m_bg_tilemap[0]->set_scrolly(0, state->m_io_ram[0x000] + 1); + state->m_bg_tilemap[1]->set_scrolly(0, state->m_io_ram[0x020] + 1); if (state->m_priority == 0) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[1], TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); bootleg_draw_sprites(screen.machine(), bitmap,cliprect, state->m_page[0], 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[0], 0 ,0); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, 0 ,0); bootleg_draw_sprites(screen.machine(), bitmap,cliprect, state->m_page[1], 1); } else { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[0], TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); bootleg_draw_sprites(screen.machine(), bitmap,cliprect, state->m_page[0], 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[1], 0, 0); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, 0, 0); bootleg_draw_sprites(screen.machine(), bitmap,cliprect, state->m_page[1], 1); } - tilemap_draw(bitmap, cliprect, state->m_textlayer, 0, 0); + state->m_textlayer->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index 3b1bda588d4..0faf0c957df 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -15,7 +15,7 @@ WRITE8_HANDLER( commando_videoram_w ) commando_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( commando_colorram_w ) @@ -23,7 +23,7 @@ WRITE8_HANDLER( commando_colorram_w ) commando_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( commando_videoram2_w ) @@ -31,7 +31,7 @@ WRITE8_HANDLER( commando_videoram2_w ) commando_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( commando_colorram2_w ) @@ -39,7 +39,7 @@ WRITE8_HANDLER( commando_colorram2_w ) commando_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( commando_scrollx_w ) @@ -47,7 +47,7 @@ WRITE8_HANDLER( commando_scrollx_w ) commando_state *state = space->machine().driver_data(); state->m_scroll_x[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_x[0] | (state->m_scroll_x[1] << 8)); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_x[0] | (state->m_scroll_x[1] << 8)); } WRITE8_HANDLER( commando_scrolly_w ) @@ -55,7 +55,7 @@ WRITE8_HANDLER( commando_scrolly_w ) commando_state *state = space->machine().driver_data(); state->m_scroll_y[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll_y[0] | (state->m_scroll_y[1] << 8)); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll_y[0] | (state->m_scroll_y[1] << 8)); } WRITE8_HANDLER( commando_c804_w ) @@ -102,7 +102,7 @@ VIDEO_START( commando ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 3); + state->m_fg_tilemap->set_transparent_pen(3); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -139,9 +139,9 @@ SCREEN_UPDATE_IND16( commando ) { commando_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c index e746bd263ae..4c92e790125 100644 --- a/src/mame/video/compgolf.c +++ b/src/mame/video/compgolf.c @@ -37,14 +37,14 @@ WRITE8_HANDLER( compgolf_video_w ) { compgolf_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_text_tilemap, offset / 2); + state->m_text_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( compgolf_back_w ) { compgolf_state *state = space->machine().driver_data(); state->m_bg_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_text_info ) @@ -76,7 +76,7 @@ VIDEO_START( compgolf ) state->m_bg_tilemap = tilemap_create(machine, get_back_info, back_scan, 16, 16, 32, 32); state->m_text_tilemap = tilemap_create(machine, get_text_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_text_tilemap, 0); + state->m_text_tilemap->set_transparent_pen(0); } /* @@ -124,11 +124,11 @@ SCREEN_UPDATE_IND16( compgolf ) int scrollx = state->m_scrollx_hi + state->m_scrollx_lo; int scrolly = state->m_scrolly_hi + state->m_scrolly_lo; - tilemap_set_scrollx(state->m_bg_tilemap, 0, scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, scrolly); + state->m_bg_tilemap->set_scrollx(0, scrollx); + state->m_bg_tilemap->set_scrolly(0, scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_text_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_text_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index fffd5bb7878..07360700399 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -184,7 +184,7 @@ VIDEO_START( contra ) state->m_tx_clip.max_x = 39; state->m_tx_clip.min_x = 0; - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->save_pointer(NAME(state->m_buffered_spriteram), 0x800); state->save_pointer(NAME(state->m_buffered_spriteram_2), 0x800); @@ -202,7 +202,7 @@ WRITE8_HANDLER( contra_fg_vram_w ) contra_state *state = space->machine().driver_data(); state->m_fg_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( contra_fg_cram_w ) @@ -210,7 +210,7 @@ WRITE8_HANDLER( contra_fg_cram_w ) contra_state *state = space->machine().driver_data(); state->m_fg_cram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( contra_bg_vram_w ) @@ -218,7 +218,7 @@ WRITE8_HANDLER( contra_bg_vram_w ) contra_state *state = space->machine().driver_data(); state->m_bg_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( contra_bg_cram_w ) @@ -226,7 +226,7 @@ WRITE8_HANDLER( contra_bg_cram_w ) contra_state *state = space->machine().driver_data(); state->m_bg_cram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( contra_text_vram_w ) @@ -234,7 +234,7 @@ WRITE8_HANDLER( contra_text_vram_w ) contra_state *state = space->machine().driver_data(); state->m_tx_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( contra_text_cram_w ) @@ -242,7 +242,7 @@ WRITE8_HANDLER( contra_text_cram_w ) contra_state *state = space->machine().driver_data(); state->m_tx_cram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( contra_K007121_ctrl_0_w ) @@ -261,11 +261,11 @@ WRITE8_HANDLER( contra_K007121_ctrl_0_w ) if (offset == 6) { if (ctrl_6 != data) - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } if (offset == 7) - tilemap_set_flip(state->m_fg_tilemap, (data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_fg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); k007121_ctrl_w(state->m_k007121_1, offset, data); } @@ -285,10 +285,10 @@ WRITE8_HANDLER( contra_K007121_ctrl_1_w ) if (offset == 6) { if (ctrl_6 != data ) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } if (offset == 7) - tilemap_set_flip(state->m_bg_tilemap, (data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_bg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); k007121_ctrl_w(state->m_k007121_2, offset, data); } @@ -333,15 +333,15 @@ SCREEN_UPDATE_IND16( contra ) set_pens(screen.machine()); - tilemap_set_scrollx(state->m_fg_tilemap, 0, ctrl_1_0 - 40); - tilemap_set_scrolly(state->m_fg_tilemap, 0, ctrl_1_2); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ctrl_2_0 - 40); - tilemap_set_scrolly(state->m_bg_tilemap, 0, ctrl_2_2); + state->m_fg_tilemap->set_scrollx(0, ctrl_1_0 - 40); + state->m_fg_tilemap->set_scrolly(0, ctrl_1_2); + state->m_bg_tilemap->set_scrollx(0, ctrl_2_0 - 40); + state->m_bg_tilemap->set_scrolly(0, ctrl_2_2); - tilemap_draw(bitmap, bg_finalclip, state->m_bg_tilemap, 0 ,0); - tilemap_draw(bitmap, fg_finalclip, state->m_fg_tilemap, 0 ,0); + state->m_bg_tilemap->draw(bitmap, bg_finalclip, 0 ,0); + state->m_fg_tilemap->draw(bitmap, fg_finalclip, 0 ,0); draw_sprites(screen.machine(),bitmap,cliprect, 0); draw_sprites(screen.machine(),bitmap,cliprect, 1); - tilemap_draw(bitmap, tx_finalclip, state->m_tx_tilemap, 0 ,0); + state->m_tx_tilemap->draw(bitmap, tx_finalclip, 0 ,0); return 0; } diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c index acb3ad30e78..5b0ed49dd0b 100644 --- a/src/mame/video/cop01.c +++ b/src/mame/video/cop01.c @@ -81,7 +81,7 @@ static TILE_GET_INFO( get_bg_tile_info ) pri = 0; SET_TILE_INFO(1, tile + ((attr & 0x03) << 8), (attr & 0x1c) >> 2, 0); - tileinfo->group = pri; + tileinfo.group = pri; } static TILE_GET_INFO( get_fg_tile_info ) @@ -105,11 +105,11 @@ VIDEO_START( cop01 ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8, 8, 64, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); /* priority doesn't exactly work this way, see above */ - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x0fff, 0xf000); /* split type 1 has pens 0-11 transparent in front half */ + state->m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x0fff, 0xf000); /* split type 1 has pens 0-11 transparent in front half */ } @@ -124,14 +124,14 @@ WRITE8_HANDLER( cop01_background_w ) { cop01_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE8_HANDLER( cop01_foreground_w ) { cop01_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( cop01_vreg_w ) @@ -209,12 +209,12 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( cop01 ) { cop01_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_vreg[1] + 256 * (state->m_vreg[2] & 1)); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_vreg[3]); + state->m_bg_tilemap->set_scrollx(0, state->m_vreg[1] + 256 * (state->m_vreg[2] & 1)); + state->m_bg_tilemap->set_scrolly(0, state->m_vreg[3]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0 ); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0 ); return 0; } diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index 116dbe4d163..952b9d1df08 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -1813,17 +1813,17 @@ void cps1_get_video_base( running_machine &machine ) if (state->m_scroll1 != cps1_base(machine, CPS1_SCROLL1_BASE, state->m_scroll_size)) { state->m_scroll1 = cps1_base(machine, CPS1_SCROLL1_BASE, state->m_scroll_size); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[0]); + state->m_bg_tilemap[0]->mark_all_dirty(); } if (state->m_scroll2 != cps1_base(machine, CPS1_SCROLL2_BASE, state->m_scroll_size)) { state->m_scroll2 = cps1_base(machine, CPS1_SCROLL2_BASE, state->m_scroll_size); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[1]); + state->m_bg_tilemap[1]->mark_all_dirty(); } if (state->m_scroll3 != cps1_base(machine, CPS1_SCROLL3_BASE, state->m_scroll_size)) { state->m_scroll3 = cps1_base(machine, CPS1_SCROLL3_BASE, state->m_scroll_size); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[2]); + state->m_bg_tilemap[2]->mark_all_dirty(); } /* Some of the sf2 hacks use only sprite port 0x9100 and the scroll layers are offset */ @@ -1860,9 +1860,9 @@ void cps1_get_video_base( running_machine &machine ) /* Get layer enable bits */ layercontrol = state->m_cps_b_regs[state->m_game_config->layer_control / 2]; videocontrol = state->m_cps_a_regs[CPS1_VIDEOCONTROL]; - tilemap_set_enable(state->m_bg_tilemap[0],layercontrol & state->m_game_config->layer_enable_mask[0]); - tilemap_set_enable(state->m_bg_tilemap[1],(layercontrol & state->m_game_config->layer_enable_mask[1]) && (videocontrol & 4)); - tilemap_set_enable(state->m_bg_tilemap[2],(layercontrol & state->m_game_config->layer_enable_mask[2]) && (videocontrol & 8)); + state->m_bg_tilemap[0]->enable(layercontrol & state->m_game_config->layer_enable_mask[0]); + state->m_bg_tilemap[1]->enable((layercontrol & state->m_game_config->layer_enable_mask[1]) && (videocontrol & 4)); + state->m_bg_tilemap[2]->enable((layercontrol & state->m_game_config->layer_enable_mask[2]) && (videocontrol & 8)); state->m_stars_enabled[0] = layercontrol & state->m_game_config->layer_enable_mask[3]; state->m_stars_enabled[1] = layercontrol & state->m_game_config->layer_enable_mask[4]; @@ -1904,13 +1904,13 @@ WRITE16_HANDLER( cps1_gfxram_w ) COMBINE_DATA(&state->m_gfxram[offset]); if (page == (state->m_cps_a_regs[CPS1_SCROLL1_BASE] & 0x3c0)) - tilemap_mark_tile_dirty(state->m_bg_tilemap[0], offset / 2 & 0x0fff); + state->m_bg_tilemap[0]->mark_tile_dirty(offset / 2 & 0x0fff); if (page == (state->m_cps_a_regs[CPS1_SCROLL2_BASE] & 0x3c0)) - tilemap_mark_tile_dirty(state->m_bg_tilemap[1], offset / 2 & 0x0fff); + state->m_bg_tilemap[1]->mark_tile_dirty(offset / 2 & 0x0fff); if (page == (state->m_cps_a_regs[CPS1_SCROLL3_BASE] & 0x3c0)) - tilemap_mark_tile_dirty(state->m_bg_tilemap[2], offset / 2 & 0x0fff); + state->m_bg_tilemap[2]->mark_tile_dirty(offset / 2 & 0x0fff); } @@ -2003,12 +2003,12 @@ static TILE_GET_INFO( get_tile0_info ) code, (attr & 0x1f) + 0x20, TILE_FLIPYX((attr & 0x60) >> 5)); - tileinfo->group = (attr & 0x0180) >> 7; + tileinfo.group = (attr & 0x0180) >> 7; // for out of range tiles, switch to fully transparent data // (but still call SET_TILE_INFO, otherwise problems might occur on boot e.g. unsquad) if (code == -1) - tileinfo->pen_data = state->m_empty_tile8x8; + tileinfo.pen_data = state->m_empty_tile8x8; } static TILE_GET_INFO( get_tile1_info ) @@ -2024,11 +2024,11 @@ static TILE_GET_INFO( get_tile1_info ) code, (attr & 0x1f) + 0x40, TILE_FLIPYX((attr & 0x60) >> 5)); - tileinfo->group = (attr & 0x0180) >> 7; + tileinfo.group = (attr & 0x0180) >> 7; // for out of range tiles, switch to fully transparent data if (code == -1) - tileinfo->pen_data = state->m_empty_tile; + tileinfo.pen_data = state->m_empty_tile; } static TILE_GET_INFO( get_tile2_info ) @@ -2044,12 +2044,12 @@ static TILE_GET_INFO( get_tile2_info ) code, (attr & 0x1f) + 0x60, TILE_FLIPYX((attr & 0x60) >> 5)); - tileinfo->group = (attr & 0x0180) >> 7; + tileinfo.group = (attr & 0x0180) >> 7; // for out of range tiles, switch to fully transparent data // (but still call SET_TILE_INFO, otherwise problems might occur on boot e.g. unsquad) if (code == -1) - tileinfo->pen_data = state->m_empty_tile; + tileinfo.pen_data = state->m_empty_tile; } @@ -2069,9 +2069,9 @@ static void cps1_update_transmasks( running_machine &machine ) else mask = 0xffff; /* completely transparent if priority masks not defined (qad) */ - tilemap_set_transmask(state->m_bg_tilemap[0], i, mask, 0x8000); - tilemap_set_transmask(state->m_bg_tilemap[1], i, mask, 0x8000); - tilemap_set_transmask(state->m_bg_tilemap[2], i, mask, 0x8000); + state->m_bg_tilemap[0]->set_transmask(i, mask, 0x8000); + state->m_bg_tilemap[1]->set_transmask(i, mask, 0x8000); + state->m_bg_tilemap[2]->set_transmask(i, mask, 0x8000); } } @@ -2767,7 +2767,7 @@ static void cps1_render_layer( running_machine &machine, bitmap_ind16 &bitmap, c case 1: case 2: case 3: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[layer - 1], TILEMAP_DRAW_LAYER1, primask); + state->m_bg_tilemap[layer - 1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, primask); break; } } @@ -2784,7 +2784,7 @@ static void cps1_render_high_layer( running_machine &machine, bitmap_ind16 &bitm case 1: case 2: case 3: - tilemap_draw(dummy_bitmap, cliprect, state->m_bg_tilemap[layer - 1], TILEMAP_DRAW_LAYER0, 1); + state->m_bg_tilemap[layer - 1]->draw(dummy_bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); break; } } @@ -2819,8 +2819,8 @@ SCREEN_UPDATE_IND16( cps1 ) cps1_update_transmasks(screen.machine()); - tilemap_set_scrollx(state->m_bg_tilemap[0], 0, state->m_scroll1x); - tilemap_set_scrolly(state->m_bg_tilemap[0], 0, state->m_scroll1y); + state->m_bg_tilemap[0]->set_scrollx(0, state->m_scroll1x); + state->m_bg_tilemap[0]->set_scrolly(0, state->m_scroll1y); if (videocontrol & 0x01) /* linescroll enable */ { @@ -2828,21 +2828,21 @@ SCREEN_UPDATE_IND16( cps1 ) int i; int otheroffs; - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 1024); + state->m_bg_tilemap[1]->set_scroll_rows(1024); otheroffs = state->m_cps_a_regs[CPS1_ROWSCROLL_OFFS]; for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg_tilemap[1], (i - scrly) & 0x3ff, state->m_scroll2x + state->m_other[(i + otheroffs) & 0x3ff]); + state->m_bg_tilemap[1]->set_scrollx((i - scrly) & 0x3ff, state->m_scroll2x + state->m_other[(i + otheroffs) & 0x3ff]); } else { - tilemap_set_scroll_rows(state->m_bg_tilemap[1], 1); - tilemap_set_scrollx(state->m_bg_tilemap[1], 0, state->m_scroll2x); + state->m_bg_tilemap[1]->set_scroll_rows(1); + state->m_bg_tilemap[1]->set_scrollx(0, state->m_scroll2x); } - tilemap_set_scrolly(state->m_bg_tilemap[1], 0, state->m_scroll2y); - tilemap_set_scrollx(state->m_bg_tilemap[2], 0, state->m_scroll3x); - tilemap_set_scrolly(state->m_bg_tilemap[2], 0, state->m_scroll3y); + state->m_bg_tilemap[1]->set_scrolly(0, state->m_scroll2y); + state->m_bg_tilemap[2]->set_scrollx(0, state->m_scroll3x); + state->m_bg_tilemap[2]->set_scrolly(0, state->m_scroll3y); /* Blank screen */ diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c index 136a9bd956e..7154903c995 100644 --- a/src/mame/video/crbaloon.c +++ b/src/mame/video/crbaloon.c @@ -51,14 +51,14 @@ WRITE8_HANDLER( crbaloon_videoram_w ) { crbaloon_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( crbaloon_colorram_w ) { crbaloon_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -151,7 +151,7 @@ static void draw_sprite_and_check_collision(running_machine &machine, bitmap_ind SCREEN_UPDATE_IND16( crbaloon ) { crbaloon_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprite_and_check_collision(screen.machine(), bitmap); diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c index 4f97eea4d33..54604311766 100644 --- a/src/mame/video/crospang.c +++ b/src/mame/video/crospang.c @@ -19,8 +19,8 @@ WRITE16_HANDLER( bestri_tilebank_w) state->m_bestri_tilebank = (data>>10) & 0xf; //printf("bestri %04x\n", data); - tilemap_mark_all_tiles_dirty(state->m_fg_layer); - tilemap_mark_all_tiles_dirty(state->m_bg_layer); + state->m_fg_layer->mark_all_dirty(); + state->m_bg_layer->mark_all_dirty(); } @@ -30,7 +30,7 @@ WRITE16_HANDLER ( bestri_bg_scrolly_w ) /* Very Strange */ int scroll = (data & 0x3ff) ^ 0x0155; - tilemap_set_scrolly(state->m_bg_layer, 0, -scroll + 7); + state->m_bg_layer->set_scrolly(0, -scroll + 7); } WRITE16_HANDLER ( bestri_fg_scrolly_w ) @@ -39,7 +39,7 @@ WRITE16_HANDLER ( bestri_fg_scrolly_w ) /* Very Strange */ int scroll = (data & 0x3ff) ^ 0x00ab; - tilemap_set_scrolly(state->m_fg_layer, 0, -scroll + 7); + state->m_fg_layer->set_scrolly(0, -scroll + 7); } WRITE16_HANDLER ( bestri_fg_scrollx_w ) @@ -47,7 +47,7 @@ WRITE16_HANDLER ( bestri_fg_scrollx_w ) crospang_state *state = space->machine().driver_data(); // printf("fg_layer x %04x\n",data); - tilemap_set_scrollx(state->m_fg_layer, 0, data + 32); + state->m_fg_layer->set_scrollx(0, data + 32); } WRITE16_HANDLER ( bestri_bg_scrollx_w ) @@ -55,32 +55,32 @@ WRITE16_HANDLER ( bestri_bg_scrollx_w ) crospang_state *state = space->machine().driver_data(); // printf("bg_layer x %04x\n",data); - tilemap_set_scrollx(state->m_bg_layer, 0, data - 60); + state->m_bg_layer->set_scrollx(0, data - 60); } WRITE16_HANDLER ( crospang_fg_scrolly_w ) { crospang_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_fg_layer, 0, data + 8); + state->m_fg_layer->set_scrolly(0, data + 8); } WRITE16_HANDLER ( crospang_bg_scrolly_w ) { crospang_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_layer, 0, data + 8); + state->m_bg_layer->set_scrolly(0, data + 8); } WRITE16_HANDLER ( crospang_fg_scrollx_w ) { crospang_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_fg_layer, 0, data); + state->m_fg_layer->set_scrollx(0, data); } WRITE16_HANDLER ( crospang_bg_scrollx_w ) { crospang_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_layer, 0, data + 4); + state->m_bg_layer->set_scrollx(0, data + 4); } @@ -88,14 +88,14 @@ WRITE16_HANDLER ( crospang_fg_videoram_w ) { crospang_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_layer, offset); + state->m_fg_layer->mark_tile_dirty(offset); } WRITE16_HANDLER ( crospang_bg_videoram_w ) { crospang_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_layer, offset); + state->m_bg_layer->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -212,14 +212,14 @@ VIDEO_START( crospang ) state->m_bg_layer = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_fg_layer = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_layer, 0); + state->m_fg_layer->set_transparent_pen(0); } SCREEN_UPDATE_IND16( crospang ) { crospang_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_layer, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_layer, 0, 0); + state->m_bg_layer->draw(bitmap, cliprect, 0, 0); + state->m_fg_layer->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index 5b15d117f64..30493428a64 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -39,8 +39,8 @@ VIDEO_START( crshrace ) state->m_tilemap1 = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 16, 16, 64, 64); state->m_tilemap2 = tilemap_create(machine, get_tile_info2, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_tilemap1, 0x0f); - tilemap_set_transparent_pen(state->m_tilemap2, 0xff); + state->m_tilemap1->set_transparent_pen(0x0f); + state->m_tilemap2->set_transparent_pen(0xff); } @@ -55,7 +55,7 @@ WRITE16_HANDLER( crshrace_videoram1_w ) crshrace_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram1[offset]); - tilemap_mark_tile_dirty(state->m_tilemap1, offset); + state->m_tilemap1->mark_tile_dirty(offset); } WRITE16_HANDLER( crshrace_videoram2_w ) @@ -63,7 +63,7 @@ WRITE16_HANDLER( crshrace_videoram2_w ) crshrace_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram2[offset]); - tilemap_mark_tile_dirty(state->m_tilemap2, offset); + state->m_tilemap2->mark_tile_dirty(offset); } WRITE16_HANDLER( crshrace_roz_bank_w ) @@ -75,7 +75,7 @@ WRITE16_HANDLER( crshrace_roz_bank_w ) if (state->m_roz_bank != (data & 0xff)) { state->m_roz_bank = data & 0xff; - tilemap_mark_all_tiles_dirty(state->m_tilemap1); + state->m_tilemap1->mark_all_dirty(); } } } @@ -174,7 +174,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re static void draw_bg( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) { crshrace_state *state = machine.driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tilemap2, 0, 0); + state->m_tilemap2->draw(bitmap, cliprect, 0, 0); } diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index 780c3b0aaf0..ec9209e6e49 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -153,14 +153,14 @@ static void video_start_cyberbal_common(running_machine &machine, int screens) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* allocate the second screen if necessary */ if (screens == 2) { /* initialize the playfield */ state->m_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_rows, 16,8, 64,64); - tilemap_set_scrollx(state->m_playfield2_tilemap, 0, 0); + state->m_playfield2_tilemap->set_scrollx(0, 0); /* initialize the motion objects */ atarimo_init(machine, 1, &mo1desc); @@ -168,8 +168,8 @@ static void video_start_cyberbal_common(running_machine &machine, int screens) /* initialize the alphanumerics */ state->m_alpha2_tilemap = tilemap_create(machine, get_alpha2_tile_info, tilemap_scan_rows, 16,8, 64,32); - tilemap_set_scrollx(state->m_alpha2_tilemap, 0, 0); - tilemap_set_transparent_pen(state->m_alpha2_tilemap, 0); + state->m_alpha2_tilemap->set_scrollx(0, 0); + state->m_alpha2_tilemap->set_transparent_pen(0); } /* save states */ @@ -286,7 +286,7 @@ void cyberbal_scanline_update(screen_device &screen, int scanline) if (scanline > 0) update_screen->update_partial(scanline - 1); state->m_playfield_palette_bank[i] = (base[3] >> 1) & 7; - tilemap_set_palette_offset(i ? state->m_playfield2_tilemap : state->m_playfield_tilemap, state->m_playfield_palette_bank[i] << 8); + (i ? state->m_playfield2_tilemap : state->m_playfield_tilemap)->set_palette_offset(state->m_playfield_palette_bank[i] << 8); } } if (!(base[4] & 1)) @@ -296,7 +296,7 @@ void cyberbal_scanline_update(screen_device &screen, int scanline) { if (scanline > 0) update_screen->update_partial(scanline - 1); - tilemap_set_scrollx(i ? state->m_playfield2_tilemap : state->m_playfield_tilemap, 0, newscroll); + (i ? state->m_playfield2_tilemap : state->m_playfield_tilemap)->set_scrollx(0, newscroll); state->m_playfield_xscroll[i] = newscroll; } } @@ -308,7 +308,7 @@ void cyberbal_scanline_update(screen_device &screen, int scanline) { if (scanline > 0) update_screen->update_partial(scanline - 1); - tilemap_set_scrolly(i ? state->m_playfield2_tilemap : state->m_playfield_tilemap, 0, newscroll); + (i ? state->m_playfield2_tilemap : state->m_playfield_tilemap)->set_scrolly(0, newscroll); state->m_playfield_yscroll[i] = newscroll; } } @@ -342,7 +342,7 @@ static UINT32 update_one_screen(screen_device &screen, bitmap_ind16 &bitmap, con rectangle visarea = screen.visible_area(); /* draw the playfield */ - tilemap_draw(bitmap, cliprect, (index == 0) ? state->m_playfield_tilemap : state->m_playfield2_tilemap, 0, 0); + ((index == 0) ? state->m_playfield_tilemap : state->m_playfield2_tilemap)->draw(bitmap, cliprect, 0, 0); /* draw the MOs -- note some kludging to get this to work correctly for 2 screens */ mooffset = 0; @@ -375,7 +375,7 @@ static UINT32 update_one_screen(screen_device &screen, bitmap_ind16 &bitmap, con } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, (index == 0) ? state->m_alpha_tilemap : state->m_alpha2_tilemap, 0, 0); + ((index == 0) ? state->m_alpha_tilemap : state->m_alpha2_tilemap)->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index 4a06d2a20a5..bcaf4bdf60f 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -4,7 +4,7 @@ /***************************************************************************/ -INLINE void actual_get_fg_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, UINT16 *ram, int gfxnum ) +INLINE void actual_get_fg_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum ) { UINT16 code = (ram[tile_index + 0x2000] & 0x7ff); UINT16 attr = ram[tile_index]; @@ -30,7 +30,7 @@ VIDEO_START( darius ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,128,64); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } /***************************************************************************/ @@ -41,7 +41,7 @@ WRITE16_HANDLER( darius_fg_layer_w ) COMBINE_DATA(&state->m_fg_ram[offset]); if (offset < 0x4000) - tilemap_mark_tile_dirty(state->m_fg_tilemap, (offset & 0x1fff)); + state->m_fg_tilemap->mark_tile_dirty((offset & 0x1fff)); } /***************************************************************************/ @@ -110,9 +110,9 @@ static UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const r draw_sprites(screen.machine(), bitmap, cliprect, 1, xoffs, -8); // draw sprites with priority 1 which are over the mid layer /* top(text) layer is in fixed position */ - tilemap_set_scrollx(state->m_fg_tilemap, 0, 0 + xoffs); - tilemap_set_scrolly(state->m_fg_tilemap, 0, -8); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->set_scrollx(0, 0 + xoffs); + state->m_fg_tilemap->set_scrolly(0, -8); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index 81954f451ca..01a6f401aca 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -123,8 +123,8 @@ VIDEO_START(darkmist) state->m_bgtilemap = tilemap_create( machine, get_bgtile_info,tilemap_scan_rows,16,16,512,64 ); state->m_fgtilemap = tilemap_create( machine, get_fgtile_info,tilemap_scan_rows,16,16,64,256 ); state->m_txtilemap = tilemap_create( machine, get_txttile_info,tilemap_scan_rows,8,8,32,32 ); - tilemap_set_transparent_pen(state->m_fgtilemap, 0); - tilemap_set_transparent_pen(state->m_txtilemap, 0); + state->m_fgtilemap->set_transparent_pen(0); + state->m_txtilemap->set_transparent_pen(0); } SCREEN_UPDATE_IND16( darkmist) @@ -136,18 +136,18 @@ SCREEN_UPDATE_IND16( darkmist) set_pens(screen.machine()); - tilemap_set_scrollx(state->m_bgtilemap, 0, DM_GETSCROLL(0x2)); - tilemap_set_scrolly(state->m_bgtilemap, 0, DM_GETSCROLL(0x6)); - tilemap_set_scrollx(state->m_fgtilemap, 0, DM_GETSCROLL(0xa)); - tilemap_set_scrolly(state->m_fgtilemap, 0, DM_GETSCROLL(0xe)); + state->m_bgtilemap->set_scrollx(0, DM_GETSCROLL(0x2)); + state->m_bgtilemap->set_scrolly(0, DM_GETSCROLL(0x6)); + state->m_fgtilemap->set_scrollx(0, DM_GETSCROLL(0xa)); + state->m_fgtilemap->set_scrolly(0, DM_GETSCROLL(0xe)); bitmap.fill(get_black_pen(screen.machine()), cliprect); if(state->m_hw & DISPLAY_BG) - tilemap_draw(bitmap,cliprect,state->m_bgtilemap, 0,0); + state->m_bgtilemap->draw(bitmap, cliprect, 0,0); if(state->m_hw & DISPLAY_FG) - tilemap_draw(bitmap,cliprect,state->m_fgtilemap, 0,0); + state->m_fgtilemap->draw(bitmap, cliprect, 0,0); if(state->m_hw & DISPLAY_SPR) { @@ -192,8 +192,8 @@ SCREEN_UPDATE_IND16( darkmist) if(state->m_hw & DISPLAY_TXT) { - tilemap_mark_all_tiles_dirty(state->m_txtilemap); - tilemap_draw(bitmap,cliprect,state->m_txtilemap, 0,0); + state->m_txtilemap->mark_all_dirty(); + state->m_txtilemap->draw(bitmap, cliprect, 0,0); } diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c index 3e7366c07de..5e15f5c3ddd 100644 --- a/src/mame/video/darkseal.c +++ b/src/mame/video/darkseal.c @@ -62,7 +62,7 @@ VIDEO_START( darkseal ) SCREEN_UPDATE_IND16( darkseal ) { darkseal_state *state = screen.machine().driver_data(); - tilemap_set_flip_all(screen.machine(),state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); bitmap.fill(get_black_pen(screen.machine()), cliprect); diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c index 8d8683bf919..a54e7d68b68 100644 --- a/src/mame/video/dbz.c +++ b/src/mame/video/dbz.c @@ -42,7 +42,7 @@ WRITE16_HANDLER( dbz_bg2_videoram_w ) { dbz_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg2_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset / 2); + state->m_bg2_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_dbz_bg2_tile_info ) @@ -61,7 +61,7 @@ WRITE16_HANDLER( dbz_bg1_videoram_w ) { dbz_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg1_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg1_tilemap, offset / 2); + state->m_bg1_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_dbz_bg1_tile_info ) @@ -83,8 +83,8 @@ VIDEO_START( dbz ) state->m_bg1_tilemap = tilemap_create(machine, get_dbz_bg1_tile_info, tilemap_scan_rows, 16, 16, 64, 32); state->m_bg2_tilemap = tilemap_create(machine, get_dbz_bg2_tile_info, tilemap_scan_rows, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_bg1_tilemap, 0); - tilemap_set_transparent_pen(state->m_bg2_tilemap, 0); + state->m_bg1_tilemap->set_transparent_pen(0); + state->m_bg2_tilemap->set_transparent_pen(0); if (!strcmp(machine.system().name, "dbz")) k056832_set_layer_offs(state->m_k056832, 0, -34, -16); @@ -114,9 +114,9 @@ SCREEN_UPDATE_IND16( dbz ) if (plane <= 3) k056832_mark_plane_dirty(state->m_k056832, plane); else if (plane == 4) - tilemap_mark_all_tiles_dirty(state->m_bg1_tilemap); + state->m_bg1_tilemap->mark_all_dirty(); else if (plane == 5) - tilemap_mark_all_tiles_dirty(state->m_bg2_tilemap); + state->m_bg2_tilemap->mark_all_dirty(); } } diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c index 13934d05ae8..ba97a7a908c 100644 --- a/src/mame/video/dcon.c +++ b/src/mame/video/dcon.c @@ -23,19 +23,19 @@ WRITE16_HANDLER( dcon_control_w ) { state->m_enable=data; if ((state->m_enable&4)==4) - tilemap_set_enable(state->m_foreground_layer,0); + state->m_foreground_layer->enable(0); else - tilemap_set_enable(state->m_foreground_layer,1); + state->m_foreground_layer->enable(1); if ((state->m_enable&2)==2) - tilemap_set_enable(state->m_midground_layer,0); + state->m_midground_layer->enable(0); else - tilemap_set_enable(state->m_midground_layer,1); + state->m_midground_layer->enable(1); if ((state->m_enable&1)==1) - tilemap_set_enable(state->m_background_layer,0); + state->m_background_layer->enable(0); else - tilemap_set_enable(state->m_background_layer,1); + state->m_background_layer->enable(1); } } @@ -52,28 +52,28 @@ WRITE16_HANDLER( dcon_background_w ) { dcon_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_back_data[offset]); - tilemap_mark_tile_dirty(state->m_background_layer,offset); + state->m_background_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( dcon_foreground_w ) { dcon_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fore_data[offset]); - tilemap_mark_tile_dirty(state->m_foreground_layer,offset); + state->m_foreground_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( dcon_midground_w ) { dcon_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_mid_data[offset]); - tilemap_mark_tile_dirty(state->m_midground_layer,offset); + state->m_midground_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( dcon_text_w ) { dcon_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_textram[offset]); - tilemap_mark_tile_dirty(state->m_text_layer,offset); + state->m_text_layer->mark_tile_dirty(offset); } static TILE_GET_INFO( get_back_tile_info ) @@ -144,9 +144,9 @@ VIDEO_START( dcon ) state->m_midground_layer = tilemap_create(machine, get_mid_tile_info, tilemap_scan_rows,16,16,32,32); state->m_text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8,8,64,32); - tilemap_set_transparent_pen(state->m_midground_layer,15); - tilemap_set_transparent_pen(state->m_foreground_layer,15); - tilemap_set_transparent_pen(state->m_text_layer,15); + state->m_midground_layer->set_transparent_pen(15); + state->m_foreground_layer->set_transparent_pen(15); + state->m_text_layer->set_transparent_pen(15); state->m_gfx_bank_select = 0; } @@ -283,21 +283,21 @@ SCREEN_UPDATE_IND16( dcon ) screen.machine().priority_bitmap.fill(0, cliprect); /* Setup the tilemaps */ - tilemap_set_scrollx( state->m_background_layer,0, state->m_scroll_ram[0] ); - tilemap_set_scrolly( state->m_background_layer,0, state->m_scroll_ram[1] ); - tilemap_set_scrollx( state->m_midground_layer, 0, state->m_scroll_ram[2] ); - tilemap_set_scrolly( state->m_midground_layer, 0, state->m_scroll_ram[3] ); - tilemap_set_scrollx( state->m_foreground_layer,0, state->m_scroll_ram[4] ); - tilemap_set_scrolly( state->m_foreground_layer,0, state->m_scroll_ram[5] ); + state->m_background_layer->set_scrollx(0, state->m_scroll_ram[0] ); + state->m_background_layer->set_scrolly(0, state->m_scroll_ram[1] ); + state->m_midground_layer->set_scrollx(0, state->m_scroll_ram[2] ); + state->m_midground_layer->set_scrolly(0, state->m_scroll_ram[3] ); + state->m_foreground_layer->set_scrollx(0, state->m_scroll_ram[4] ); + state->m_foreground_layer->set_scrolly(0, state->m_scroll_ram[5] ); if ((state->m_enable&1)!=1) - tilemap_draw(bitmap,cliprect,state->m_background_layer,0,0); + state->m_background_layer->draw(bitmap, cliprect, 0,0); else bitmap.fill(15, cliprect); /* Should always be black, not pen 15 */ - tilemap_draw(bitmap,cliprect,state->m_midground_layer,0,1); - tilemap_draw(bitmap,cliprect,state->m_foreground_layer,0,2); - tilemap_draw(bitmap,cliprect,state->m_text_layer,0,4); + state->m_midground_layer->draw(bitmap, cliprect, 0,1); + state->m_foreground_layer->draw(bitmap, cliprect, 0,2); + state->m_text_layer->draw(bitmap, cliprect, 0,4); draw_sprites(screen.machine(),bitmap,cliprect); return 0; @@ -312,28 +312,28 @@ SCREEN_UPDATE_IND16( sdgndmps ) /* Gfx banking */ if (state->m_last_gfx_bank!=state->m_gfx_bank_select) { - tilemap_mark_all_tiles_dirty(state->m_midground_layer); + state->m_midground_layer->mark_all_dirty(); state->m_last_gfx_bank=state->m_gfx_bank_select; } /* Setup the tilemaps */ - tilemap_set_scrollx( state->m_background_layer,0, state->m_scroll_ram[0]+128 ); - tilemap_set_scrolly( state->m_background_layer,0, state->m_scroll_ram[1] ); - tilemap_set_scrollx( state->m_midground_layer, 0, state->m_scroll_ram[2]+128 ); - tilemap_set_scrolly( state->m_midground_layer, 0, state->m_scroll_ram[3] ); - tilemap_set_scrollx( state->m_foreground_layer,0, state->m_scroll_ram[4]+128 ); - tilemap_set_scrolly( state->m_foreground_layer,0, state->m_scroll_ram[5] ); - tilemap_set_scrollx( state->m_text_layer,0, /*state->m_scroll_ram[6] + */ 128 ); - tilemap_set_scrolly( state->m_text_layer,0, /*state->m_scroll_ram[7] + */ 0 ); + state->m_background_layer->set_scrollx(0, state->m_scroll_ram[0]+128 ); + state->m_background_layer->set_scrolly(0, state->m_scroll_ram[1] ); + state->m_midground_layer->set_scrollx(0, state->m_scroll_ram[2]+128 ); + state->m_midground_layer->set_scrolly(0, state->m_scroll_ram[3] ); + state->m_foreground_layer->set_scrollx(0, state->m_scroll_ram[4]+128 ); + state->m_foreground_layer->set_scrolly(0, state->m_scroll_ram[5] ); + state->m_text_layer->set_scrollx(0, /*state->m_scroll_ram[6] + */ 128 ); + state->m_text_layer->set_scrolly(0, /*state->m_scroll_ram[7] + */ 0 ); if ((state->m_enable&1)!=1) - tilemap_draw(bitmap,cliprect,state->m_background_layer,0,0); + state->m_background_layer->draw(bitmap, cliprect, 0,0); else bitmap.fill(15, cliprect); /* Should always be black, not pen 15 */ - tilemap_draw(bitmap,cliprect,state->m_midground_layer,0,1); - tilemap_draw(bitmap,cliprect,state->m_foreground_layer,0,2); - tilemap_draw(bitmap,cliprect,state->m_text_layer,0,4); + state->m_midground_layer->draw(bitmap, cliprect, 0,1); + state->m_foreground_layer->draw(bitmap, cliprect, 0,2); + state->m_text_layer->draw(bitmap, cliprect, 0,4); draw_sprites(screen.machine(),bitmap,cliprect); return 0; diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index 328340e7298..1b2ec8d6109 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -221,9 +221,9 @@ VIDEO_START( dday ) machine.primary_screen->register_screen_bitmap(state->m_main_bitmap); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0x00f0, 0xff0f); /* pens 0-3 have priority over the foreground layer */ - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_transparent_pen(state->m_text_tilemap, 0); + state->m_bg_tilemap->set_transmask(0, 0x00f0, 0xff0f); /* pens 0-3 have priority over the foreground layer */ + state->m_fg_tilemap->set_transparent_pen(0); + state->m_text_tilemap->set_transparent_pen(0); start_countdown_timer(machine); } @@ -233,7 +233,7 @@ WRITE8_HANDLER( dday_bgvideoram_w ) dday_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( dday_fgvideoram_w ) @@ -241,8 +241,8 @@ WRITE8_HANDLER( dday_fgvideoram_w ) dday_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset ^ 0x1f); /* for flipx case */ + state->m_fg_tilemap->mark_tile_dirty(offset); + state->m_fg_tilemap->mark_tile_dirty(offset ^ 0x1f); /* for flipx case */ } WRITE8_HANDLER( dday_textvideoram_w ) @@ -250,7 +250,7 @@ WRITE8_HANDLER( dday_textvideoram_w ) dday_state *state = space->machine().driver_data(); state->m_textvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_text_tilemap, offset); + state->m_text_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( dday_colorram_w ) @@ -263,7 +263,7 @@ WRITE8_HANDLER( dday_colorram_w ) state->m_colorram[offset & 0x3e0] = data; for (i = 0; i < 0x20; i++) - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset + i); + state->m_fg_tilemap->mark_tile_dirty(offset + i); } READ8_HANDLER( dday_colorram_r ) @@ -280,7 +280,7 @@ WRITE8_HANDLER( dday_sl_control_w ) if (state->m_sl_image != data) { state->m_sl_image = data; - tilemap_mark_all_tiles_dirty(state->m_sl_tilemap); + state->m_sl_tilemap->mark_all_dirty(); } } @@ -319,17 +319,17 @@ SCREEN_UPDATE_IND16( dday ) { dday_state *state = screen.machine().driver_data(); - tilemap_draw(state->m_main_bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(state->m_main_bitmap, cliprect, state->m_fg_tilemap, 0, 0); - tilemap_draw(state->m_main_bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(state->m_main_bitmap, cliprect, state->m_text_tilemap, 0, 0); + state->m_bg_tilemap->draw(state->m_main_bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_fg_tilemap->draw(state->m_main_bitmap, cliprect, 0, 0); + state->m_bg_tilemap->draw(state->m_main_bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_text_tilemap->draw(state->m_main_bitmap, cliprect, 0, 0); if (state->m_sl_enable) { /* apply shadow */ int x, y; - bitmap_ind16 &sl_bitmap = tilemap_get_pixmap(state->m_sl_tilemap); + bitmap_ind16 &sl_bitmap = state->m_sl_tilemap->pixmap(); for (x = cliprect.min_x; x <= cliprect.max_x; x++) for (y = cliprect.min_y; y <= cliprect.max_y; y++) diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c index 7278b86ff24..5a36e50a0fa 100644 --- a/src/mame/video/ddragon.c +++ b/src/mame/video/ddragon.c @@ -103,11 +103,11 @@ VIDEO_START( ddragon ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, background_scan, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldx(state->m_fg_tilemap, 0, 384 - 256); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 384 - 256); - tilemap_set_scrolldy(state->m_fg_tilemap, -8, -8); - tilemap_set_scrolldy(state->m_bg_tilemap, -8, -8); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scrolldx(0, 384 - 256); + state->m_bg_tilemap->set_scrolldx(0, 384 - 256); + state->m_fg_tilemap->set_scrolldy(-8, -8); + state->m_bg_tilemap->set_scrolldy(-8, -8); } VIDEO_START( chinagat ) @@ -117,9 +117,9 @@ VIDEO_START( chinagat ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,background_scan, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_16color_tile_info,tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldy(state->m_fg_tilemap, -8, -8); - tilemap_set_scrolldy(state->m_bg_tilemap, -8, -8); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scrolldy(-8, -8); + state->m_bg_tilemap->set_scrolldy(-8, -8); } @@ -133,14 +133,14 @@ WRITE8_HANDLER( ddragon_bgvideoram_w ) { ddragon_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( ddragon_fgvideoram_w ) { ddragon_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } @@ -247,11 +247,11 @@ SCREEN_UPDATE_IND16( ddragon ) int scrollx = (state->m_scrollx_hi << 8) | *state->m_scrollx_lo; int scrolly = (state->m_scrolly_hi << 8) | *state->m_scrolly_lo; - tilemap_set_scrollx(state->m_bg_tilemap, 0, scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, scrolly); + state->m_bg_tilemap->set_scrollx(0, scrollx); + state->m_bg_tilemap->set_scrolly(0, scrolly); - tilemap_draw(bitmap,cliprect, state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c index 6bb960bcac3..96826981a87 100644 --- a/src/mame/video/ddragon3.c +++ b/src/mame/video/ddragon3.c @@ -22,7 +22,7 @@ WRITE16_HANDLER( ddragon3_scroll_w ) case 6: COMBINE_DATA(&state->m_bg_tilebase); // BG Tile Base state->m_bg_tilebase &= 0x1ff; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); break; } } @@ -48,14 +48,14 @@ WRITE16_HANDLER( ddragon3_bg_videoram_w ) { ddragon3_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( ddragon3_fg_videoram_w ) { ddragon3_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_bg_tile_info ) @@ -87,8 +87,8 @@ VIDEO_START( ddragon3 ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); } /* @@ -166,28 +166,28 @@ SCREEN_UPDATE_IND16( ddragon3 ) { ddragon3_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_fg_scrollx); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_fg_scrolly); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); + state->m_fg_tilemap->set_scrollx(0, state->m_fg_scrollx); + state->m_fg_tilemap->set_scrolly(0, state->m_fg_scrolly); if ((state->m_vreg & 0x60) == 0x40) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); } else if ((state->m_vreg & 0x60) == 0x60) { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); } else { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } return 0; } @@ -196,21 +196,21 @@ SCREEN_UPDATE_IND16( ctribe ) { ddragon3_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_fg_scrollx); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_fg_scrolly); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); + state->m_fg_tilemap->set_scrollx(0, state->m_fg_scrollx); + state->m_fg_tilemap->set_scrolly(0, state->m_fg_scrolly); if(state->m_vreg & 8) { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); } else { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); } return 0; diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c index b9170038a3d..7906c150247 100644 --- a/src/mame/video/ddribble.c +++ b/src/mame/video/ddribble.c @@ -53,7 +53,7 @@ WRITE8_HANDLER( K005885_0_w ) if ((data & 0x03) != state->m_charbank[0]) { state->m_charbank[0] = data & 0x03; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } break; case 0x04: /* IRQ control, flipscreen */ @@ -72,7 +72,7 @@ WRITE8_HANDLER( K005885_1_w ) if ((data & 0x03) != state->m_charbank[1]) { state->m_charbank[1] = data & 0x03; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } break; case 0x04: /* IRQ control, flipscreen */ @@ -131,7 +131,7 @@ VIDEO_START( ddribble ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan, 8, 8, 64, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } /*************************************************************************** @@ -144,14 +144,14 @@ WRITE8_HANDLER( ddribble_fg_videoram_w ) { ddribble_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0xbff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0xbff); } WRITE8_HANDLER( ddribble_bg_videoram_w ) { ddribble_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0xbff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0xbff); } /*************************************************************************** @@ -255,18 +255,18 @@ SCREEN_UPDATE_IND16( ddribble ) ddribble_state *state = screen.machine().driver_data(); set_pens(screen.machine()); - tilemap_set_flip(state->m_fg_tilemap, (state->m_vregs[0][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(state->m_bg_tilemap, (state->m_vregs[1][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_fg_tilemap->set_flip((state->m_vregs[0][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_bg_tilemap->set_flip((state->m_vregs[1][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* set scroll registers */ - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_vregs[0][1] | ((state->m_vregs[0][2] & 0x01) << 8)); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_vregs[1][1] | ((state->m_vregs[1][2] & 0x01) << 8)); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_vregs[0][0]); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_vregs[1][0]); + state->m_fg_tilemap->set_scrollx(0, state->m_vregs[0][1] | ((state->m_vregs[0][2] & 0x01) << 8)); + state->m_bg_tilemap->set_scrollx(0, state->m_vregs[1][1] | ((state->m_vregs[1][2] & 0x01) << 8)); + state->m_fg_tilemap->set_scrolly(0, state->m_vregs[0][0]); + state->m_bg_tilemap->set_scrolly(0, state->m_vregs[1][0]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram_1, 0x07d, 2, state->m_vregs[0][4] & 0x08); draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram_2, 0x140, 3, state->m_vregs[1][4] & 0x08); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c index 91328233d9a..77922a2145c 100644 --- a/src/mame/video/deadang.c +++ b/src/mame/video/deadang.c @@ -8,7 +8,7 @@ WRITE16_HANDLER( deadang_foreground_w ) { deadang_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_video_data[offset]); - tilemap_mark_tile_dirty( state->m_pf1_layer, offset ); + state->m_pf1_layer->mark_tile_dirty(offset ); } WRITE16_HANDLER( deadang_text_w ) @@ -16,7 +16,7 @@ WRITE16_HANDLER( deadang_text_w ) deadang_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty( state->m_text_layer, offset ); + state->m_text_layer->mark_tile_dirty(offset ); } WRITE16_HANDLER( deadang_bank_w ) @@ -28,7 +28,7 @@ WRITE16_HANDLER( deadang_bank_w ) if (state->m_deadangle_tilebank!=state->m_deadangle_oldtilebank) { state->m_deadangle_oldtilebank = state->m_deadangle_tilebank; - tilemap_mark_all_tiles_dirty (state->m_pf1_layer); + state->m_pf1_layer->mark_all_dirty(); } } } @@ -82,9 +82,9 @@ VIDEO_START( deadang ) state->m_pf1_layer = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_cols,16,16, 32, 32); state->m_text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_pf2_layer, 15); - tilemap_set_transparent_pen(state->m_pf1_layer, 15); - tilemap_set_transparent_pen(state->m_text_layer, 15); + state->m_pf2_layer->set_transparent_pen(15); + state->m_pf1_layer->set_transparent_pen(15); + state->m_text_layer->set_transparent_pen(15); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -134,12 +134,12 @@ SCREEN_UPDATE_IND16( deadang ) { deadang_state *state = screen.machine().driver_data(); /* Setup the tilemaps */ - tilemap_set_scrolly( state->m_pf3_layer,0, ((state->m_scroll_ram[0x01]&0xf0)<<4)+((state->m_scroll_ram[0x02]&0x7f)<<1)+((state->m_scroll_ram[0x02]&0x80)>>7) ); - tilemap_set_scrollx( state->m_pf3_layer,0, ((state->m_scroll_ram[0x09]&0xf0)<<4)+((state->m_scroll_ram[0x0a]&0x7f)<<1)+((state->m_scroll_ram[0x0a]&0x80)>>7) ); - tilemap_set_scrolly( state->m_pf1_layer,0, ((state->m_scroll_ram[0x11]&0x10)<<4)+((state->m_scroll_ram[0x12]&0x7f)<<1)+((state->m_scroll_ram[0x12]&0x80)>>7) ); - tilemap_set_scrollx( state->m_pf1_layer,0, ((state->m_scroll_ram[0x19]&0x10)<<4)+((state->m_scroll_ram[0x1a]&0x7f)<<1)+((state->m_scroll_ram[0x1a]&0x80)>>7) ); - tilemap_set_scrolly( state->m_pf2_layer,0, ((state->m_scroll_ram[0x21]&0xf0)<<4)+((state->m_scroll_ram[0x22]&0x7f)<<1)+((state->m_scroll_ram[0x22]&0x80)>>7) ); - tilemap_set_scrollx( state->m_pf2_layer,0, ((state->m_scroll_ram[0x29]&0xf0)<<4)+((state->m_scroll_ram[0x2a]&0x7f)<<1)+((state->m_scroll_ram[0x2a]&0x80)>>7) ); + state->m_pf3_layer->set_scrolly(0, ((state->m_scroll_ram[0x01]&0xf0)<<4)+((state->m_scroll_ram[0x02]&0x7f)<<1)+((state->m_scroll_ram[0x02]&0x80)>>7) ); + state->m_pf3_layer->set_scrollx(0, ((state->m_scroll_ram[0x09]&0xf0)<<4)+((state->m_scroll_ram[0x0a]&0x7f)<<1)+((state->m_scroll_ram[0x0a]&0x80)>>7) ); + state->m_pf1_layer->set_scrolly(0, ((state->m_scroll_ram[0x11]&0x10)<<4)+((state->m_scroll_ram[0x12]&0x7f)<<1)+((state->m_scroll_ram[0x12]&0x80)>>7) ); + state->m_pf1_layer->set_scrollx(0, ((state->m_scroll_ram[0x19]&0x10)<<4)+((state->m_scroll_ram[0x1a]&0x7f)<<1)+((state->m_scroll_ram[0x1a]&0x80)>>7) ); + state->m_pf2_layer->set_scrolly(0, ((state->m_scroll_ram[0x21]&0xf0)<<4)+((state->m_scroll_ram[0x22]&0x7f)<<1)+((state->m_scroll_ram[0x22]&0x80)>>7) ); + state->m_pf2_layer->set_scrollx(0, ((state->m_scroll_ram[0x29]&0xf0)<<4)+((state->m_scroll_ram[0x2a]&0x7f)<<1)+((state->m_scroll_ram[0x2a]&0x80)>>7) ); /* Control byte: 0x01: Background playfield disable @@ -151,17 +151,17 @@ SCREEN_UPDATE_IND16( deadang ) 0x40: Flipscreen 0x80: Always set? */ - tilemap_set_enable(state->m_pf3_layer,!(state->m_scroll_ram[0x34]&1)); - tilemap_set_enable(state->m_pf1_layer,!(state->m_scroll_ram[0x34]&2)); - tilemap_set_enable(state->m_pf2_layer,!(state->m_scroll_ram[0x34]&4)); + state->m_pf3_layer->enable(!(state->m_scroll_ram[0x34]&1)); + state->m_pf1_layer->enable(!(state->m_scroll_ram[0x34]&2)); + state->m_pf2_layer->enable(!(state->m_scroll_ram[0x34]&4)); flip_screen_set(screen.machine(), state->m_scroll_ram[0x34]&0x40 ); bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect,state->m_pf3_layer,0,1); - tilemap_draw(bitmap,cliprect,state->m_pf1_layer,0,2); - tilemap_draw(bitmap,cliprect,state->m_pf2_layer,0,4); + state->m_pf3_layer->draw(bitmap, cliprect, 0,1); + state->m_pf1_layer->draw(bitmap, cliprect, 0,2); + state->m_pf2_layer->draw(bitmap, cliprect, 0,4); if (!(state->m_scroll_ram[0x34]&0x10)) draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_text_layer,0,0); + state->m_text_layer->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 8fa38fb90cd..78e7a406bc0 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -107,7 +107,7 @@ WRITE8_HANDLER( dec8_bg_data_w ) { dec8_state *state = space->machine().driver_data(); state->m_bg_data[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } READ8_HANDLER( dec8_bg_data_r ) @@ -121,14 +121,14 @@ WRITE8_HANDLER( dec8_videoram_w ) { dec8_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fix_tilemap, offset / 2); + state->m_fix_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( srdarwin_videoram_w ) { dec8_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fix_tilemap, offset); + state->m_fix_tilemap->mark_tile_dirty(offset); } @@ -282,7 +282,7 @@ SCREEN_UPDATE_IND16( cobracom ) screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x04, 0x00, 0x03); screen.machine().device("tilegen2")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x04, 0x04, 0x03); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -308,7 +308,7 @@ VIDEO_START( cobracom ) dec8_state *state = machine.driver_data(); state->m_fix_tilemap = tilemap_create(machine, get_cobracom_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); state->m_game_uses_priority = 0; machine.device("tilegen1")->set_colmask(0x3); @@ -323,7 +323,7 @@ SCREEN_UPDATE_IND16( ghostb ) dec8_state *state = screen.machine().driver_data(); screen.machine().device("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x400, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -345,7 +345,7 @@ VIDEO_START( ghostb ) { dec8_state *state = machine.driver_data(); state->m_fix_tilemap = tilemap_create(machine, get_ghostb_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); state->m_game_uses_priority = 0; machine.device("tilegen1")->set_colmask(0xf); @@ -362,7 +362,7 @@ SCREEN_UPDATE_IND16( oscar ) screen.machine().device("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x00, 0x00, 0x0f); screen.machine().device("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x08,0x08,0x08,0x08); - tilemap_draw(bitmap,cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -385,7 +385,7 @@ VIDEO_START( oscar ) dec8_state *state = machine.driver_data(); state->m_fix_tilemap = tilemap_create(machine, get_oscar_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); state->m_game_uses_priority = 1; machine.device("tilegen1")->set_colmask(0x7); @@ -397,27 +397,27 @@ VIDEO_START( oscar ) SCREEN_UPDATE_IND16( lastmisn ) { dec8_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((state->m_scroll2[0] << 8)+ state->m_scroll2[1])); - tilemap_set_scrolly(state->m_bg_tilemap, 0, ((state->m_scroll2[2] << 8)+ state->m_scroll2[3])); + state->m_bg_tilemap->set_scrollx(0, ((state->m_scroll2[0] << 8)+ state->m_scroll2[1])); + state->m_bg_tilemap->set_scrolly(0, ((state->m_scroll2[2] << 8)+ state->m_scroll2[3])); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x400, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } SCREEN_UPDATE_IND16( shackled ) { dec8_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((state->m_scroll2[0] << 8) + state->m_scroll2[1])); - tilemap_set_scrolly(state->m_bg_tilemap, 0, ((state->m_scroll2[2] << 8) + state->m_scroll2[3])); + state->m_bg_tilemap->set_scrollx(0, ((state->m_scroll2[0] << 8) + state->m_scroll2[1])); + state->m_bg_tilemap->set_scrolly(0, ((state->m_scroll2[2] << 8) + state->m_scroll2[3])); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 1, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x400, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 1, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -435,9 +435,9 @@ static TILE_GET_INFO( get_lastmisn_tile_info ) int color = tile >> 12; if (color > 7 && state->m_game_uses_priority) - tileinfo->category = 1; + tileinfo.category = 1; else - tileinfo->category = 0; + tileinfo.category = 0; SET_TILE_INFO( 2, @@ -466,7 +466,7 @@ VIDEO_START( lastmisn ) state->m_bg_tilemap = tilemap_create(machine, get_lastmisn_tile_info, lastmisn_scan_rows, 16, 16, 32, 32); state->m_fix_tilemap = tilemap_create(machine, get_lastmisn_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); state->m_game_uses_priority = 0; } @@ -476,8 +476,8 @@ VIDEO_START( shackled ) state->m_bg_tilemap = tilemap_create(machine, get_lastmisn_tile_info, lastmisn_scan_rows, 16, 16, 32, 32); state->m_fix_tilemap = tilemap_create(machine, get_lastmisn_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0x000f, 0xfff0); /* Bottom 12 pens */ + state->m_fix_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transmask(0, 0x000f, 0xfff0); /* Bottom 12 pens */ state->m_game_uses_priority = 1; } @@ -486,13 +486,13 @@ VIDEO_START( shackled ) SCREEN_UPDATE_IND16( srdarwin ) { dec8_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, (state->m_scroll2[0] << 8) + state->m_scroll2[1]); + state->m_bg_tilemap->set_scrollx(0, (state->m_scroll2[0] << 8) + state->m_scroll2[1]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); srdarwin_draw_sprites(screen.machine(), bitmap, cliprect, 0); //* (srdarwin37b5gre) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); srdarwin_draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -503,9 +503,9 @@ static TILE_GET_INFO( get_srdarwin_fix_tile_info ) int color = 0; /* ? */ if (color > 1) - tileinfo->category = 1; + tileinfo.category = 1; else - tileinfo->category = 0; + tileinfo.category = 0; SET_TILE_INFO( 0, @@ -530,7 +530,7 @@ static TILE_GET_INFO( get_srdarwin_tile_info ) tile, color, 0); - tileinfo->group = color; + tileinfo.group = color; } VIDEO_START( srdarwin ) @@ -539,11 +539,11 @@ VIDEO_START( srdarwin ) state->m_bg_tilemap = tilemap_create(machine, get_srdarwin_tile_info, tilemap_scan_rows, 16, 16, 32, 16); state->m_fix_tilemap = tilemap_create(machine, get_srdarwin_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0x0000); //* draw as background only - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x00ff, 0xff00); /* Bottom 8 pens */ - tilemap_set_transmask(state->m_bg_tilemap, 2, 0x00ff, 0xff00); /* Bottom 8 pens */ - tilemap_set_transmask(state->m_bg_tilemap, 3, 0x0000, 0xffff); //* draw as foreground only + state->m_fix_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); //* draw as background only + state->m_bg_tilemap->set_transmask(1, 0x00ff, 0xff00); /* Bottom 8 pens */ + state->m_bg_tilemap->set_transmask(2, 0x00ff, 0xff00); /* Bottom 8 pens */ + state->m_bg_tilemap->set_transmask(3, 0x0000, 0xffff); //* draw as foreground only } /******************************************************************************/ @@ -551,27 +551,27 @@ VIDEO_START( srdarwin ) SCREEN_UPDATE_IND16( gondo ) { dec8_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((state->m_scroll2[0] << 8) + state->m_scroll2[1])); - tilemap_set_scrolly(state->m_bg_tilemap, 0, ((state->m_scroll2[2] << 8) + state->m_scroll2[3])); + state->m_bg_tilemap->set_scrollx(0, ((state->m_scroll2[0] << 8) + state->m_scroll2[1])); + state->m_bg_tilemap->set_scrolly(0, ((state->m_scroll2[2] << 8) + state->m_scroll2[3])); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x400, 2); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x400, 1); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } SCREEN_UPDATE_IND16( garyoret ) { dec8_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((state->m_scroll2[0] << 8) + state->m_scroll2[1])); - tilemap_set_scrolly(state->m_bg_tilemap, 0, ((state->m_scroll2[2] << 8) + state->m_scroll2[3])); + state->m_bg_tilemap->set_scrollx(0, ((state->m_scroll2[0] << 8) + state->m_scroll2[1])); + state->m_bg_tilemap->set_scrolly(0, ((state->m_scroll2[2] << 8) + state->m_scroll2[3])); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x400, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -597,9 +597,9 @@ static TILE_GET_INFO( get_gondo_tile_info ) int color = tile>> 12; if (color > 7 && state->m_game_uses_priority) - tileinfo->category = 1; + tileinfo.category = 1; else - tileinfo->category = 0; + tileinfo.category = 0; SET_TILE_INFO( 2, @@ -614,8 +614,8 @@ VIDEO_START( gondo ) state->m_fix_tilemap = tilemap_create(machine, get_gondo_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, get_gondo_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0x00ff, 0xff00); /* Bottom 8 pens */ + state->m_fix_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transmask(0, 0x00ff, 0xff00); /* Bottom 8 pens */ state->m_game_uses_priority = 0; } @@ -625,7 +625,7 @@ VIDEO_START( garyoret ) state->m_fix_tilemap = tilemap_create(machine, get_gondo_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, get_gondo_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); state->m_game_uses_priority = 1; } diff --git a/src/mame/video/decbac06.c b/src/mame/video/decbac06.c index 34c66625095..9b3e50b67ef 100644 --- a/src/mame/video/decbac06.c +++ b/src/mame/video/decbac06.c @@ -126,7 +126,7 @@ static TILE_GET_INFO_DEVICE( get_pf8x8_tile_info ) int tile=dev->pf_data[tile_index]; int colourpri=(tile>>12); SET_TILE_INFO_DEVICE(dev->tile_region,tile&0xfff,0,0); - tileinfo->category = colourpri; + tileinfo.category = colourpri; } static TILE_GET_INFO_DEVICE( get_pf16x16_tile_info ) @@ -136,7 +136,7 @@ static TILE_GET_INFO_DEVICE( get_pf16x16_tile_info ) int tile=dev->pf_data[tile_index]; int colourpri=(tile>>12); SET_TILE_INFO_DEVICE(dev->tile_region,tile&0xfff,0,0); - tileinfo->category = colourpri; + tileinfo.category = colourpri; } @@ -205,8 +205,8 @@ void deco_bac06_device::custom_tilemap_draw(running_machine &machine, UINT16 colpricondition ) { - const bitmap_ind16 &src_bitmap = tilemap_get_pixmap(tilemap_ptr); - const bitmap_ind8 &flags_bitmap = tilemap_get_flagsmap(tilemap_ptr); + const bitmap_ind16 &src_bitmap = tilemap_ptr->pixmap(); + const bitmap_ind8 &flags_bitmap = tilemap_ptr->flagsmap(); int x, y, p, colpri; int column_offset=0, src_x=0, src_y=0; UINT32 scrollx = 0; @@ -348,12 +348,12 @@ WRITE16_DEVICE_HANDLER( deco_bac06_pf_control_0_w ) printf("tilemap ram bank change to %d\n", newbank&1); dev->m_rambank = newbank&1; - tilemap_mark_all_tiles_dirty(dev->pf8x8_tilemap[0]); - tilemap_mark_all_tiles_dirty(dev->pf8x8_tilemap[1]); - tilemap_mark_all_tiles_dirty(dev->pf8x8_tilemap[2]); - tilemap_mark_all_tiles_dirty(dev->pf16x16_tilemap[0]); - tilemap_mark_all_tiles_dirty(dev->pf16x16_tilemap[1]); - tilemap_mark_all_tiles_dirty(dev->pf16x16_tilemap[2]); + dev->pf8x8_tilemap[0]->mark_all_dirty(); + dev->pf8x8_tilemap[1]->mark_all_dirty(); + dev->pf8x8_tilemap[2]->mark_all_dirty(); + dev->pf16x16_tilemap[0]->mark_all_dirty(); + dev->pf16x16_tilemap[1]->mark_all_dirty(); + dev->pf16x16_tilemap[2]->mark_all_dirty(); } } } @@ -379,12 +379,12 @@ WRITE16_DEVICE_HANDLER( deco_bac06_pf_data_w ) if (dev->m_rambank&1) offset+=0x1000; COMBINE_DATA(&dev->pf_data[offset]); - tilemap_mark_tile_dirty(dev->pf8x8_tilemap[0],offset); - tilemap_mark_tile_dirty(dev->pf8x8_tilemap[1],offset); - tilemap_mark_tile_dirty(dev->pf8x8_tilemap[2],offset); - tilemap_mark_tile_dirty(dev->pf16x16_tilemap[0],offset); - tilemap_mark_tile_dirty(dev->pf16x16_tilemap[1],offset); - tilemap_mark_tile_dirty(dev->pf16x16_tilemap[2],offset); + dev->pf8x8_tilemap[0]->mark_tile_dirty(offset); + dev->pf8x8_tilemap[1]->mark_tile_dirty(offset); + dev->pf8x8_tilemap[2]->mark_tile_dirty(offset); + dev->pf16x16_tilemap[0]->mark_tile_dirty(offset); + dev->pf16x16_tilemap[1]->mark_tile_dirty(offset); + dev->pf16x16_tilemap[2]->mark_tile_dirty(offset); } READ16_DEVICE_HANDLER( deco_bac06_pf_data_r ) diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index bcd11f59db8..139193da5ca 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -380,8 +380,8 @@ static void custom_tilemap_draw( running_machine &machine = device->machine(); tilemap_t *tilemap0 = BIT(control1, 7) ? tilemap0_8x8 : tilemap0_16x16; tilemap_t *tilemap1 = BIT(control1, 7) ? tilemap1_8x8 : tilemap1_16x16; - const bitmap_ind16 *src_bitmap0 = tilemap0 ? &tilemap_get_pixmap(tilemap0) : NULL; - const bitmap_ind16 *src_bitmap1 = tilemap1 ? &tilemap_get_pixmap(tilemap1) : NULL; + const bitmap_ind16 *src_bitmap0 = tilemap0 ? &tilemap0->pixmap() : NULL; + const bitmap_ind16 *src_bitmap1 = tilemap1 ? &tilemap1->pixmap() : NULL; int width_mask, height_mask, x, y, p; int column_offset, src_x = 0, src_y = 0; int row_type = 1 << ((control0 >> 3) & 0xf); @@ -479,9 +479,9 @@ void deco16ic_pf12_set_gfxbank( device_t *device, int small, int big ) if (deco16ic->pf12_last_big != big) { if (deco16ic->pf1_tilemap_16x16) - tilemap_mark_all_tiles_dirty(deco16ic->pf1_tilemap_16x16); + deco16ic->pf1_tilemap_16x16->mark_all_dirty(); if (deco16ic->pf2_tilemap_16x16) - tilemap_mark_all_tiles_dirty(deco16ic->pf2_tilemap_16x16); + deco16ic->pf2_tilemap_16x16->mark_all_dirty(); deco16ic->pf12_last_big = big; } @@ -490,9 +490,9 @@ void deco16ic_pf12_set_gfxbank( device_t *device, int small, int big ) if (deco16ic->pf12_last_small != small) { if (deco16ic->pf1_tilemap_8x8) - tilemap_mark_all_tiles_dirty(deco16ic->pf1_tilemap_8x8); + deco16ic->pf1_tilemap_8x8->mark_all_dirty(); if (deco16ic->pf2_tilemap_8x8) - tilemap_mark_all_tiles_dirty(deco16ic->pf2_tilemap_8x8); + deco16ic->pf2_tilemap_8x8->mark_all_dirty(); deco16ic->pf12_last_small = small; } @@ -508,15 +508,15 @@ void deco16ic_set_scrolldx( device_t *device, int tmap, int size, int dx, int dx { case 0: if (!size) - tilemap_set_scrolldx(deco16ic->pf1_tilemap_16x16, dx, dx_if_flipped); + deco16ic->pf1_tilemap_16x16->set_scrolldx(dx, dx_if_flipped); else - tilemap_set_scrolldx(deco16ic->pf1_tilemap_8x8, dx, dx_if_flipped); + deco16ic->pf1_tilemap_8x8->set_scrolldx(dx, dx_if_flipped); break; case 1: if (!size) - tilemap_set_scrolldx(deco16ic->pf2_tilemap_16x16, dx, dx_if_flipped); + deco16ic->pf2_tilemap_16x16->set_scrolldx(dx, dx_if_flipped); else - tilemap_set_scrolldx(deco16ic->pf2_tilemap_8x8, dx, dx_if_flipped); + deco16ic->pf2_tilemap_8x8->set_scrolldx(dx, dx_if_flipped); break; } } @@ -540,9 +540,9 @@ WRITE16_DEVICE_HANDLER( deco16ic_pf1_data_w ) COMBINE_DATA(&deco16ic->pf1_data[offset]); - tilemap_mark_tile_dirty(deco16ic->pf1_tilemap_8x8, offset); + deco16ic->pf1_tilemap_8x8->mark_tile_dirty(offset); // if (offset < 0x800) - tilemap_mark_tile_dirty(deco16ic->pf1_tilemap_16x16, offset); + deco16ic->pf1_tilemap_16x16->mark_tile_dirty(offset); } WRITE16_DEVICE_HANDLER( deco16ic_pf2_data_w ) @@ -551,9 +551,9 @@ WRITE16_DEVICE_HANDLER( deco16ic_pf2_data_w ) COMBINE_DATA(&deco16ic->pf2_data[offset]); - tilemap_mark_tile_dirty(deco16ic->pf2_tilemap_8x8, offset); + deco16ic->pf2_tilemap_8x8->mark_tile_dirty(offset); // if (offset < 0x800) - tilemap_mark_tile_dirty(deco16ic->pf2_tilemap_16x16, offset); + deco16ic->pf2_tilemap_16x16->mark_tile_dirty(offset); } READ16_DEVICE_HANDLER( deco16ic_pf1_data_r ) @@ -631,19 +631,19 @@ static int deco16_pf_update( if (BIT(control1, 7)) { if (tilemap_8x8) - tilemap_set_enable(tilemap_8x8, BIT(control0, 7)); + tilemap_8x8->enable(BIT(control0, 7)); if (tilemap_16x16) - tilemap_set_enable(tilemap_16x16, 0); + tilemap_16x16->enable(0); } else { if (tilemap_8x8) - tilemap_set_enable(tilemap_8x8, 0); + tilemap_8x8->enable(0); if (tilemap_16x16) - tilemap_set_enable(tilemap_16x16, BIT(control0, 7)); + tilemap_16x16->enable(BIT(control0, 7)); } /* Rowscroll enable */ @@ -667,22 +667,22 @@ static int deco16_pf_update( if (tilemap_16x16) { - tilemap_set_scroll_cols(tilemap_16x16, 1); - tilemap_set_scroll_rows(tilemap_16x16, rows); - tilemap_set_scrolly(tilemap_16x16, 0, scrolly); + tilemap_16x16->set_scroll_cols(1); + tilemap_16x16->set_scroll_rows(rows); + tilemap_16x16->set_scrolly(0, scrolly); for (offs = 0; offs < rows; offs++) - tilemap_set_scrollx(tilemap_16x16, offs, scrollx + rowscroll_ptr[offs]); + tilemap_16x16->set_scrollx(offs, scrollx + rowscroll_ptr[offs]); } if (tilemap_8x8) { - tilemap_set_scroll_cols(tilemap_8x8, 1); - tilemap_set_scroll_rows(tilemap_8x8, rows / 2); - tilemap_set_scrolly(tilemap_8x8, 0, scrolly); + tilemap_8x8->set_scroll_cols(1); + tilemap_8x8->set_scroll_rows(rows / 2); + tilemap_8x8->set_scrolly(0, scrolly); for (offs = 0; offs < rows / 2; offs++) - tilemap_set_scrollx(tilemap_8x8, offs, scrollx + rowscroll_ptr[offs]); + tilemap_8x8->set_scrollx(offs, scrollx + rowscroll_ptr[offs]); } } else if (rowscroll_ptr && (control1 & 0x60) == 0x20) /* Column scroll */ @@ -701,24 +701,24 @@ static int deco16_pf_update( if (tilemap_16x16) { - tilemap_set_scroll_cols(tilemap_16x16, cols); - tilemap_set_scroll_rows(tilemap_16x16, 1); - tilemap_set_scrollx(tilemap_16x16, 0, scrollx); + tilemap_16x16->set_scroll_cols(cols); + tilemap_16x16->set_scroll_rows(1); + tilemap_16x16->set_scrollx(0, scrollx); for (offs = 0; offs < cols; offs++) - tilemap_set_scrolly(tilemap_16x16, offs, scrolly + rowscroll_ptr[(offs & mask) + 0x200]); + tilemap_16x16->set_scrolly(offs, scrolly + rowscroll_ptr[(offs & mask) + 0x200]); } if (tilemap_8x8) { cols = cols / 2; /* Adjust because 8x8 tilemap is half the width of 16x16 */ - tilemap_set_scroll_cols(tilemap_8x8, cols); - tilemap_set_scroll_rows(tilemap_8x8, 1); - tilemap_set_scrollx(tilemap_8x8, 0, scrollx); + tilemap_8x8->set_scroll_cols(cols); + tilemap_8x8->set_scroll_rows(1); + tilemap_8x8->set_scrollx(0, scrollx); for (offs = 0; offs < cols; offs++) - tilemap_set_scrolly(tilemap_8x8, offs, scrolly + rowscroll_ptr[(offs & mask) + 0x200]); + tilemap_8x8->set_scrolly(offs, scrolly + rowscroll_ptr[(offs & mask) + 0x200]); } } else if (control1 & 0x60) @@ -728,18 +728,18 @@ static int deco16_pf_update( if (tilemap_16x16) { - tilemap_set_scroll_rows(tilemap_16x16, 1); - tilemap_set_scroll_cols(tilemap_16x16, 1); - tilemap_set_scrollx(tilemap_16x16, 0, scrollx); - tilemap_set_scrolly(tilemap_16x16, 0, scrolly); + tilemap_16x16->set_scroll_rows(1); + tilemap_16x16->set_scroll_cols(1); + tilemap_16x16->set_scrollx(0, scrollx); + tilemap_16x16->set_scrolly(0, scrolly); } if (tilemap_8x8) { - tilemap_set_scroll_rows(tilemap_8x8, 1); - tilemap_set_scroll_cols(tilemap_8x8, 1); - tilemap_set_scrollx(tilemap_8x8, 0, scrollx); - tilemap_set_scrolly(tilemap_8x8, 0, scrolly); + tilemap_8x8->set_scroll_rows(1); + tilemap_8x8->set_scroll_cols(1); + tilemap_8x8->set_scrollx(0, scrollx); + tilemap_8x8->set_scrolly(0, scrolly); } @@ -748,18 +748,18 @@ static int deco16_pf_update( { if (tilemap_16x16) { - tilemap_set_scroll_rows(tilemap_16x16, 1); - tilemap_set_scroll_cols(tilemap_16x16, 1); - tilemap_set_scrollx(tilemap_16x16, 0, scrollx); - tilemap_set_scrolly(tilemap_16x16, 0, scrolly); + tilemap_16x16->set_scroll_rows(1); + tilemap_16x16->set_scroll_cols(1); + tilemap_16x16->set_scrollx(0, scrollx); + tilemap_16x16->set_scrolly(0, scrolly); } if (tilemap_8x8) { - tilemap_set_scroll_rows(tilemap_8x8, 1); - tilemap_set_scroll_cols(tilemap_8x8, 1); - tilemap_set_scrollx(tilemap_8x8, 0, scrollx); - tilemap_set_scrolly(tilemap_8x8, 0, scrolly); + tilemap_8x8->set_scroll_rows(1); + tilemap_8x8->set_scroll_cols(1); + tilemap_8x8->set_scrollx(0, scrollx); + tilemap_8x8->set_scrolly(0, scrolly); } } @@ -785,9 +785,9 @@ void deco16ic_pf_update( device_t *device, const UINT16 *rowscroll_1_ptr, const if (bank1 != deco16ic->pf1_bank) { if (deco16ic->pf1_tilemap_8x8) - tilemap_mark_all_tiles_dirty(deco16ic->pf1_tilemap_8x8); + deco16ic->pf1_tilemap_8x8->mark_all_dirty(); if (deco16ic->pf1_tilemap_16x16) - tilemap_mark_all_tiles_dirty(deco16ic->pf1_tilemap_16x16); + deco16ic->pf1_tilemap_16x16->mark_all_dirty(); deco16ic->pf1_bank = bank1; } @@ -800,9 +800,9 @@ void deco16ic_pf_update( device_t *device, const UINT16 *rowscroll_1_ptr, const if (bank2 != deco16ic->pf2_bank) { if (deco16ic->pf2_tilemap_8x8) - tilemap_mark_all_tiles_dirty(deco16ic->pf2_tilemap_8x8); + deco16ic->pf2_tilemap_8x8->mark_all_dirty(); if (deco16ic->pf2_tilemap_16x16) - tilemap_mark_all_tiles_dirty(deco16ic->pf2_tilemap_16x16); + deco16ic->pf2_tilemap_16x16->mark_all_dirty(); deco16ic->pf2_bank = bank2; } @@ -844,9 +844,9 @@ void deco16ic_tilemap_1_draw_common( device_t *device, _BitmapClass &bitmap, con else { if (deco16ic->pf1_tilemap_8x8) - tilemap_draw(bitmap, cliprect, deco16ic->pf1_tilemap_8x8, flags, priority); + deco16ic->pf1_tilemap_8x8->draw(bitmap, cliprect, flags, priority); if (deco16ic->pf1_tilemap_16x16) - tilemap_draw(bitmap, cliprect, deco16ic->pf1_tilemap_16x16, flags, priority); + deco16ic->pf1_tilemap_16x16->draw(bitmap, cliprect, flags, priority); } } @@ -869,9 +869,9 @@ void deco16ic_tilemap_2_draw_common(device_t *device, _BitmapClass &bitmap, cons else { if (deco16ic->pf2_tilemap_8x8) - tilemap_draw(bitmap, cliprect, deco16ic->pf2_tilemap_8x8, flags, priority); + deco16ic->pf2_tilemap_8x8->draw(bitmap, cliprect, flags, priority); if (deco16ic->pf2_tilemap_16x16) - tilemap_draw(bitmap, cliprect, deco16ic->pf2_tilemap_16x16, flags, priority); + deco16ic->pf2_tilemap_16x16->draw(bitmap, cliprect, flags, priority); } } @@ -942,13 +942,13 @@ static DEVICE_START( deco16ic ) deco16ic->pf2_tilemap_8x8 = tilemap_create_device(device, get_pf2_tile_info_b, tilemap_scan_rows, 8, 8, fullwidth ? 64 : 32, fullheight ? 64 : 32); - tilemap_set_transparent_pen(deco16ic->pf1_tilemap_8x8, 0); - tilemap_set_transparent_pen(deco16ic->pf2_tilemap_8x8, 0); - tilemap_set_transparent_pen(deco16ic->pf1_tilemap_16x16, 0); - tilemap_set_transparent_pen(deco16ic->pf2_tilemap_16x16, 0); + deco16ic->pf1_tilemap_8x8->set_transparent_pen(0); + deco16ic->pf2_tilemap_8x8->set_transparent_pen(0); + deco16ic->pf1_tilemap_16x16->set_transparent_pen(0); + deco16ic->pf2_tilemap_16x16->set_transparent_pen(0); if (intf->split) /* Caveman Ninja only */ - tilemap_set_transmask(deco16ic->pf2_tilemap_16x16, 0, 0x00ff, 0xff01); + deco16ic->pf2_tilemap_16x16->set_transmask(0, 0x00ff, 0xff01); deco16ic->pf1_8bpp_mode = 0; diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 2ec15bb6766..1490408fe57 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -587,7 +587,7 @@ SCREEN_UPDATE_IND16( captaven ) state->m_deco_tilegen1 = screen.machine().device("tilegen1"); state->m_deco_tilegen2 = screen.machine().device("tilegen2"); - tilemap_set_flip_all(screen.machine(),flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); screen.machine().priority_bitmap.fill(0, cliprect); bitmap.fill(screen.machine().pens[0x000], cliprect); // Palette index not confirmed diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 3f02e9583cd..8c88e952524 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -198,23 +198,23 @@ WRITE8_HANDLER( decocass_fgvideoram_w ) { decocass_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( decocass_colorram_w ) { decocass_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static void mark_bg_tile_dirty( running_machine &machine, offs_t offset ) { decocass_state *state = machine.driver_data(); if (offset & 0x80) - tilemap_mark_tile_dirty(state->m_bg_tilemap_r, offset); + state->m_bg_tilemap_r->mark_tile_dirty(offset); else - tilemap_mark_tile_dirty(state->m_bg_tilemap_l, offset); + state->m_bg_tilemap_l->mark_tile_dirty(offset); } WRITE8_HANDLER( decocass_tileram_w ) @@ -318,11 +318,11 @@ WRITE8_HANDLER( decocass_color_center_bot_w ) if ((state->m_color_center_bot ^ data) & 0x80) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap_r); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap_l); + state->m_bg_tilemap_r->mark_all_dirty(); + state->m_bg_tilemap_l->mark_all_dirty(); } if ((state->m_color_center_bot ^ data) & 0x01) - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); state->m_color_center_bot = data; } @@ -495,9 +495,9 @@ VIDEO_START( decocass ) state->m_bg_tilemap_r = tilemap_create(machine, get_bg_r_tile_info, bgvideoram_scan_cols, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, fgvideoram_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap_l, 0); - tilemap_set_transparent_pen(state->m_bg_tilemap_r, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap_l->set_transparent_pen(0); + state->m_bg_tilemap_r->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_bg_tilemap_l_clip = machine.primary_screen->visible_area(); state->m_bg_tilemap_l_clip.max_y = 256 / 2 - 1; @@ -572,21 +572,21 @@ SCREEN_UPDATE_IND16( decocass ) else scrolly_l += 256; - tilemap_set_scrollx(state->m_bg_tilemap_l, 0, scrollx); - tilemap_set_scrolly(state->m_bg_tilemap_l, 0, scrolly_l); + state->m_bg_tilemap_l->set_scrollx(0, scrollx); + state->m_bg_tilemap_l->set_scrolly(0, scrolly_l); - tilemap_set_scrollx(state->m_bg_tilemap_r, 0, scrollx); - tilemap_set_scrolly(state->m_bg_tilemap_r, 0, scrolly_r); + state->m_bg_tilemap_r->set_scrollx(0, scrollx); + state->m_bg_tilemap_r->set_scrolly(0, scrolly_r); if (state->m_mode_set & 0x08) /* bkg_ena on ? */ { clip = state->m_bg_tilemap_l_clip; clip &= cliprect; - tilemap_draw(bitmap, clip, state->m_bg_tilemap_l, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap_l->draw(bitmap, clip, TILEMAP_DRAW_OPAQUE, 0); clip = state->m_bg_tilemap_r_clip; clip &= cliprect; - tilemap_draw(bitmap, clip, state->m_bg_tilemap_r, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap_r->draw(bitmap, clip, TILEMAP_DRAW_OPAQUE, 0); } if (state->m_mode_set & 0x20) @@ -602,14 +602,14 @@ SCREEN_UPDATE_IND16( decocass ) { clip = state->m_bg_tilemap_l_clip; clip &= cliprect; - tilemap_draw(bitmap, clip, state->m_bg_tilemap_l, 0, 0); + state->m_bg_tilemap_l->draw(bitmap, clip, 0, 0); clip = state->m_bg_tilemap_r_clip; clip &= cliprect; - tilemap_draw(bitmap, clip, state->m_bg_tilemap_r, 0, 0); + state->m_bg_tilemap_r->draw(bitmap, clip, 0, 0); } } - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, (state->m_color_center_bot >> 1) & 1, 0, 0, state->m_fgvideoram, 0x20); draw_missiles(screen.machine(), bitmap, cliprect, 1, 0, state->m_colorram, 0x20); return 0; diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c index 6ef23b89f8b..d3ad227c790 100644 --- a/src/mame/video/deniam.c +++ b/src/mame/video/deniam.c @@ -112,8 +112,8 @@ VIDEO_START( deniam ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, scan_pages, 8, 8, 128, 64); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); } @@ -134,9 +134,9 @@ WRITE16_HANDLER( deniam_videoram_w ) for (i = 0; i < 4; i++) { if (state->m_bg_page[i] == page) - tilemap_mark_tile_dirty(state->m_bg_tilemap, i * 0x800 + (offset & 0x7ff)); + state->m_bg_tilemap->mark_tile_dirty(i * 0x800 + (offset & 0x7ff)); if (state->m_fg_page[i] == page) - tilemap_mark_tile_dirty(state->m_fg_tilemap, i * 0x800 + (offset & 0x7ff)); + state->m_fg_tilemap->mark_tile_dirty(i * 0x800 + (offset & 0x7ff)); } } @@ -145,7 +145,7 @@ WRITE16_HANDLER( deniam_textram_w ) { deniam_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_textram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } @@ -356,7 +356,7 @@ static void set_bg_page( running_machine &machine, int page, int value ) { state->m_bg_page[page] = value; for (tile_index = page * 0x800; tile_index < (page + 1) * 0x800; tile_index++) - tilemap_mark_tile_dirty(state->m_bg_tilemap, tile_index); + state->m_bg_tilemap->mark_tile_dirty(tile_index); } } @@ -369,7 +369,7 @@ static void set_fg_page( running_machine &machine, int page, int value ) { state->m_fg_page[page] = value; for (tile_index = page * 0x800; tile_index < (page + 1) * 0x800; tile_index++) - tilemap_mark_tile_dirty(state->m_fg_tilemap, tile_index); + state->m_fg_tilemap->mark_tile_dirty(tile_index); } } @@ -398,16 +398,16 @@ SCREEN_UPDATE_IND16( deniam ) set_fg_page(screen.machine(), 1, (page >> 4) & 0x0f); set_fg_page(screen.machine(), 0, (page >> 0) & 0x0f); - tilemap_set_scrollx(state->m_bg_tilemap, 0, bg_scrollx & 0x1ff); - tilemap_set_scrolly(state->m_bg_tilemap, 0, bg_scrolly & 0x0ff); - tilemap_set_scrollx(state->m_fg_tilemap, 0, fg_scrollx & 0x1ff); - tilemap_set_scrolly(state->m_fg_tilemap, 0, fg_scrolly & 0x0ff); + state->m_bg_tilemap->set_scrollx(0, bg_scrollx & 0x1ff); + state->m_bg_tilemap->set_scrolly(0, bg_scrolly & 0x0ff); + state->m_fg_tilemap->set_scrollx(0, fg_scrollx & 0x1ff); + state->m_fg_tilemap->set_scrolly(0, fg_scrolly & 0x0ff); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index 5f861eee8b9..f3dc646582b 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -149,7 +149,7 @@ VIDEO_START( digdug ) state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan, 8,8,36,28); state->m_fg_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan,8,8,36,28); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->save_item(NAME(state->m_bg_select)); state->save_item(NAME(state->m_tx_color_mode)); @@ -170,7 +170,7 @@ WRITE8_HANDLER( digdug_videoram_w ) digdug_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( digdug_PORT_w ) @@ -188,7 +188,7 @@ WRITE8_HANDLER( digdug_PORT_w ) if ((state->m_bg_select & mask) != ((data & 1) << shift)) { state->m_bg_select = (state->m_bg_select & ~mask) | ((data & 1) << shift); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } break; @@ -197,7 +197,7 @@ WRITE8_HANDLER( digdug_PORT_w ) if (state->m_tx_color_mode != (data & 1)) { state->m_tx_color_mode = data & 1; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } break; @@ -205,7 +205,7 @@ WRITE8_HANDLER( digdug_PORT_w ) if (state->m_bg_disable != (data & 1)) { state->m_bg_disable = data & 1; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } break; @@ -218,7 +218,7 @@ WRITE8_HANDLER( digdug_PORT_w ) if ((state->m_bg_color_bank & mask) != ((data & 1) << shift)) { state->m_bg_color_bank = (state->m_bg_color_bank & ~mask) | ((data & 1) << shift); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } break; @@ -314,8 +314,8 @@ SCREEN_UPDATE_IND16( digdug ) { digdug_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); return 0; } diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c index f5d35ddc367..985fe1f9848 100644 --- a/src/mame/video/djboy.c +++ b/src/mame/video/djboy.c @@ -37,7 +37,7 @@ WRITE8_HANDLER( djboy_videoram_w ) djboy_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_background, offset & 0x7ff); + state->m_background->mark_tile_dirty(offset & 0x7ff); } VIDEO_START( djboy ) @@ -70,12 +70,12 @@ SCREEN_UPDATE_IND16( djboy ) int scroll; scroll = state->m_scrollx | ((state->m_videoreg & 0xc0) << 2); - tilemap_set_scrollx(state->m_background, 0, scroll - 0x391); + state->m_background->set_scrollx(0, scroll - 0x391); scroll = state->m_scrolly | ((state->m_videoreg & 0x20) << 3); - tilemap_set_scrolly(state->m_background, 0, scroll); + state->m_background->set_scrolly(0, scroll); - tilemap_draw(bitmap, cliprect, state->m_background, 0, 0); + state->m_background->draw(bitmap, cliprect, 0, 0); pandora_update(state->m_pandora, bitmap, cliprect); return 0; diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index ca6ccfc2cd6..98d189bff88 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -479,7 +479,7 @@ WRITE8_HANDLER( dkong_videoram_w ) if (state->m_video_ram[offset] != data) { state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } } @@ -490,7 +490,7 @@ WRITE8_HANDLER( dkongjr_gfxbank_w ) if (state->m_gfx_bank != (data & 0x01)) { state->m_gfx_bank = data & 0x01; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -501,7 +501,7 @@ WRITE8_HANDLER( dkong3_gfxbank_w ) if (state->m_gfx_bank != (~data & 0x01)) { state->m_gfx_bank = ~data & 0x01; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -520,7 +520,7 @@ WRITE8_HANDLER( dkong_palettebank_w ) if (state->m_palette_bank != newbank) { state->m_palette_bank = newbank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -954,11 +954,11 @@ VIDEO_START( dkong ) case HARDWARE_TKG04: case HARDWARE_TKG02: state->m_bg_tilemap = tilemap_create(machine, dkong_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 128); + state->m_bg_tilemap->set_scrolldx(0, 128); break; case HARDWARE_TRS01: state->m_bg_tilemap = tilemap_create(machine, radarscp1_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 128); + state->m_bg_tilemap->set_scrolldx(0, 128); machine.primary_screen->register_screen_bitmap(state->m_bg_bits); state->m_gfx4 = machine.region("gfx4")->base(); @@ -975,21 +975,21 @@ SCREEN_UPDATE_IND16( dkong ) { dkong_state *state = screen.machine().driver_data(); - tilemap_set_flip_all(screen.machine(), state->m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_flip ? 0 : 0); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_flip ? -8 : 0); + screen.machine().tilemap().set_flip_all(state->m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_bg_tilemap->set_scrollx(0, state->m_flip ? 0 : 0); + state->m_bg_tilemap->set_scrolly(0, state->m_flip ? -8 : 0); switch (state->m_hardware_type) { case HARDWARE_TKG02: case HARDWARE_TKG04: check_palette(screen.machine()); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x40, 1); break; case HARDWARE_TRS01: case HARDWARE_TRS02: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x40, 1); radarscp_draw_background(screen.machine(), state, bitmap, cliprect); break; @@ -1004,7 +1004,7 @@ SCREEN_UPDATE_IND16( pestplce ) dkong_state *state = screen.machine().driver_data(); int offs; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* Draw the sprites. */ for (offs = 0;offs < state->m_sprite_ram_size;offs += 4) @@ -1025,7 +1025,7 @@ SCREEN_UPDATE_IND16( spclforc ) { dkong_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* it uses sprite_ram[offs + 2] & 0x10 for sprite bank */ draw_sprites(screen.machine(), bitmap, cliprect, 0x10, 3); diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c index a793770eb3b..1a4b81ef0de 100644 --- a/src/mame/video/docastle.c +++ b/src/mame/video/docastle.c @@ -66,21 +66,21 @@ WRITE8_HANDLER( docastle_videoram_w ) { docastle_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_do_tilemap, offset); + state->m_do_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( docastle_colorram_w ) { docastle_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_do_tilemap, offset); + state->m_do_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( docastle_flipscreen_off_r ) { docastle_state *state = space->machine().driver_data(); flip_screen_set(space->machine(), 0); - tilemap_mark_all_tiles_dirty(state->m_do_tilemap); + state->m_do_tilemap->mark_all_dirty(); return 0; } @@ -88,7 +88,7 @@ READ8_HANDLER( docastle_flipscreen_on_r ) { docastle_state *state = space->machine().driver_data(); flip_screen_set(space->machine(), 1); - tilemap_mark_all_tiles_dirty(state->m_do_tilemap); + state->m_do_tilemap->mark_all_dirty(); return 1; } @@ -96,14 +96,14 @@ WRITE8_HANDLER( docastle_flipscreen_off_w ) { docastle_state *state = space->machine().driver_data(); flip_screen_set(space->machine(), 0); - tilemap_mark_all_tiles_dirty(state->m_do_tilemap); + state->m_do_tilemap->mark_all_dirty(); } WRITE8_HANDLER( docastle_flipscreen_on_w ) { docastle_state *state = space->machine().driver_data(); flip_screen_set(space->machine(), 1); - tilemap_mark_all_tiles_dirty(state->m_do_tilemap); + state->m_do_tilemap->mark_all_dirty(); } static TILE_GET_INFO( get_tile_info ) @@ -119,7 +119,7 @@ static void video_start_common( running_machine &machine, UINT32 tile_transmask { docastle_state *state = machine.driver_data(); state->m_do_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transmask(state->m_do_tilemap, 0, tile_transmask, 0x0000); + state->m_do_tilemap->set_transmask(0, tile_transmask, 0x0000); } VIDEO_START( docastle ) @@ -228,8 +228,8 @@ SCREEN_UPDATE_IND16( docastle ) { docastle_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_do_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_do_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_do_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_do_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c index 52089f622b6..abaff8a2330 100644 --- a/src/mame/video/dogfgt.c +++ b/src/mame/video/dogfgt.c @@ -147,7 +147,7 @@ WRITE8_HANDLER( dogfgt_bgvideoram_w ) dogfgt_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( dogfgt_scroll_w ) @@ -155,8 +155,8 @@ WRITE8_HANDLER( dogfgt_scroll_w ) dogfgt_state *state = space->machine().driver_data(); state->m_scroll[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll[0] + 256 * state->m_scroll[1] + 256); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll[2] + 256 * state->m_scroll[3]); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll[0] + 256 * state->m_scroll[1] + 256); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll[2] + 256 * state->m_scroll[3]); } WRITE8_HANDLER( dogfgt_1800_w ) @@ -234,7 +234,7 @@ SCREEN_UPDATE_IND16( dogfgt ) } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index addb3aafed8..f4c8fbbb338 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -11,19 +11,19 @@ INLINE void dooyong_scroll8_w(offs_t offset, UINT8 data, UINT8 *scroll, tilemap_ if (map != NULL) switch (offset) { case 0: /* Low byte of x scroll - scroll tilemap */ - tilemap_set_scrollx(map, 0, data); + map->set_scrollx(0, data); break; case 1: /* High byte of x scroll - mark tilemap dirty so new tile gfx will be loaded */ - tilemap_mark_all_tiles_dirty(map); + map->mark_all_dirty(); break; case 3: /* Low byte of y scroll */ case 4: /* High byte of y scroll */ - tilemap_set_scrolly(map, 0, (int)scroll[3] | ((int)scroll[4] << 8)); + map->set_scrolly(0, (int)scroll[3] | ((int)scroll[4] << 8)); break; case 6: /* Tilemap enable and mode control */ - tilemap_set_enable(map, !(data & 0x10)); + map->enable(!(data & 0x10)); if ((data & 0x20) != (old & 0x20)) // This sets the tilemap data format - tilemap_mark_all_tiles_dirty(map); + map->mark_all_dirty(); break; default: /* Other addresses are used but function is unknown */ /* 0x05 and 0x07 are initialised on startup */ @@ -102,9 +102,9 @@ WRITE8_HANDLER( dooyong_txvideoram8_w ) { state->m_txvideoram[offset] = data; if (state->m_tx_tilemap_mode == 0) - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset & 0x07ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x07ff); else - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset >> 1); + state->m_tx_tilemap->mark_tile_dirty(offset >> 1); } } @@ -213,7 +213,7 @@ WRITE16_HANDLER( rshark_ctrl_w ) when the x scroll moves out of range (trying to decode the whole lot at once uses hundreds of megabytes of RAM). */ -INLINE void lastday_get_tile_info(running_machine &machine, tile_data *tileinfo, int tile_index, +INLINE void lastday_get_tile_info(running_machine &machine, tile_data &tileinfo, int tile_index, const UINT8 *tilerom, UINT8 *scroll, int graphics) { int offs = (tile_index + ((int)scroll[1] << 6)) * 2; @@ -251,7 +251,7 @@ INLINE void lastday_get_tile_info(running_machine &machine, tile_data *tileinfo, SET_TILE_INFO(graphics, code, color, flags); } -INLINE void rshark_get_tile_info(running_machine &machine, tile_data *tileinfo, int tile_index, +INLINE void rshark_get_tile_info(running_machine &machine, tile_data &tileinfo, int tile_index, const UINT8 *tilerom1, const UINT8 *tilerom2, UINT8 *scroll, int graphics) { /* Tiles take two bytes in tile ROM 1: @@ -518,9 +518,9 @@ SCREEN_UPDATE_IND16( lastday ) bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); if (!state->m_sprites_disabled) draw_sprites(screen.machine(), bitmap, cliprect, 0); @@ -533,9 +533,9 @@ SCREEN_UPDATE_IND16( gulfstrm ) bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect, 1); return 0; @@ -547,9 +547,9 @@ SCREEN_UPDATE_IND16( pollux ) bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect, 2); return 0; @@ -563,15 +563,15 @@ SCREEN_UPDATE_IND16( flytiger ) if (state->m_flytiger_pri) { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 2); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 2); } else { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); } - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect, 4); return 0; @@ -584,10 +584,10 @@ SCREEN_UPDATE_IND16( bluehawk ) bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); - tilemap_draw(bitmap, cliprect, state->m_fg2_tilemap, 0, 4); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); + state->m_fg2_tilemap->draw(bitmap, cliprect, 0, 4); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect, 3); return 0; @@ -598,10 +598,10 @@ SCREEN_UPDATE_IND16( primella ) dooyong_state *state = screen.machine().driver_data(); bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - if (state->m_tx_pri) tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); - if (!state->m_tx_pri) tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + if (state->m_tx_pri) state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); + if (!state->m_tx_pri) state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -611,10 +611,10 @@ SCREEN_UPDATE_IND16( rshark ) bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, (state->m_rshark_pri ? 2 : 1)); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); - tilemap_draw(bitmap, cliprect, state->m_fg2_tilemap, 0, 2); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, (state->m_rshark_pri ? 2 : 1)); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); + state->m_fg2_tilemap->draw(bitmap, cliprect, 0, 2); rshark_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -626,7 +626,7 @@ SCREEN_UPDATE_IND16( popbingo ) bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); rshark_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -654,11 +654,11 @@ VIDEO_START( lastday ) 8, 8, 64, 32); /* Configure tilemap transparency */ - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); /* Text layer is offset on this machine */ - tilemap_set_scrolly(state->m_tx_tilemap, 0, 8); + state->m_tx_tilemap->set_scrolly(0, 8); memset(state->m_bgscroll8, 0, 0x10); memset(state->m_bg2scroll8, 0, 0x10); @@ -694,11 +694,11 @@ VIDEO_START( gulfstrm ) 8, 8, 64, 32); /* Configure tilemap transparency */ - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); /* Text layer is offset on this machine */ - tilemap_set_scrolly(state->m_tx_tilemap, 0, 8); + state->m_tx_tilemap->set_scrolly(0, 8); memset(state->m_bgscroll8, 0, 0x10); memset(state->m_bg2scroll8, 0, 0x10); @@ -733,8 +733,8 @@ VIDEO_START( pollux ) 8, 8, 64, 32); /* Configure tilemap transparency */ - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); memset(state->m_bgscroll8, 0, 0x10); memset(state->m_bg2scroll8, 0, 0x10); @@ -774,9 +774,9 @@ VIDEO_START( bluehawk ) 8, 8, 64, 32); /* Configure tilemap transparency */ - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_fg2_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_fg2_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); memset(state->m_bgscroll8, 0, 0x10); memset(state->m_bg2scroll8, 0, 0x10); @@ -810,9 +810,9 @@ VIDEO_START( flytiger ) 8, 8, 64, 32); /* Configure tilemap transparency */ - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_bg_tilemap->set_transparent_pen(15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); memset(state->m_bgscroll8, 0, 0x10); memset(state->m_bg2scroll8, 0, 0x10); @@ -846,8 +846,8 @@ VIDEO_START( primella ) 8, 8, 64, 32); /* Configure tilemap transparency */ - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); memset(state->m_bgscroll8, 0, 0x10); memset(state->m_bg2scroll8, 0, 0x10); @@ -888,9 +888,9 @@ VIDEO_START( rshark ) 16, 16, 64, 32); /* Configure tilemap transparency */ - tilemap_set_transparent_pen(state->m_bg2_tilemap, 15); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_fg2_tilemap, 15); + state->m_bg2_tilemap->set_transparent_pen(15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_fg2_tilemap->set_transparent_pen(15); memset(state->m_bgscroll8, 0, 0x10); memset(state->m_bg2scroll8, 0, 0x10); diff --git a/src/mame/video/dragrace.c b/src/mame/video/dragrace.c index 0321290c1b5..d6089d3485c 100644 --- a/src/mame/video/dragrace.c +++ b/src/mame/video/dragrace.c @@ -52,7 +52,7 @@ SCREEN_UPDATE_IND16( dragrace ) dragrace_state *state = screen.machine().driver_data(); int y; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); for (y = 0; y < 256; y += 4) { @@ -63,13 +63,13 @@ SCREEN_UPDATE_IND16( dragrace ) int yl = state->m_position_ram[y + 2] & 15; int yh = state->m_position_ram[y + 3] & 15; - tilemap_set_scrollx(state->m_bg_tilemap, 0, 16 * xh + xl - 8); - tilemap_set_scrolly(state->m_bg_tilemap, 0, 16 * yh + yl); + state->m_bg_tilemap->set_scrollx(0, 16 * xh + xl - 8); + state->m_bg_tilemap->set_scrolly(0, 16 * yh + yl); if (rect.min_y < y + 0) rect.min_y = y + 0; if (rect.max_y > y + 3) rect.max_y = y + 3; - tilemap_draw(bitmap, rect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, rect, 0, 0); } return 0; } diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c index 75d9f7c3523..3e227dfb082 100644 --- a/src/mame/video/drgnmst.c +++ b/src/mame/video/drgnmst.c @@ -21,7 +21,7 @@ WRITE16_HANDLER( drgnmst_fg_videoram_w ) { drgnmst_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_drgnmst_bg_tile_info ) @@ -39,7 +39,7 @@ WRITE16_HANDLER( drgnmst_bg_videoram_w ) { drgnmst_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_drgnmst_md_tile_info ) @@ -57,7 +57,7 @@ WRITE16_HANDLER( drgnmst_md_videoram_w ) { drgnmst_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_md_videoram[offset]); - tilemap_mark_tile_dirty(state->m_md_tilemap, offset / 2); + state->m_md_tilemap->mark_tile_dirty(offset / 2); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect ) @@ -127,16 +127,16 @@ VIDEO_START(drgnmst) { drgnmst_state *state = machine.driver_data(); state->m_fg_tilemap = tilemap_create(machine, get_drgnmst_fg_tile_info, drgnmst_fg_tilemap_scan_cols, 8, 8, 64,64); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); state->m_md_tilemap = tilemap_create(machine, get_drgnmst_md_tile_info, drgnmst_md_tilemap_scan_cols, 16, 16, 64,64); - tilemap_set_transparent_pen(state->m_md_tilemap, 15); + state->m_md_tilemap->set_transparent_pen(15); state->m_bg_tilemap = tilemap_create(machine, get_drgnmst_bg_tile_info, drgnmst_bg_tilemap_scan_cols, 32, 32, 64,64); - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); + state->m_bg_tilemap->set_transparent_pen(15); // do the other tilemaps have rowscroll too? probably not .. - tilemap_set_scroll_rows(state->m_md_tilemap, 1024); + state->m_md_tilemap->set_scroll_rows(1024); } SCREEN_UPDATE_IND16(drgnmst) @@ -144,19 +144,19 @@ SCREEN_UPDATE_IND16(drgnmst) drgnmst_state *state = screen.machine().driver_data(); int y, rowscroll_bank; - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_vidregs[10] - 18); // verify - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_vidregs[11]); // verify + state->m_bg_tilemap->set_scrollx(0, state->m_vidregs[10] - 18); // verify + state->m_bg_tilemap->set_scrolly(0, state->m_vidregs[11]); // verify -// tilemap_set_scrollx(state->m_md_tilemap,0, state->m_vidregs[8] - 16); // rowscrolled - tilemap_set_scrolly(state->m_md_tilemap,0, state->m_vidregs[9]); // verify +// state->m_md_tilemap->set_scrollx(0, state->m_vidregs[8] - 16); // rowscrolled + state->m_md_tilemap->set_scrolly(0, state->m_vidregs[9]); // verify - tilemap_set_scrollx(state->m_fg_tilemap,0, state->m_vidregs[6] - 18); // verify (test mode colour test needs it) - tilemap_set_scrolly(state->m_fg_tilemap,0, state->m_vidregs[7]); // verify + state->m_fg_tilemap->set_scrollx(0, state->m_vidregs[6] - 18); // verify (test mode colour test needs it) + state->m_fg_tilemap->set_scrolly(0, state->m_vidregs[7]); // verify rowscroll_bank = (state->m_vidregs[4] & 0x30) >> 4; for (y = 0; y < 1024; y++) - tilemap_set_scrollx(state->m_md_tilemap, y, state->m_vidregs[8] - 16 + state->m_rowscrollram[y + 0x800 * rowscroll_bank]); + state->m_md_tilemap->set_scrollx(y, state->m_vidregs[8] - 16 + state->m_rowscrollram[y + 0x800 * rowscroll_bank]); // todo: figure out which bits relate to the order switch (state->m_vidregs2[0]) @@ -165,31 +165,31 @@ SCREEN_UPDATE_IND16(drgnmst) case 0x2d9a: // fg unsure case 0x2440: // all ok case 0x245a: // fg unsure, title screen - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_md_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_md_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); break; case 0x23c0: // all ok - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_md_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_md_tilemap->draw(bitmap, cliprect, 0, 0); break; case 0x38da: // fg unsure case 0x215a: // fg unsure case 0x2140: // all ok - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_md_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_md_tilemap->draw(bitmap, cliprect, 0, 0); break; case 0x2d80: // all ok - tilemap_draw(bitmap, cliprect, state->m_md_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_md_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); break; default: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_md_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_md_tilemap->draw(bitmap, cliprect, 0, 0); logerror ("unknown video priority regs %04x\n", state->m_vidregs2[0]); } diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c index d1495d5e056..3f8b393bebc 100644 --- a/src/mame/video/drmicro.c +++ b/src/mame/video/drmicro.c @@ -19,9 +19,9 @@ WRITE8_HANDLER( drmicro_videoram_w ) state->m_videoram[offset] = data; if (offset < 0x800) - tilemap_mark_tile_dirty(state->m_bg2, (offset & 0x3ff)); + state->m_bg2->mark_tile_dirty((offset & 0x3ff)); else - tilemap_mark_tile_dirty(state->m_bg1, (offset & 0x3ff)); + state->m_bg1->mark_tile_dirty((offset & 0x3ff)); } @@ -113,7 +113,7 @@ VIDEO_START( drmicro) state->m_bg1 = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg2 = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg2, 0); + state->m_bg2->set_transparent_pen(0); } SCREEN_UPDATE_IND16( drmicro ) @@ -123,8 +123,8 @@ SCREEN_UPDATE_IND16( drmicro ) int chr, col, attr; int x, y, fx, fy; - tilemap_draw(bitmap, cliprect, state->m_bg1, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg2, 0, 0); + state->m_bg1->draw(bitmap, cliprect, 0, 0); + state->m_bg2->draw(bitmap, cliprect, 0, 0); /* draw sprites */ for (g = 0; g < 2; g++) diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index 282759c25cd..b2ce9176098 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -18,14 +18,14 @@ WRITE16_HANDLER( dynduke_background_w ) { dynduke_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_back_data[offset]); - tilemap_mark_tile_dirty(state->m_bg_layer,offset); + state->m_bg_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( dynduke_foreground_w ) { dynduke_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fore_data[offset]); - tilemap_mark_tile_dirty(state->m_fg_layer,offset); + state->m_fg_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( dynduke_text_w ) @@ -33,7 +33,7 @@ WRITE16_HANDLER( dynduke_text_w ) dynduke_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_layer,offset); + state->m_tx_layer->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -89,8 +89,8 @@ VIDEO_START( dynduke ) state->m_fg_layer = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,16,16,32,32); state->m_tx_layer = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); - tilemap_set_transparent_pen(state->m_fg_layer,15); - tilemap_set_transparent_pen(state->m_tx_layer,15); + state->m_fg_layer->set_transparent_pen(15); + state->m_tx_layer->set_transparent_pen(15); } WRITE16_HANDLER( dynduke_gfxbank_w ) @@ -103,9 +103,9 @@ WRITE16_HANDLER( dynduke_gfxbank_w ) if (data&0x10) state->m_fore_bankbase=0x1000; else state->m_fore_bankbase=0; if (state->m_back_bankbase!=state->m_old_back) - tilemap_mark_all_tiles_dirty(state->m_bg_layer); + state->m_bg_layer->mark_all_dirty(); if (state->m_fore_bankbase!=state->m_old_fore) - tilemap_mark_all_tiles_dirty(state->m_fg_layer); + state->m_fg_layer->mark_all_dirty(); state->m_old_back=state->m_back_bankbase; state->m_old_fore=state->m_fore_bankbase; @@ -179,7 +179,7 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons { dynduke_state *state = machine.driver_data(); /* The transparency / palette handling on the background layer is very strange */ - bitmap_ind16 &bm = tilemap_get_pixmap(state->m_bg_layer); + bitmap_ind16 &bm = state->m_bg_layer->pixmap(); int scrolly, scrollx; int x,y; @@ -232,10 +232,10 @@ SCREEN_UPDATE_IND16( dynduke ) { dynduke_state *state = screen.machine().driver_data(); /* Setup the tilemaps */ - tilemap_set_scrolly( state->m_fg_layer,0, ((state->m_scroll_ram[0x11]&0x30)<<4)+((state->m_scroll_ram[0x12]&0x7f)<<1)+((state->m_scroll_ram[0x12]&0x80)>>7) ); - tilemap_set_scrollx( state->m_fg_layer,0, ((state->m_scroll_ram[0x19]&0x30)<<4)+((state->m_scroll_ram[0x1a]&0x7f)<<1)+((state->m_scroll_ram[0x1a]&0x80)>>7) ); - tilemap_set_enable( state->m_fg_layer,state->m_fore_enable); - tilemap_set_enable( state->m_tx_layer,state->m_txt_enable); + state->m_fg_layer->set_scrolly(0, ((state->m_scroll_ram[0x11]&0x30)<<4)+((state->m_scroll_ram[0x12]&0x7f)<<1)+((state->m_scroll_ram[0x12]&0x80)>>7) ); + state->m_fg_layer->set_scrollx(0, ((state->m_scroll_ram[0x19]&0x30)<<4)+((state->m_scroll_ram[0x1a]&0x7f)<<1)+((state->m_scroll_ram[0x1a]&0x80)>>7) ); + state->m_fg_layer->enable(state->m_fore_enable); + state->m_tx_layer->enable(state->m_txt_enable); draw_background(screen.machine(), bitmap, cliprect,0x00); @@ -244,9 +244,9 @@ SCREEN_UPDATE_IND16( dynduke ) draw_background(screen.machine(), bitmap, cliprect,0x20); draw_sprites(screen.machine(),bitmap,cliprect,2); - tilemap_draw(bitmap,cliprect,state->m_fg_layer,0,0); + state->m_fg_layer->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect,3); - tilemap_draw(bitmap,cliprect,state->m_tx_layer,0,0); + state->m_tx_layer->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c index baff5d64dbb..fd67e8f94fe 100644 --- a/src/mame/video/eprom.c +++ b/src/mame/video/eprom.c @@ -139,7 +139,7 @@ VIDEO_START( eprom ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* save states */ state->save_item(NAME(state->m_screen_intensity)); @@ -195,7 +195,7 @@ VIDEO_START( guts ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* save states */ state->save_item(NAME(state->m_screen_intensity)); @@ -219,8 +219,8 @@ void eprom_scanline_update(screen_device &screen, int scanline) { int xscroll = (state->m_alpha[0x780] >> 7) & 0x1ff; int yscroll = (state->m_alpha[0x781] >> 7) & 0x1ff; - tilemap_set_scrollx(state->m_playfield_tilemap, 0, xscroll); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, yscroll); + state->m_playfield_tilemap->set_scrollx(0, xscroll); + state->m_playfield_tilemap->set_scrolly(0, yscroll); atarimo_set_xscroll(0, xscroll); atarimo_set_yscroll(0, yscroll); } @@ -250,7 +250,7 @@ SCREEN_UPDATE_IND16( eprom ) update_palette(screen.machine()); /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -359,7 +359,7 @@ SCREEN_UPDATE_IND16( eprom ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; @@ -405,7 +405,7 @@ SCREEN_UPDATE_IND16( guts ) update_palette(screen.machine()); /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -433,7 +433,7 @@ SCREEN_UPDATE_IND16( guts ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index 3970caa4d78..b7b85d77586 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -68,7 +68,7 @@ static TILE_GET_INFO( equites_fg_info ) SET_TILE_INFO(0, tile, color, 0); if (color & 0x10) - tileinfo->flags |= TILE_FORCE_LAYER0; + tileinfo.flags |= TILE_FORCE_LAYER0; } static TILE_GET_INFO( splndrbt_fg_info ) @@ -79,7 +79,7 @@ static TILE_GET_INFO( splndrbt_fg_info ) SET_TILE_INFO(0, tile, color, 0); if (color & 0x10) - tileinfo->flags |= TILE_FORCE_LAYER0; + tileinfo.flags |= TILE_FORCE_LAYER0; } static TILE_GET_INFO( equites_bg_info ) @@ -102,7 +102,7 @@ static TILE_GET_INFO( splndrbt_bg_info ) int fxy = (data & 0x0600) >> 9; SET_TILE_INFO(1, tile, color, TILE_FLIPXY(fxy)); - tileinfo->group = color; + tileinfo.group = color; } @@ -120,11 +120,11 @@ VIDEO_START( equites ) state->save_pointer(NAME(state->m_fg_videoram), 0x800); state->m_fg_tilemap = tilemap_create(machine, equites_fg_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_bg_tilemap = tilemap_create(machine, equites_bg_info, tilemap_scan_rows, 16, 16, 16, 16); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, -10); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scrolldx(0, -10); } VIDEO_START( splndrbt ) @@ -136,8 +136,8 @@ VIDEO_START( splndrbt ) state->save_pointer(NAME(state->m_fg_videoram), 0x800); state->m_fg_tilemap = tilemap_create(machine, splndrbt_fg_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldx(state->m_fg_tilemap, 8, -8); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scrolldx(8, -8); state->m_bg_tilemap = tilemap_create(machine, splndrbt_bg_info, tilemap_scan_rows, 16, 16, 32, 32); colortable_configure_tilemap_groups(machine.colortable, state->m_bg_tilemap, machine.gfx[1], 0x10); @@ -164,7 +164,7 @@ WRITE16_HANDLER(equites_fg_videoram_w) { state->m_fg_videoram[offset] = data & 0xff; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset >> 1); + state->m_fg_tilemap->mark_tile_dirty(offset >> 1); } } @@ -173,7 +173,7 @@ WRITE16_HANDLER(equites_bg_videoram_w) equites_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_bg_videoram + offset); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER(equites_bgcolor_w) @@ -187,10 +187,10 @@ WRITE16_HANDLER(equites_scrollreg_w) { equites_state *state = space->machine().driver_data(); if (ACCESSING_BITS_0_7) - tilemap_set_scrolly(state->m_bg_tilemap, 0, data & 0xff); + state->m_bg_tilemap->set_scrolly(0, data & 0xff); if (ACCESSING_BITS_8_15) - tilemap_set_scrollx(state->m_bg_tilemap, 0, data >> 8); + state->m_bg_tilemap->set_scrollx(0, data >> 8); } WRITE16_HANDLER(splndrbt_selchar0_w) @@ -199,7 +199,7 @@ WRITE16_HANDLER(splndrbt_selchar0_w) if (state->m_fg_char_bank != 0) { state->m_fg_char_bank = 0; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } } @@ -209,7 +209,7 @@ WRITE16_HANDLER(splndrbt_selchar1_w) if (state->m_fg_char_bank != 1) { state->m_fg_char_bank = 1; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } } @@ -411,8 +411,8 @@ static void splndrbt_draw_sprites( running_machine &machine, bitmap_ind16 &bitma static void splndrbt_copy_bg( running_machine &machine, bitmap_ind16 &dst_bitmap, const rectangle &cliprect ) { equites_state *state = machine.driver_data(); - bitmap_ind16 &src_bitmap = tilemap_get_pixmap(state->m_bg_tilemap); - bitmap_ind8 &flags_bitmap = tilemap_get_flagsmap(state->m_bg_tilemap); + bitmap_ind16 &src_bitmap = state->m_bg_tilemap->pixmap(); + bitmap_ind8 &flags_bitmap = state->m_bg_tilemap->flagsmap(); const UINT8 * const xrom = machine.region("user1")->base(); const UINT8 * const yrom = xrom + 0x2000; int scroll_x = state->m_splndrbt_bg_scrollx; @@ -468,11 +468,11 @@ SCREEN_UPDATE_IND16( equites ) equites_state *state = screen.machine().driver_data(); bitmap.fill(state->m_bgcolor, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); equites_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -485,12 +485,12 @@ SCREEN_UPDATE_IND16( splndrbt ) splndrbt_copy_bg(screen.machine(), bitmap, cliprect); if (state->m_fg_char_bank) - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); splndrbt_draw_sprites(screen.machine(), bitmap, cliprect); if (!state->m_fg_char_bank) - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c index 55807ee19fc..8baca75d23b 100644 --- a/src/mame/video/esd16.c +++ b/src/mame/video/esd16.c @@ -99,23 +99,23 @@ WRITE16_HANDLER( esd16_vram_0_w ) { esd16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_0[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_0, offset); - tilemap_mark_tile_dirty(state->m_tilemap_0_16x16, offset); + state->m_tilemap_0->mark_tile_dirty(offset); + state->m_tilemap_0_16x16->mark_tile_dirty(offset); } WRITE16_HANDLER( esd16_vram_1_w ) { esd16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_1[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_1, offset); - tilemap_mark_tile_dirty(state->m_tilemap_1_16x16, offset); + state->m_tilemap_1->mark_tile_dirty(offset); + state->m_tilemap_1_16x16->mark_tile_dirty(offset); } WRITE16_HANDLER( esd16_tilemap0_color_w ) { esd16_state *state = space->machine().driver_data(); state->m_tilemap0_color = data & 3; - tilemap_mark_all_tiles_dirty(state->m_tilemap_0); + state->m_tilemap_0->mark_all_dirty(); flip_screen_set(space->machine(), data & 0x80); } @@ -143,13 +143,13 @@ VIDEO_START( esd16 ) /* hedpanic changes tilemap 1 to 16x16 at various times */ state->m_tilemap_1_16x16 = tilemap_create(machine, get_tile_info_1_16x16, tilemap_scan_rows, 16,16, 0x40, 0x40); - tilemap_set_scrolldx(state->m_tilemap_0, -0x60 + 2, -0x60); - tilemap_set_scrolldx(state->m_tilemap_1, -0x60, -0x60 + 2); - tilemap_set_scrolldx(state->m_tilemap_0_16x16, -0x60 + 2, -0x60); - tilemap_set_scrolldx(state->m_tilemap_1_16x16, -0x60, -0x60 + 2); + state->m_tilemap_0->set_scrolldx(-0x60 + 2, -0x60); + state->m_tilemap_1->set_scrolldx(-0x60, -0x60 + 2); + state->m_tilemap_0_16x16->set_scrolldx(-0x60 + 2, -0x60); + state->m_tilemap_1_16x16->set_scrolldx(-0x60, -0x60 + 2); - tilemap_set_transparent_pen(state->m_tilemap_1, 0x00); - tilemap_set_transparent_pen(state->m_tilemap_1_16x16, 0x00); + state->m_tilemap_1->set_transparent_pen(0x00); + state->m_tilemap_1_16x16->set_transparent_pen(0x00); } @@ -330,11 +330,11 @@ SCREEN_UPDATE_IND16( esd16 ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_set_scrollx(state->m_tilemap_0, 0, state->m_scroll_0[0]); - tilemap_set_scrolly(state->m_tilemap_0, 0, state->m_scroll_0[1]); + state->m_tilemap_0->set_scrollx(0, state->m_scroll_0[0]); + state->m_tilemap_0->set_scrolly(0, state->m_scroll_0[1]); - tilemap_set_scrollx(state->m_tilemap_1, 0, state->m_scroll_1[0]); - tilemap_set_scrolly(state->m_tilemap_1, 0, state->m_scroll_1[1]); + state->m_tilemap_1->set_scrollx(0, state->m_scroll_1[0]); + state->m_tilemap_1->set_scrolly(0, state->m_scroll_1[1]); #ifdef MAME_DEBUG if (screen.machine().input().code_pressed(KEYCODE_Z)) @@ -347,10 +347,10 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) } #endif - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 0); + if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); else bitmap.fill(0, cliprect); - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 1); + if (layers_ctrl & 2) state->m_tilemap_1->draw(bitmap, cliprect, 0, 1); if (layers_ctrl & 4) esd16_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -379,15 +379,15 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) { if (state->m_head_layersize[0] & 0x0001) { - tilemap_set_scrollx(state->m_tilemap_0_16x16, 0, state->m_scroll_0[0]); - tilemap_set_scrolly(state->m_tilemap_0_16x16, 0, state->m_scroll_0[1]); - tilemap_draw(bitmap, cliprect, state->m_tilemap_0_16x16, 0, 0); + state->m_tilemap_0_16x16->set_scrollx(0, state->m_scroll_0[0]); + state->m_tilemap_0_16x16->set_scrolly(0, state->m_scroll_0[1]); + state->m_tilemap_0_16x16->draw(bitmap, cliprect, 0, 0); } else { - tilemap_set_scrollx(state->m_tilemap_0, 0, state->m_scroll_0[0]); - tilemap_set_scrolly(state->m_tilemap_0, 0, state->m_scroll_0[1]); - tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 0); + state->m_tilemap_0->set_scrollx(0, state->m_scroll_0[0]); + state->m_tilemap_0->set_scrolly(0, state->m_scroll_0[1]); + state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); } } else @@ -400,15 +400,15 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) { if (state->m_head_layersize[0] & 0x0002) { - tilemap_set_scrollx(state->m_tilemap_1_16x16, 0, state->m_scroll_1[0]); - tilemap_set_scrolly(state->m_tilemap_1_16x16, 0, state->m_scroll_1[1]); - tilemap_draw(bitmap, cliprect, state->m_tilemap_1_16x16, 0, 1); + state->m_tilemap_1_16x16->set_scrollx(0, state->m_scroll_1[0]); + state->m_tilemap_1_16x16->set_scrolly(0, state->m_scroll_1[1]); + state->m_tilemap_1_16x16->draw(bitmap, cliprect, 0, 1); } else { - tilemap_set_scrollx(state->m_tilemap_1, 0, state->m_scroll_1[0]); - tilemap_set_scrolly(state->m_tilemap_1, 0, state->m_scroll_1[1]); - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 1); + state->m_tilemap_1->set_scrollx(0, state->m_scroll_1[0]); + state->m_tilemap_1->set_scrolly(0, state->m_scroll_1[1]); + state->m_tilemap_1->draw(bitmap, cliprect, 0, 1); } } @@ -442,15 +442,15 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) ) { if (state->m_head_layersize[0] & 0x0001) { - tilemap_set_scrollx(state->m_tilemap_0_16x16, 0, state->m_scroll_0[0]); - tilemap_set_scrolly(state->m_tilemap_0_16x16, 0, state->m_scroll_0[1]); - tilemap_draw(bitmap, cliprect, state->m_tilemap_0_16x16, 0, 0); + state->m_tilemap_0_16x16->set_scrollx(0, state->m_scroll_0[0]); + state->m_tilemap_0_16x16->set_scrolly(0, state->m_scroll_0[1]); + state->m_tilemap_0_16x16->draw(bitmap, cliprect, 0, 0); } else { - tilemap_set_scrollx(state->m_tilemap_0, 0, state->m_scroll_0[0]); - tilemap_set_scrolly(state->m_tilemap_0, 0, state->m_scroll_0[1]); - tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 0); + state->m_tilemap_0->set_scrollx(0, state->m_scroll_0[0]); + state->m_tilemap_0->set_scrolly(0, state->m_scroll_0[1]); + state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); } } else @@ -463,15 +463,15 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) ) { if (state->m_head_layersize[0] & 0x0002) { - tilemap_set_scrollx(state->m_tilemap_1_16x16, 0, state->m_scroll_1[0]); - tilemap_set_scrolly(state->m_tilemap_1_16x16, 0, state->m_scroll_1[1]); - tilemap_draw(bitmap, cliprect, state->m_tilemap_1_16x16, 0, 1); + state->m_tilemap_1_16x16->set_scrollx(0, state->m_scroll_1[0]); + state->m_tilemap_1_16x16->set_scrolly(0, state->m_scroll_1[1]); + state->m_tilemap_1_16x16->draw(bitmap, cliprect, 0, 1); } else { - tilemap_set_scrollx(state->m_tilemap_1, 0, state->m_scroll_1[0]); - tilemap_set_scrolly(state->m_tilemap_1, 0, state->m_scroll_1[1]); - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 1); + state->m_tilemap_1->set_scrollx(0, state->m_scroll_1[0]); + state->m_tilemap_1->set_scrolly(0, state->m_scroll_1[1]); + state->m_tilemap_1->draw(bitmap, cliprect, 0, 1); } } diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c index 2110536e105..31aa4d8bd2d 100644 --- a/src/mame/video/espial.c +++ b/src/mame/video/espial.c @@ -90,7 +90,7 @@ VIDEO_START( espial ) espial_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); state->save_item(NAME(state->m_flipscreen)); } @@ -102,8 +102,8 @@ VIDEO_START( netwars ) /* Net Wars has a tile map that's twice as big as Espial's */ state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 64); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - tilemap_set_scrolldy(state->m_bg_tilemap, 0, 0x100); + state->m_bg_tilemap->set_scroll_cols(32); + state->m_bg_tilemap->set_scrolldy(0, 0x100); state->save_item(NAME(state->m_flipscreen)); } @@ -120,7 +120,7 @@ WRITE8_HANDLER( espial_videoram_w ) espial_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -129,7 +129,7 @@ WRITE8_HANDLER( espial_colorram_w ) espial_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -138,7 +138,7 @@ WRITE8_HANDLER( espial_attributeram_w ) espial_state *state = space->machine().driver_data(); state->m_attributeram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -147,7 +147,7 @@ WRITE8_HANDLER( espial_scrollram_w ) espial_state *state = space->machine().driver_data(); state->m_scrollram[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap, offset, data); + state->m_bg_tilemap->set_scrolly(offset, data); } @@ -156,7 +156,7 @@ WRITE8_HANDLER( espial_flipscreen_w ) espial_state *state = space->machine().driver_data(); state->m_flipscreen = data; - tilemap_set_flip(state->m_bg_tilemap, state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_bg_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); } @@ -236,7 +236,7 @@ SCREEN_UPDATE_IND16( espial ) { espial_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index e2e1a27d748..ec75d01a751 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -85,7 +85,7 @@ WRITE8_HANDLER( exedexes_videoram_w ) exedexes_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( exedexes_colorram_w ) @@ -93,7 +93,7 @@ WRITE8_HANDLER( exedexes_colorram_w ) exedexes_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( exedexes_c804_w ) @@ -155,7 +155,7 @@ static TILE_GET_INFO( get_tx_tile_info ) int code = state->m_videoram[tile_index] + 2 * (state->m_colorram[tile_index] & 0x80); int color = state->m_colorram[tile_index] & 0x3f; - tileinfo->group = color; + tileinfo.group = color; SET_TILE_INFO(0, code, color, 0); } @@ -180,7 +180,7 @@ VIDEO_START( exedexes ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, exedexes_fg_tilemap_scan, 16, 16, 128, 128); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); colortable_configure_tilemap_groups(machine.colortable, state->m_tx_tilemap, machine.gfx[0], 0xcf); } @@ -222,8 +222,8 @@ SCREEN_UPDATE_IND16( exedexes ) exedexes_state *state = screen.machine().driver_data(); if (state->m_sc2on) { - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((state->m_bg_scroll[1]) << 8) + state->m_bg_scroll[0]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, ((state->m_bg_scroll[1]) << 8) + state->m_bg_scroll[0]); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); } else bitmap.fill(0, cliprect); @@ -232,15 +232,15 @@ SCREEN_UPDATE_IND16( exedexes ) if (state->m_sc1on) { - tilemap_set_scrollx(state->m_fg_tilemap, 0, ((state->m_nbg_yscroll[1]) << 8) + state->m_nbg_yscroll[0]); - tilemap_set_scrolly(state->m_fg_tilemap, 0, ((state->m_nbg_xscroll[1]) << 8) + state->m_nbg_xscroll[0]); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->set_scrollx(0, ((state->m_nbg_yscroll[1]) << 8) + state->m_nbg_yscroll[0]); + state->m_fg_tilemap->set_scrolly(0, ((state->m_nbg_xscroll[1]) << 8) + state->m_nbg_xscroll[0]); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } draw_sprites(screen.machine(), bitmap, cliprect, 0); if (state->m_chon) - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index 99168bfc9db..7c6618c4de9 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -6,14 +6,14 @@ WRITE8_HANDLER( exprraid_videoram_w ) { exprraid_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( exprraid_colorram_w ) { exprraid_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( exprraid_flipscreen_w ) @@ -21,7 +21,7 @@ WRITE8_HANDLER( exprraid_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -31,20 +31,20 @@ WRITE8_HANDLER( exprraid_bgselect_w ) if (state->m_bg_index[offset] != data) { state->m_bg_index[offset] = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } WRITE8_HANDLER( exprraid_scrollx_w ) { exprraid_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, offset, data); + state->m_bg_tilemap->set_scrollx(offset, data); } WRITE8_HANDLER( exprraid_scrolly_w ) { exprraid_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } static TILE_GET_INFO( get_bg_tile_info ) @@ -70,7 +70,7 @@ static TILE_GET_INFO( get_bg_tile_info ) color = (attr & 0x18) >> 3; flags = (attr & 0x04) ? TILE_FLIPX : 0; - tileinfo->category = ((attr & 0x80) ? 1 : 0); + tileinfo.category = ((attr & 0x80) ? 1 : 0); SET_TILE_INFO(bank, code, color, flags); } @@ -92,8 +92,8 @@ VIDEO_START( exprraid ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 2); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_scroll_rows(2); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -139,9 +139,9 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( exprraid ) { exprraid_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index 7cba1718810..513408df229 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -50,7 +50,7 @@ VIDEO_START( f1gp ) state->m_roz_tilemap = tilemap_create(machine, f1gp_get_roz_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0xff); + state->m_fg_tilemap->set_transparent_pen(0xff); state->m_zoomdata = (UINT16 *)machine.region("gfx4")->base(); gfx_element_set_source(machine.gfx[3], (UINT8 *)state->m_zoomdata); @@ -66,7 +66,7 @@ VIDEO_START( f1gpb ) state->m_roz_tilemap = tilemap_create(machine, f1gp_get_roz_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0xff); + state->m_fg_tilemap->set_transparent_pen(0xff); state->m_zoomdata = (UINT16 *)machine.region("gfx4")->base(); gfx_element_set_source(machine.gfx[3], (UINT8 *)state->m_zoomdata); @@ -81,11 +81,11 @@ VIDEO_START( f1gp2 ) state->m_roz_tilemap = tilemap_create(machine, f1gp2_get_roz_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0xff); - tilemap_set_transparent_pen(state->m_roz_tilemap, 0x0f); + state->m_fg_tilemap->set_transparent_pen(0xff); + state->m_roz_tilemap->set_transparent_pen(0x0f); - tilemap_set_scrolldx(state->m_fg_tilemap, -80, 0); - tilemap_set_scrolldy(state->m_fg_tilemap, -26, 0); + state->m_fg_tilemap->set_scrolldx(-80, 0); + state->m_fg_tilemap->set_scrolldy(-26, 0); } @@ -118,14 +118,14 @@ WRITE16_HANDLER( f1gp_rozvideoram_w ) { f1gp_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_rozvideoram[offset]); - tilemap_mark_tile_dirty(state->m_roz_tilemap, offset); + state->m_roz_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( f1gp_fgvideoram_w ) { f1gp_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( f1gp_fgscroll_w ) @@ -133,8 +133,8 @@ WRITE16_HANDLER( f1gp_fgscroll_w ) f1gp_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll[offset]); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scroll[0]); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_scroll[1]); + state->m_fg_tilemap->set_scrollx(0, state->m_scroll[0]); + state->m_fg_tilemap->set_scrolly(0, state->m_scroll[1]); } WRITE16_HANDLER( f1gp_gfxctrl_w ) @@ -165,7 +165,7 @@ WRITE16_HANDLER( f1gp2_gfxctrl_w ) if (state->m_roz_bank != (data >> 8)) { state->m_roz_bank = (data >> 8); - tilemap_mark_all_tiles_dirty(state->m_roz_tilemap); + state->m_roz_tilemap->mark_all_dirty(); } } } @@ -258,7 +258,7 @@ SCREEN_UPDATE_IND16( f1gp ) k053936_zoom_draw(state->m_k053936, bitmap, cliprect, state->m_roz_tilemap, 0, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 1); /* quick kludge for "continue" screen priority */ if (state->m_gfxctrl == 0x00) @@ -355,16 +355,16 @@ SCREEN_UPDATE_IND16( f1gpb ) startx = state->m_rozregs[0] + 328; starty = state->m_rozregs[2]; - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_fgregs[0] + 8); + state->m_fg_tilemap->set_scrolly(0, state->m_fgregs[0] + 8); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw_roz(bitmap, cliprect, state->m_roz_tilemap, + state->m_roz_tilemap->draw_roz(bitmap, cliprect, startx << 13, starty << 13, incxx << 5, incxy << 5, incyx << 5, incyy << 5, 1, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 1); f1gpb_draw_sprites(screen.machine(), bitmap, cliprect); @@ -457,15 +457,15 @@ SCREEN_UPDATE_IND16( f1gp2 ) case 0: k053936_zoom_draw(state->m_k053936, bitmap, cliprect, state->m_roz_tilemap, TILEMAP_DRAW_OPAQUE, 0, 1); f1gp2_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); break; case 1: k053936_zoom_draw(state->m_k053936, bitmap, cliprect, state->m_roz_tilemap, TILEMAP_DRAW_OPAQUE, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); f1gp2_draw_sprites(screen.machine(), bitmap, cliprect); break; case 2: - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); k053936_zoom_draw(state->m_k053936, bitmap, cliprect, state->m_roz_tilemap, 0, 0, 1); f1gp2_draw_sprites(screen.machine(), bitmap, cliprect); break; diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c index 68070651379..7ae2b248429 100644 --- a/src/mame/video/fastfred.c +++ b/src/mame/video/fastfred.c @@ -103,8 +103,8 @@ VIDEO_START( fastfred ) fastfred_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scroll_cols(32); } @@ -118,7 +118,7 @@ WRITE8_HANDLER( fastfred_videoram_w ) { fastfred_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -133,12 +133,12 @@ WRITE8_HANDLER( fastfred_attributes_w ) int i; for (i = offset / 2; i < 0x0400; i += 32) - tilemap_mark_tile_dirty(state->m_bg_tilemap, i); + state->m_bg_tilemap->mark_tile_dirty(i); } else { /* coloumn scroll */ - tilemap_set_scrolly(state->m_bg_tilemap, offset / 2, data); + state->m_bg_tilemap->set_scrolly(offset / 2, data); } state->m_attributesram[offset] = data; @@ -153,7 +153,7 @@ WRITE8_HANDLER( fastfred_charbank1_w ) if (new_data != state->m_charbank) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_charbank = new_data; } @@ -166,7 +166,7 @@ WRITE8_HANDLER( fastfred_charbank2_w ) if (new_data != state->m_charbank) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_charbank = new_data; } @@ -180,7 +180,7 @@ WRITE8_HANDLER( fastfred_colorbank1_w ) if (new_data != state->m_colorbank) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_colorbank = new_data; } @@ -193,7 +193,7 @@ WRITE8_HANDLER( fastfred_colorbank2_w ) if (new_data != state->m_colorbank) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_colorbank = new_data; } @@ -208,7 +208,7 @@ WRITE8_HANDLER( fastfred_flip_screen_x_w ) { flip_screen_x_set(space->machine(), data & 0x01); - tilemap_set_flip(state->m_bg_tilemap, (flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0)); } } @@ -219,7 +219,7 @@ WRITE8_HANDLER( fastfred_flip_screen_y_w ) { flip_screen_y_set(space->machine(), data & 0x01); - tilemap_set_flip(state->m_bg_tilemap, (flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0)); } } @@ -300,7 +300,7 @@ SCREEN_UPDATE_IND16( fastfred ) { fastfred_state *state = screen.machine().driver_data(); bitmap.fill(*state->m_background_color, cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -334,7 +334,7 @@ WRITE8_HANDLER( imago_fg_videoram_w ) { fastfred_state *state = space->machine().driver_data(); state->m_imago_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( imago_charbank_w ) @@ -343,7 +343,7 @@ WRITE8_HANDLER( imago_charbank_w ) if( state->m_charbank != data ) { state->m_charbank = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -354,8 +354,8 @@ VIDEO_START( imago ) state->m_bg_tilemap = tilemap_create(machine, imago_get_tile_info_bg, tilemap_scan_rows,8,8,32,32); state->m_fg_tilemap = tilemap_create(machine, imago_get_tile_info_fg, tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); /* the game has a galaxian starfield */ galaxold_init_stars(machine, 256); @@ -369,11 +369,11 @@ VIDEO_START( imago ) SCREEN_UPDATE_IND16( imago ) { fastfred_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_web_tilemap,0,0); + state->m_web_tilemap->draw(bitmap, cliprect, 0,0); galaxold_draw_stars(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c index 5e7744ad1c9..abf696d209e 100644 --- a/src/mame/video/fastlane.c +++ b/src/mame/video/fastlane.c @@ -117,7 +117,7 @@ VIDEO_START( fastlane ) state->m_layer0 = tilemap_create(machine, get_tile_info0, tilemap_scan_rows, 8, 8, 32, 32); state->m_layer1 = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_layer0, 32); + state->m_layer0->set_scroll_rows(32); state->m_clip0 = machine.primary_screen->visible_area(); state->m_clip0.min_x += 40; @@ -137,14 +137,14 @@ WRITE8_HANDLER( fastlane_vram1_w ) { fastlane_state *state = space->machine().driver_data(); state->m_videoram1[offset] = data; - tilemap_mark_tile_dirty(state->m_layer0, offset & 0x3ff); + state->m_layer0->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( fastlane_vram2_w ) { fastlane_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_layer1, offset & 0x3ff); + state->m_layer1->mark_tile_dirty(offset & 0x3ff); } @@ -169,12 +169,12 @@ SCREEN_UPDATE_IND16( fastlane ) /* set scroll registers */ xoffs = k007121_ctrlram_r(state->m_k007121, 0); for (i = 0; i < 32; i++) - tilemap_set_scrollx(state->m_layer0, i, state->m_k007121_regs[0x20 + i] + xoffs - 40); + state->m_layer0->set_scrollx(i, state->m_k007121_regs[0x20 + i] + xoffs - 40); - tilemap_set_scrolly(state->m_layer0, 0, k007121_ctrlram_r(state->m_k007121, 2)); + state->m_layer0->set_scrolly(0, k007121_ctrlram_r(state->m_k007121, 2)); - tilemap_draw(bitmap, finalclip0, state->m_layer0, 0, 0); + state->m_layer0->draw(bitmap, finalclip0, 0, 0); k007121_sprites_draw(state->m_k007121, bitmap, cliprect, screen.machine().gfx[0], screen.machine().colortable, state->m_spriteram, 0, 40, 0, (UINT32)-1); - tilemap_draw(bitmap, finalclip1, state->m_layer1, 0, 0); + state->m_layer1->draw(bitmap, finalclip1, 0, 0); return 0; } diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 94cfbfa78d8..8923c055be9 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -140,11 +140,11 @@ SCREEN_UPDATE_IND16( fcombat ) int sx, sy, offs, i; /* draw background */ - tilemap_set_scrolly(state->m_bgmap, 0, state->m_fcombat_sh); - tilemap_set_scrollx(state->m_bgmap, 0, state->m_fcombat_sv - 24); + state->m_bgmap->set_scrolly(0, state->m_fcombat_sh); + state->m_bgmap->set_scrollx(0, state->m_fcombat_sv - 24); - tilemap_mark_all_tiles_dirty(state->m_bgmap); - tilemap_draw(bitmap, cliprect, state->m_bgmap, 0, 0); + state->m_bgmap->mark_all_dirty(); + state->m_bgmap->draw(bitmap, cliprect, 0, 0); //draw_background(bitmap, cliprect); /* draw sprites */ diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c index 3a4a4174077..218d9dff903 100644 --- a/src/mame/video/finalizr.c +++ b/src/mame/video/finalizr.c @@ -90,11 +90,11 @@ SCREEN_UPDATE_IND16( finalizr ) finalizr_state *state = screen.machine().driver_data(); int offs; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); + state->m_fg_tilemap->mark_all_dirty(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, *state->m_scroll - 32); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, *state->m_scroll - 32); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* Draw the sprites. */ { @@ -219,8 +219,8 @@ SCREEN_UPDATE_IND16( finalizr ) /* draw top status region */ clip.min_x = visarea.min_x; clip.max_x = visarea.min_x + 31; - tilemap_set_scrolldx(state->m_fg_tilemap, 0,-32); - tilemap_draw(bitmap, clip, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->set_scrolldx(0,-32); + state->m_fg_tilemap->draw(bitmap, clip, 0, 0); } return 0; } diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c index 057a9febd2f..e1f0b3499c1 100644 --- a/src/mame/video/firetrap.c +++ b/src/mame/video/firetrap.c @@ -95,7 +95,7 @@ static TILE_GET_INFO( get_fg_tile_info ) 0); } -INLINE void get_bg_tile_info(running_machine &machine, tile_data *tileinfo, int tile_index, UINT8 *bgvideoram, int gfx_region) +INLINE void get_bg_tile_info(running_machine &machine, tile_data &tileinfo, int tile_index, UINT8 *bgvideoram, int gfx_region) { int code = bgvideoram[tile_index]; int color = bgvideoram[tile_index + 0x100]; @@ -132,8 +132,8 @@ VIDEO_START( firetrap ) state->m_bg1_tilemap = tilemap_create(machine, get_bg1_tile_info, get_bg_memory_offset, 16, 16, 32, 32); state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, get_bg_memory_offset, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_transparent_pen(state->m_bg1_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg1_tilemap->set_transparent_pen(0); } @@ -147,21 +147,21 @@ WRITE8_HANDLER( firetrap_fgvideoram_w ) { firetrap_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( firetrap_bg1videoram_w ) { firetrap_state *state = space->machine().driver_data(); state->m_bg1videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg1_tilemap, offset & 0x6ff); + state->m_bg1_tilemap->mark_tile_dirty(offset & 0x6ff); } WRITE8_HANDLER( firetrap_bg2videoram_w ) { firetrap_state *state = space->machine().driver_data(); state->m_bg2videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset & 0x6ff); + state->m_bg2_tilemap->mark_tile_dirty(offset & 0x6ff); } @@ -169,28 +169,28 @@ WRITE8_HANDLER( firetrap_bg1_scrollx_w ) { firetrap_state *state = space->machine().driver_data(); state->m_scroll1_x[offset] = data; - tilemap_set_scrollx(state->m_bg1_tilemap, 0, state->m_scroll1_x[0] | (state->m_scroll1_x[1] << 8)); + state->m_bg1_tilemap->set_scrollx(0, state->m_scroll1_x[0] | (state->m_scroll1_x[1] << 8)); } WRITE8_HANDLER( firetrap_bg1_scrolly_w ) { firetrap_state *state = space->machine().driver_data(); state->m_scroll1_y[offset] = data; - tilemap_set_scrolly(state->m_bg1_tilemap, 0, -(state->m_scroll1_y[0] | (state->m_scroll1_y[1] << 8))); + state->m_bg1_tilemap->set_scrolly(0, -(state->m_scroll1_y[0] | (state->m_scroll1_y[1] << 8))); } WRITE8_HANDLER( firetrap_bg2_scrollx_w ) { firetrap_state *state = space->machine().driver_data(); state->m_scroll2_x[offset] = data; - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_scroll2_x[0] | (state->m_scroll2_x[1] << 8)); + state->m_bg2_tilemap->set_scrollx(0, state->m_scroll2_x[0] | (state->m_scroll2_x[1] << 8)); } WRITE8_HANDLER( firetrap_bg2_scrolly_w ) { firetrap_state *state = space->machine().driver_data(); state->m_scroll2_y[offset] = data; - tilemap_set_scrolly(state->m_bg2_tilemap, 0, -(state->m_scroll2_y[0] | (state->m_scroll2_y[1] << 8))); + state->m_bg2_tilemap->set_scrolly(0, -(state->m_scroll2_y[0] | (state->m_scroll2_y[1] << 8))); } @@ -274,9 +274,9 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( firetrap ) { firetrap_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index c460d451e11..227e4db7c6f 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -360,14 +360,14 @@ static void check_collision(firetrk_state *state, int which) SCREEN_UPDATE_IND16( firetrk ) { firetrk_state *state = screen.machine().driver_data(); - tilemap_mark_all_tiles_dirty_all(screen.machine()); - tilemap_set_scrollx(state->m_tilemap1, 0, *state->m_scroll_x - 37); - tilemap_set_scrollx(state->m_tilemap2, 0, *state->m_scroll_x - 37); - tilemap_set_scrolly(state->m_tilemap1, 0, *state->m_scroll_y); - tilemap_set_scrolly(state->m_tilemap2, 0, *state->m_scroll_y); + screen.machine().tilemap().mark_all_dirty(); + state->m_tilemap1->set_scrollx(0, *state->m_scroll_x - 37); + state->m_tilemap2->set_scrollx(0, *state->m_scroll_x - 37); + state->m_tilemap1->set_scrolly(0, *state->m_scroll_y); + state->m_tilemap2->set_scrolly(0, *state->m_scroll_y); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, playfield_window, state->m_tilemap1, 0, 0); + state->m_tilemap1->draw(bitmap, playfield_window, 0, 0); firetrk_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, 0, state->m_flash); firetrk_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, 1, state->m_flash); draw_text(bitmap, cliprect, screen.machine().gfx, state->m_alpha_num_ram + 0x00, 296, 0x10, 0x10); @@ -375,7 +375,7 @@ SCREEN_UPDATE_IND16( firetrk ) if (cliprect.max_y == screen.visible_area().max_y) { - tilemap_draw(state->m_helper1, playfield_window, state->m_tilemap2, 0, 0); + state->m_tilemap2->draw(state->m_helper1, playfield_window, 0, 0); state->m_helper2.fill(0xff, playfield_window); firetrk_draw_car(screen.machine(), state->m_helper2, playfield_window, screen.machine().gfx, 0, FALSE); @@ -395,21 +395,21 @@ SCREEN_UPDATE_IND16( firetrk ) SCREEN_UPDATE_IND16( superbug ) { firetrk_state *state = screen.machine().driver_data(); - tilemap_mark_all_tiles_dirty_all(screen.machine()); - tilemap_set_scrollx(state->m_tilemap1, 0, *state->m_scroll_x - 37); - tilemap_set_scrollx(state->m_tilemap2, 0, *state->m_scroll_x - 37); - tilemap_set_scrolly(state->m_tilemap1, 0, *state->m_scroll_y); - tilemap_set_scrolly(state->m_tilemap2, 0, *state->m_scroll_y); + screen.machine().tilemap().mark_all_dirty(); + state->m_tilemap1->set_scrollx(0, *state->m_scroll_x - 37); + state->m_tilemap2->set_scrollx(0, *state->m_scroll_x - 37); + state->m_tilemap1->set_scrolly(0, *state->m_scroll_y); + state->m_tilemap2->set_scrolly(0, *state->m_scroll_y); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, playfield_window, state->m_tilemap1, 0, 0); + state->m_tilemap1->draw(bitmap, playfield_window, 0, 0); superbug_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, state->m_flash); draw_text(bitmap, cliprect, screen.machine().gfx, state->m_alpha_num_ram + 0x00, 296, 0x10, 0x10); draw_text(bitmap, cliprect, screen.machine().gfx, state->m_alpha_num_ram + 0x10, 8, 0x10, 0x10); if (cliprect.max_y == screen.visible_area().max_y) { - tilemap_draw(state->m_helper1, playfield_window, state->m_tilemap2, 0, 0); + state->m_tilemap2->draw(state->m_helper1, playfield_window, 0, 0); state->m_helper2.fill(0xff, playfield_window); superbug_draw_car(screen.machine(), state->m_helper2, playfield_window, screen.machine().gfx, FALSE); @@ -425,14 +425,14 @@ SCREEN_UPDATE_IND16( superbug ) SCREEN_UPDATE_IND16( montecar ) { firetrk_state *state = screen.machine().driver_data(); - tilemap_mark_all_tiles_dirty_all(screen.machine()); - tilemap_set_scrollx(state->m_tilemap1, 0, *state->m_scroll_x - 37); - tilemap_set_scrollx(state->m_tilemap2, 0, *state->m_scroll_x - 37); - tilemap_set_scrolly(state->m_tilemap1, 0, *state->m_scroll_y); - tilemap_set_scrolly(state->m_tilemap2, 0, *state->m_scroll_y); + screen.machine().tilemap().mark_all_dirty(); + state->m_tilemap1->set_scrollx(0, *state->m_scroll_x - 37); + state->m_tilemap2->set_scrollx(0, *state->m_scroll_x - 37); + state->m_tilemap1->set_scrolly(0, *state->m_scroll_y); + state->m_tilemap2->set_scrolly(0, *state->m_scroll_y); bitmap.fill(0x2c, cliprect); - tilemap_draw(bitmap, playfield_window, state->m_tilemap1, 0, 0); + state->m_tilemap1->draw(bitmap, playfield_window, 0, 0); montecar_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, 0, FALSE); montecar_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, 1, FALSE); draw_text(bitmap, cliprect, screen.machine().gfx, state->m_alpha_num_ram + 0x00, 24, 0x20, 0x08); @@ -440,7 +440,7 @@ SCREEN_UPDATE_IND16( montecar ) if (cliprect.max_y == screen.visible_area().max_y) { - tilemap_draw(state->m_helper1, playfield_window, state->m_tilemap2, 0, 0); + state->m_tilemap2->draw(state->m_helper1, playfield_window, 0, 0); state->m_helper2.fill(0xff, playfield_window); montecar_draw_car(screen.machine(), state->m_helper2, playfield_window, screen.machine().gfx, 0, TRUE); diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index f1fc1893fde..a0b75f288a4 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -57,7 +57,7 @@ WRITE16_HANDLER( fof_bak_tileram_w ) fitfight_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fof_bak_tileram[offset]); - tilemap_mark_tile_dirty(state->m_fof_bak_tilemap, offset / 2); + state->m_fof_bak_tilemap->mark_tile_dirty(offset / 2); } @@ -77,7 +77,7 @@ WRITE16_HANDLER( fof_mid_tileram_w ) fitfight_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fof_mid_tileram[offset]); - tilemap_mark_tile_dirty(state->m_fof_mid_tilemap, offset / 2); + state->m_fof_mid_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_fof_txt_tile_info ) @@ -96,7 +96,7 @@ WRITE16_HANDLER( fof_txt_tileram_w ) fitfight_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fof_txt_tileram[offset]); - tilemap_mark_tile_dirty(state->m_fof_txt_tilemap, offset / 2); + state->m_fof_txt_tilemap->mark_tile_dirty(offset / 2); } /* video start / update */ @@ -108,10 +108,10 @@ VIDEO_START(fitfight) /* opaque */ state->m_fof_mid_tilemap = tilemap_create(machine, get_fof_mid_tile_info, tilemap_scan_cols, 8, 8, 128, 32); - tilemap_set_transparent_pen(state->m_fof_mid_tilemap, 0); + state->m_fof_mid_tilemap->set_transparent_pen(0); state->m_fof_txt_tilemap = tilemap_create(machine, get_fof_txt_tile_info, tilemap_scan_cols, 8, 8, 128, 32); - tilemap_set_transparent_pen(state->m_fof_txt_tilemap, 0); + state->m_fof_txt_tilemap->set_transparent_pen(0); } SCREEN_UPDATE_IND16(fitfight) @@ -138,9 +138,9 @@ SCREEN_UPDATE_IND16(fitfight) // scrollbak = ((state->m_fof_a00000[0] & 0xff00) >> 5) + ((state->m_fof_700000[0] & 0x0038) >> 3); // else scrollbak = ((state->m_fof_a00000[0] & 0xff00) >> 5); - tilemap_set_scrollx(state->m_fof_bak_tilemap,0, scrollbak ); - tilemap_set_scrolly(state->m_fof_bak_tilemap,0, state->m_fof_a00000[0] & 0xff); - tilemap_draw(bitmap, cliprect, state->m_fof_bak_tilemap, 0, 0); + state->m_fof_bak_tilemap->set_scrollx(0, scrollbak ); + state->m_fof_bak_tilemap->set_scrolly(0, state->m_fof_a00000[0] & 0xff); + state->m_fof_bak_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); @@ -154,14 +154,14 @@ SCREEN_UPDATE_IND16(fitfight) // scrollmid = ((state->m_fof_900000[0] & 0xff00) >> 5) + ((state->m_fof_700000[0] & 0x01c0) >> 6); // else scrollmid = ((state->m_fof_900000[0] & 0xff00) >> 5); - tilemap_set_scrollx(state->m_fof_mid_tilemap, 0, scrollmid ); - tilemap_set_scrolly(state->m_fof_mid_tilemap, 0, state->m_fof_900000[0] & 0xff); + state->m_fof_mid_tilemap->set_scrollx(0, scrollmid ); + state->m_fof_mid_tilemap->set_scrolly(0, state->m_fof_900000[0] & 0xff); // if (!screen.machine().input().code_pressed(KEYCODE_F)) - tilemap_draw(bitmap, cliprect, state->m_fof_mid_tilemap, 0, 0); + state->m_fof_mid_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_fof_txt_tilemap, 0, 0); + state->m_fof_txt_tilemap->draw(bitmap, cliprect, 0, 0); } /* popmessage ("Regs %04x %04x %04x %04x %04x %04x", state->m_fof_100000[0], state->m_fof_600000[0], state->m_fof_700000[0], diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index 2beae0c697a..5892f6ec4a7 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -91,9 +91,9 @@ WRITE8_HANDLER( flkatck_k007121_w ) if (offset < 0x1000) /* tiles */ { if (offset & 0x800) /* score */ - tilemap_mark_tile_dirty(state->m_k007121_tilemap[1], offset & 0x3ff); + state->m_k007121_tilemap[1]->mark_tile_dirty(offset & 0x3ff); else - tilemap_mark_tile_dirty(state->m_k007121_tilemap[0], offset & 0x3ff); + state->m_k007121_tilemap[0]->mark_tile_dirty(offset & 0x3ff); } } @@ -105,12 +105,12 @@ WRITE8_HANDLER( flkatck_k007121_regs_w ) { case 0x04: /* ROM bank select */ if (data != k007121_ctrlram_r(state->m_k007121, 4)) - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); break; case 0x07: /* flip screen + IRQ control */ state->m_flipscreen = data & 0x08; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); state->m_irq_enabled = data & 0x02; break; } @@ -146,9 +146,9 @@ SCREEN_UPDATE_IND16( flkatck ) clip[1] = visarea; clip[1].min_x = clip[1].max_x - 40; - tilemap_set_scrollx(state->m_k007121_tilemap[0], 0, k007121_ctrlram_r(state->m_k007121, 0) - 56 ); - tilemap_set_scrolly(state->m_k007121_tilemap[0], 0, k007121_ctrlram_r(state->m_k007121, 2)); - tilemap_set_scrollx(state->m_k007121_tilemap[1], 0, -16); + state->m_k007121_tilemap[0]->set_scrollx(0, k007121_ctrlram_r(state->m_k007121, 0) - 56 ); + state->m_k007121_tilemap[0]->set_scrolly(0, k007121_ctrlram_r(state->m_k007121, 2)); + state->m_k007121_tilemap[1]->set_scrollx(0, -16); } else { @@ -159,9 +159,9 @@ SCREEN_UPDATE_IND16( flkatck ) clip[1].max_x = 39; clip[1].min_x = 0; - tilemap_set_scrollx(state->m_k007121_tilemap[0], 0, k007121_ctrlram_r(state->m_k007121, 0) - 40 ); - tilemap_set_scrolly(state->m_k007121_tilemap[0], 0, k007121_ctrlram_r(state->m_k007121, 2)); - tilemap_set_scrollx(state->m_k007121_tilemap[1], 0, 0); + state->m_k007121_tilemap[0]->set_scrollx(0, k007121_ctrlram_r(state->m_k007121, 0) - 40 ); + state->m_k007121_tilemap[0]->set_scrolly(0, k007121_ctrlram_r(state->m_k007121, 2)); + state->m_k007121_tilemap[1]->set_scrollx(0, 0); } /* compute clipping */ @@ -169,8 +169,8 @@ SCREEN_UPDATE_IND16( flkatck ) clip[1] &= cliprect; /* draw the graphics */ - tilemap_draw(bitmap, clip[0], state->m_k007121_tilemap[0], 0, 0); + state->m_k007121_tilemap[0]->draw(bitmap, clip[0], 0, 0); k007121_sprites_draw(state->m_k007121, bitmap, cliprect, screen.machine().gfx[0], NULL, &state->m_k007121_ram[0x1000], 0, 40, 0, (UINT32)-1); - tilemap_draw(bitmap, clip[1], state->m_k007121_tilemap[1], 0, 0); + state->m_k007121_tilemap[1]->draw(bitmap, clip[1], 0, 0); return 0; } diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c index 12a6529e22c..610fef3f1bc 100644 --- a/src/mame/video/flower.c +++ b/src/mame/video/flower.c @@ -155,12 +155,12 @@ VIDEO_START(flower) state->m_text_tilemap = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8, 8,32,32); state->m_text_right_tilemap = tilemap_create(machine, get_text_tile_info,tilemap_scan_cols, 8, 8, 2,32); - tilemap_set_transparent_pen(state->m_bg1_tilemap,15); - tilemap_set_transparent_pen(state->m_text_tilemap,3); - tilemap_set_transparent_pen(state->m_text_right_tilemap,3); + state->m_bg1_tilemap->set_transparent_pen(15); + state->m_text_tilemap->set_transparent_pen(3); + state->m_text_right_tilemap->set_transparent_pen(3); - tilemap_set_scrolly(state->m_text_tilemap, 0, 16); - tilemap_set_scrolly(state->m_text_right_tilemap, 0, 16); + state->m_text_tilemap->set_scrolly(0, 16); + state->m_text_right_tilemap->set_scrolly(0, 16); } SCREEN_UPDATE_IND16( flower ) @@ -168,11 +168,11 @@ SCREEN_UPDATE_IND16( flower ) flower_state *state = screen.machine().driver_data(); rectangle myclip = cliprect; - tilemap_set_scrolly(state->m_bg0_tilemap,0, state->m_bg0_scroll[0]+16); - tilemap_set_scrolly(state->m_bg1_tilemap,0, state->m_bg1_scroll[0]+16); + state->m_bg0_tilemap->set_scrolly(0, state->m_bg0_scroll[0]+16); + state->m_bg1_tilemap->set_scrolly(0, state->m_bg1_scroll[0]+16); - tilemap_draw(bitmap,cliprect,state->m_bg0_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_bg1_tilemap,0,0); + state->m_bg0_tilemap->draw(bitmap, cliprect, 0,0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); @@ -187,8 +187,8 @@ SCREEN_UPDATE_IND16( flower ) myclip.max_x = cliprect.max_x; } - tilemap_draw(bitmap,cliprect,state->m_text_tilemap,0,0); - tilemap_draw(bitmap,myclip,state->m_text_right_tilemap,0,0); + state->m_text_tilemap->draw(bitmap, cliprect, 0,0); + state->m_text_right_tilemap->draw(bitmap, myclip, 0,0); return 0; } @@ -196,22 +196,22 @@ WRITE8_HANDLER( flower_textram_w ) { flower_state *state = space->machine().driver_data(); state->m_textram[offset] = data; - tilemap_mark_tile_dirty(state->m_text_tilemap, offset); - tilemap_mark_all_tiles_dirty(state->m_text_right_tilemap); + state->m_text_tilemap->mark_tile_dirty(offset); + state->m_text_right_tilemap->mark_all_dirty(); } WRITE8_HANDLER( flower_bg0ram_w ) { flower_state *state = space->machine().driver_data(); state->m_bg0ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg0_tilemap, offset & 0x1ff); + state->m_bg0_tilemap->mark_tile_dirty(offset & 0x1ff); } WRITE8_HANDLER( flower_bg1ram_w ) { flower_state *state = space->machine().driver_data(); state->m_bg1ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg1_tilemap, offset & 0x1ff); + state->m_bg1_tilemap->mark_tile_dirty(offset & 0x1ff); } WRITE8_HANDLER( flower_flipscreen_w ) diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c index d354bf5c51e..16eb4f5cada 100644 --- a/src/mame/video/flstory.c +++ b/src/mame/video/flstory.c @@ -16,8 +16,8 @@ static TILE_GET_INFO( get_tile_info ) int attr = state->m_videoram[tile_index * 2 + 1]; int tile_number = code + ((attr & 0xc0) << 2) + 0x400 + 0x800 * state->m_char_bank; int flags = TILE_FLIPYX((attr & 0x18) >> 3); - tileinfo->category = (attr & 0x20) >> 5; - tileinfo->group = (attr & 0x20) >> 5; + tileinfo.category = (attr & 0x20) >> 5; + tileinfo.group = (attr & 0x20) >> 5; SET_TILE_INFO( 0, tile_number, @@ -48,8 +48,8 @@ static TILE_GET_INFO( get_rumba_tile_info ) int tile_number = code + ((attr & 0xc0) << 2) + 0x400 + 0x800 * state->m_char_bank; int col = (attr & 0x0f); - tileinfo->category = (attr & 0x20) >> 5; - tileinfo->group = (attr & 0x20) >> 5; + tileinfo.category = (attr & 0x20) >> 5; + tileinfo.group = (attr & 0x20) >> 5; SET_TILE_INFO( 0, tile_number, @@ -61,10 +61,10 @@ VIDEO_START( flstory ) { flstory_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); -// tilemap_set_transparent_pen(state->m_bg_tilemap, 15); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0x3fff, 0xc000); /* split type 0 has pens 0-13 transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x8000, 0x7fff); /* split type 1 has pen 15 transparent in front half */ - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); +// state->m_bg_tilemap->set_transparent_pen(15); + state->m_bg_tilemap->set_transmask(0, 0x3fff, 0xc000); /* split type 0 has pens 0-13 transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x8000, 0x7fff); /* split type 1 has pen 15 transparent in front half */ + state->m_bg_tilemap->set_scroll_cols(32); machine.generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x200); machine.generic.paletteram2.u8 = auto_alloc_array(machine, UINT8, 0x200); @@ -76,10 +76,10 @@ VIDEO_START( rumba ) { flstory_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_rumba_tile_info, tilemap_scan_rows, 8, 8, 32, 32); -// tilemap_set_transparent_pen(state->m_bg_tilemap, 15); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0x3fff, 0xc000); /* split type 0 has pens 0-13 transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x8000, 0x7fff); /* split type 1 has pen 15 transparent in front half */ - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); +// state->m_bg_tilemap->set_transparent_pen(15); + state->m_bg_tilemap->set_transmask(0, 0x3fff, 0xc000); /* split type 0 has pens 0-13 transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x8000, 0x7fff); /* split type 1 has pen 15 transparent in front half */ + state->m_bg_tilemap->set_scroll_cols(32); machine.generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x200); machine.generic.paletteram2.u8 = auto_alloc_array(machine, UINT8, 0x200); @@ -91,7 +91,7 @@ VIDEO_START( victnine ) { flstory_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, victnine_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); machine.generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x200); machine.generic.paletteram2.u8 = auto_alloc_array(machine, UINT8, 0x200); @@ -103,7 +103,7 @@ WRITE8_HANDLER( flstory_videoram_w ) { flstory_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( flstory_palette_w ) @@ -135,7 +135,7 @@ WRITE8_HANDLER( flstory_gfxctrl_w ) if (state->m_char_bank != ((data & 0x10) >> 4)) { state->m_char_bank = (data & 0x10) >> 4; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } state->m_palette_bank = (data & 0x20) >> 5; @@ -174,7 +174,7 @@ WRITE8_HANDLER( flstory_scrlram_w ) { flstory_state *state = space->machine().driver_data(); state->m_scrlram[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap, offset, data); + state->m_bg_tilemap->set_scrolly(offset, data); } @@ -226,12 +226,12 @@ static void flstory_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap SCREEN_UPDATE_IND16( flstory ) { flstory_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0 | TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1 | TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER1, 0); flstory_draw_sprites(screen.machine(), bitmap, cliprect, 0x00); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0 | TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER0, 0); flstory_draw_sprites(screen.machine(), bitmap, cliprect, 0x80); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1 | TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER0, 0); return 0; } @@ -283,7 +283,7 @@ static void victnine_draw_sprites( running_machine &machine, bitmap_ind16 &bitma SCREEN_UPDATE_IND16( victnine ) { flstory_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); victnine_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -291,11 +291,11 @@ SCREEN_UPDATE_IND16( victnine ) SCREEN_UPDATE_IND16( rumba ) { flstory_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0 | TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1 | TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER1, 0); victnine_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0 | TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER0, 0); victnine_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1 | TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c index 108ebab1115..7723cbc601c 100644 --- a/src/mame/video/foodf.c +++ b/src/mame/video/foodf.c @@ -39,10 +39,10 @@ VIDEO_START( foodf ) /* initialize the playfield */ state->m_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 32,32); - tilemap_set_transparent_pen(state->m_playfield_tilemap, 0); + state->m_playfield_tilemap->set_transparent_pen(0); /* adjust the playfield for the 8 pixel offset */ - tilemap_set_scrollx(state->m_playfield_tilemap, 0, -8); + state->m_playfield_tilemap->set_scrollx(0, -8); state->save_item(NAME(state->m_playfield_flip)); /* compute the color output resistor weights */ @@ -65,7 +65,7 @@ void foodf_set_flip(foodf_state *state, int flip) if (flip != state->m_playfield_flip) { state->m_playfield_flip = flip; - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); } } @@ -123,11 +123,11 @@ SCREEN_UPDATE_IND16( foodf ) UINT16 *spriteram16 = state->m_spriteram; /* first draw the playfield opaquely */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); /* then draw the non-transparent parts with a priority of 1 */ priority_bitmap.fill(0); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 1); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 1); /* draw the motion objects front-to-back */ for (offs = 0x80-2; offs >= 0x20; offs -= 2) diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c index d879b26f336..565184fa3dd 100644 --- a/src/mame/video/freekick.c +++ b/src/mame/video/freekick.c @@ -26,7 +26,7 @@ WRITE8_HANDLER( freek_videoram_w ) { freekick_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_freek_tilemap, offset & 0x3ff); + state->m_freek_tilemap->mark_tile_dirty(offset & 0x3ff); } static void gigas_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -137,7 +137,7 @@ static void freekick_draw_sprites( running_machine &machine, bitmap_ind16 &bitma SCREEN_UPDATE_IND16( gigas ) { freekick_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_freek_tilemap, 0, 0); + state->m_freek_tilemap->draw(bitmap, cliprect, 0, 0); gigas_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -145,7 +145,7 @@ SCREEN_UPDATE_IND16( gigas ) SCREEN_UPDATE_IND16( pbillrd ) { freekick_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_freek_tilemap, 0, 0); + state->m_freek_tilemap->draw(bitmap, cliprect, 0, 0); pbillrd_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -153,7 +153,7 @@ SCREEN_UPDATE_IND16( pbillrd ) SCREEN_UPDATE_IND16( freekick ) { freekick_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_freek_tilemap, 0, 0); + state->m_freek_tilemap->draw(bitmap, cliprect, 0, 0); freekick_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index df18246f27f..367f2479cbc 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -15,7 +15,7 @@ ******************************************************************************/ -INLINE void fromanc2_get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int vram, int layer ) +INLINE void fromanc2_get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int vram, int layer ) { fromanc2_state *state = machine.driver_data(); int tile, color; @@ -36,7 +36,7 @@ static TILE_GET_INFO( fromanc2_get_v1_l2_tile_info ) { fromanc2_get_tile_info(ma static TILE_GET_INFO( fromanc2_get_v1_l3_tile_info ) { fromanc2_get_tile_info(machine, tileinfo, tile_index, 1, 3); } -INLINE void fromancr_get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int vram, int layer ) +INLINE void fromancr_get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int vram, int layer ) { fromanc2_state *state = machine.driver_data(); int tile, color; @@ -178,7 +178,7 @@ INLINE void fromanc2_dispvram_w( running_machine &machine, offs_t offset, UINT16 layer += (offset < 0x1000) ? 0 : 1; COMBINE_DATA(&state->m_videoram[vram][layer][offset & 0x0fff]); - tilemap_mark_tile_dirty(state->m_tilemap[vram][layer], offset & 0x0fff); + state->m_tilemap[vram][layer]->mark_tile_dirty(offset & 0x0fff); } WRITE16_HANDLER( fromanc2_videoram_0_w ) { fromanc2_dispvram_w(space->machine(), offset, data, mem_mask, 0, 0); } @@ -249,10 +249,10 @@ WRITE16_HANDLER( fromanc2_gfxbank_0_w ) state->m_gfxbank[0][1] = (data & 0x00f0) >> 4; state->m_gfxbank[0][2] = (data & 0x0f00) >> 8; state->m_gfxbank[0][3] = (data & 0xf000) >> 12; - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][0]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][1]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][2]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][3]); + state->m_tilemap[0][0]->mark_all_dirty(); + state->m_tilemap[0][1]->mark_all_dirty(); + state->m_tilemap[0][2]->mark_all_dirty(); + state->m_tilemap[0][3]->mark_all_dirty(); } WRITE16_HANDLER( fromanc2_gfxbank_1_w ) @@ -262,10 +262,10 @@ WRITE16_HANDLER( fromanc2_gfxbank_1_w ) state->m_gfxbank[1][1] = (data & 0x00f0) >> 4; state->m_gfxbank[1][2] = (data & 0x0f00) >> 8; state->m_gfxbank[1][3] = (data & 0xf000) >> 12; - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][0]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][1]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][2]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][3]); + state->m_tilemap[1][0]->mark_all_dirty(); + state->m_tilemap[1][1]->mark_all_dirty(); + state->m_tilemap[1][2]->mark_all_dirty(); + state->m_tilemap[1][3]->mark_all_dirty(); } @@ -275,7 +275,7 @@ INLINE void fromancr_vram_w(running_machine &machine, offs_t offset, UINT16 data int vram = (offset < 0x1000) ? 0 : 1; COMBINE_DATA(&state->m_videoram[vram][layer][offset & 0x0fff]); - tilemap_mark_tile_dirty(state->m_tilemap[vram][layer], offset & 0x0fff); + state->m_tilemap[vram][layer]->mark_tile_dirty(offset & 0x0fff); } WRITE16_HANDLER( fromancr_videoram_0_w ) { fromancr_vram_w(space->machine(), offset, data, mem_mask, 1); } @@ -318,10 +318,10 @@ void fromancr_gfxbank_w( running_machine &machine, int data ) state->m_gfxbank[0][1] = (data & 0xf000) >> 12; // FG (1P) state->m_gfxbank[1][0] = (data & 0x0008) >> 3; // BG (2P) state->m_gfxbank[1][1] = (data & 0x0f00) >> 8; // FG (2P) - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][0]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][1]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][0]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][1]); + state->m_tilemap[0][0]->mark_all_dirty(); + state->m_tilemap[0][1]->mark_all_dirty(); + state->m_tilemap[1][0]->mark_all_dirty(); + state->m_tilemap[1][1]->mark_all_dirty(); } @@ -331,7 +331,7 @@ INLINE void fromanc4_vram_w( running_machine &machine, offs_t offset, UINT16 dat int vram = (offset < 0x4000) ? 0 : 1; COMBINE_DATA(&state->m_videoram[vram][layer][offset & 0x3fff]); - tilemap_mark_tile_dirty(state->m_tilemap[vram][layer], offset & 0x3fff); + state->m_tilemap[vram][layer]->mark_tile_dirty(offset & 0x3fff); } WRITE16_HANDLER( fromanc4_videoram_0_w ) { fromanc4_vram_w(space->machine(), offset, data, mem_mask, 2); } @@ -349,8 +349,8 @@ WRITE16_HANDLER( fromanc4_gfxreg_0_w ) case 0x03: state->m_scrolly[1][2] = -(data - 0x1e4); break; case 0x05: state->m_gfxbank[0][2] = (data & 0x000f) >> 0; state->m_gfxbank[1][2] = (data & 0x0f00) >> 8; - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][2]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][2]); + state->m_tilemap[0][2]->mark_all_dirty(); + state->m_tilemap[1][2]->mark_all_dirty(); break; // offset 0x04, 0x06 - 0x11 unknown default: break; @@ -368,8 +368,8 @@ WRITE16_HANDLER( fromanc4_gfxreg_1_w ) case 0x03: state->m_scrolly[1][1] = -(data - 0x1e4); break; case 0x05: state->m_gfxbank[0][1] = (data & 0x000f) >> 0; state->m_gfxbank[1][1] = (data & 0x0f00) >> 8; - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][1]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][1]); + state->m_tilemap[0][1]->mark_all_dirty(); + state->m_tilemap[1][1]->mark_all_dirty(); break; // offset 0x04, 0x06 - 0x11 unknown default: break; @@ -387,8 +387,8 @@ WRITE16_HANDLER( fromanc4_gfxreg_2_w ) case 0x03: state->m_scrolly[1][0] = -(data - 0x1e4); break; case 0x05: state->m_gfxbank[0][0] = (data & 0x000f) >> 0; state->m_gfxbank[1][0] = (data & 0x0f00) >> 8; - tilemap_mark_all_tiles_dirty(state->m_tilemap[0][0]); - tilemap_mark_all_tiles_dirty(state->m_tilemap[1][0]); + state->m_tilemap[0][0]->mark_all_dirty(); + state->m_tilemap[1][0]->mark_all_dirty(); break; // offset 0x04, 0x06 - 0x11 unknown default: break; @@ -415,12 +415,12 @@ VIDEO_START( fromanc2 ) state->m_tilemap[1][2] = tilemap_create(machine, fromanc2_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->m_tilemap[1][3] = tilemap_create(machine, fromanc2_get_v1_l3_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_tilemap[0][1], 0x000); - tilemap_set_transparent_pen(state->m_tilemap[0][2], 0x000); - tilemap_set_transparent_pen(state->m_tilemap[0][3], 0x000); - tilemap_set_transparent_pen(state->m_tilemap[1][1], 0x000); - tilemap_set_transparent_pen(state->m_tilemap[1][2], 0x000); - tilemap_set_transparent_pen(state->m_tilemap[1][3], 0x000); + state->m_tilemap[0][1]->set_transparent_pen(0x000); + state->m_tilemap[0][2]->set_transparent_pen(0x000); + state->m_tilemap[0][3]->set_transparent_pen(0x000); + state->m_tilemap[1][1]->set_transparent_pen(0x000); + state->m_tilemap[1][2]->set_transparent_pen(0x000); + state->m_tilemap[1][3]->set_transparent_pen(0x000); state->m_videoram[0][0] = auto_alloc_array(machine, UINT16, (64 * 64)); state->m_videoram[0][1] = auto_alloc_array(machine, UINT16, (64 * 64)); @@ -465,10 +465,10 @@ VIDEO_START( fromancr ) state->m_tilemap[1][2] = tilemap_create(machine, fromancr_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->m_tilemap[1][3] = 0; - tilemap_set_transparent_pen(state->m_tilemap[0][1], 0x0ff); - tilemap_set_transparent_pen(state->m_tilemap[0][2], 0x0ff); - tilemap_set_transparent_pen(state->m_tilemap[1][1], 0x0ff); - tilemap_set_transparent_pen(state->m_tilemap[1][2], 0x0ff); + state->m_tilemap[0][1]->set_transparent_pen(0x0ff); + state->m_tilemap[0][2]->set_transparent_pen(0x0ff); + state->m_tilemap[1][1]->set_transparent_pen(0x0ff); + state->m_tilemap[1][2]->set_transparent_pen(0x0ff); state->m_videoram[0][0] = auto_alloc_array(machine, UINT16, (64 * 64)); state->m_videoram[0][1] = auto_alloc_array(machine, UINT16, (64 * 64)); @@ -510,10 +510,10 @@ VIDEO_START( fromanc4 ) state->m_tilemap[1][2] = tilemap_create(machine, fromancr_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 256, 64); state->m_tilemap[1][3] = 0; - tilemap_set_transparent_pen(state->m_tilemap[0][1], 0x000); - tilemap_set_transparent_pen(state->m_tilemap[0][2], 0x000); - tilemap_set_transparent_pen(state->m_tilemap[1][1], 0x000); - tilemap_set_transparent_pen(state->m_tilemap[1][2], 0x000); + state->m_tilemap[0][1]->set_transparent_pen(0x000); + state->m_tilemap[0][2]->set_transparent_pen(0x000); + state->m_tilemap[1][1]->set_transparent_pen(0x000); + state->m_tilemap[1][2]->set_transparent_pen(0x000); state->m_videoram[0][0] = auto_alloc_array(machine, UINT16, (256 * 64)); state->m_videoram[0][1] = auto_alloc_array(machine, UINT16, (256 * 64)); @@ -556,9 +556,9 @@ SCREEN_UPDATE_IND16( fromanc2_left ) { if (state->m_tilemap[0][i]) { - tilemap_set_scrollx(state->m_tilemap[0][i], 0, -state->m_scrollx[0][i]); - tilemap_set_scrolly(state->m_tilemap[0][i], 0, -state->m_scrolly[0][i]); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0][i], 0, 0); + state->m_tilemap[0][i]->set_scrollx(0, -state->m_scrollx[0][i]); + state->m_tilemap[0][i]->set_scrolly(0, -state->m_scrolly[0][i]); + state->m_tilemap[0][i]->draw(bitmap, cliprect, 0, 0); } } @@ -574,9 +574,9 @@ SCREEN_UPDATE_IND16( fromanc2_right ) { if (state->m_tilemap[1][i]) { - tilemap_set_scrollx(state->m_tilemap[1][i], 0, -state->m_scrollx[1][i]); - tilemap_set_scrolly(state->m_tilemap[1][i], 0, -state->m_scrolly[1][i]); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1][i], 0, 0); + state->m_tilemap[1][i]->set_scrollx(0, -state->m_scrollx[1][i]); + state->m_tilemap[1][i]->set_scrolly(0, -state->m_scrolly[1][i]); + state->m_tilemap[1][i]->draw(bitmap, cliprect, 0, 0); } } diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index dd40c6e2ca6..51620b3ccbe 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -19,7 +19,7 @@ static TIMER_CALLBACK( crtc_interrupt_gen ); * *************************************/ -INLINE void get_fromance_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int layer ) +INLINE void get_fromance_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int layer ) { fromance_state *state = machine.driver_data(); int tile = ((state->m_local_videoram[layer][0x0000 + tile_index] & 0x80) << 9) | @@ -34,7 +34,7 @@ static TILE_GET_INFO( get_fromance_bg_tile_info ) { get_fromance_tile_info(machi static TILE_GET_INFO( get_fromance_fg_tile_info ) { get_fromance_tile_info(machine, tileinfo, tile_index, 1); } -INLINE void get_nekkyoku_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int layer ) +INLINE void get_nekkyoku_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int layer ) { fromance_state *state = machine.driver_data(); int tile = (state->m_local_videoram[layer][0x0000 + tile_index] << 8) | @@ -67,7 +67,7 @@ static void init_common( running_machine &machine ) state->m_local_paletteram = auto_alloc_array(machine, UINT8, 0x800 * 2); /* configure tilemaps */ - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); /* reset the timer */ state->m_crtc_timer = machine.scheduler().timer_alloc(FUNC(crtc_interrupt_gen)); @@ -146,7 +146,7 @@ WRITE8_HANDLER( fromance_gfxreg_w ) if (state->m_flipscreen != state->m_flipscreen_old) { state->m_flipscreen_old = state->m_flipscreen; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } } @@ -201,7 +201,7 @@ WRITE8_HANDLER( fromance_videoram_w ) { fromance_state *state = space->machine().driver_data(); state->m_local_videoram[state->m_selected_videoram][offset] = data; - tilemap_mark_tile_dirty(state->m_selected_videoram ? state->m_fg_tilemap : state->m_bg_tilemap, offset & 0x0fff); + (state->m_selected_videoram ? state->m_fg_tilemap : state->m_bg_tilemap)->mark_tile_dirty(offset & 0x0fff); } @@ -426,13 +426,13 @@ SCREEN_UPDATE_IND16( fromance ) { fromance_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx[0]); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrolly[0]); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scrollx[1]); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_scrolly[1]); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx[0]); + state->m_bg_tilemap->set_scrolly(0, state->m_scrolly[0]); + state->m_fg_tilemap->set_scrollx(0, state->m_scrollx[1]); + state->m_fg_tilemap->set_scrolly(0, state->m_scrolly[1]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -442,11 +442,11 @@ SCREEN_UPDATE_IND16( pipedrm ) fromance_state *state = screen.machine().driver_data(); /* there seems to be no logical mapping for the X scroll register -- maybe it's gone */ - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrolly[1]); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_scrolly[0]); + state->m_bg_tilemap->set_scrolly(0, state->m_scrolly[1]); + state->m_fg_tilemap->set_scrolly(0, state->m_scrolly[0]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen, bitmap, cliprect, 0); draw_sprites(screen, bitmap, cliprect, 1); diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index 7aa85dade85..530998a28dd 100644 --- a/src/mame/video/funkybee.c +++ b/src/mame/video/funkybee.c @@ -43,14 +43,14 @@ WRITE8_HANDLER( funkybee_videoram_w ) { funkybee_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( funkybee_colorram_w ) { funkybee_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( funkybee_gfx_bank_w ) @@ -59,14 +59,14 @@ WRITE8_HANDLER( funkybee_gfx_bank_w ) if (state->m_gfx_bank != (data & 0x01)) { state->m_gfx_bank = data & 0x01; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } WRITE8_HANDLER( funkybee_scroll_w ) { funkybee_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, flip_screen_get(space->machine()) ? -data : data); + state->m_bg_tilemap->set_scrollx(0, flip_screen_get(space->machine()) ? -data : data); } WRITE8_HANDLER( funkybee_flipscreen_w ) @@ -163,7 +163,7 @@ static void draw_columns( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( funkybee ) { funkybee_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); draw_columns(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c index cd396830185..15f5a70bd5b 100644 --- a/src/mame/video/funworld.c +++ b/src/mame/video/funworld.c @@ -146,14 +146,14 @@ WRITE8_HANDLER( funworld_videoram_w ) { funworld_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( funworld_colorram_w ) { funworld_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -198,6 +198,6 @@ VIDEO_START(magicrd2) SCREEN_UPDATE_IND16(funworld) { funworld_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c index 11bdcb73364..cfd3f334554 100644 --- a/src/mame/video/fuukifg2.c +++ b/src/mame/video/fuukifg2.c @@ -44,7 +44,7 @@ ***************************************************************************/ -INLINE void get_tile_info(running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, int _N_) +INLINE void get_tile_info(running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, int _N_) { fuuki16_state *state = machine.driver_data(); UINT16 code = state->m_vram[_N_][2 * tile_index + 0]; @@ -61,7 +61,7 @@ INLINE void fuuki16_vram_w(address_space *space, offs_t offset, UINT16 data, UIN { fuuki16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram[_N_][offset]); - tilemap_mark_tile_dirty(state->m_tilemap[_N_], offset / 2); + state->m_tilemap[_N_]->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( fuuki16_vram_0_w ) { fuuki16_vram_w(space, offset, data, mem_mask, 0); } @@ -99,10 +99,10 @@ VIDEO_START( fuuki16 ) state->m_tilemap[2] = tilemap_create(machine, get_tile_info_2, tilemap_scan_rows, 8, 8, 64, 32); state->m_tilemap[3] = tilemap_create(machine, get_tile_info_3, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_tilemap[0], 0x0f); // 4 bits - tilemap_set_transparent_pen(state->m_tilemap[1], 0xff); // 8 bits - tilemap_set_transparent_pen(state->m_tilemap[2], 0x0f); // 4 bits - tilemap_set_transparent_pen(state->m_tilemap[3], 0x0f); // 4 bits + state->m_tilemap[0]->set_transparent_pen(0x0f); // 4 bits + state->m_tilemap[1]->set_transparent_pen(0xff); // 8 bits + state->m_tilemap[2]->set_transparent_pen(0x0f); // 4 bits + state->m_tilemap[3]->set_transparent_pen(0x0f); // 4 bits machine.gfx[2]->color_granularity = 16; /* 256 colour tiles with palette selectable on 16 colour boundaries */ } @@ -272,12 +272,12 @@ static void fuuki16_draw_layer( running_machine &machine, bitmap_ind16 &bitmap, switch( i ) { - case 2: if (buffer) tilemap_draw(bitmap, cliprect, state->m_tilemap[3], flag, pri); - else tilemap_draw(bitmap, cliprect, state->m_tilemap[2], flag, pri); + case 2: if (buffer) state->m_tilemap[3]->draw(bitmap, cliprect, flag, pri); + else state->m_tilemap[2]->draw(bitmap, cliprect, flag, pri); return; - case 1: tilemap_draw(bitmap, cliprect, state->m_tilemap[1], flag, pri); + case 1: state->m_tilemap[1]->draw(bitmap, cliprect, flag, pri); return; - case 0: tilemap_draw(bitmap, cliprect, state->m_tilemap[0], flag, pri); + case 0: state->m_tilemap[0]->draw(bitmap, cliprect, flag, pri); return; } } @@ -321,15 +321,15 @@ SCREEN_UPDATE_IND16( fuuki16 ) layer2_scrolly = state->m_vregs[0x8 / 2]; layer2_scrollx = state->m_vregs[0xa / 2]; - tilemap_set_scrollx(state->m_tilemap[0], 0, layer0_scrollx); - tilemap_set_scrolly(state->m_tilemap[0], 0, layer0_scrolly); - tilemap_set_scrollx(state->m_tilemap[1], 0, layer1_scrollx); - tilemap_set_scrolly(state->m_tilemap[1], 0, layer1_scrolly); + state->m_tilemap[0]->set_scrollx(0, layer0_scrollx); + state->m_tilemap[0]->set_scrolly(0, layer0_scrolly); + state->m_tilemap[1]->set_scrollx(0, layer1_scrollx); + state->m_tilemap[1]->set_scrolly(0, layer1_scrolly); - tilemap_set_scrollx(state->m_tilemap[2], 0, layer2_scrollx + 0x10); - tilemap_set_scrolly(state->m_tilemap[2], 0, layer2_scrolly /*+ 0x02*/); - tilemap_set_scrollx(state->m_tilemap[3], 0, layer2_scrollx + 0x10); - tilemap_set_scrolly(state->m_tilemap[3], 0, layer2_scrolly /*+ 0x02*/); + state->m_tilemap[2]->set_scrollx(0, layer2_scrollx + 0x10); + state->m_tilemap[2]->set_scrolly(0, layer2_scrolly /*+ 0x02*/); + state->m_tilemap[3]->set_scrollx(0, layer2_scrollx + 0x10); + state->m_tilemap[3]->set_scrolly(0, layer2_scrolly /*+ 0x02*/); /* The backmost tilemap decides the background color(s) but sprites can go below the opaque pixels of that tilemap. We thus need to mark the diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c index be1c96114ef..187d5eb0ca7 100644 --- a/src/mame/video/fuukifg3.c +++ b/src/mame/video/fuukifg3.c @@ -48,7 +48,7 @@ ***************************************************************************/ -INLINE void get_tile_info8bpp(running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, int _N_) +INLINE void get_tile_info8bpp(running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, int _N_) { fuuki32_state *state = machine.driver_data(); UINT16 code = (state->m_vram[_N_][tile_index] & 0xffff0000) >> 16; @@ -59,7 +59,7 @@ INLINE void get_tile_info8bpp(running_machine &machine, tile_data *tileinfo, til static TILE_GET_INFO( get_tile_info_0 ) { get_tile_info8bpp(machine, tileinfo, tile_index, 0); } static TILE_GET_INFO( get_tile_info_1 ) { get_tile_info8bpp(machine, tileinfo, tile_index, 1); } -INLINE void get_tile_info4bpp(running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, int _N_) +INLINE void get_tile_info4bpp(running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, int _N_) { fuuki32_state *state = machine.driver_data(); UINT16 code = (state->m_vram[_N_][tile_index] & 0xffff0000) >> 16; @@ -74,7 +74,7 @@ INLINE void fuuki32_vram_w(address_space *space, offs_t offset, UINT32 data, UIN { fuuki32_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram[_N_][offset]); - tilemap_mark_tile_dirty(state->m_tilemap[_N_],offset); + state->m_tilemap[_N_]->mark_tile_dirty(offset); } WRITE32_HANDLER( fuuki32_vram_0_w ) { fuuki32_vram_w(space, offset, data, mem_mask, 0); } @@ -105,10 +105,10 @@ VIDEO_START( fuuki32 ) state->m_tilemap[2] = tilemap_create(machine, get_tile_info_2, tilemap_scan_rows, 8, 8, 64, 32); state->m_tilemap[3] = tilemap_create(machine, get_tile_info_3, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_tilemap[0], 0xff); // 8 bits - tilemap_set_transparent_pen(state->m_tilemap[1], 0xff); // 8 bits - tilemap_set_transparent_pen(state->m_tilemap[2], 0x0f); // 4 bits - tilemap_set_transparent_pen(state->m_tilemap[3], 0x0f); // 4 bits + state->m_tilemap[0]->set_transparent_pen(0xff); // 8 bits + state->m_tilemap[1]->set_transparent_pen(0xff); // 8 bits + state->m_tilemap[2]->set_transparent_pen(0x0f); // 4 bits + state->m_tilemap[3]->set_transparent_pen(0x0f); // 4 bits //machine.gfx[1]->color_granularity = 16; /* 256 colour tiles with palette selectable on 16 colour boundaries */ //machine.gfx[2]->color_granularity = 16; @@ -296,12 +296,12 @@ static void fuuki32_draw_layer( running_machine &machine, bitmap_ind16 &bitmap, switch( i ) { - case 2: if (buffer) tilemap_draw(bitmap, cliprect, state->m_tilemap[3], flag, pri); - else tilemap_draw(bitmap, cliprect, state->m_tilemap[2], flag, pri); + case 2: if (buffer) state->m_tilemap[3]->draw(bitmap, cliprect, flag, pri); + else state->m_tilemap[2]->draw(bitmap, cliprect, flag, pri); return; - case 1: tilemap_draw(bitmap, cliprect, state->m_tilemap[1], flag, pri); + case 1: state->m_tilemap[1]->draw(bitmap, cliprect, flag, pri); return; - case 0: tilemap_draw(bitmap, cliprect, state->m_tilemap[0], flag, pri); + case 0: state->m_tilemap[0]->draw(bitmap, cliprect, flag, pri); return; } } @@ -345,15 +345,15 @@ SCREEN_UPDATE_IND16( fuuki32 ) layer2_scrolly = ((state->m_vregs[0x8 / 4] & 0xffff0000) >> 16); layer2_scrollx = ((state->m_vregs[0x8 / 4] & 0x0000ffff)); - tilemap_set_scrollx(state->m_tilemap[0], 0, layer0_scrollx); - tilemap_set_scrolly(state->m_tilemap[0], 0, layer0_scrolly); - tilemap_set_scrollx(state->m_tilemap[1], 0, layer1_scrollx); - tilemap_set_scrolly(state->m_tilemap[1], 0, layer1_scrolly); + state->m_tilemap[0]->set_scrollx(0, layer0_scrollx); + state->m_tilemap[0]->set_scrolly(0, layer0_scrolly); + state->m_tilemap[1]->set_scrollx(0, layer1_scrollx); + state->m_tilemap[1]->set_scrolly(0, layer1_scrolly); - tilemap_set_scrollx(state->m_tilemap[2], 0, layer2_scrollx); - tilemap_set_scrolly(state->m_tilemap[2], 0, layer2_scrolly); - tilemap_set_scrollx(state->m_tilemap[3], 0, layer2_scrollx); - tilemap_set_scrolly(state->m_tilemap[3], 0, layer2_scrolly); + state->m_tilemap[2]->set_scrollx(0, layer2_scrollx); + state->m_tilemap[2]->set_scrolly(0, layer2_scrolly); + state->m_tilemap[3]->set_scrollx(0, layer2_scrollx); + state->m_tilemap[3]->set_scrolly(0, layer2_scrolly); /* The bg colour is the last pen i.e. 0x1fff */ bitmap.fill((0x800 * 4) - 1, cliprect); diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index 441e9876b0c..72ef6cff708 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -38,7 +38,7 @@ static TILE_GET_INFO( get_tile_info_gaelco_screen0 ) int data2 = state->m_videoram[(tile_index << 1) + 1]; int code = ((data & 0xfffc) >> 2); - tileinfo->category = (data2 >> 6) & 0x03; + tileinfo.category = (data2 >> 6) & 0x03; SET_TILE_INFO(1, 0x4000 + code, data2 & 0x3f, TILE_FLIPYX(data & 0x03)); } @@ -51,7 +51,7 @@ static TILE_GET_INFO( get_tile_info_gaelco_screen1 ) int data2 = state->m_videoram[(0x1000 / 2) + (tile_index << 1) + 1]; int code = ((data & 0xfffc) >> 2); - tileinfo->category = (data2 >> 6) & 0x03; + tileinfo.category = (data2 >> 6) & 0x03; SET_TILE_INFO(1, 0x4000 + code, data2 & 0x3f, TILE_FLIPYX(data & 0x03)); } @@ -66,7 +66,7 @@ WRITE16_HANDLER( gaelco_vram_w ) { gaelco_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap[offset >> 11], ((offset << 1) & 0x0fff) >> 2); + state->m_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2); } /*************************************************************************** @@ -81,8 +81,8 @@ VIDEO_START( bigkarnk ) state->m_tilemap[0] = tilemap_create(machine, get_tile_info_gaelco_screen0, tilemap_scan_rows, 16, 16, 32, 32); state->m_tilemap[1] = tilemap_create(machine, get_tile_info_gaelco_screen1, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transmask(state->m_tilemap[0], 0, 0xff01, 0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ - tilemap_set_transmask(state->m_tilemap[1], 0, 0xff01, 0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ + state->m_tilemap[0]->set_transmask(0, 0xff01, 0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ + state->m_tilemap[1]->set_transmask(0, 0xff01, 0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ } VIDEO_START( maniacsq ) @@ -91,8 +91,8 @@ VIDEO_START( maniacsq ) state->m_tilemap[0] = tilemap_create(machine, get_tile_info_gaelco_screen0, tilemap_scan_rows, 16, 16, 32, 32); state->m_tilemap[1] = tilemap_create(machine, get_tile_info_gaelco_screen1, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tilemap[0], 0); - tilemap_set_transparent_pen(state->m_tilemap[1], 0); + state->m_tilemap[0]->set_transparent_pen(0); + state->m_tilemap[1]->set_transparent_pen(0); } @@ -192,25 +192,25 @@ SCREEN_UPDATE_IND16( maniacsq ) gaelco_state *state = screen.machine().driver_data(); /* set scroll registers */ - tilemap_set_scrolly(state->m_tilemap[0], 0, state->m_vregs[0]); - tilemap_set_scrollx(state->m_tilemap[0], 0, state->m_vregs[1] + 4); - tilemap_set_scrolly(state->m_tilemap[1], 0, state->m_vregs[2]); - tilemap_set_scrollx(state->m_tilemap[1], 0, state->m_vregs[3]); + state->m_tilemap[0]->set_scrolly(0, state->m_vregs[0]); + state->m_tilemap[0]->set_scrollx(0, state->m_vregs[1] + 4); + state->m_tilemap[1]->set_scrolly(0, state->m_vregs[2]); + state->m_tilemap[1]->set_scrollx(0, state->m_vregs[3]); screen.machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], 3, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], 3, 0); + state->m_tilemap[1]->draw(bitmap, cliprect, 3, 0); + state->m_tilemap[0]->draw(bitmap, cliprect, 3, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], 2, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], 2, 1); + state->m_tilemap[1]->draw(bitmap, cliprect, 2, 1); + state->m_tilemap[0]->draw(bitmap, cliprect, 2, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], 1, 2); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], 1, 2); + state->m_tilemap[1]->draw(bitmap, cliprect, 1, 2); + state->m_tilemap[0]->draw(bitmap, cliprect, 1, 2); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], 0, 4); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], 0, 4); + state->m_tilemap[1]->draw(bitmap, cliprect, 0, 4); + state->m_tilemap[0]->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -221,37 +221,37 @@ SCREEN_UPDATE_IND16( bigkarnk ) gaelco_state *state = screen.machine().driver_data(); /* set scroll registers */ - tilemap_set_scrolly(state->m_tilemap[0], 0, state->m_vregs[0]); - tilemap_set_scrollx(state->m_tilemap[0], 0, state->m_vregs[1] + 4); - tilemap_set_scrolly(state->m_tilemap[1], 0, state->m_vregs[2]); - tilemap_set_scrollx(state->m_tilemap[1], 0, state->m_vregs[3]); + state->m_tilemap[0]->set_scrolly(0, state->m_vregs[0]); + state->m_tilemap[0]->set_scrollx(0, state->m_vregs[1] + 4); + state->m_tilemap[1]->set_scrolly(0, state->m_vregs[2]); + state->m_tilemap[1]->set_scrollx(0, state->m_vregs[3]); screen.machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], TILEMAP_DRAW_LAYER1 | 3, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], TILEMAP_DRAW_LAYER1 | 3, 0); + state->m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0); + state->m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], TILEMAP_DRAW_LAYER0 | 3, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], TILEMAP_DRAW_LAYER0 | 3, 1); + state->m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 1); + state->m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], TILEMAP_DRAW_LAYER1 | 2, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], TILEMAP_DRAW_LAYER1 | 2, 1); + state->m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 1); + state->m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], TILEMAP_DRAW_LAYER0 | 2, 2); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], TILEMAP_DRAW_LAYER0 | 2, 2); + state->m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 2); + state->m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 2); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], TILEMAP_DRAW_LAYER1 | 1, 2); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], TILEMAP_DRAW_LAYER1 | 1, 2); + state->m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 2); + state->m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 2); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], TILEMAP_DRAW_LAYER0 | 1, 4); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], TILEMAP_DRAW_LAYER0 | 1, 4); + state->m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 4); + state->m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 4); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], TILEMAP_DRAW_LAYER1 | 0, 4); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], TILEMAP_DRAW_LAYER1 | 0, 4); + state->m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 4); + state->m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 4); - tilemap_draw(bitmap, cliprect, state->m_tilemap[1], TILEMAP_DRAW_LAYER0 | 0, 8); - tilemap_draw(bitmap, cliprect, state->m_tilemap[0], TILEMAP_DRAW_LAYER0 | 0, 8); + state->m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 8); + state->m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 8); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index 474fc18da5e..c3fb9dcab3c 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -183,12 +183,12 @@ WRITE16_HANDLER( gaelco2_vram_w ) /* tilemap 0 writes */ if ((offset >= pant0_start) && (offset < pant0_end)){ - tilemap_mark_tile_dirty(state->m_pant[0], ((offset << 1) & 0x1fff) >> 2); + state->m_pant[0]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2); } /* tilemap 1 writes */ if ((offset >= pant1_start) && (offset < pant1_end)){ - tilemap_mark_tile_dirty(state->m_pant[1], ((offset << 1) & 0x1fff) >> 2); + state->m_pant[1]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2); } } @@ -271,13 +271,13 @@ VIDEO_START( gaelco2 ) state->m_pant[1] = tilemap_create(machine, get_tile_info_gaelco2_screen1,tilemap_scan_rows,16,16,64,32); /* set tilemap properties */ - tilemap_set_transparent_pen(state->m_pant[0],0); - tilemap_set_transparent_pen(state->m_pant[1],0); + state->m_pant[0]->set_transparent_pen(0); + state->m_pant[1]->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_pant[0], 512); - tilemap_set_scroll_cols(state->m_pant[0], 1); - tilemap_set_scroll_rows(state->m_pant[1], 512); - tilemap_set_scroll_cols(state->m_pant[1], 1); + state->m_pant[0]->set_scroll_rows(512); + state->m_pant[0]->set_scroll_cols(1); + state->m_pant[1]->set_scroll_rows(512); + state->m_pant[1]->set_scroll_cols(1); state->m_dual_monitor = 0; } @@ -292,13 +292,13 @@ VIDEO_START( gaelco2_dual ) state->m_pant[1] = tilemap_create(machine, get_tile_info_gaelco2_screen1_dual,tilemap_scan_rows,16,16,64,32); /* set tilemap properties */ - tilemap_set_transparent_pen(state->m_pant[0],0); - tilemap_set_transparent_pen(state->m_pant[1],0); + state->m_pant[0]->set_transparent_pen(0); + state->m_pant[1]->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_pant[0], 512); - tilemap_set_scroll_cols(state->m_pant[0], 1); - tilemap_set_scroll_rows(state->m_pant[1], 512); - tilemap_set_scroll_cols(state->m_pant[1], 1); + state->m_pant[0]->set_scroll_rows(512); + state->m_pant[0]->set_scroll_cols(1); + state->m_pant[1]->set_scroll_rows(512); + state->m_pant[1]->set_scroll_cols(1); state->m_dual_monitor = 1; } @@ -448,20 +448,20 @@ SCREEN_UPDATE_IND16( gaelco2 ) int scroll1y = state->m_videoram[0x2804/2] + 0x01; /* set y scroll registers */ - tilemap_set_scrolly(state->m_pant[0], 0, scroll0y & 0x1ff); - tilemap_set_scrolly(state->m_pant[1], 0, scroll1y & 0x1ff); + state->m_pant[0]->set_scrolly(0, scroll0y & 0x1ff); + state->m_pant[1]->set_scrolly(0, scroll1y & 0x1ff); /* set x linescroll registers */ for (i = 0; i < 512; i++){ - tilemap_set_scrollx(state->m_pant[0], i & 0x1ff, (state->m_vregs[0] & 0x8000) ? (state->m_videoram[(0x2000/2) + i] + 0x14) & 0x3ff : scroll0x & 0x3ff); - tilemap_set_scrollx(state->m_pant[1], i & 0x1ff, (state->m_vregs[1] & 0x8000) ? (state->m_videoram[(0x2400/2) + i] + 0x10) & 0x3ff : scroll1x & 0x3ff); + state->m_pant[0]->set_scrollx(i & 0x1ff, (state->m_vregs[0] & 0x8000) ? (state->m_videoram[(0x2000/2) + i] + 0x14) & 0x3ff : scroll0x & 0x3ff); + state->m_pant[1]->set_scrollx(i & 0x1ff, (state->m_vregs[1] & 0x8000) ? (state->m_videoram[(0x2400/2) + i] + 0x10) & 0x3ff : scroll1x & 0x3ff); } /* draw screen */ bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_pant[1], 0, 0); - tilemap_draw(bitmap, cliprect, state->m_pant[0], 0, 0); + state->m_pant[1]->draw(bitmap, cliprect, 0, 0); + state->m_pant[0]->draw(bitmap, cliprect, 0, 0); draw_sprites(screen, bitmap, cliprect, 0, 0); return 0; } @@ -478,19 +478,19 @@ static UINT32 dual_update(screen_device &screen, bitmap_ind16 &bitmap, const rec int scroll1y = state->m_videoram[0x2804/2] + 0x01; /* set y scroll registers */ - tilemap_set_scrolly(state->m_pant[0], 0, scroll0y & 0x1ff); - tilemap_set_scrolly(state->m_pant[1], 0, scroll1y & 0x1ff); + state->m_pant[0]->set_scrolly(0, scroll0y & 0x1ff); + state->m_pant[1]->set_scrolly(0, scroll1y & 0x1ff); /* set x linescroll registers */ for (i = 0; i < 512; i++){ - tilemap_set_scrollx(state->m_pant[0], i & 0x1ff, (state->m_vregs[0] & 0x8000) ? (state->m_videoram[(0x2000/2) + i] + 0x14) & 0x3ff : scroll0x & 0x3ff); - tilemap_set_scrollx(state->m_pant[1], i & 0x1ff, (state->m_vregs[1] & 0x8000) ? (state->m_videoram[(0x2400/2) + i] + 0x10) & 0x3ff : scroll1x & 0x3ff); + state->m_pant[0]->set_scrollx(i & 0x1ff, (state->m_vregs[0] & 0x8000) ? (state->m_videoram[(0x2000/2) + i] + 0x14) & 0x3ff : scroll0x & 0x3ff); + state->m_pant[1]->set_scrollx(i & 0x1ff, (state->m_vregs[1] & 0x8000) ? (state->m_videoram[(0x2400/2) + i] + 0x10) & 0x3ff : scroll1x & 0x3ff); } /* draw screen */ bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect,state->m_pant[index], 0, 0); + state->m_pant[index]->draw(bitmap, cliprect, 0, 0); draw_sprites(screen,bitmap,cliprect, 0x8000 * index, 0); return 0; diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c index cf5707de9b3..a1712693c18 100644 --- a/src/mame/video/gaiden.c +++ b/src/mame/video/gaiden.c @@ -44,12 +44,12 @@ static TILE_GET_INFO( get_fg_tile_info_raiga ) UINT16 *videoram2 = state->m_videoram2; /* bit 3 controls blending */ - tileinfo->category = (videoram2[tile_index] & 0x08) >> 3; + tileinfo.category = (videoram2[tile_index] & 0x08) >> 3; SET_TILE_INFO( 2, videoram1[tile_index] & 0x0fff, - ((videoram2[tile_index] & 0xf0) >> 4) | (tileinfo->category ? 0x80 : 0x00), + ((videoram2[tile_index] & 0xf0) >> 4) | (tileinfo.category ? 0x80 : 0x00), 0); } @@ -84,17 +84,17 @@ VIDEO_START( gaiden ) state->m_foreground = tilemap_create(machine, get_fg_tile_info_raiga, tilemap_scan_rows, 16, 16, 64, 32); state->m_text_layer = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_background, 0); - tilemap_set_transparent_pen(state->m_foreground, 0); - tilemap_set_transparent_pen(state->m_text_layer, 0); + state->m_background->set_transparent_pen(0); + state->m_foreground->set_transparent_pen(0); + state->m_text_layer->set_transparent_pen(0); - tilemap_set_scrolldy(state->m_background, 0, 33); - tilemap_set_scrolldy(state->m_foreground, 0, 33); - tilemap_set_scrolldy(state->m_text_layer, 0, 31); + state->m_background->set_scrolldy(0, 33); + state->m_foreground->set_scrolldy(0, 33); + state->m_text_layer->set_scrolldy(0, 31); - tilemap_set_scrolldx(state->m_background, 0, -1); - tilemap_set_scrolldx(state->m_foreground, 0, -1); - tilemap_set_scrolldx(state->m_text_layer, 0, -1); + state->m_background->set_scrolldx(0, -1); + state->m_foreground->set_scrolldx(0, -1); + state->m_text_layer->set_scrolldx(0, -1); /* set up sprites */ machine.primary_screen->register_screen_bitmap(state->m_sprite_bitmap); @@ -113,15 +113,15 @@ VIDEO_START( mastninj ) state->m_foreground = tilemap_create(machine, get_fg_tile_info_raiga, tilemap_scan_rows, 16, 16, 64, 32); state->m_text_layer = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); -// tilemap_set_transparent_pen(state->m_background, 15); - tilemap_set_transparent_pen(state->m_foreground, 15); - tilemap_set_transparent_pen(state->m_text_layer, 15); +// state->m_background->set_transparent_pen(15); + state->m_foreground->set_transparent_pen(15); + state->m_text_layer->set_transparent_pen(15); /* set up sprites */ machine.primary_screen->register_screen_bitmap(state->m_sprite_bitmap); - tilemap_set_scrolldx(state->m_background, -248, 248); - tilemap_set_scrolldx(state->m_foreground, -252, 252); + state->m_background->set_scrolldx(-248, 248); + state->m_foreground->set_scrolldx(-252, 252); } VIDEO_START( raiga ) @@ -136,9 +136,9 @@ VIDEO_START( raiga ) state->m_foreground = tilemap_create(machine, get_fg_tile_info_raiga, tilemap_scan_rows, 16, 16, 64, 32); state->m_text_layer = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_background, 0); - tilemap_set_transparent_pen(state->m_foreground, 0); - tilemap_set_transparent_pen(state->m_text_layer, 0); + state->m_background->set_transparent_pen(0); + state->m_foreground->set_transparent_pen(0); + state->m_text_layer->set_transparent_pen(0); /* set up sprites */ machine.primary_screen->register_screen_bitmap(state->m_sprite_bitmap); @@ -152,11 +152,11 @@ VIDEO_START( drgnbowl ) state->m_foreground = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); state->m_text_layer = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_foreground, 15); - tilemap_set_transparent_pen(state->m_text_layer, 15); + state->m_foreground->set_transparent_pen(15); + state->m_text_layer->set_transparent_pen(15); - tilemap_set_scrolldx(state->m_background, -248, 248); - tilemap_set_scrolldx(state->m_foreground, -252, 252); + state->m_background->set_scrolldx(-248, 248); + state->m_foreground->set_scrolldx(-252, 252); } @@ -177,42 +177,42 @@ WRITE16_HANDLER( gaiden_txscrollx_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tx_scroll_x); - tilemap_set_scrollx(state->m_text_layer, 0, state->m_tx_scroll_x); + state->m_text_layer->set_scrollx(0, state->m_tx_scroll_x); } WRITE16_HANDLER( gaiden_txscrolly_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tx_scroll_y); - tilemap_set_scrolly(state->m_text_layer, 0, (state->m_tx_scroll_y - state->m_tx_offset_y) & 0xffff); + state->m_text_layer->set_scrolly(0, (state->m_tx_scroll_y - state->m_tx_offset_y) & 0xffff); } WRITE16_HANDLER( gaiden_fgscrollx_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_scroll_x); - tilemap_set_scrollx(state->m_foreground, 0, state->m_fg_scroll_x); + state->m_foreground->set_scrollx(0, state->m_fg_scroll_x); } WRITE16_HANDLER( gaiden_fgscrolly_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_scroll_y); - tilemap_set_scrolly(state->m_foreground, 0, (state->m_fg_scroll_y - state->m_fg_offset_y) & 0xffff); + state->m_foreground->set_scrolly(0, (state->m_fg_scroll_y - state->m_fg_offset_y) & 0xffff); } WRITE16_HANDLER( gaiden_bgscrollx_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_scroll_x); - tilemap_set_scrollx(state->m_background, 0, state->m_bg_scroll_x); + state->m_background->set_scrollx(0, state->m_bg_scroll_x); } WRITE16_HANDLER( gaiden_bgscrolly_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_scroll_y); - tilemap_set_scrolly(state->m_background, 0, (state->m_bg_scroll_y - state->m_bg_offset_y) & 0xffff); + state->m_background->set_scrolly(0, (state->m_bg_scroll_y - state->m_bg_offset_y) & 0xffff); } WRITE16_HANDLER( gaiden_txoffsety_w ) @@ -221,7 +221,7 @@ WRITE16_HANDLER( gaiden_txoffsety_w ) if (ACCESSING_BITS_0_7) { state->m_tx_offset_y = data; - tilemap_set_scrolly(state->m_text_layer, 0, (state->m_tx_scroll_y - state->m_tx_offset_y) & 0xffff); + state->m_text_layer->set_scrolly(0, (state->m_tx_scroll_y - state->m_tx_offset_y) & 0xffff); } } @@ -231,7 +231,7 @@ WRITE16_HANDLER( gaiden_fgoffsety_w ) if (ACCESSING_BITS_0_7) { state->m_fg_offset_y = data; - tilemap_set_scrolly(state->m_foreground, 0, (state->m_fg_scroll_y - state->m_fg_offset_y) & 0xffff); + state->m_foreground->set_scrolly(0, (state->m_fg_scroll_y - state->m_fg_offset_y) & 0xffff); } } @@ -241,7 +241,7 @@ WRITE16_HANDLER( gaiden_bgoffsety_w ) if (ACCESSING_BITS_0_7) { state->m_bg_offset_y = data; - tilemap_set_scrolly(state->m_background, 0, (state->m_bg_scroll_y - state->m_bg_offset_y) & 0xffff); + state->m_background->set_scrolly(0, (state->m_bg_scroll_y - state->m_bg_offset_y) & 0xffff); } } @@ -260,7 +260,7 @@ WRITE16_HANDLER( gaiden_videoram3_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram3[offset]); - tilemap_mark_tile_dirty(state->m_background, offset & 0x07ff); + state->m_background->mark_tile_dirty(offset & 0x07ff); } READ16_HANDLER( gaiden_videoram3_r ) @@ -273,7 +273,7 @@ WRITE16_HANDLER( gaiden_videoram2_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram2[offset]); - tilemap_mark_tile_dirty(state->m_foreground, offset & 0x07ff); + state->m_foreground->mark_tile_dirty(offset & 0x07ff); } READ16_HANDLER( gaiden_videoram2_r ) @@ -286,7 +286,7 @@ WRITE16_HANDLER( gaiden_videoram_w ) { gaiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_text_layer, offset & 0x03ff); + state->m_text_layer->mark_tile_dirty(offset & 0x03ff); } @@ -674,12 +674,12 @@ SCREEN_UPDATE_RGB32( gaiden ) state->m_sprite_bitmap.fill(0, cliprect); /* draw tilemaps into a 16-bit bitmap */ - tilemap_draw(state->m_tile_bitmap_bg, cliprect, state->m_background, 0, 1); - tilemap_draw(state->m_tile_bitmap_fg, cliprect, state->m_foreground, 0, 2); + state->m_background->draw(state->m_tile_bitmap_bg, cliprect, 0, 1); + state->m_foreground->draw(state->m_tile_bitmap_fg, cliprect, 0, 2); /* draw the blended tiles at a lower priority so sprites covered by them will still be drawn */ - tilemap_draw(state->m_tile_bitmap_fg, cliprect, state->m_foreground, 1, 0); - tilemap_draw(state->m_tile_bitmap_fg, cliprect, state->m_text_layer, 0, 4); + state->m_foreground->draw(state->m_tile_bitmap_fg, cliprect, 1, 0); + state->m_text_layer->draw(state->m_tile_bitmap_fg, cliprect, 0, 4); /* draw sprites into a 16-bit bitmap */ gaiden_draw_sprites(screen.machine(), state->m_tile_bitmap_bg, state->m_tile_bitmap_fg, state->m_sprite_bitmap, cliprect); @@ -700,12 +700,12 @@ SCREEN_UPDATE_RGB32( raiga ) state->m_sprite_bitmap.fill(0, cliprect); /* draw tilemaps into a 16-bit bitmap */ - tilemap_draw(state->m_tile_bitmap_bg, cliprect, state->m_background, 0, 1); - tilemap_draw(state->m_tile_bitmap_fg, cliprect, state->m_foreground, 0, 2); + state->m_background->draw(state->m_tile_bitmap_bg, cliprect, 0, 1); + state->m_foreground->draw(state->m_tile_bitmap_fg, cliprect, 0, 2); /* draw the blended tiles at a lower priority so sprites covered by them will still be drawn */ - tilemap_draw(state->m_tile_bitmap_fg, cliprect, state->m_foreground, 1, 0); - tilemap_draw(state->m_tile_bitmap_fg, cliprect, state->m_text_layer, 0, 4); + state->m_foreground->draw(state->m_tile_bitmap_fg, cliprect, 1, 0); + state->m_text_layer->draw(state->m_tile_bitmap_fg, cliprect, 0, 4); /* draw sprites into a 16-bit bitmap */ raiga_draw_sprites(screen.machine(), state->m_tile_bitmap_bg, state->m_tile_bitmap_fg, state->m_sprite_bitmap, cliprect); @@ -720,9 +720,9 @@ SCREEN_UPDATE_IND16( drgnbowl ) gaiden_state *state = screen.machine().driver_data(); screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_background, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_foreground, 0, 2); - tilemap_draw(bitmap, cliprect, state->m_text_layer, 0, 4); + state->m_background->draw(bitmap, cliprect, 0, 1); + state->m_foreground->draw(bitmap, cliprect, 0, 2); + state->m_text_layer->draw(bitmap, cliprect, 0, 4); drgnbowl_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index 53252a28627..918734c3638 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -419,7 +419,7 @@ static TILE_GET_INFO( get_tile_info ) (state->m_videoram[tile_index] & 0x7f) | (flip_screen_get(machine) ? 0x80 : 0) | (state->m_galaga_gfxbank << 8), color, flip_screen_get(machine) ? TILE_FLIPX : 0); - tileinfo->group = color; + tileinfo.group = color; } @@ -457,7 +457,7 @@ WRITE8_HANDLER( galaga_videoram_w ) galaga_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER ( gatsbee_bank_w ) @@ -465,7 +465,7 @@ WRITE8_HANDLER ( gatsbee_bank_w ) galaga_state *state = space->machine().driver_data(); state->m_galaga_gfxbank = data & 0x1; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } @@ -572,7 +572,7 @@ SCREEN_UPDATE_IND16( galaga ) bitmap.fill(get_black_pen(screen.machine()), cliprect); draw_stars(screen.machine(),bitmap,cliprect); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index 1e87f8c9a3d..62f2e127744 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -396,19 +396,19 @@ VIDEO_START( galaxian ) { /* normal galaxian hardware is row-based and individually scrolling columns */ state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, GALAXIAN_XSCALE*8,8, 32,32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, -GALAXIAN_XSCALE * 128); - tilemap_set_scrolldy(state->m_bg_tilemap, 0, 8); + state->m_bg_tilemap->set_scroll_cols(32); + state->m_bg_tilemap->set_scrolldx(0, -GALAXIAN_XSCALE * 128); + state->m_bg_tilemap->set_scrolldy(0, 8); } else { /* sfx hardware is column-based and individually scrolling rows */ state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_cols, GALAXIAN_XSCALE*8,8, 32,32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, -GALAXIAN_XSCALE * 128); - tilemap_set_scrolldy(state->m_bg_tilemap, 0, 8); + state->m_bg_tilemap->set_scroll_rows(32); + state->m_bg_tilemap->set_scrolldx(0, -GALAXIAN_XSCALE * 128); + state->m_bg_tilemap->set_scrolldy(0, 8); } - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); /* initialize globals */ state->m_flipscreen_x = 0; @@ -459,7 +459,7 @@ SCREEN_UPDATE_RGB32( galaxian ) (*state->m_draw_background_ptr)(screen.machine(), bitmap, cliprect); /* draw the tilemap characters over top */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* render the sprites next */ sprites_draw(screen.machine(), bitmap, cliprect, &screen.machine().generic.spriteram.u8[0x40]); @@ -516,7 +516,7 @@ WRITE8_HANDLER( galaxian_videoram_w ) /* store the data and mark the corresponding tile dirty */ videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -539,16 +539,16 @@ WRITE8_HANDLER( galaxian_objram_w ) if (state->m_frogger_adjust) data = (data >> 4) | (data << 4); if (!state->m_sfx_tilemap) - tilemap_set_scrolly(state->m_bg_tilemap, offset >> 1, data); + state->m_bg_tilemap->set_scrolly(offset >> 1, data); else - tilemap_set_scrollx(state->m_bg_tilemap, offset >> 1, GALAXIAN_XSCALE*data); + state->m_bg_tilemap->set_scrollx(offset >> 1, GALAXIAN_XSCALE*data); } /* odd entries control the color base for the row */ else { for (offset >>= 1; offset < 0x0400; offset += 32) - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } } } @@ -682,7 +682,7 @@ WRITE8_HANDLER( galaxian_flip_screen_x_w ) stars_update_origin(space->machine()); state->m_flipscreen_x = data & 0x01; - tilemap_set_flip(state->m_bg_tilemap, (state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); } } @@ -693,7 +693,7 @@ WRITE8_HANDLER( galaxian_flip_screen_y_w ) { space->machine().primary_screen->update_now(); state->m_flipscreen_y = data & 0x01; - tilemap_set_flip(state->m_bg_tilemap, (state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); } } @@ -783,7 +783,7 @@ WRITE8_HANDLER( galaxian_gfxbank_w ) { space->machine().primary_screen->update_now(); state->m_gfxbank[offset] = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index acbc2b33639..094717f193f 100644 --- a/src/mame/video/galaxold.c +++ b/src/mame/video/galaxold.c @@ -475,10 +475,9 @@ VIDEO_START( galaxold_plain ) galaxold_state *state = machine.driver_data(); video_start_common(machine); state->m_bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); + state->m_bg_tilemap->set_transparent_pen(0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - state->m_tilemap_set_scroll = tilemap_set_scrolly; + state->m_bg_tilemap->set_scroll_cols(32); state->m_color_mask = (machine.gfx[0]->color_granularity == 4) ? 7 : 3; } @@ -501,7 +500,7 @@ VIDEO_START( scrambold ) /* FIXME: This most probably needs to be adjusted * again when RAW video params are added to scramble */ - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrolldx(0, 0); state->m_draw_stars = scrambold_draw_stars; @@ -515,7 +514,7 @@ VIDEO_START( darkplnt ) galaxold_state *state = machine.driver_data(); VIDEO_START_CALL(galaxold_plain); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrolldx(0, 0); state->m_draw_bullets = darkplnt_draw_bullets; } @@ -678,7 +677,7 @@ VIDEO_START( batman2 ) static void rockclim_draw_background(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) { galaxold_state *state = machine.driver_data(); - tilemap_draw(bitmap,cliprect,state->m_rockclim_tilemap, 0,0); + state->m_rockclim_tilemap->draw(bitmap, cliprect, 0,0); } static void rockclim_modify_spritecode(running_machine &machine, UINT8 *spriteram, int *code, int *flipx, int *flipy, int offs) @@ -722,9 +721,8 @@ VIDEO_START( drivfrcg ) video_start_common(machine); state->m_bg_tilemap = tilemap_create(machine, drivfrcg_get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - state->m_tilemap_set_scroll = tilemap_set_scrolly; + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scroll_cols(32); state->m_modify_spritecode = mshuttle_modify_spritecode; state->m_modify_color = drivfrcg_modify_color; @@ -738,9 +736,8 @@ VIDEO_START( ad2083 ) video_start_common(machine); state->m_bg_tilemap = tilemap_create(machine, drivfrcg_get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - state->m_tilemap_set_scroll = tilemap_set_scrolly; + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scroll_cols(32); state->m_modify_spritecode = ad2083_modify_spritecode; @@ -756,7 +753,7 @@ WRITE8_HANDLER( racknrol_tiles_bank_w ) { galaxold_state *state = space->machine().driver_data(); state->m_racknrol_tiles_bank[offset] = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } static TILE_GET_INFO( racknrol_get_tile_info ) @@ -778,9 +775,8 @@ VIDEO_START( racknrol ) video_start_common(machine); state->m_bg_tilemap = tilemap_create(machine, racknrol_get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - state->m_tilemap_set_scroll = tilemap_set_scrolly; + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scroll_cols(32); state->m_color_mask = 0xff; } @@ -839,7 +835,7 @@ VIDEO_START( dambustr ) state->m_dambustr_videoram2 = auto_alloc_array(machine, UINT8, 0x0400); state->m_dambustr_tilemap2 = tilemap_create(machine, dambustr_get_tile_info2,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_dambustr_tilemap2,0); + state->m_dambustr_tilemap2->set_transparent_pen(0); } @@ -847,7 +843,7 @@ WRITE8_HANDLER( galaxold_videoram_w ) { galaxold_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( galaxold_videoram_r ) @@ -868,7 +864,7 @@ WRITE8_HANDLER( galaxold_attributesram_w ) int i; for (i = offset >> 1; i < 0x0400; i += 32) - tilemap_mark_tile_dirty(state->m_bg_tilemap, i); + state->m_bg_tilemap->mark_tile_dirty(i); } else { @@ -877,7 +873,7 @@ WRITE8_HANDLER( galaxold_attributesram_w ) (*state->m_modify_ypos)(&data); } - (*state->m_tilemap_set_scroll)(state->m_bg_tilemap, offset >> 1, data); + state->m_bg_tilemap->set_scrolly(offset >> 1, data); } state->m_attributesram[offset] = data; @@ -892,7 +888,7 @@ WRITE8_HANDLER( galaxold_flip_screen_x_w ) { state->m_flipscreen_x = data & 0x01; - tilemap_set_flip(state->m_bg_tilemap, (state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); } } @@ -903,7 +899,7 @@ WRITE8_HANDLER( galaxold_flip_screen_y_w ) { state->m_flipscreen_y = data & 0x01; - tilemap_set_flip(state->m_bg_tilemap, (state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); } } @@ -980,7 +976,7 @@ WRITE8_HANDLER( galaxold_gfxbank_w ) { state->m_gfxbank[offset] = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -988,7 +984,7 @@ WRITE8_HANDLER( rockclim_videoram_w ) { galaxold_state *state = space->machine().driver_data(); state->m_rockclim_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_rockclim_tilemap, offset); + state->m_rockclim_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( rockclim_scroll_w ) @@ -996,10 +992,10 @@ WRITE8_HANDLER( rockclim_scroll_w ) galaxold_state *state = space->machine().driver_data(); switch(offset&3) { - case 0: state->m_rockclim_h=(state->m_rockclim_h&0xff00)|data;tilemap_set_scrollx(state->m_rockclim_tilemap , 0, state->m_rockclim_h );break; - case 1: state->m_rockclim_h=(state->m_rockclim_h&0xff)|(data<<8);tilemap_set_scrollx(state->m_rockclim_tilemap , 0, state->m_rockclim_h );break; - case 2: state->m_rockclim_v=(state->m_rockclim_v&0xff00)|data;tilemap_set_scrolly(state->m_rockclim_tilemap , 0, state->m_rockclim_v );break; - case 3: state->m_rockclim_v=(state->m_rockclim_v&0xff)|(data<<8);tilemap_set_scrolly(state->m_rockclim_tilemap , 0, state->m_rockclim_v );break; + case 0: state->m_rockclim_h=(state->m_rockclim_h&0xff00)|data;state->m_rockclim_tilemap ->set_scrollx(0, state->m_rockclim_h );break; + case 1: state->m_rockclim_h=(state->m_rockclim_h&0xff)|(data<<8);state->m_rockclim_tilemap ->set_scrollx(0, state->m_rockclim_h );break; + case 2: state->m_rockclim_v=(state->m_rockclim_v&0xff00)|data;state->m_rockclim_tilemap ->set_scrolly(0, state->m_rockclim_v );break; + case 3: state->m_rockclim_v=(state->m_rockclim_v&0xff)|(data<<8);state->m_rockclim_tilemap ->set_scrolly(0, state->m_rockclim_v );break; } } @@ -1026,7 +1022,7 @@ WRITE8_HANDLER( dambustr_bg_color_w ) state->m_dambustr_bg_color_2 = (BIT(data,6)<<2) | (BIT(data,5)<<1) | BIT(data,4); state->m_dambustr_bg_priority = BIT(data,3); state->m_dambustr_char_bank = BIT(data,7); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } @@ -1806,7 +1802,7 @@ SCREEN_UPDATE_IND16( galaxold ) } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_draw_bullets) { @@ -1840,7 +1836,7 @@ SCREEN_UPDATE_IND16( dambustr ) /* save the background for drawing it again later, if background has priority over characters */ copybitmap(*state->m_dambustr_tmpbitmap, bitmap, 0, 0, 0, 0, state->m_dambustr_tmpbitmap->cliprect()); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_draw_bullets) { @@ -1863,8 +1859,8 @@ SCREEN_UPDATE_IND16( dambustr ) state->m_dambustr_videoram2[32*j+i] = state->m_videoram[32*j+i]; }; }; - tilemap_mark_all_tiles_dirty(state->m_dambustr_tilemap2); - tilemap_draw(bitmap, cliprect, state->m_dambustr_tilemap2, 0, 0); + state->m_dambustr_tilemap2->mark_all_dirty(); + state->m_dambustr_tilemap2->draw(bitmap, cliprect, 0, 0); }; return 0; diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index 565c46a1737..20baf72077d 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -141,7 +141,7 @@ static TILE_GET_INFO( get_tx_tile_info ) code, (attr & 0xe0) >> 5, /* not sure */ 0); - tileinfo->category = attr & 8 ? 0 : 1; /* seems correct */ + tileinfo.category = attr & 8 ? 0 : 1; /* seems correct */ } static TILE_GET_INFO( ninjemak_get_bg_tile_info ) @@ -187,7 +187,7 @@ VIDEO_START( galivan ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 128, 128); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_tx_tilemap->set_transparent_pen(15); } VIDEO_START( ninjemak ) @@ -197,7 +197,7 @@ VIDEO_START( ninjemak ) state->m_bg_tilemap = tilemap_create(machine, ninjemak_get_bg_tile_info, tilemap_scan_cols, 16, 16, 512, 32); state->m_tx_tilemap = tilemap_create(machine, ninjemak_get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_tx_tilemap->set_transparent_pen(15); } @@ -212,7 +212,7 @@ WRITE8_HANDLER( galivan_videoram_w ) { galivan_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset & 0x3ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } /* Written through port 40 */ @@ -226,8 +226,8 @@ WRITE8_HANDLER( galivan_gfxbank_w ) /* bit 2 flip screen */ state->m_flipscreen = data & 0x04; - tilemap_set_flip (state->m_bg_tilemap, state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_flip (state->m_tx_tilemap, state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_bg_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_tx_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); /* bit 7 selects one of two ROM banks for c000-dfff */ memory_set_bank(space->machine(), "bank1", (data & 0x80) >> 7); @@ -245,8 +245,8 @@ WRITE8_HANDLER( ninjemak_gfxbank_w ) /* bit 2 flip screen */ state->m_flipscreen = data & 0x04; - tilemap_set_flip (state->m_bg_tilemap, state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_flip (state->m_tx_tilemap, state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_bg_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_tx_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); /* bit 3 unknown */ @@ -348,25 +348,25 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( galivan ) { galivan_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_galivan_scrollx[0] + 256 * (state->m_galivan_scrollx[1] & 0x07)); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_galivan_scrolly[0] + 256 * (state->m_galivan_scrolly[1] & 0x07)); + state->m_bg_tilemap->set_scrollx(0, state->m_galivan_scrollx[0] + 256 * (state->m_galivan_scrollx[1] & 0x07)); + state->m_bg_tilemap->set_scrolly(0, state->m_galivan_scrolly[0] + 256 * (state->m_galivan_scrolly[1] & 0x07)); if (state->m_layers & 0x40) bitmap.fill(0, cliprect); else - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_layers & 0x20) { - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 1, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 1, 0); draw_sprites(screen.machine(), bitmap, cliprect); } else { draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 1, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 1, 0); } return 0; @@ -377,15 +377,15 @@ SCREEN_UPDATE_IND16( ninjemak ) galivan_state *state = screen.machine().driver_data(); /* (scrollx[1] & 0x40) does something */ - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrolly); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_scrolly); if (state->m_ninjemak_dispdisable) bitmap.fill(0, cliprect); else - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c index 257e7705420..b07b459e7cb 100644 --- a/src/mame/video/gaplus.c +++ b/src/mame/video/gaplus.c @@ -98,8 +98,8 @@ static TILE_GET_INFO( get_tile_info ) { gaplus_state *state = machine.driver_data(); UINT8 attr = state->m_videoram[tile_index + 0x400]; - tileinfo->category = (attr & 0x40) >> 6; - tileinfo->group = attr & 0x3f; + tileinfo.category = (attr & 0x40) >> 6; + tileinfo.group = attr & 0x3f; SET_TILE_INFO( 0, state->m_videoram[tile_index] + ((attr & 0x80) << 1), @@ -207,7 +207,7 @@ WRITE8_HANDLER( gaplus_videoram_w ) { gaplus_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( gaplus_starfield_control_w ) @@ -318,13 +318,13 @@ SCREEN_UPDATE_IND16( gaplus ) starfield_render(screen.machine(), bitmap); /* draw the low priority characters */ - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect); /* draw the high priority characters */ /* (I don't know if this feature is used by Gaplus, but it's shown in the schematics) */ - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1,0); return 0; } diff --git a/src/mame/video/gatron.c b/src/mame/video/gatron.c index eb9bdaef037..3d65ff9c91c 100644 --- a/src/mame/video/gatron.c +++ b/src/mame/video/gatron.c @@ -26,7 +26,7 @@ WRITE8_HANDLER( gat_videoram_w ) gatron_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -54,7 +54,7 @@ VIDEO_START( gat ) SCREEN_UPDATE_IND16( gat ) { gatron_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gauntlet.c b/src/mame/video/gauntlet.c index bdfa9f02532..4844bde83b0 100644 --- a/src/mame/video/gauntlet.c +++ b/src/mame/video/gauntlet.c @@ -96,7 +96,7 @@ VIDEO_START( gauntlet ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* modify the motion object code lookup table to account for the code XOR */ codelookup = atarimo_get_code_lookup(0, &size); @@ -131,7 +131,7 @@ WRITE16_HANDLER( gauntlet_xscroll_w ) space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); /* adjust the scrolls */ - tilemap_set_scrollx(state->m_playfield_tilemap, 0, *state->m_xscroll); + state->m_playfield_tilemap->set_scrollx(0, *state->m_xscroll); atarimo_set_xscroll(0, *state->m_xscroll & 0x1ff); } } @@ -159,11 +159,11 @@ WRITE16_HANDLER( gauntlet_yscroll_w ) if (state->m_playfield_tile_bank != (*state->m_yscroll & 3)) { state->m_playfield_tile_bank = *state->m_yscroll & 3; - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); } /* adjust the scrolls */ - tilemap_set_scrolly(state->m_playfield_tilemap, 0, *state->m_yscroll >> 7); + state->m_playfield_tilemap->set_scrolly(0, *state->m_yscroll >> 7); atarimo_set_yscroll(0, (*state->m_yscroll >> 7) & 0x1ff); } } @@ -184,7 +184,7 @@ SCREEN_UPDATE_IND16( gauntlet ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -215,6 +215,6 @@ SCREEN_UPDATE_IND16( gauntlet ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index 87cb4c60ce0..da7c2853140 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -81,14 +81,14 @@ WRITE8_HANDLER( gberet_videoram_w ) { gberet_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gberet_colorram_w ) { gberet_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gberet_scroll_w ) @@ -99,7 +99,7 @@ WRITE8_HANDLER( gberet_scroll_w ) state->m_scrollram[offset] = data; scroll = state->m_scrollram[offset & 0x1f] | (state->m_scrollram[offset | 0x20] << 8); - tilemap_set_scrollx(state->m_bg_tilemap, offset & 0x1f, scroll); + state->m_bg_tilemap->set_scrollx(offset & 0x1f, scroll); } WRITE8_HANDLER( gberet_sprite_bank_w ) @@ -116,8 +116,8 @@ static TILE_GET_INFO( get_bg_tile_info ) int color = attr & 0x0f; int flags = TILE_FLIPYX((attr & 0x30) >> 4); - tileinfo->group = color; - tileinfo->category = (attr & 0x80) >> 7; + tileinfo.group = color; + tileinfo.category = (attr & 0x80) >> 7; SET_TILE_INFO(0, code, color, flags); } @@ -128,7 +128,7 @@ VIDEO_START( gberet ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); colortable_configure_tilemap_groups(machine.colortable, state->m_bg_tilemap, machine.gfx[0], 0x10); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); } static void gberet_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -172,9 +172,9 @@ SCREEN_UPDATE_IND16( gberet ) { gberet_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); gberet_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -189,7 +189,7 @@ WRITE8_HANDLER( gberetb_scroll_w ) scroll |= 0x100; for (offset = 6; offset < 29; offset++) - tilemap_set_scrollx(state->m_bg_tilemap, offset, scroll + 64 - 8); + state->m_bg_tilemap->set_scrollx(offset, scroll + 64 - 8); } static void gberetb_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -227,8 +227,8 @@ static void gberetb_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap SCREEN_UPDATE_IND16( gberetb ) { gberet_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); gberetb_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c index a080151ee42..58c8dc3bf16 100644 --- a/src/mame/video/gcpinbal.c +++ b/src/mame/video/gcpinbal.c @@ -53,17 +53,17 @@ static void gcpinbal_core_vh_start( running_machine &machine ) state->m_tilemap[1] = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows,16,16,32,32); state->m_tilemap[2] = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows,8,8,64,64); - tilemap_set_transparent_pen(state->m_tilemap[0], 0); - tilemap_set_transparent_pen(state->m_tilemap[1], 0); - tilemap_set_transparent_pen(state->m_tilemap[2], 0); + state->m_tilemap[0]->set_transparent_pen(0); + state->m_tilemap[1]->set_transparent_pen(0); + state->m_tilemap[2]->set_transparent_pen(0); /* flipscreen n/a */ - tilemap_set_scrolldx(state->m_tilemap[0], -xoffs, 0); - tilemap_set_scrolldx(state->m_tilemap[1], -xoffs, 0); - tilemap_set_scrolldx(state->m_tilemap[2], -xoffs, 0); - tilemap_set_scrolldy(state->m_tilemap[0], -yoffs, 0); - tilemap_set_scrolldy(state->m_tilemap[1], -yoffs, 0); - tilemap_set_scrolldy(state->m_tilemap[2], -yoffs, 0); + state->m_tilemap[0]->set_scrolldx(-xoffs, 0); + state->m_tilemap[1]->set_scrolldx(-xoffs, 0); + state->m_tilemap[2]->set_scrolldx(-xoffs, 0); + state->m_tilemap[0]->set_scrolldy(-yoffs, 0); + state->m_tilemap[1]->set_scrolldy(-yoffs, 0); + state->m_tilemap[2]->set_scrolldy(-yoffs, 0); } VIDEO_START( gcpinbal ) @@ -88,11 +88,11 @@ WRITE16_HANDLER( gcpinbal_tilemaps_word_w ) COMBINE_DATA(&state->m_tilemapram[offset]); if (offset < 0x800) /* BG0 */ - tilemap_mark_tile_dirty(state->m_tilemap[0], offset / 2); + state->m_tilemap[0]->mark_tile_dirty(offset / 2); else if ((offset < 0x1000)) /* BG1 */ - tilemap_mark_tile_dirty(state->m_tilemap[1], (offset % 0x800) / 2); + state->m_tilemap[1]->mark_tile_dirty((offset % 0x800) / 2); else if ((offset < 0x1800)) /* FG */ - tilemap_mark_tile_dirty(state->m_tilemap[2], (offset % 0x800)); + state->m_tilemap[2]->mark_tile_dirty((offset % 0x800)); } @@ -288,8 +288,8 @@ SCREEN_UPDATE_IND16( gcpinbal ) for (i = 0; i < 3; i++) { - tilemap_set_scrollx(state->m_tilemap[i], 0, state->m_scrollx[i]); - tilemap_set_scrolly(state->m_tilemap[i], 0, state->m_scrolly[i]); + state->m_tilemap[i]->set_scrollx(0, state->m_scrollx[i]); + state->m_tilemap[i]->set_scrolly(0, state->m_scrolly[i]); } screen.machine().priority_bitmap.fill(0, cliprect); @@ -303,17 +303,17 @@ SCREEN_UPDATE_IND16( gcpinbal ) #ifdef MAME_DEBUG if (state->m_dislayer[layer[0]] == 0) #endif - tilemap_draw(bitmap, cliprect, state->m_tilemap[layer[0]], TILEMAP_DRAW_OPAQUE, 1); + state->m_tilemap[layer[0]]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 1); #ifdef MAME_DEBUG if (state->m_dislayer[layer[1]] == 0) #endif - tilemap_draw(bitmap, cliprect, state->m_tilemap[layer[1]], 0, 2); + state->m_tilemap[layer[1]]->draw(bitmap, cliprect, 0, 2); #ifdef MAME_DEBUG if (state->m_dislayer[layer[2]] == 0) #endif - tilemap_draw(bitmap, cliprect, state->m_tilemap[layer[2]], 0, 4); + state->m_tilemap[layer[2]]->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect, 16); diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index b16781ee1f3..fe2f04aed7d 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -107,7 +107,7 @@ WRITE16_HANDLER( ginganin_fgram16_w ) { ginganin_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fgram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -132,7 +132,7 @@ WRITE16_HANDLER( ginganin_txtram16_w ) { ginganin_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_txtram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } @@ -143,8 +143,8 @@ VIDEO_START( ginganin ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 16, 16, FG_NX, FG_NY); state->m_tx_tilemap = tilemap_create(machine, get_txt_tile_info, tilemap_scan_rows, 8, 8, TXT_NX, TXT_NY); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); } @@ -157,16 +157,16 @@ WRITE16_HANDLER( ginganin_vregs16_w ) switch (offset) { case 0: - tilemap_set_scrolly(state->m_fg_tilemap, 0, data); + state->m_fg_tilemap->set_scrolly(0, data); break; case 1: - tilemap_set_scrollx(state->m_fg_tilemap, 0, data); + state->m_fg_tilemap->set_scrollx(0, data); break; case 2: - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); break; case 3: - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); break; case 4: state->m_layers_ctrl = data; @@ -176,7 +176,7 @@ WRITE16_HANDLER( ginganin_vregs16_w ) */ case 6: state->m_flipscreen = !(data & 1); - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); break; case 7: soundlatch_w(space, 0, data); @@ -262,10 +262,10 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) if (msk != 0) layers_ctrl1 &= msk; #define SETSCROLL \ - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_posx); \ - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_posy); \ - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_posx); \ - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_posy); \ + state->m_bg_tilemap->set_scrollx(0, state->m_posx); \ + state->m_bg_tilemap->set_scrolly(0, state->m_posy); \ + state->m_fg_tilemap->set_scrollx(0, state->m_posx); \ + state->m_fg_tilemap->set_scrolly(0, state->m_posy); \ popmessage("B>%04X:%04X F>%04X:%04X",state->m_posx%(BG_NX*16),state->m_posy%(BG_NY*16),state->m_posx%(FG_NX*16),state->m_posy%(FG_NY*16)); if (screen.machine().input().code_pressed(KEYCODE_L)) { state->m_posx +=8; SETSCROLL } @@ -279,16 +279,16 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) if (layers_ctrl1 & 1) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(0, cliprect); if (layers_ctrl1 & 2) - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); if (layers_ctrl1 & 8) draw_sprites(screen.machine(), bitmap, cliprect); if (layers_ctrl1 & 4) - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c index c1c0f31dc9d..dab763949d1 100644 --- a/src/mame/video/gladiatr.c +++ b/src/mame/video/gladiatr.c @@ -50,9 +50,9 @@ VIDEO_START( ppking ) state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,8,8,32,64); state->m_fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan_rows,8,8,32,64); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scroll_cols(state->m_bg_tilemap, 0x10); + state->m_bg_tilemap->set_scroll_cols(0x10); state->m_sprite_bank = 1; } @@ -63,10 +63,10 @@ VIDEO_START( gladiatr ) state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,8,8,64,32); state->m_fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg_tilemap, -0x30, 0x12f); - tilemap_set_scrolldx(state->m_fg_tilemap, -0x30, 0x12f); + state->m_bg_tilemap->set_scrolldx(-0x30, 0x12f); + state->m_fg_tilemap->set_scrolldx(-0x30, 0x12f); state->m_sprite_bank = 2; } @@ -83,21 +83,21 @@ WRITE8_HANDLER( gladiatr_videoram_w ) { gladiatr_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gladiatr_colorram_w ) { gladiatr_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gladiatr_textram_w ) { gladiatr_state *state = space->machine().driver_data(); state->m_textram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gladiatr_paletteram_w ) @@ -138,7 +138,7 @@ WRITE8_HANDLER( ppking_video_registers_w ) switch (offset & 0x300) { case 0x000: - tilemap_set_scrolly(state->m_bg_tilemap, offset & 0x0f, 0x100-data); + state->m_bg_tilemap->set_scrolly(offset & 0x0f, 0x100-data); break; case 0x200: if (data & 0x80) @@ -150,7 +150,7 @@ WRITE8_HANDLER( ppking_video_registers_w ) if (state->m_fg_tile_bank != (data & 0x03)) { state->m_fg_tile_bank = data & 0x03; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } state->m_video_attributes = data; break; @@ -171,12 +171,12 @@ WRITE8_HANDLER( gladiatr_video_registers_w ) if (state->m_fg_tile_bank != (data & 0x03)) { state->m_fg_tile_bank = data & 0x03; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } if (state->m_bg_tile_bank != ((data & 0x10) >> 4)) { state->m_bg_tile_bank = (data & 0x10) >> 4; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } state->m_video_attributes = data; break; @@ -254,7 +254,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( ppking ) { gladiatr_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); /* the fg layer just selects the upper palette bank on underlying pixels */ @@ -262,8 +262,8 @@ SCREEN_UPDATE_IND16( ppking ) int sx = cliprect.min_x; int sy = cliprect.min_y; - tilemap_get_pixmap( state->m_fg_tilemap ); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap( state->m_fg_tilemap ); + state->m_fg_tilemap ->pixmap(); + bitmap_ind8 &flagsbitmap = state->m_fg_tilemap ->flagsmap(); while( sy <= cliprect.max_y ) { @@ -294,17 +294,17 @@ SCREEN_UPDATE_IND16( gladiatr ) int scroll; scroll = state->m_bg_scrollx + ((state->m_video_attributes & 0x04) << 6); - tilemap_set_scrollx(state->m_bg_tilemap, 0, scroll ^ (flip_screen_get(screen.machine()) ? 0x0f : 0)); + state->m_bg_tilemap->set_scrollx(0, scroll ^ (flip_screen_get(screen.machine()) ? 0x0f : 0)); scroll = state->m_fg_scrollx + ((state->m_video_attributes & 0x08) << 5); - tilemap_set_scrollx(state->m_fg_tilemap, 0, scroll ^ (flip_screen_get(screen.machine()) ? 0x0f : 0)); + state->m_fg_tilemap->set_scrollx(0, scroll ^ (flip_screen_get(screen.machine()) ? 0x0f : 0)); // always 0 anyway - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_fg_scrolly); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); + state->m_fg_tilemap->set_scrolly(0, state->m_fg_scrolly); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); } else bitmap.fill(get_black_pen(screen.machine()), cliprect ); diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index 10739c2edd7..7de62cf0dc1 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -117,7 +117,7 @@ WRITE16_HANDLER( glass_vram_w ) { glass_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_pant[offset >> 11], ((offset << 1) & 0x0fff) >> 2); + state->m_pant[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2); } @@ -136,8 +136,8 @@ VIDEO_START( glass ) state->save_item(NAME(*state->m_screen_bitmap)); - tilemap_set_transparent_pen(state->m_pant[0], 0); - tilemap_set_transparent_pen(state->m_pant[1], 0); + state->m_pant[0]->set_transparent_pen(0); + state->m_pant[1]->set_transparent_pen(0); } @@ -199,16 +199,16 @@ SCREEN_UPDATE_IND16( glass ) { glass_state *state = screen.machine().driver_data(); /* set scroll registers */ - tilemap_set_scrolly(state->m_pant[0], 0, state->m_vregs[0]); - tilemap_set_scrollx(state->m_pant[0], 0, state->m_vregs[1] + 0x04); - tilemap_set_scrolly(state->m_pant[1], 0, state->m_vregs[2]); - tilemap_set_scrollx(state->m_pant[1], 0, state->m_vregs[3]); + state->m_pant[0]->set_scrolly(0, state->m_vregs[0]); + state->m_pant[0]->set_scrollx(0, state->m_vregs[1] + 0x04); + state->m_pant[1]->set_scrolly(0, state->m_vregs[2]); + state->m_pant[1]->set_scrollx(0, state->m_vregs[3]); /* draw layers + sprites */ bitmap.fill(get_black_pen(screen.machine()), cliprect); copybitmap(bitmap, *state->m_screen_bitmap, 0, 0, 0x18, 0x24, cliprect); - tilemap_draw(bitmap, cliprect, state->m_pant[1], 0, 0); - tilemap_draw(bitmap, cliprect, state->m_pant[0], 0, 0); + state->m_pant[1]->draw(bitmap, cliprect, 0, 0); + state->m_pant[0]->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index 43d2e21396f..1960f086fd9 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_bg_tile_info ) state->m_bgvideoram[tile_index] + ((attr & 0xc0) << 2), attr & 0x07, TILE_FLIPYX((attr & 0x30) >> 4)); - tileinfo->group = (attr & 0x08) >> 3; + tileinfo.group = (attr & 0x08) >> 3; } @@ -53,9 +53,9 @@ VIDEO_START( gng ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 3); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x41, 0xbe); /* split type 1 has pens 0 and 6 transparent in front half */ + state->m_fg_tilemap->set_transparent_pen(3); + state->m_bg_tilemap->set_transmask(0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x41, 0xbe); /* split type 1 has pens 0 and 6 transparent in front half */ } @@ -69,14 +69,14 @@ WRITE8_HANDLER( gng_fgvideoram_w ) { gng_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( gng_bgvideoram_w ) { gng_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -84,14 +84,14 @@ WRITE8_HANDLER( gng_bgscrollx_w ) { gng_state *state = space->machine().driver_data(); state->m_scrollx[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx[0] + 256 * state->m_scrollx[1]); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx[0] + 256 * state->m_scrollx[1]); } WRITE8_HANDLER( gng_bgscrolly_w ) { gng_state *state = space->machine().driver_data(); state->m_scrolly[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrolly[0] + 256 * state->m_scrolly[1]); + state->m_bg_tilemap->set_scrolly(0, state->m_scrolly[0] + 256 * state->m_scrolly[1]); } @@ -143,10 +143,10 @@ SCREEN_UPDATE_IND16( gng ) { gng_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c index b4a34c19b9f..f01c811e142 100644 --- a/src/mame/video/goal92.c +++ b/src/mame/video/goal92.c @@ -20,7 +20,7 @@ WRITE16_HANDLER( goal92_fg_bank_w ) if (ACCESSING_BITS_0_7) { - tilemap_mark_all_tiles_dirty(state->m_fg_layer); + state->m_fg_layer->mark_all_dirty(); } } @@ -28,21 +28,21 @@ WRITE16_HANDLER( goal92_text_w ) { goal92_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tx_data[offset]); - tilemap_mark_tile_dirty(state->m_tx_layer, offset); + state->m_tx_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( goal92_background_w ) { goal92_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_data[offset]); - tilemap_mark_tile_dirty(state->m_bg_layer, offset); + state->m_bg_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( goal92_foreground_w ) { goal92_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_data[offset]); - tilemap_mark_tile_dirty(state->m_fg_layer, offset); + state->m_fg_layer->mark_tile_dirty(offset); } static TILE_GET_INFO( get_text_tile_info ) @@ -147,44 +147,44 @@ VIDEO_START( goal92 ) state->m_buffered_spriteram = auto_alloc_array(machine, UINT16, 0x400 * 2); state_save_register_global_pointer(machine, state->m_buffered_spriteram, 0x400 * 2); - tilemap_set_transparent_pen(state->m_bg_layer, 15); - tilemap_set_transparent_pen(state->m_fg_layer, 15); - tilemap_set_transparent_pen(state->m_tx_layer, 15); + state->m_bg_layer->set_transparent_pen(15); + state->m_fg_layer->set_transparent_pen(15); + state->m_tx_layer->set_transparent_pen(15); } SCREEN_UPDATE_IND16( goal92 ) { goal92_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_layer, 0, state->m_scrollram[0] + 60); - tilemap_set_scrolly(state->m_bg_layer, 0, state->m_scrollram[1] + 8); + state->m_bg_layer->set_scrollx(0, state->m_scrollram[0] + 60); + state->m_bg_layer->set_scrolly(0, state->m_scrollram[1] + 8); if (state->m_fg_bank & 0xff) { - tilemap_set_scrollx(state->m_fg_layer, 0, state->m_scrollram[0] + 60); - tilemap_set_scrolly(state->m_fg_layer, 0, state->m_scrollram[1] + 8); + state->m_fg_layer->set_scrollx(0, state->m_scrollram[0] + 60); + state->m_fg_layer->set_scrolly(0, state->m_scrollram[1] + 8); } else { - tilemap_set_scrollx(state->m_fg_layer, 0, state->m_scrollram[2] + 60); - tilemap_set_scrolly(state->m_fg_layer, 0, state->m_scrollram[3] + 8); + state->m_fg_layer->set_scrollx(0, state->m_scrollram[2] + 60); + state->m_fg_layer->set_scrolly(0, state->m_scrollram[3] + 8); } bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_layer, 0, 0); + state->m_bg_layer->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 2); if (!(state->m_fg_bank & 0xff)) draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_layer, 0, 0); + state->m_fg_layer->draw(bitmap, cliprect, 0, 0); if(state->m_fg_bank & 0xff) draw_sprites(screen.machine(), bitmap, cliprect, 1); draw_sprites(screen.machine(), bitmap, cliprect, 0); draw_sprites(screen.machine(), bitmap, cliprect, 3); - tilemap_draw(bitmap, cliprect, state->m_tx_layer, 0, 0); + state->m_tx_layer->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c index ce278e0befd..922d1df7c15 100644 --- a/src/mame/video/goindol.c +++ b/src/mame/video/goindol.c @@ -53,7 +53,7 @@ VIDEO_START( goindol ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -67,14 +67,14 @@ WRITE8_HANDLER( goindol_fg_videoram_w ) { goindol_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( goindol_bg_videoram_w ) { goindol_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -126,11 +126,11 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( goindol ) { goindol_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_fg_tilemap, 0, *state->m_fg_scrollx); - tilemap_set_scrolly(state->m_fg_tilemap, 0, *state->m_fg_scrolly); + state->m_fg_tilemap->set_scrollx(0, *state->m_fg_scrollx); + state->m_fg_tilemap->set_scrolly(0, *state->m_fg_scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1, state->m_spriteram); draw_sprites(screen.machine(), bitmap, cliprect, 0, state->m_spriteram2); return 0; diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index 19a32b14cbe..663cb3b8424 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -55,7 +55,7 @@ WRITE8_HANDLER( goldstar_fg_vidram_w ) goldstar_state *state = space->machine().driver_data(); state->m_fg_vidram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( goldstar_fg_atrram_w ) @@ -63,7 +63,7 @@ WRITE8_HANDLER( goldstar_fg_atrram_w ) goldstar_state *state = space->machine().driver_data(); state->m_fg_atrram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_goldstar_fg_tile_info ) @@ -114,7 +114,7 @@ WRITE8_HANDLER( goldstar_reel1_ram_w ) goldstar_state *state = space->machine().driver_data(); state->m_reel1_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel1_tilemap,offset); + state->m_reel1_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_goldstar_reel1_tile_info ) @@ -134,7 +134,7 @@ WRITE8_HANDLER( goldstar_reel2_ram_w ) { goldstar_state *state = space->machine().driver_data(); state->m_reel2_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel2_tilemap,offset); + state->m_reel2_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_goldstar_reel2_tile_info ) @@ -154,7 +154,7 @@ WRITE8_HANDLER( goldstar_reel3_ram_w ) goldstar_state *state = space->machine().driver_data(); state->m_reel3_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel3_tilemap,offset); + state->m_reel3_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_goldstar_reel3_tile_info ) @@ -174,7 +174,7 @@ WRITE8_HANDLER( unkch_reel1_attrram_w ) goldstar_state *state = space->machine().driver_data(); state->m_reel1_attrram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel1_tilemap,offset); + state->m_reel1_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( unkch_reel2_attrram_w ) @@ -182,7 +182,7 @@ WRITE8_HANDLER( unkch_reel2_attrram_w ) goldstar_state *state = space->machine().driver_data(); state->m_reel2_attrram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel2_tilemap,offset); + state->m_reel2_tilemap->mark_tile_dirty(offset); } @@ -191,7 +191,7 @@ WRITE8_HANDLER( unkch_reel3_attrram_w ) goldstar_state *state = space->machine().driver_data(); state->m_reel3_attrram[offset] = data; - tilemap_mark_tile_dirty(state->m_reel3_tilemap,offset); + state->m_reel3_tilemap->mark_tile_dirty(offset); } @@ -245,12 +245,12 @@ VIDEO_START( goldstar ) state->m_reel2_tilemap = tilemap_create(machine,get_goldstar_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); state->m_reel3_tilemap = tilemap_create(machine,get_goldstar_reel3_tile_info,tilemap_scan_rows,8,32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 64); + state->m_reel1_tilemap->set_scroll_cols(64); + state->m_reel2_tilemap->set_scroll_cols(64); + state->m_reel3_tilemap->set_scroll_cols(64); state->m_fg_tilemap = tilemap_create(machine,get_goldstar_fg_tile_info,tilemap_scan_rows,8,8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); // is there an enable reg for this game? state->m_cm_enable_reg = 0x0b; @@ -262,10 +262,10 @@ VIDEO_START( bingowng ) state->m_reel1_tilemap = tilemap_create(machine,get_goldstar_reel1_tile_info,tilemap_scan_rows,8,32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 64); + state->m_reel1_tilemap->set_scroll_cols(64); state->m_fg_tilemap = tilemap_create(machine,get_goldstar_fg_tile_info,tilemap_scan_rows,8,8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); // is there an enable reg for this game? state->m_cm_enable_reg = 0x0b; @@ -279,12 +279,12 @@ VIDEO_START( magical ) state->m_reel2_tilemap = tilemap_create(machine,get_goldstar_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); state->m_reel3_tilemap = tilemap_create(machine,get_goldstar_reel3_tile_info,tilemap_scan_rows,8,32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 32); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 32); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 32); + state->m_reel1_tilemap->set_scroll_cols(32); + state->m_reel2_tilemap->set_scroll_cols(32); + state->m_reel3_tilemap->set_scroll_cols(32); state->m_fg_tilemap = tilemap_create(machine,get_magical_fg_tile_info,tilemap_scan_rows,8,8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); // is there an enable reg for this game? state->m_cm_enable_reg = 0x0b; @@ -298,16 +298,16 @@ VIDEO_START( unkch ) state->m_reel2_tilemap = tilemap_create(machine,get_unkch_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); state->m_reel3_tilemap = tilemap_create(machine,get_unkch_reel3_tile_info,tilemap_scan_rows,8,32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 32); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 32); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 32); + state->m_reel1_tilemap->set_scroll_cols(32); + state->m_reel2_tilemap->set_scroll_cols(32); + state->m_reel3_tilemap->set_scroll_cols(32); state->m_cmaster_girl_num = 0; state->m_cmaster_girl_pal = 0; state->m_unkch_vidreg = 0x00; state->m_fg_tilemap = tilemap_create(machine,get_cherrym_fg_tile_info,tilemap_scan_rows,8,8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_cm_enable_reg = 0x0b; } @@ -320,15 +320,15 @@ VIDEO_START( cherrym ) state->m_reel2_tilemap = tilemap_create(machine,get_goldstar_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); state->m_reel3_tilemap = tilemap_create(machine,get_goldstar_reel3_tile_info,tilemap_scan_rows,8,32, 64, 8); - tilemap_set_scroll_cols(state->m_reel1_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel2_tilemap, 64); - tilemap_set_scroll_cols(state->m_reel3_tilemap, 64); + state->m_reel1_tilemap->set_scroll_cols(64); + state->m_reel2_tilemap->set_scroll_cols(64); + state->m_reel3_tilemap->set_scroll_cols(64); state->m_cmaster_girl_num = 0; state->m_cmaster_girl_pal = 0; state->m_fg_tilemap = tilemap_create(machine,get_cherrym_fg_tile_info,tilemap_scan_rows,8,8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_cm_enable_reg = 0x0b; } @@ -343,9 +343,9 @@ WRITE8_HANDLER( goldstar_fa00_w ) /* bit 2 selects background gfx color (I think) */ state->m_bgcolor = (data & 0x04) >> 2; - tilemap_mark_all_tiles_dirty (state->m_reel1_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel2_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel3_tilemap); + state->m_reel1_tilemap->mark_all_dirty(); + state->m_reel2_tilemap->mark_all_dirty(); + state->m_reel3_tilemap->mark_all_dirty(); } WRITE8_HANDLER( cm_background_col_w ) @@ -381,9 +381,9 @@ WRITE8_HANDLER( cm_background_col_w ) state->m_bgcolor = (data & 0x03) >> 0; #endif - tilemap_mark_all_tiles_dirty (state->m_reel1_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel2_tilemap); - tilemap_mark_all_tiles_dirty (state->m_reel3_tilemap); + state->m_reel1_tilemap->mark_all_dirty(); + state->m_reel2_tilemap->mark_all_dirty(); + state->m_reel3_tilemap->mark_all_dirty(); } @@ -402,9 +402,9 @@ SCREEN_UPDATE_IND16( goldstar ) { for (i= 0;i < 64;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i]); + state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i]); } @@ -413,9 +413,9 @@ SCREEN_UPDATE_IND16( goldstar ) const rectangle visible2(0*8, (14+48)*8-1, 12*8, (12+7)*8-1); const rectangle visible3(0*8, (14+48)*8-1, 20*8, (20+7)*8-1); - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2, state->m_reel2_tilemap, 0, 0); - tilemap_draw(bitmap, visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel3_tilemap->draw(bitmap, visible3, 0, 0); } if (state->m_cm_enable_reg &0x04) @@ -432,7 +432,7 @@ SCREEN_UPDATE_IND16( goldstar ) if (state->m_cm_enable_reg &0x02) { - tilemap_draw(bitmap,cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } return 0; @@ -453,12 +453,12 @@ SCREEN_UPDATE_IND16( bingowng ) { for (i= 0;i < 64;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i]); } const rectangle visible1(0*8, (14+48)*8-1, 3*8, (4+7)*8-1); - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); } if (state->m_cm_enable_reg &0x04) @@ -475,7 +475,7 @@ SCREEN_UPDATE_IND16( bingowng ) if (state->m_cm_enable_reg &0x02) { - tilemap_draw(bitmap,cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } return 0; @@ -499,26 +499,26 @@ SCREEN_UPDATE_IND16( magical ) { for (i= 0;i < 32;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i*2]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i*2]); - // tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i*2]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i*2]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i*2]); + // state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i*2]); } const rectangle visible1alt(0*8, (16+48)*8-1, 4*8, 16*8-1); const rectangle visible2alt(0*8, (16+48)*8-1, 16*8, 28*8-1); - tilemap_draw(bitmap, visible1alt, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2alt, state->m_reel2_tilemap, 0, 0); - //tilemap_draw(bitmap, &magical_visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1alt, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2alt, 0, 0); + //state->m_reel3_tilemap->draw(bitmap, &magical_visible3, 0, 0); } else { for (i= 0;i < 32;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i*2]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i*2]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i*2]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i*2]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i*2]); + state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i*2]); } @@ -526,15 +526,15 @@ SCREEN_UPDATE_IND16( magical ) const rectangle visible2(0*8, (14+48)*8-1, 12*8, (12+8)*8-1); const rectangle visible3(0*8, (14+48)*8-1, 20*8, (20+8)*8-1); - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2, state->m_reel2_tilemap, 0, 0); - tilemap_draw(bitmap, visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel3_tilemap->draw(bitmap, visible3, 0, 0); } } if (state->m_cm_enable_reg &0x02) { - tilemap_draw(bitmap,cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } return 0; @@ -559,12 +559,12 @@ SCREEN_UPDATE_IND16( unkch ) { for (i= 0;i < 32;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, -0x08/*state->m_reel1_scroll[(i*2)+1]*/); - // tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[(i*2)+1]); - // tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[(i*2)+1]); + state->m_reel1_tilemap->set_scrolly(i, -0x08/*state->m_reel1_scroll[(i*2)+1]*/); + // state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[(i*2)+1]); + // state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[(i*2)+1]); } - tilemap_draw(bitmap, cliprect, state->m_reel1_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, cliprect, 0, 0); } // or draw the reels normally? @@ -572,24 +572,24 @@ SCREEN_UPDATE_IND16( unkch ) { for (i= 0;i < 32;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i*2]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i*2]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i*2]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i*2]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i*2]); + state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i*2]); } const rectangle visible1(0*8, (14+48)*8-1, 3*8, (3+7)*8-1); const rectangle visible2(0*8, (14+48)*8-1, 10*8, (10+7)*8-1); const rectangle visible3(0*8, (14+48)*8-1, 17*8, (17+7)*8-1); - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2, state->m_reel2_tilemap, 0, 0); - tilemap_draw(bitmap, visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel3_tilemap->draw(bitmap, visible3, 0, 0); } } if (state->m_cm_enable_reg &0x02) { - tilemap_draw(bitmap,cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } return 0; @@ -609,23 +609,23 @@ SCREEN_UPDATE_IND16( cmast91 ) { for (i= 0;i < 64;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i]); + state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i]); } const rectangle visible1(0*8, (14+48)*8-1, 4*8, (4+7)*8-1); /* same start for reel1 */ const rectangle visible2(0*8, (14+48)*8-1, 11*8, (12+7)*8-1); /* 4 pixels less for reel2 */ const rectangle visible3(0*8, (14+48)*8-1, 19*8, (19+7)*8-1); /* 8 pixels less for reel3 */ - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2, state->m_reel2_tilemap, 0, 0); - tilemap_draw(bitmap, visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel3_tilemap->draw(bitmap, visible3, 0, 0); } if (state->m_cm_enable_reg &0x02) { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } return 0; @@ -645,18 +645,18 @@ SCREEN_UPDATE_IND16( amcoe1a ) { for (i= 0;i < 64;i++) { - tilemap_set_scrolly(state->m_reel1_tilemap, i, state->m_reel1_scroll[i]); - tilemap_set_scrolly(state->m_reel2_tilemap, i, state->m_reel2_scroll[i]); - tilemap_set_scrolly(state->m_reel3_tilemap, i, state->m_reel3_scroll[i]); + state->m_reel1_tilemap->set_scrolly(i, state->m_reel1_scroll[i]); + state->m_reel2_tilemap->set_scrolly(i, state->m_reel2_scroll[i]); + state->m_reel3_tilemap->set_scrolly(i, state->m_reel3_scroll[i]); } const rectangle visible1(0*8, (14+48)*8-1, 4*8, (4+6)*8-1); const rectangle visible2(0*8, (14+48)*8-1, 10*8, (10+6)*8-1); const rectangle visible3(0*8, (14+48)*8-1, 16*8, (16+6)*8-1); - tilemap_draw(bitmap, visible1, state->m_reel1_tilemap, 0, 0); - tilemap_draw(bitmap, visible2, state->m_reel2_tilemap, 0, 0); - tilemap_draw(bitmap, visible3, state->m_reel3_tilemap, 0, 0); + state->m_reel1_tilemap->draw(bitmap, visible1, 0, 0); + state->m_reel2_tilemap->draw(bitmap, visible2, 0, 0); + state->m_reel3_tilemap->draw(bitmap, visible3, 0, 0); } if (state->m_cm_enable_reg &0x04) @@ -666,7 +666,7 @@ SCREEN_UPDATE_IND16( amcoe1a ) if (state->m_cm_enable_reg &0x02) { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } return 0; diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c index f9874499ed3..a4bcfc3de78 100644 --- a/src/mame/video/gomoku.c +++ b/src/mame/video/gomoku.c @@ -72,14 +72,14 @@ WRITE8_HANDLER( gomoku_videoram_w ) { gomoku_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gomoku_colorram_w ) { gomoku_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gomoku_bgram_w ) @@ -121,7 +121,7 @@ VIDEO_START( gomoku ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); /* make background bitmap */ state->m_bg_bitmap.fill(0x20); @@ -229,6 +229,6 @@ SCREEN_UPDATE_IND16( gomoku ) bitmap.fill(0x20); } - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c index be527026852..033cf23e8ca 100644 --- a/src/mame/video/gotcha.c +++ b/src/mame/video/gotcha.c @@ -12,7 +12,7 @@ static TILEMAP_MAPPER( gotcha_tilemap_scan ) return (col & 0x1f) | (row << 5) | ((col & 0x20) << 5); } -INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index ,UINT16 *vram, int color_offs) +INLINE void get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index ,UINT16 *vram, int color_offs) { gotcha_state *state = machine.driver_data(); UINT16 data = vram[tile_index]; @@ -47,10 +47,10 @@ VIDEO_START( gotcha ) state->m_fg_tilemap = tilemap_create(machine, fg_get_tile_info, gotcha_tilemap_scan, 16, 16, 64, 32); state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info, gotcha_tilemap_scan, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_fg_tilemap, -1, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, -5, 0); + state->m_fg_tilemap->set_scrolldx(-1, 0); + state->m_bg_tilemap->set_scrolldx(-5, 0); } @@ -58,14 +58,14 @@ WRITE16_HANDLER( gotcha_fgvideoram_w ) { gotcha_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( gotcha_bgvideoram_w ) { gotcha_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( gotcha_gfxbank_select_w ) @@ -83,7 +83,7 @@ WRITE16_HANDLER( gotcha_gfxbank_w ) if (state->m_gfxbank[state->m_banksel] != ((data & 0x0f00) >> 8)) { state->m_gfxbank[state->m_banksel] = (data & 0x0f00) >> 8; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } } @@ -95,10 +95,10 @@ WRITE16_HANDLER( gotcha_scroll_w ) switch (offset) { - case 0: tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scroll[0]); break; - case 1: tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_scroll[1]); break; - case 2: tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll[2]); break; - case 3: tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll[3]); break; + case 0: state->m_fg_tilemap->set_scrollx(0, state->m_scroll[0]); break; + case 1: state->m_fg_tilemap->set_scrolly(0, state->m_scroll[1]); break; + case 2: state->m_bg_tilemap->set_scrollx(0, state->m_scroll[2]); break; + case 3: state->m_bg_tilemap->set_scrolly(0, state->m_scroll[3]); break; } } @@ -138,8 +138,8 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( gotcha ) { gotcha_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index 2f63c8b03fb..97e9b7ad632 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -56,14 +56,14 @@ WRITE8_HANDLER( gottlieb_video_control_w ) if (flip_screen_x_get(space->machine()) != (data & 0x02)) { flip_screen_x_set(space->machine(), data & 0x02); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* bit 2 controls horizonal flip screen */ if (flip_screen_y_get(space->machine()) != (data & 0x04)) { flip_screen_y_set(space->machine(), data & 0x04); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* in Q*Bert Qubes only, bit 4 controls the sprite bank */ @@ -104,7 +104,7 @@ WRITE8_HANDLER( gottlieb_videoram_w ) gottlieb_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -165,8 +165,8 @@ VIDEO_START( gottlieb ) /* configure the background tilemap */ state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 318 - 256); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scrolldx(0, 318 - 256); gfx_element_set_source(machine.gfx[0], state->m_charram); @@ -192,8 +192,8 @@ VIDEO_START( screwloo ) /* configure the background tilemap */ state->m_bg_tilemap = tilemap_create(machine, get_screwloo_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 318 - 256); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scrolldx(0, 318 - 256); gfx_element_set_source(machine.gfx[0], state->m_charram); @@ -254,7 +254,7 @@ SCREEN_UPDATE_IND16( gottlieb ) gottlieb_state *state = screen.machine().driver_data(); /* if the background has lower priority, render it first, else clear the screen */ if (!state->m_background_priority) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); else bitmap.fill(0, cliprect); @@ -263,7 +263,7 @@ SCREEN_UPDATE_IND16( gottlieb ) /* if the background has higher priority, render it now */ if (state->m_background_priority) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index 45dedebd1d3..1ece4fb492c 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -65,14 +65,14 @@ WRITE8_HANDLER( gotya_videoram_w ) { gotya_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gotya_colorram_w ) { gotya_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gotya_video_control_w ) @@ -88,7 +88,7 @@ WRITE8_HANDLER( gotya_video_control_w ) if (flip_screen_get(space->machine()) != (data & 0x02)) { flip_screen_set(space->machine(), data & 0x02); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -180,8 +180,8 @@ static void draw_status( running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( gotya ) { gotya_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, -(*state->m_scroll + (state->m_scroll_bit_8 * 256)) - 2 * 8); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, -(*state->m_scroll + (state->m_scroll_bit_8 * 256)) - 2 * 8); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); draw_status(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c index 99795765fa8..6e2433559c3 100644 --- a/src/mame/video/gp9001.c +++ b/src/mame/video/gp9001.c @@ -152,21 +152,21 @@ static WRITE16_DEVICE_HANDLER( gp9001_bg_tmap_w ) { gp9001vdp_device *vdp = (gp9001vdp_device*)device; COMBINE_DATA(&vdp->bg.vram16[offset]); - tilemap_mark_tile_dirty(vdp->bg.tmap,offset/2); + vdp->bg.tmap->mark_tile_dirty(offset/2); } static WRITE16_DEVICE_HANDLER( gp9001_fg_tmap_w ) { gp9001vdp_device *vdp = (gp9001vdp_device*)device; COMBINE_DATA(&vdp->fg.vram16[offset]); - tilemap_mark_tile_dirty(vdp->fg.tmap,offset/2); + vdp->fg.tmap->mark_tile_dirty(offset/2); } static WRITE16_DEVICE_HANDLER( gp9001_top_tmap_w ) { gp9001vdp_device *vdp = (gp9001vdp_device*)device; COMBINE_DATA(&vdp->top.vram16[offset]); - tilemap_mark_tile_dirty(vdp->top.tmap,offset/2); + vdp->top.tmap->mark_tile_dirty(offset/2); } static READ16_DEVICE_HANDLER( gp9001_bg_tmap_r ) @@ -259,7 +259,7 @@ static TILE_GET_INFO_DEVICE( get_top0_tile_info ) tile_number, color, 0); - //tileinfo->category = (attrib & 0x0f00) >> 8; + //tileinfo.category = (attrib & 0x0f00) >> 8; } @@ -286,7 +286,7 @@ static TILE_GET_INFO_DEVICE( get_fg0_tile_info ) tile_number, color, 0); - //tileinfo->category = (attrib & 0x0f00) >> 8; + //tileinfo.category = (attrib & 0x0f00) >> 8; } static TILE_GET_INFO_DEVICE( get_bg0_tile_info ) @@ -309,7 +309,7 @@ static TILE_GET_INFO_DEVICE( get_bg0_tile_info ) tile_number, color, 0); - //tileinfo->category = (attrib & 0x0f00) >> 8; + //tileinfo.category = (attrib & 0x0f00) >> 8; } void gp9001vdp_device::create_tilemaps(int region) @@ -320,9 +320,9 @@ void gp9001vdp_device::create_tilemaps(int region) fg.tmap = tilemap_create_device(this, get_fg0_tile_info,tilemap_scan_rows,16,16,32,32); bg.tmap = tilemap_create_device(this, get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); - tilemap_set_transparent_pen(top.tmap,0); - tilemap_set_transparent_pen(fg.tmap,0); - tilemap_set_transparent_pen(bg.tmap,0); + top.tmap->set_transparent_pen(0); + fg.tmap->set_transparent_pen(0); + bg.tmap->set_transparent_pen(0); } @@ -473,14 +473,14 @@ static void gp9001_set_scrollx_and_flip_reg(gp9001tilemaplayer* layer, UINT16 da if (flip) { layer->flip |= TILEMAP_FLIPX; - tilemap_set_scrollx(layer->tmap,0,-(layer->scrollx+layer->extra_xoffset.flipped)); + layer->tmap->set_scrollx(0,-(layer->scrollx+layer->extra_xoffset.flipped)); } else { layer->flip &= (~TILEMAP_FLIPX); - tilemap_set_scrollx(layer->tmap,0,layer->scrollx+layer->extra_xoffset.normal); + layer->tmap->set_scrollx(0,layer->scrollx+layer->extra_xoffset.normal); } - tilemap_set_flip(layer->tmap,layer->flip); + layer->tmap->set_flip(layer->flip); } static void gp9001_set_scrolly_and_flip_reg(gp9001tilemaplayer* layer, UINT16 data, UINT16 mem_mask, int flip) @@ -490,16 +490,16 @@ static void gp9001_set_scrolly_and_flip_reg(gp9001tilemaplayer* layer, UINT16 da if (flip) { layer->flip |= TILEMAP_FLIPY; - tilemap_set_scrolly(layer->tmap,0,-(layer->scrolly+layer->extra_yoffset.flipped)); + layer->tmap->set_scrolly(0,-(layer->scrolly+layer->extra_yoffset.flipped)); } else { layer->flip &= (~TILEMAP_FLIPY); - tilemap_set_scrolly(layer->tmap,0,layer->scrolly+layer->extra_yoffset.normal); + layer->tmap->set_scrolly(0,layer->scrolly+layer->extra_yoffset.normal); } - tilemap_set_flip(layer->tmap,layer->flip); + layer->tmap->set_flip(layer->flip); } static void gp9001_set_sprite_scrollx_and_flip_reg(gp9001spritelayer* layer, UINT16 data, UINT16 mem_mask, int flip) @@ -956,13 +956,13 @@ void gp9001vdp_device::gp9001_draw_custom_tilemap(running_machine& machine, bitm int width = machine.primary_screen->width(); int height = machine.primary_screen->height(); int y,x; - bitmap_ind16 &tmb = tilemap_get_pixmap(tilemap); + bitmap_ind16 &tmb = tilemap->pixmap(); UINT16* srcptr; UINT16* dstptr; UINT8* dstpriptr; - int scrollx = tilemap_get_scrollx(tilemap, 0); - int scrolly = tilemap_get_scrolly(tilemap, 0); + int scrollx = tilemap->scrollx(0); + int scrolly = tilemap->scrolly(0); for (y=0;ymark_all_dirty(); + fg.tmap->mark_all_dirty(); gp9001_gfxrom_bank_dirty = 0; } diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index 2ca4da300a7..20de9bf8862 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -56,21 +56,21 @@ WRITE8_HANDLER( grchamp_left_w ) { grchamp_state *state = space->machine().driver_data(); state->m_leftram[offset] = data; - tilemap_mark_tile_dirty(state->m_left_tilemap, offset); + state->m_left_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( grchamp_center_w ) { grchamp_state *state = space->machine().driver_data(); state->m_centerram[offset] = data; - tilemap_mark_tile_dirty(state->m_center_tilemap, offset); + state->m_center_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( grchamp_right_w ) { grchamp_state *state = space->machine().driver_data(); state->m_rightram[offset] = data; - tilemap_mark_tile_dirty(state->m_right_tilemap, offset); + state->m_right_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_text_tile_info ) @@ -369,9 +369,9 @@ SCREEN_UPDATE_RGB32( grchamp ) const UINT8 *amedata = screen.machine().region("gfx5")->base(); const UINT8 *headdata = screen.machine().region("gfx6")->base(); const UINT8 *pldata = screen.machine().region("gfx7")->base(); - bitmap_ind16 &lpixmap = tilemap_get_pixmap(state->m_left_tilemap); - bitmap_ind16 &rpixmap = tilemap_get_pixmap(state->m_right_tilemap); - bitmap_ind16 &cpixmap = tilemap_get_pixmap(state->m_center_tilemap); + bitmap_ind16 &lpixmap = state->m_left_tilemap->pixmap(); + bitmap_ind16 &rpixmap = state->m_right_tilemap->pixmap(); + bitmap_ind16 &cpixmap = state->m_center_tilemap->pixmap(); int lrxscroll, cxscroll, lyscroll, ryscroll, cyscroll; int bgcolor = state->m_cpu1_out[3] & 0x10; int amebase = state->m_cpu0_out[4] >> 4; diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c index e1cc9ae53e0..87bdbe1a4a3 100644 --- a/src/mame/video/gstriker.c +++ b/src/mame/video/gstriker.c @@ -43,14 +43,14 @@ WRITE16_HANDLER( VS920A_0_vram_w ) { gstriker_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_VS920A[0].vram[offset]); - tilemap_mark_tile_dirty(state->m_VS920A[0].tmap, offset); + state->m_VS920A[0].tmap->mark_tile_dirty(offset); } WRITE16_HANDLER( VS920A_1_vram_w ) { gstriker_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_VS920A[1].vram[offset]); - tilemap_mark_tile_dirty(state->m_VS920A[1].tmap, offset); + state->m_VS920A[1].tmap->mark_tile_dirty(offset); } static void VS920A_init(running_machine &machine, int numchips) @@ -65,7 +65,7 @@ static void VS920A_init(running_machine &machine, int numchips) { state->m_VS920A[i].tmap = tilemap_create(machine, VS920A_get_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_VS920A[i].tmap, 0); + state->m_VS920A[i].tmap->set_transparent_pen(0); } } @@ -88,7 +88,7 @@ static void VS920A_draw(gstriker_state *state, int numchip, bitmap_ind16& screen { state->m_VS920A_cur_chip = &state->m_VS920A[numchip]; - tilemap_draw(screen, cliprect, state->m_VS920A_cur_chip->tmap, 0, priority); + state->m_VS920A_cur_chip->tmap->draw(screen, cliprect, 0, priority); } @@ -163,11 +163,11 @@ static void MB60553_reg_written(gstriker_state *state, int numchip, int num_reg) switch (num_reg) { case 0: - tilemap_set_scrollx(cur->tmap, 0, cur->regs[0]>>4); + cur->tmap->set_scrollx(0, cur->regs[0]>>4); break; case 1: - tilemap_set_scrolly(cur->tmap, 0, cur->regs[1]>>4); + cur->tmap->set_scrolly(0, cur->regs[1]>>4); break; case 2: @@ -181,25 +181,25 @@ static void MB60553_reg_written(gstriker_state *state, int numchip, int num_reg) case 4: cur->bank[0] = (cur->regs[4] >> 8) & 0x1F; cur->bank[1] = (cur->regs[4] >> 0) & 0x1F; - tilemap_mark_all_tiles_dirty(cur->tmap); + cur->tmap->mark_all_dirty(); break; case 5: cur->bank[2] = (cur->regs[5] >> 8) & 0x1F; cur->bank[3] = (cur->regs[5] >> 0) & 0x1F; - tilemap_mark_all_tiles_dirty(cur->tmap); + cur->tmap->mark_all_dirty(); break; case 6: cur->bank[4] = (cur->regs[6] >> 8) & 0x1F; cur->bank[5] = (cur->regs[6] >> 0) & 0x1F; - tilemap_mark_all_tiles_dirty(cur->tmap); + cur->tmap->mark_all_dirty(); break; case 7: cur->bank[6] = (cur->regs[7] >> 8) & 0x1F; cur->bank[7] = (cur->regs[7] >> 0) & 0x1F; - tilemap_mark_all_tiles_dirty(cur->tmap); + cur->tmap->mark_all_dirty(); break; } } @@ -223,7 +223,7 @@ static void MB60553_init(running_machine &machine, int numchips) { state->m_MB60553[i].tmap = tilemap_create(machine, MB60553_get_tile_info,twc94_scan, 16,16,128,64); - tilemap_set_transparent_pen(state->m_MB60553[i].tmap, 0); + state->m_MB60553[i].tmap->set_transparent_pen(0); } } @@ -269,7 +269,7 @@ static void MB60553_draw(running_machine &machine, int numchip, bitmap_ind16& sc clip.min_y = clip.max_y = line; - tilemap_draw_roz(screen,clip,state->m_MB60553_cur_chip->tmap,startx<<12,starty<<12, + state->m_MB60553_cur_chip->tmap->draw_roz(screen, clip, startx<<12,starty<<12, incxx,0,0,incyy, 1, 0,priority); @@ -313,7 +313,7 @@ WRITE16_HANDLER(MB60553_0_vram_w) gstriker_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_MB60553[0].vram[offset]); - tilemap_mark_tile_dirty(state->m_MB60553[0].tmap, offset); + state->m_MB60553[0].tmap->mark_tile_dirty(offset); } WRITE16_HANDLER(MB60553_1_vram_w) @@ -321,7 +321,7 @@ WRITE16_HANDLER(MB60553_1_vram_w) gstriker_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_MB60553[1].vram[offset]); - tilemap_mark_tile_dirty(state->m_MB60553[1].tmap, offset); + state->m_MB60553[1].tmap->mark_tile_dirty(offset); } @@ -574,13 +574,13 @@ VIDEO_START(gstriker) VS920A_init(machine, 1); VS920A_set_gfx_region(state, 0, 0); VS920A_set_pal_base(state, 0, 0x30); - tilemap_set_transparent_pen(VS920A_get_tilemap(state, 0), 0xf); + VS920A_get_tilemap(state, 0)->set_transparent_pen(0xf); // Initalize the chip for the screen plane MB60553_init(machine, 1); MB60553_set_gfx_region(state, 0, 1); MB60553_set_pal_base(state, 0, 0); - tilemap_set_transparent_pen(MB60553_get_tilemap(state, 0), 0xf); + MB60553_get_tilemap(state, 0)->set_transparent_pen(0xf); // Initialize the sprite generator CG10103_init(1); @@ -599,13 +599,13 @@ VIDEO_START(twrldc94) VS920A_init(machine, 1); VS920A_set_gfx_region(state, 0, 0); VS920A_set_pal_base(state, 0, 0x40); - tilemap_set_transparent_pen(VS920A_get_tilemap(state, 0), 0xf); + VS920A_get_tilemap(state, 0)->set_transparent_pen(0xf); // Initalize the chip for the screen plane MB60553_init(machine, 1); MB60553_set_gfx_region(state, 0, 1); MB60553_set_pal_base(state, 0, 0x50); - tilemap_set_transparent_pen(MB60553_get_tilemap(state, 0), 0xf); + MB60553_get_tilemap(state, 0)->set_transparent_pen(0xf); // Initialize the sprite generator CG10103_init(1); @@ -624,13 +624,13 @@ VIDEO_START(vgoalsoc) VS920A_init(machine, 1); VS920A_set_gfx_region(state, 0, 0); VS920A_set_pal_base(state, 0, 0x30); - tilemap_set_transparent_pen(VS920A_get_tilemap(state, 0), 0xf); + VS920A_get_tilemap(state, 0)->set_transparent_pen(0xf); // Initalize the chip for the screen plane MB60553_init(machine, 1); MB60553_set_gfx_region(state, 0, 1); MB60553_set_pal_base(state, 0, 0x20); - tilemap_set_transparent_pen(MB60553_get_tilemap(state, 0), 0xf); + MB60553_get_tilemap(state, 0)->set_transparent_pen(0xf); // Initialize the sprite generator CG10103_init(1); diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c index fc370f8bc5a..9291732b387 100644 --- a/src/mame/video/gsword.c +++ b/src/mame/video/gsword.c @@ -95,7 +95,7 @@ WRITE8_HANDLER( gsword_videoram_w ) gsword_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gsword_charbank_w ) @@ -104,7 +104,7 @@ WRITE8_HANDLER( gsword_charbank_w ) if (state->m_charbank != data) { state->m_charbank = data; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -121,7 +121,7 @@ WRITE8_HANDLER( gsword_videoctrl_w ) if (state->m_charpalbank != ((data & 0x60) >> 5)) { state->m_charpalbank = (data & 0x60) >> 5; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* bit 4 is flip screen */ @@ -129,7 +129,7 @@ WRITE8_HANDLER( gsword_videoctrl_w ) if (state->m_flipscreen != (data & 0x10)) { state->m_flipscreen = data & 0x10; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* bit 0 could be used but unknown */ @@ -140,7 +140,7 @@ WRITE8_HANDLER( gsword_videoctrl_w ) WRITE8_HANDLER( gsword_scroll_w ) { gsword_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } static TILE_GET_INFO( get_bg_tile_info ) @@ -208,7 +208,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( gsword ) { gsword_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/gumbo.c b/src/mame/video/gumbo.c index ad8925c7a3a..ca6a529305d 100644 --- a/src/mame/video/gumbo.c +++ b/src/mame/video/gumbo.c @@ -8,7 +8,7 @@ WRITE16_HANDLER( gumbo_bg_videoram_w ) { gumbo_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_gumbo_bg_tile_info ) @@ -23,7 +23,7 @@ WRITE16_HANDLER( gumbo_fg_videoram_w ) { gumbo_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_gumbo_fg_tile_info ) @@ -39,13 +39,13 @@ VIDEO_START( gumbo ) gumbo_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_gumbo_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_fg_tilemap = tilemap_create(machine, get_gumbo_fg_tile_info, tilemap_scan_rows, 4, 4, 128, 64); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0xff); + state->m_fg_tilemap->set_transparent_pen(0xff); } SCREEN_UPDATE_IND16( gumbo ) { gumbo_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c index bd21d3da09c..33577fdd402 100644 --- a/src/mame/video/gundealr.c +++ b/src/mame/video/gundealr.c @@ -58,7 +58,7 @@ VIDEO_START( gundealr ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, gundealr_scan, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); } @@ -73,14 +73,14 @@ WRITE8_HANDLER( gundealr_bg_videoram_w ) { gundealr_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( gundealr_fg_videoram_w ) { gundealr_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( gundealr_paletteram_w ) @@ -105,23 +105,23 @@ WRITE8_HANDLER( gundealr_fg_scroll_w ) { gundealr_state *state = space->machine().driver_data(); state->m_scroll[offset] = data; - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scroll[1] | ((state->m_scroll[0] & 0x03) << 8)); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_scroll[3] | ((state->m_scroll[2] & 0x03) << 8)); + state->m_fg_tilemap->set_scrollx(0, state->m_scroll[1] | ((state->m_scroll[0] & 0x03) << 8)); + state->m_fg_tilemap->set_scrolly(0, state->m_scroll[3] | ((state->m_scroll[2] & 0x03) << 8)); } WRITE8_HANDLER( yamyam_fg_scroll_w ) { gundealr_state *state = space->machine().driver_data(); state->m_scroll[offset] = data; - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scroll[0] | ((state->m_scroll[1] & 0x03) << 8)); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_scroll[2] | ((state->m_scroll[3] & 0x03) << 8)); + state->m_fg_tilemap->set_scrollx(0, state->m_scroll[0] | ((state->m_scroll[1] & 0x03) << 8)); + state->m_fg_tilemap->set_scrolly(0, state->m_scroll[2] | ((state->m_scroll[3] & 0x03) << 8)); } WRITE8_HANDLER( gundealr_flipscreen_w ) { gundealr_state *state = space->machine().driver_data(); state->m_flipscreen = data; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } @@ -135,7 +135,7 @@ WRITE8_HANDLER( gundealr_flipscreen_w ) SCREEN_UPDATE_IND16( gundealr ) { gundealr_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index 5f52c1f5a0d..f118348ab2a 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -62,14 +62,14 @@ WRITE8_HANDLER( gunsmoke_videoram_w ) { gunsmoke_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gunsmoke_colorram_w ) { gunsmoke_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( gunsmoke_c804_w ) @@ -126,7 +126,7 @@ static TILE_GET_INFO( get_fg_tile_info ) int code = state->m_videoram[tile_index] + ((attr & 0xe0) << 2); int color = attr & 0x1f; - tileinfo->group = color; + tileinfo.group = color; SET_TILE_INFO(0, code, color, 0); } @@ -177,11 +177,11 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( gunsmoke ) { gunsmoke_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx[0] + 256 * state->m_scrollx[1]); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrolly[0]); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx[0] + 256 * state->m_scrollx[1]); + state->m_bg_tilemap->set_scrolly(0, state->m_scrolly[0]); if (state->m_bgon) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(get_black_pen(screen.machine()), cliprect); @@ -189,7 +189,7 @@ SCREEN_UPDATE_IND16( gunsmoke ) draw_sprites(screen.machine(), bitmap, cliprect); if (state->m_chon) - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index 735f8487e8c..02ba0634a2a 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -106,7 +106,7 @@ static TILE_GET_INFO( gyruss_get_tile_info ) int color = state->m_colorram[tile_index] & 0x0f; int flags = TILE_FLIPYX(state->m_colorram[tile_index] >> 6); - tileinfo->group = (state->m_colorram[tile_index] & 0x10) ? 0 : 1; + tileinfo.group = (state->m_colorram[tile_index] & 0x10) ? 0 : 1; SET_TILE_INFO(2, code, color, flags); } @@ -116,8 +116,8 @@ VIDEO_START( gyruss ) { gyruss_state *state = machine.driver_data(); state->m_tilemap = tilemap_create(machine, gyruss_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transmask(state->m_tilemap, 0, 0x00, 0); /* opaque */ - tilemap_set_transmask(state->m_tilemap, 1, 0x0f, 0); /* transparent */ + state->m_tilemap->set_transmask(0, 0x00, 0); /* opaque */ + state->m_tilemap->set_transmask(1, 0x0f, 0); /* transparent */ } @@ -156,13 +156,13 @@ SCREEN_UPDATE_IND16( gyruss ) if (cliprect.min_y == screen.visible_area().min_y) { - tilemap_mark_all_tiles_dirty_all(screen.machine()); - tilemap_set_flip_all(screen.machine(), (*state->m_flipscreen & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + screen.machine().tilemap().mark_all_dirty(); + screen.machine().tilemap().set_flip_all((*state->m_flipscreen & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } - tilemap_draw(bitmap, cliprect, state->m_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().gfx); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c index 80f7125b94f..783a0beb610 100644 --- a/src/mame/video/hanaawas.c +++ b/src/mame/video/hanaawas.c @@ -66,7 +66,7 @@ WRITE8_HANDLER( hanaawas_videoram_w ) { hanaawas_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( hanaawas_colorram_w ) @@ -75,8 +75,8 @@ WRITE8_HANDLER( hanaawas_colorram_w ) state->m_colorram[offset] = data; /* dirty both current and next offsets */ - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); - tilemap_mark_tile_dirty(state->m_bg_tilemap, (offset + (flip_screen_get(space->machine()) ? -1 : 1)) & 0x03ff); + state->m_bg_tilemap->mark_tile_dirty(offset); + state->m_bg_tilemap->mark_tile_dirty((offset + (flip_screen_get(space->machine()) ? -1 : 1)) & 0x03ff); } WRITE8_DEVICE_HANDLER( hanaawas_portB_w ) @@ -85,7 +85,7 @@ WRITE8_DEVICE_HANDLER( hanaawas_portB_w ) if (flip_screen_get(device->machine()) != (~data & 0x80)) { flip_screen_set(device->machine(), ~data & 0x80); - tilemap_mark_all_tiles_dirty_all(device->machine()); + device->machine().tilemap().mark_all_dirty(); } } @@ -111,6 +111,6 @@ VIDEO_START( hanaawas ) SCREEN_UPDATE_IND16( hanaawas ) { hanaawas_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c index 7754da1e8ba..351a8985515 100644 --- a/src/mame/video/hcastle.c +++ b/src/mame/video/hcastle.c @@ -135,7 +135,7 @@ VIDEO_START( hcastle ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan, 8, 8, 64, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -150,14 +150,14 @@ WRITE8_HANDLER( hcastle_pf1_video_w ) { hcastle_state *state = space->machine().driver_data(); state->m_pf1_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0xbff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0xbff); } WRITE8_HANDLER( hcastle_pf2_video_w ) { hcastle_state *state = space->machine().driver_data(); state->m_pf2_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0xbff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0xbff); } WRITE8_HANDLER( hcastle_gfxbank_w ) @@ -185,7 +185,7 @@ WRITE8_HANDLER( hcastle_pf1_control_w ) } else if (offset == 7) { - tilemap_set_flip(state->m_fg_tilemap, (data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_fg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } k007121_ctrl_w(state->m_k007121_1, offset, data); } @@ -203,7 +203,7 @@ WRITE8_HANDLER( hcastle_pf2_control_w ) } else if (offset == 7) { - tilemap_set_flip(state->m_bg_tilemap, (data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_bg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } k007121_ctrl_w(state->m_k007121_2, offset, data); } @@ -246,32 +246,32 @@ SCREEN_UPDATE_IND16( hcastle ) state->m_pf2_bankbase += 0x2000; if (state->m_pf1_bankbase != state->m_old_pf1) - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); if (state->m_pf2_bankbase != state->m_old_pf2) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_old_pf1 = state->m_pf1_bankbase; state->m_old_pf2 = state->m_pf2_bankbase; - tilemap_set_scrolly(state->m_bg_tilemap, 0, ctrl_2_2); - tilemap_set_scrollx(state->m_bg_tilemap, 0, ((ctrl_2_1 << 8) + ctrl_2_0)); - tilemap_set_scrolly(state->m_fg_tilemap, 0, ctrl_1_2); - tilemap_set_scrollx(state->m_fg_tilemap, 0, ((ctrl_1_1 << 8) + ctrl_1_0)); + state->m_bg_tilemap->set_scrolly(0, ctrl_2_2); + state->m_bg_tilemap->set_scrollx(0, ((ctrl_2_1 << 8) + ctrl_2_0)); + state->m_fg_tilemap->set_scrolly(0, ctrl_1_2); + state->m_fg_tilemap->set_scrollx(0, ((ctrl_1_1 << 8) + ctrl_1_0)); // /* Sprite priority */ // if (ctrl_1_3 & 0x20) if ((state->m_gfx_bank & 0x04) == 0) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().generic.buffered_spriteram.u8, 0); draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().generic.buffered_spriteram2.u8, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } else { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().generic.buffered_spriteram.u8, 0); draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().generic.buffered_spriteram2.u8, 1); } diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c index bce2f9604d9..a950a934a1f 100644 --- a/src/mame/video/hexion.c +++ b/src/mame/video/hexion.c @@ -10,7 +10,7 @@ ***************************************************************************/ -INLINE void get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,UINT8 *ram) +INLINE void get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,UINT8 *ram) { tile_index *= 4; SET_TILE_INFO( @@ -46,9 +46,9 @@ VIDEO_START( hexion ) state->m_bg_tilemap[0] = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,8,8,64,32); state->m_bg_tilemap[1] = tilemap_create(machine, get_tile_info1,tilemap_scan_rows, 8,8,64,32); - tilemap_set_transparent_pen(state->m_bg_tilemap[0],0); - tilemap_set_scrollx(state->m_bg_tilemap[1],0,-4); - tilemap_set_scrolly(state->m_bg_tilemap[1],0,4); + state->m_bg_tilemap[0]->set_transparent_pen(0); + state->m_bg_tilemap[1]->set_scrollx(0,-4); + state->m_bg_tilemap[1]->set_scrolly(0,4); state->m_vram[0] = machine.region("maincpu")->base() + 0x30000; state->m_vram[1] = state->m_vram[0] + 0x2000; @@ -76,7 +76,7 @@ WRITE8_HANDLER( hexion_bankswitch_w ) { int bank = state->m_unkram[0]&1; memset(state->m_vram[bank],state->m_unkram[1],0x2000); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[bank]); + state->m_bg_tilemap[bank]->mark_all_dirty(); } /* bit 7 = PMC-BK */ state->m_pmcbank = (data & 0x80) >> 7; @@ -124,7 +124,7 @@ WRITE8_HANDLER( hexion_bankedram_w ) { //logerror("%04x: bankedram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space->device()),offset,data,state->m_bankctrl); state->m_vram[state->m_rambank][offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap[state->m_rambank],offset/4); + state->m_bg_tilemap[state->m_rambank]->mark_tile_dirty(offset/4); } else logerror("%04x pmc internal ram %04x = %02x\n",cpu_get_pc(&space->device()),offset,data); @@ -168,7 +168,7 @@ WRITE8_HANDLER( hexion_gfxrom_select_w ) SCREEN_UPDATE_IND16( hexion ) { hexion_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap[1],0,0); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap[0],0,0); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, 0,0); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c index 0ad63a1ff49..47efa4d6e6c 100644 --- a/src/mame/video/higemaru.c +++ b/src/mame/video/higemaru.c @@ -5,14 +5,14 @@ WRITE8_HANDLER( higemaru_videoram_w ) { higemaru_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( higemaru_colorram_w ) { higemaru_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } /*************************************************************************** @@ -87,7 +87,7 @@ WRITE8_HANDLER( higemaru_c800_w ) if (flip_screen_get(space->machine()) != (data & 0x80)) { flip_screen_set(space->machine(), data & 0x80); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -148,7 +148,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( higemaru ) { higemaru_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c index 5d57038416a..4ee045601b6 100644 --- a/src/mame/video/himesiki.c +++ b/src/mame/video/himesiki.c @@ -31,7 +31,7 @@ WRITE8_HANDLER( himesiki_bg_ram_w ) { himesiki_state *state = space->machine().driver_data(); state->m_bg_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( himesiki_scrollx_w ) @@ -121,9 +121,9 @@ SCREEN_UPDATE_IND16( himesiki ) { himesiki_state *state = screen.machine().driver_data(); int x = -(state->m_scrollx[0] << 8 | state->m_scrollx[1]) & 0x1ff; - tilemap_set_scrolldx(state->m_bg_tilemap, x, x); + state->m_bg_tilemap->set_scrolldx(x, x); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); himesiki_draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index 46e3e329d2b..ab8975b1b1c 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -12,27 +12,27 @@ static void hng64_mark_all_tiles_dirty( hng64_state *state, int tilemap ) { if (tilemap == 0) { - tilemap_mark_all_tiles_dirty (state->m_tilemap0_8x8); - tilemap_mark_all_tiles_dirty (state->m_tilemap0_16x16); - tilemap_mark_all_tiles_dirty (state->m_tilemap0_16x16_alt); + state->m_tilemap0_8x8->mark_all_dirty(); + state->m_tilemap0_16x16->mark_all_dirty(); + state->m_tilemap0_16x16_alt->mark_all_dirty(); } else if (tilemap == 1) { - tilemap_mark_all_tiles_dirty (state->m_tilemap1_8x8); - tilemap_mark_all_tiles_dirty (state->m_tilemap1_16x16); - tilemap_mark_all_tiles_dirty (state->m_tilemap1_16x16_alt); + state->m_tilemap1_8x8->mark_all_dirty(); + state->m_tilemap1_16x16->mark_all_dirty(); + state->m_tilemap1_16x16_alt->mark_all_dirty(); } else if (tilemap == 2) { - tilemap_mark_all_tiles_dirty (state->m_tilemap2_8x8); - tilemap_mark_all_tiles_dirty (state->m_tilemap2_16x16); - tilemap_mark_all_tiles_dirty (state->m_tilemap2_16x16_alt); + state->m_tilemap2_8x8->mark_all_dirty(); + state->m_tilemap2_16x16->mark_all_dirty(); + state->m_tilemap2_16x16_alt->mark_all_dirty(); } else if (tilemap == 3) { - tilemap_mark_all_tiles_dirty (state->m_tilemap3_8x8); - tilemap_mark_all_tiles_dirty (state->m_tilemap3_16x16); - tilemap_mark_all_tiles_dirty (state->m_tilemap3_16x16_alt); + state->m_tilemap3_8x8->mark_all_dirty(); + state->m_tilemap3_16x16->mark_all_dirty(); + state->m_tilemap3_16x16_alt->mark_all_dirty(); } } @@ -40,27 +40,27 @@ static void hng64_mark_tile_dirty( hng64_state *state, int tilemap, int tile_ind { if (tilemap == 0) { - tilemap_mark_tile_dirty(state->m_tilemap0_8x8, tile_index); - tilemap_mark_tile_dirty(state->m_tilemap0_16x16, tile_index); - tilemap_mark_tile_dirty(state->m_tilemap0_16x16_alt, tile_index); + state->m_tilemap0_8x8->mark_tile_dirty(tile_index); + state->m_tilemap0_16x16->mark_tile_dirty(tile_index); + state->m_tilemap0_16x16_alt->mark_tile_dirty(tile_index); } else if (tilemap == 1) { - tilemap_mark_tile_dirty(state->m_tilemap1_8x8, tile_index); - tilemap_mark_tile_dirty(state->m_tilemap1_16x16, tile_index); - tilemap_mark_tile_dirty(state->m_tilemap1_16x16_alt, tile_index); + state->m_tilemap1_8x8->mark_tile_dirty(tile_index); + state->m_tilemap1_16x16->mark_tile_dirty(tile_index); + state->m_tilemap1_16x16_alt->mark_tile_dirty(tile_index); } else if (tilemap == 2) { - tilemap_mark_tile_dirty(state->m_tilemap2_8x8, tile_index); - tilemap_mark_tile_dirty(state->m_tilemap2_16x16, tile_index); - tilemap_mark_tile_dirty(state->m_tilemap2_16x16_alt, tile_index); + state->m_tilemap2_8x8->mark_tile_dirty(tile_index); + state->m_tilemap2_16x16->mark_tile_dirty(tile_index); + state->m_tilemap2_16x16_alt->mark_tile_dirty(tile_index); } else if (tilemap == 3) { - tilemap_mark_tile_dirty(state->m_tilemap3_8x8, tile_index); - tilemap_mark_tile_dirty(state->m_tilemap3_16x16, tile_index); - tilemap_mark_tile_dirty(state->m_tilemap3_16x16_alt, tile_index); + state->m_tilemap3_8x8->mark_tile_dirty(tile_index); + state->m_tilemap3_16x16->mark_tile_dirty(tile_index); + state->m_tilemap3_16x16_alt->mark_tile_dirty(tile_index); } } @@ -787,8 +787,8 @@ static void hng64_tilemap_draw_roz_core(running_machine& machine, tilemap_t *tma const pen_t *clut = &machine.pens[blit->tilemap_priority_code >> 16]; bitmap_ind8 &priority_bitmap = machine.priority_bitmap; bitmap_rgb32 &destbitmap = *blit->bitmap; - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(tmap); - bitmap_ind8 &flagsmap = tilemap_get_flagsmap(tmap); + bitmap_ind16 &srcbitmap = tmap->pixmap(); + bitmap_ind8 &flagsmap = tmap->flagsmap(); const int xmask = srcbitmap.width()-1; const int ymask = srcbitmap.height()-1; const int widthshifted = srcbitmap.width() << 16; @@ -978,7 +978,7 @@ g_profiler.start(PROFILER_TILEMAP_DRAW_ROZ); hng64_configure_blit_parameters(&blit, tmap, dest, cliprect, flags, priority, priority_mask, drawformat); /* get the full pixmap for the tilemap */ - tilemap_get_pixmap(tmap); + tmap->pixmap(); /* then do the roz copy */ hng64_tilemap_draw_roz_core(machine, tmap, &blit, startx, starty, incxx, incxy, incyx, incyy, wraparound); @@ -1227,7 +1227,7 @@ static void hng64_drawtilemap(running_machine& machine, bitmap_rgb32 &bitmap, co /* manual copy = slooow */ if (MAKE_MAME_REEEEAAALLLL_SLOW) { - bitmap_ind16 &bm = tilemap_get_pixmap(tilemap); + bitmap_ind16 &bm = tilemap->pixmap(); int bmheight = bm.height(); int bmwidth = bm.width(); const pen_t *paldata = machine.pens; @@ -1325,7 +1325,7 @@ static void hng64_drawtilemap(running_machine& machine, bitmap_rgb32 &bitmap, co /* manual copy = slooow */ if (MAKE_MAME_REEEEAAALLLL_SLOW) { - bitmap_ind16 &bm = tilemap_get_pixmap(tilemap); + bitmap_ind16 &bm = tilemap->pixmap(); int bmheight = bm.height(); int bmwidth = bm.width(); const pen_t *paldata = machine.pens; @@ -1675,21 +1675,21 @@ VIDEO_START( hng64 ) state->m_tilemap3_16x16 = tilemap_create(machine, get_hng64_tile3_16x16_info, tilemap_scan_rows, 16, 16, 128, 128); /* 128x128x4 = 0x10000 */ state->m_tilemap3_16x16_alt = tilemap_create(machine, get_hng64_tile3_16x16_info, tilemap_scan_rows, 16, 16, 256, 64); /* 128x128x4 = 0x10000 */ - tilemap_set_transparent_pen(state->m_tilemap0_8x8, 0); - tilemap_set_transparent_pen(state->m_tilemap0_16x16, 0); - tilemap_set_transparent_pen(state->m_tilemap0_16x16_alt, 0); + state->m_tilemap0_8x8->set_transparent_pen(0); + state->m_tilemap0_16x16->set_transparent_pen(0); + state->m_tilemap0_16x16_alt->set_transparent_pen(0); - tilemap_set_transparent_pen(state->m_tilemap1_8x8, 0); - tilemap_set_transparent_pen(state->m_tilemap1_16x16, 0); - tilemap_set_transparent_pen(state->m_tilemap1_16x16_alt, 0); + state->m_tilemap1_8x8->set_transparent_pen(0); + state->m_tilemap1_16x16->set_transparent_pen(0); + state->m_tilemap1_16x16_alt->set_transparent_pen(0); - tilemap_set_transparent_pen(state->m_tilemap2_8x8, 0); - tilemap_set_transparent_pen(state->m_tilemap2_16x16, 0); - tilemap_set_transparent_pen(state->m_tilemap2_16x16_alt, 0); + state->m_tilemap2_8x8->set_transparent_pen(0); + state->m_tilemap2_16x16->set_transparent_pen(0); + state->m_tilemap2_16x16_alt->set_transparent_pen(0); - tilemap_set_transparent_pen(state->m_tilemap3_8x8, 0); - tilemap_set_transparent_pen(state->m_tilemap3_16x16, 0); - tilemap_set_transparent_pen(state->m_tilemap3_16x16_alt, 0); + state->m_tilemap3_8x8->set_transparent_pen(0); + state->m_tilemap3_16x16->set_transparent_pen(0); + state->m_tilemap3_16x16_alt->set_transparent_pen(0); // Debug switch, turn on / off additive blending on a per-tilemap basis state->m_additive_tilemap_debug = 0; diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index ffc7baa5f80..bcf71241028 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -31,7 +31,7 @@ static TILE_GET_INFO( holeland_get_tile_info ) tile_number, state->m_palette_offset + ((attr >> 4) & 0x0f), TILE_FLIPYX((attr >> 2) & 0x03)); - tileinfo->group = (attr >> 4) & 1; + tileinfo.group = (attr >> 4) & 1; } static TILE_GET_INFO( crzrally_get_tile_info ) @@ -45,7 +45,7 @@ static TILE_GET_INFO( crzrally_get_tile_info ) tile_number, state->m_palette_offset + ((attr >> 4) & 0x0f), TILE_FLIPYX((attr >> 2) & 0x03)); - tileinfo->group = (attr >> 4) & 1; + tileinfo.group = (attr >> 4) & 1; } /*************************************************************************** @@ -59,8 +59,8 @@ VIDEO_START( holeland ) holeland_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, holeland_get_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x01, 0xfe); /* split type 1 has pen 0? transparent in front half */ + state->m_bg_tilemap->set_transmask(0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x01, 0xfe); /* split type 1 has pen 0? transparent in front half */ } VIDEO_START( crzrally ) @@ -73,14 +73,14 @@ WRITE8_HANDLER( holeland_videoram_w ) { holeland_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( holeland_colorram_w ) { holeland_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( holeland_pal_offs_w ) @@ -90,14 +90,14 @@ WRITE8_HANDLER( holeland_pal_offs_w ) { state->m_po[offset] = data & 1; state->m_palette_offset = (state->m_po[0] + (state->m_po[1] << 1)) << 4; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } WRITE8_HANDLER( holeland_scroll_w ) { holeland_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); } WRITE8_HANDLER( holeland_flipscreen_w ) @@ -191,17 +191,17 @@ static void crzrally_draw_sprites( running_machine &machine, bitmap_ind16 &bitma SCREEN_UPDATE_IND16( holeland ) { holeland_state *state = screen.machine().driver_data(); -/*tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); +/*state->m_bg_tilemap->mark_all_dirty(); */ + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); holeland_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); return 0; } SCREEN_UPDATE_IND16( crzrally ) { holeland_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); crzrally_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index a3c49be5dd2..10d68197863 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -400,7 +400,7 @@ PALETTE_INIT( mirderby ) ***************************************************************************/ -INLINE void mrokumei_info0( running_machine &machine, tile_data *tileinfo, int tile_index, int page, int gfxbank ) +INLINE void mrokumei_info0( running_machine &machine, tile_data &tileinfo, int tile_index, int page, int gfxbank ) { homedata_state *state = machine.driver_data(); int addr = tile_index * 2 + 0x2000 * page; @@ -410,7 +410,7 @@ INLINE void mrokumei_info0( running_machine &machine, tile_data *tileinfo, int t SET_TILE_INFO( 0, code, color, state->m_flipscreen ); } -INLINE void mrokumei_info1( running_machine &machine, tile_data *tileinfo, int tile_index, int page, int gfxbank ) +INLINE void mrokumei_info1( running_machine &machine, tile_data &tileinfo, int tile_index, int page, int gfxbank ) { homedata_state *state = machine.driver_data(); int addr = tile_index * 2 + 0x1000 + 0x2000 * page; @@ -446,7 +446,7 @@ static TILE_GET_INFO( mrokumei_get_info1_1 ) } -INLINE void reikaids_info( running_machine &machine, tile_data *tileinfo, int tile_index, int page, int layer, int gfxbank ) +INLINE void reikaids_info( running_machine &machine, tile_data &tileinfo, int tile_index, int page, int layer, int gfxbank ) { homedata_state *state = machine.driver_data(); int addr = tile_index * 4 + layer + 0x2000 * page; @@ -517,7 +517,7 @@ static TILE_GET_INFO( reikaids_get_info1_3 ) } -INLINE void pteacher_info( running_machine &machine, tile_data *tileinfo, int tile_index, int page, int layer, int gfxbank ) +INLINE void pteacher_info( running_machine &machine, tile_data &tileinfo, int tile_index, int page, int layer, int gfxbank ) { homedata_state *state = machine.driver_data(); int addr = tile_index * 2 + 0x1000 * layer + 0x2000 * page; @@ -553,7 +553,7 @@ static TILE_GET_INFO( pteacher_get_info1_1 ) } -INLINE void lemnangl_info( running_machine &machine, tile_data *tileinfo, int tile_index, int page, int layer, int gfxset, int gfxbank ) +INLINE void lemnangl_info( running_machine &machine, tile_data &tileinfo, int tile_index, int page, int layer, int gfxset, int gfxbank ) { homedata_state *state = machine.driver_data(); int addr = tile_index * 2 + 0x1000 * layer + 0x2000 * page; @@ -590,7 +590,7 @@ static TILE_GET_INFO( lemnangl_get_info1_1 ) } -INLINE void mirderby_info0( running_machine &machine, tile_data *tileinfo, int tile_index, int page, int gfxbank ) +INLINE void mirderby_info0( running_machine &machine, tile_data &tileinfo, int tile_index, int page, int gfxbank ) { homedata_state *state = machine.driver_data(); int addr = tile_index * 2 + 0x2000 * page; @@ -600,7 +600,7 @@ INLINE void mirderby_info0( running_machine &machine, tile_data *tileinfo, int t SET_TILE_INFO( 0, code, color, state->m_flipscreen ); } -INLINE void mirderby_info1( running_machine &machine, tile_data *tileinfo, int tile_index, int page, int gfxbank ) +INLINE void mirderby_info1( running_machine &machine, tile_data &tileinfo, int tile_index, int page, int gfxbank ) { homedata_state *state = machine.driver_data(); int addr = tile_index * 2 + 0x1000 + 0x2000 * page; @@ -651,8 +651,8 @@ VIDEO_START( mrokumei ) state->m_bg_tilemap[1][0] = tilemap_create( machine, mrokumei_get_info1_0, tilemap_scan_rows, 8, 8, 64, 32 ); state->m_bg_tilemap[1][1] = tilemap_create( machine, mrokumei_get_info1_1, tilemap_scan_rows, 8, 8, 64, 32 ); - tilemap_set_transparent_pen(state->m_bg_tilemap[0][1], 0); - tilemap_set_transparent_pen(state->m_bg_tilemap[1][1], 0); + state->m_bg_tilemap[0][1]->set_transparent_pen(0); + state->m_bg_tilemap[1][1]->set_transparent_pen(0); } VIDEO_START( reikaids ) @@ -667,14 +667,14 @@ VIDEO_START( reikaids ) state->m_bg_tilemap[1][2] = tilemap_create(machine, reikaids_get_info1_2, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap[1][3] = tilemap_create(machine, reikaids_get_info1_3, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap[0][0], 0xff); - tilemap_set_transparent_pen(state->m_bg_tilemap[0][1], 0xff); - tilemap_set_transparent_pen(state->m_bg_tilemap[0][2], 0xff); - tilemap_set_transparent_pen(state->m_bg_tilemap[0][3], 0xff); - tilemap_set_transparent_pen(state->m_bg_tilemap[1][0], 0xff); - tilemap_set_transparent_pen(state->m_bg_tilemap[1][1], 0xff); - tilemap_set_transparent_pen(state->m_bg_tilemap[1][2], 0xff); - tilemap_set_transparent_pen(state->m_bg_tilemap[1][3], 0xff); + state->m_bg_tilemap[0][0]->set_transparent_pen(0xff); + state->m_bg_tilemap[0][1]->set_transparent_pen(0xff); + state->m_bg_tilemap[0][2]->set_transparent_pen(0xff); + state->m_bg_tilemap[0][3]->set_transparent_pen(0xff); + state->m_bg_tilemap[1][0]->set_transparent_pen(0xff); + state->m_bg_tilemap[1][1]->set_transparent_pen(0xff); + state->m_bg_tilemap[1][2]->set_transparent_pen(0xff); + state->m_bg_tilemap[1][3]->set_transparent_pen(0xff); } VIDEO_START( pteacher ) @@ -685,8 +685,8 @@ VIDEO_START( pteacher ) state->m_bg_tilemap[1][0] = tilemap_create(machine, pteacher_get_info1_0, tilemap_scan_rows, 8, 8, 64, 32); state->m_bg_tilemap[1][1] = tilemap_create(machine, pteacher_get_info1_1, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap[0][1], 0xff); - tilemap_set_transparent_pen(state->m_bg_tilemap[1][1], 0xff); + state->m_bg_tilemap[0][1]->set_transparent_pen(0xff); + state->m_bg_tilemap[1][1]->set_transparent_pen(0xff); } VIDEO_START( lemnangl ) @@ -697,8 +697,8 @@ VIDEO_START( lemnangl ) state->m_bg_tilemap[1][0] = tilemap_create(machine, lemnangl_get_info1_0, tilemap_scan_rows, 8, 8, 64, 32); state->m_bg_tilemap[1][1] = tilemap_create(machine, lemnangl_get_info1_1, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap[0][1], 0x0f); - tilemap_set_transparent_pen(state->m_bg_tilemap[1][1], 0x0f); + state->m_bg_tilemap[0][1]->set_transparent_pen(0x0f); + state->m_bg_tilemap[1][1]->set_transparent_pen(0x0f); } VIDEO_START( mirderby ) @@ -709,8 +709,8 @@ VIDEO_START( mirderby ) state->m_bg_tilemap[1][0] = tilemap_create( machine, mirderby_get_info1_0, tilemap_scan_rows, 8, 8, 64, 32 ); state->m_bg_tilemap[1][1] = tilemap_create( machine, mirderby_get_info1_1, tilemap_scan_rows, 8, 8, 64, 32 ); - tilemap_set_transparent_pen(state->m_bg_tilemap[0][1], 0); - tilemap_set_transparent_pen(state->m_bg_tilemap[1][1], 0); + state->m_bg_tilemap[0][1]->set_transparent_pen(0); + state->m_bg_tilemap[1][1]->set_transparent_pen(0); } /*************************************************************************** @@ -723,14 +723,14 @@ WRITE8_HANDLER( mrokumei_videoram_w ) { homedata_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap[(offset & 0x2000) >> 13][(offset & 0x1000) >> 12], (offset & 0xffe) >> 1); + state->m_bg_tilemap[(offset & 0x2000) >> 13][(offset & 0x1000) >> 12]->mark_tile_dirty((offset & 0xffe) >> 1); } WRITE8_HANDLER( reikaids_videoram_w ) { homedata_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap[(offset & 0x2000) >> 13][offset & 3], (offset & 0xffc) >> 2); + state->m_bg_tilemap[(offset & 0x2000) >> 13][offset & 3]->mark_tile_dirty((offset & 0xffc) >> 2); } @@ -742,7 +742,7 @@ WRITE8_HANDLER( reikaids_gfx_bank_w ) if (state->m_gfx_bank[state->m_reikaids_which] != data) { state->m_gfx_bank[state->m_reikaids_which] = data; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } state->m_reikaids_which ^= 1; @@ -755,7 +755,7 @@ WRITE8_HANDLER( pteacher_gfx_bank_w ) if (state->m_gfx_bank[0] != data) { state->m_gfx_bank[0] = data; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -777,7 +777,7 @@ WRITE8_HANDLER( mrokumei_blitter_bank_w ) */ if ((state->m_blitter_bank ^ data) & 0x3b) - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); state->m_blitter_bank = data; } @@ -802,7 +802,7 @@ WRITE8_HANDLER( pteacher_blitter_bank_w ) */ if ((state->m_blitter_bank ^ data) & 0x03) - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); state->m_blitter_bank = data; } @@ -853,7 +853,7 @@ SCREEN_UPDATE_IND16( mrokumei ) if (flags != state->m_flipscreen) { state->m_flipscreen = flags; - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); } switch (state->m_vreg[0x3]) @@ -874,10 +874,10 @@ SCREEN_UPDATE_IND16( mrokumei ) } screen.set_visible_area(0*8, width*8-1, 2*8, 30*8-1); - tilemap_set_scrollx(state->m_bg_tilemap[state->m_visible_page][0], 0, state->m_vreg[0xc] << 1); + state->m_bg_tilemap[state->m_visible_page][0]->set_scrollx(0, state->m_vreg[0xc] << 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[state->m_visible_page][0], 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[state->m_visible_page][1], 0, 0); + state->m_bg_tilemap[state->m_visible_page][0]->draw(bitmap, cliprect, 0, 0); + state->m_bg_tilemap[state->m_visible_page][1]->draw(bitmap, cliprect, 0, 0); return 0; } @@ -904,7 +904,7 @@ SCREEN_UPDATE_IND16( reikaids ) if (flags != state->m_flipscreen) { state->m_flipscreen = flags; - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); } @@ -912,7 +912,7 @@ SCREEN_UPDATE_IND16( reikaids ) pri = (state->m_bank & 0x70) >> 4; for (i = 0; i < 4; i++) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[state->m_visible_page][pritable[pri][3 - i]], 0, 0); + state->m_bg_tilemap[state->m_visible_page][pritable[pri][3 - i]]->draw(bitmap, cliprect, 0, 0); return 0; } #endif @@ -951,7 +951,7 @@ SCREEN_UPDATE_IND16( reikaids ) if (flags != state->m_flipscreen) { state->m_flipscreen = flags; - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); } @@ -959,7 +959,7 @@ SCREEN_UPDATE_IND16( reikaids ) pri = (state->m_blitter_bank & 0x70) >> 4; for (i = 0; i < 4; i++) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[state->m_visible_page][pritable[state->m_priority][pri][3 - i]], 0, 0); + state->m_bg_tilemap[state->m_visible_page][pritable[state->m_priority][pri][3 - i]]->draw(bitmap, cliprect, 0, 0); return 0; } @@ -981,7 +981,7 @@ SCREEN_UPDATE_IND16( pteacher ) if (flags != state->m_flipscreen) { state->m_flipscreen = flags; - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); } /* bit 2 of blitter_bank stretches characters horizontally by 3/2, @@ -1035,11 +1035,11 @@ SCREEN_UPDATE_IND16( pteacher ) } scroll_high = state->m_vreg[0xb] >> 2; - tilemap_set_scrollx(state->m_bg_tilemap[state->m_visible_page][0], 0, scroll_high * 8 + scroll_low); - tilemap_set_scrollx(state->m_bg_tilemap[state->m_visible_page][1], 0, scroll_high * 8 + scroll_low); + state->m_bg_tilemap[state->m_visible_page][0]->set_scrollx(0, scroll_high * 8 + scroll_low); + state->m_bg_tilemap[state->m_visible_page][1]->set_scrollx(0, scroll_high * 8 + scroll_low); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[state->m_visible_page][0], 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[state->m_visible_page][1], 0, 0); + state->m_bg_tilemap[state->m_visible_page][0]->draw(bitmap, cliprect, 0, 0); + state->m_bg_tilemap[state->m_visible_page][1]->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 5841db72817..9b193c5b0a2 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -12,7 +12,7 @@ WRITE8_DEVICE_HANDLER(homerun_banking_w) else state->m_gc_up = data & 3; - tilemap_mark_all_tiles_dirty(state->m_tilemap); + state->m_tilemap->mark_all_dirty(); data >>= 5; memory_set_bank(device->machine(), "bank1", data & 0x07); @@ -22,7 +22,7 @@ WRITE8_HANDLER( homerun_videoram_w ) { homerun_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset & 0xfff); + state->m_tilemap->mark_tile_dirty(offset & 0xfff); } WRITE8_HANDLER(homerun_color_w) @@ -88,19 +88,19 @@ SCREEN_UPDATE_IND16(homerun) rectangle myclip = cliprect; /* upper part */ - tilemap_set_scrollx(state->m_tilemap, 0, state->m_xpc + ((state->m_xpa & 2) << 7) ); - tilemap_set_scrolly(state->m_tilemap, 0, state->m_xpb + ((state->m_xpa & 1) << 8) ); + state->m_tilemap->set_scrollx(0, state->m_xpc + ((state->m_xpa & 2) << 7) ); + state->m_tilemap->set_scrolly(0, state->m_xpb + ((state->m_xpa & 1) << 8) ); myclip.max_y /= 2; state->m_gfx_ctrl = state->m_gc_up; - tilemap_draw(bitmap, myclip, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, myclip, 0, 0); draw_sprites(screen.machine(), bitmap, myclip); /* lower part */ myclip.min_y += myclip.max_y; myclip.max_y *= 2; state->m_gfx_ctrl = state->m_gc_down; - tilemap_draw(bitmap, myclip, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, myclip, 0, 0); draw_sprites(screen.machine(), bitmap, myclip); state->m_gc_down = state->m_gc_up; diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index a1bde6540d6..37bfadae5eb 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -93,14 +93,14 @@ WRITE8_HANDLER( hyperspt_videoram_w ) { hyperspt_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( hyperspt_colorram_w ) { hyperspt_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( hyperspt_flipscreen_w ) @@ -108,7 +108,7 @@ WRITE8_HANDLER( hyperspt_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -127,7 +127,7 @@ VIDEO_START( hyperspt ) hyperspt_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -183,10 +183,10 @@ SCREEN_UPDATE_IND16( hyperspt ) { int scrollx = state->m_scroll[row * 2] + (state->m_scroll[(row * 2) + 1] & 0x01) * 256; if (flip_screen_get(screen.machine())) scrollx = -scrollx; - tilemap_set_scrollx(state->m_bg_tilemap, row, scrollx); + state->m_bg_tilemap->set_scrollx(row, scrollx); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -207,5 +207,5 @@ VIDEO_START( roadf ) hyperspt_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, roadf_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index 34c4161b347..504711ad765 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -104,7 +104,7 @@ WRITE16_HANDLER( hyprduel_paletteram_w ) /* 8x8x4 tiles only */ -INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int layer, UINT16 *vram) +INLINE void get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int layer, UINT16 *vram) { hyprduel_state *state = machine.driver_data(); UINT16 code; @@ -125,14 +125,14 @@ INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int ti if (code & 0x8000) /* Special: draw a tile of a single color (i.e. not from the gfx ROMs) */ { int _code = code & 0x000f; - tileinfo->pen_data = state->m_empty_tiles + _code * 16 * 16; - tileinfo->palette_base = ((code & 0x0ff0)) + 0x1000; - tileinfo->flags = 0; - tileinfo->group = 0; + tileinfo.pen_data = state->m_empty_tiles + _code * 16 * 16; + tileinfo.palette_base = ((code & 0x0ff0)) + 0x1000; + tileinfo.flags = 0; + tileinfo.group = 0; } else { - tileinfo->group = 0; + tileinfo.group = 0; SET_TILE_INFO( 0, (tile & 0xfffff) + (code & 0xf), @@ -143,7 +143,7 @@ INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int ti /* 8x8x4 or 8x8x8 tiles. It's the tile's color that decides: if its low 4 bits are high ($f,$1f,$2f etc) the tile is 8bpp, otherwise it's 4bpp */ -INLINE void get_tile_info_8bit( running_machine &machine, tile_data *tileinfo, int tile_index, int layer, UINT16 *vram ) +INLINE void get_tile_info_8bit( running_machine &machine, tile_data &tileinfo, int tile_index, int layer, UINT16 *vram ) { hyprduel_state *state = machine.driver_data(); UINT16 code; @@ -164,14 +164,14 @@ INLINE void get_tile_info_8bit( running_machine &machine, tile_data *tileinfo, i if (code & 0x8000) /* Special: draw a tile of a single color (i.e. not from the gfx ROMs) */ { int _code = code & 0x000f; - tileinfo->pen_data = state->m_empty_tiles + _code * 16 * 16; - tileinfo->palette_base = ((code & 0x0ff0)) + 0x1000; - tileinfo->flags = 0; - tileinfo->group = 0; + tileinfo.pen_data = state->m_empty_tiles + _code * 16 * 16; + tileinfo.palette_base = ((code & 0x0ff0)) + 0x1000; + tileinfo.flags = 0; + tileinfo.group = 0; } else if ((tile & 0x00f00000) == 0x00f00000) /* draw tile as 8bpp */ { - tileinfo->group = 1; + tileinfo.group = 1; SET_TILE_INFO( 1, (tile & 0xfffff) + 2*(code & 0xf), @@ -180,7 +180,7 @@ INLINE void get_tile_info_8bit( running_machine &machine, tile_data *tileinfo, i } else { - tileinfo->group = 0; + tileinfo.group = 0; SET_TILE_INFO( 0, (tile & 0xfffff) + (code & 0xf), @@ -191,7 +191,7 @@ INLINE void get_tile_info_8bit( running_machine &machine, tile_data *tileinfo, i /* 16x16x4 or 16x16x8 tiles. It's the tile's color that decides: if its low 4 bits are high ($f,$1f,$2f etc) the tile is 8bpp, otherwise it's 4bpp */ -INLINE void get_tile_info_16x16_8bit( running_machine &machine, tile_data *tileinfo, int tile_index, int layer, UINT16 *vram ) +INLINE void get_tile_info_16x16_8bit( running_machine &machine, tile_data &tileinfo, int tile_index, int layer, UINT16 *vram ) { hyprduel_state *state = machine.driver_data(); UINT16 code; @@ -212,14 +212,14 @@ INLINE void get_tile_info_16x16_8bit( running_machine &machine, tile_data *tilei if (code & 0x8000) /* Special: draw a tile of a single color (i.e. not from the gfx ROMs) */ { int _code = code & 0x000f; - tileinfo->pen_data = state->m_empty_tiles + _code * 16 * 16; - tileinfo->palette_base = ((code & 0x0ff0)) + 0x1000; - tileinfo->flags = 0; - tileinfo->group = 0; + tileinfo.pen_data = state->m_empty_tiles + _code * 16 * 16; + tileinfo.palette_base = ((code & 0x0ff0)) + 0x1000; + tileinfo.flags = 0; + tileinfo.group = 0; } else if ((tile & 0x00f00000) == 0x00f00000) /* draw tile as 8bpp */ { - tileinfo->group = 1; + tileinfo.group = 1; SET_TILE_INFO( 3, (tile & 0xfffff) + 8*(code & 0xf), @@ -228,7 +228,7 @@ INLINE void get_tile_info_16x16_8bit( running_machine &machine, tile_data *tilei } else { - tileinfo->group = 0; + tileinfo.group = 0; SET_TILE_INFO( 2, (tile & 0xfffff) + 4*(code & 0xf), @@ -251,7 +251,7 @@ INLINE void hyprduel_vram_w( running_machine &machine, offs_t offset, UINT16 dat if (row < -(BIG_NY-WIN_NY)) row += (BIG_NY-WIN_NY) + WIN_NY; if ((col >= 0) && (col < WIN_NX) && (row >= 0) && (row < WIN_NY)) - tilemap_mark_tile_dirty(state->m_bg_tilemap[layer], row * WIN_NX + col); + state->m_bg_tilemap[layer]->mark_tile_dirty(row * WIN_NX + col); } } @@ -303,7 +303,7 @@ WRITE16_HANDLER( hyprduel_window_w ) if (newdata != olddata) { offset /= 2; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[offset]); + state->m_bg_tilemap[offset]->mark_all_dirty(); } } @@ -343,10 +343,10 @@ static void hyprduel_postload(running_machine &machine) UINT16 wx = state->m_window[i * 2 + 1]; UINT16 wy = state->m_window[i * 2 + 0]; - tilemap_set_scrollx(state->m_bg_tilemap[i], 0, state->m_scroll[i * 2 + 1] - wx - (wx & 7)); - tilemap_set_scrolly(state->m_bg_tilemap[i], 0, state->m_scroll[i * 2 + 0] - wy - (wy & 7)); + state->m_bg_tilemap[i]->set_scrollx(0, state->m_scroll[i * 2 + 1] - wx - (wx & 7)); + state->m_bg_tilemap[i]->set_scrolly(0, state->m_scroll[i * 2 + 0] - wy - (wy & 7)); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[i]); + state->m_bg_tilemap[i]->mark_all_dirty(); } } @@ -365,18 +365,18 @@ static VIDEO_START( common_14220 ) state->m_bg_tilemap[1] = tilemap_create(machine, get_tile_info_1_8bit, tilemap_scan_rows, 8, 8, WIN_NX, WIN_NY); state->m_bg_tilemap[2] = tilemap_create(machine, get_tile_info_2_8bit, tilemap_scan_rows, 8, 8, WIN_NX, WIN_NY); - tilemap_map_pen_to_layer(state->m_bg_tilemap[0], 0, 15, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_bg_tilemap[0], 1, 255, TILEMAP_PIXEL_TRANSPARENT); + state->m_bg_tilemap[0]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); + state->m_bg_tilemap[0]->map_pen_to_layer(1, 255, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_bg_tilemap[1], 0, 15, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_bg_tilemap[1], 1, 255, TILEMAP_PIXEL_TRANSPARENT); + state->m_bg_tilemap[1]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); + state->m_bg_tilemap[1]->map_pen_to_layer(1, 255, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_bg_tilemap[2], 0, 15, TILEMAP_PIXEL_TRANSPARENT); - tilemap_map_pen_to_layer(state->m_bg_tilemap[2], 1, 255, TILEMAP_PIXEL_TRANSPARENT); + state->m_bg_tilemap[2]->map_pen_to_layer(0, 15, TILEMAP_PIXEL_TRANSPARENT); + state->m_bg_tilemap[2]->map_pen_to_layer(1, 255, TILEMAP_PIXEL_TRANSPARENT); - tilemap_set_scrolldx(state->m_bg_tilemap[0], 0, 0); - tilemap_set_scrolldx(state->m_bg_tilemap[1], 0, 0); - tilemap_set_scrolldx(state->m_bg_tilemap[2], 0, 0); + state->m_bg_tilemap[0]->set_scrolldx(0, 0); + state->m_bg_tilemap[1]->set_scrolldx(0, 0); + state->m_bg_tilemap[2]->set_scrolldx(0, 0); /* Set up save state */ state->save_item(NAME(state->m_sprite_xoffs)); @@ -610,9 +610,9 @@ WRITE16_HANDLER( hyprduel_scrollreg_w ) COMBINE_DATA(&state->m_scroll[offset]); if (offset & 0x01) - tilemap_set_scrollx(state->m_bg_tilemap[offset / 2], 0, state->m_scroll[offset] - window - (window & 7)); + state->m_bg_tilemap[offset / 2]->set_scrollx(0, state->m_scroll[offset] - window - (window & 7)); else - tilemap_set_scrolly(state->m_bg_tilemap[offset / 2], 0, state->m_scroll[offset] - window - (window & 7)); + state->m_bg_tilemap[offset / 2]->set_scrolly(0, state->m_scroll[offset] - window - (window & 7)); } WRITE16_HANDLER( hyprduel_scrollreg_init_w ) @@ -628,8 +628,8 @@ WRITE16_HANDLER( hyprduel_scrollreg_init_w ) state->m_scroll[i * 2 + 1] = data; state->m_scroll[i * 2 + 0] = data; - tilemap_set_scrollx(state->m_bg_tilemap[i], 0, data - wx - (wx & 7)); - tilemap_set_scrolly(state->m_bg_tilemap[i], 0, data - wy - (wy & 7)); + state->m_bg_tilemap[i]->set_scrollx(0, data - wx - (wx & 7)); + state->m_bg_tilemap[i]->set_scrolly(0, data - wy - (wy & 7)); } } @@ -646,7 +646,7 @@ static void draw_layers( running_machine &machine, bitmap_ind16 &bitmap, const r if ( pri == ((layers_pri >> (layer*2)) & 3) ) { if (layers_ctrl & (1 << layer)) // for debug - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[layer], 0, 1 << (3 - pri)); + state->m_bg_tilemap[layer]->draw(bitmap, cliprect, 0, 1 << (3 - pri)); } } } @@ -665,7 +665,7 @@ static void dirty_tiles( running_machine &machine, int layer, UINT16 *vram ) UINT16 code = vram[offset]; if (!(code & 0x8000) && state->m_dirtyindex[(code & 0x1ff0) >> 4]) - tilemap_mark_tile_dirty(state->m_bg_tilemap[layer], row * WIN_NX + col); + state->m_bg_tilemap[layer]->mark_tile_dirty(row * WIN_NX + col); } } } diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c index e57d852c935..27c90c9776a 100644 --- a/src/mame/video/inufuku.c +++ b/src/mame/video/inufuku.c @@ -27,10 +27,10 @@ WRITE16_HANDLER( inufuku_palettereg_w ) switch (offset) { case 0x02: state->m_bg_palettebank = (data & 0xf000) >> 12; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); break; case 0x03: state->m_tx_palettebank = (data & 0xf000) >> 12; - tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); + state->m_tx_tilemap->mark_all_dirty(); break; } } @@ -193,7 +193,7 @@ WRITE16_HANDLER( inufuku_bg_videoram_w ) { inufuku_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ16_HANDLER( inufuku_tx_videoram_r ) @@ -206,7 +206,7 @@ WRITE16_HANDLER( inufuku_tx_videoram_w ) { inufuku_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tx_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } @@ -223,8 +223,8 @@ VIDEO_START( inufuku ) state->m_bg_tilemap = tilemap_create(machine, get_inufuku_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->m_tx_tilemap = tilemap_create(machine, get_inufuku_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_bg_tilemap, 255); - tilemap_set_transparent_pen(state->m_tx_tilemap, 255); + state->m_bg_tilemap->set_transparent_pen(255); + state->m_tx_tilemap->set_transparent_pen(255); } @@ -244,21 +244,21 @@ SCREEN_UPDATE_IND16( inufuku ) if (state->m_bg_raster) { - tilemap_set_scroll_rows(state->m_bg_tilemap, 512); + state->m_bg_tilemap->set_scroll_rows(512); for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_bg_tilemap, (state->m_bg_scrolly + i) & 0x1ff, state->m_bg_rasterram[i]); + state->m_bg_tilemap->set_scrollx((state->m_bg_scrolly + i) & 0x1ff, state->m_bg_rasterram[i]); } else { - tilemap_set_scroll_rows(state->m_bg_tilemap, 1); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scroll_rows(1); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); } - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_set_scrollx(state->m_tx_tilemap, 0, state->m_tx_scrollx); - tilemap_set_scrolly(state->m_tx_tilemap, 0, state->m_tx_scrolly); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_tx_tilemap->set_scrollx(0, state->m_tx_scrollx); + state->m_tx_tilemap->set_scrolly(0, state->m_tx_scrolly); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c index 0df13d2f922..02e12110a59 100644 --- a/src/mame/video/iqblock.c +++ b/src/mame/video/iqblock.c @@ -44,8 +44,8 @@ VIDEO_START( iqblock ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8, 8,64,32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,32,64, 8); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_scroll_cols(state->m_fg_tilemap,64); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scroll_cols(64); } @@ -60,14 +60,14 @@ WRITE8_HANDLER( iqblock_fgvideoram_w ) { iqblock_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( iqblock_bgvideoram_w ) { iqblock_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } READ8_HANDLER( iqblock_bgvideoram_r ) @@ -79,7 +79,7 @@ READ8_HANDLER( iqblock_bgvideoram_r ) WRITE8_HANDLER( iqblock_fgscroll_w ) { iqblock_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_fg_tilemap,offset,data); + state->m_fg_tilemap->set_scrolly(offset,data); } @@ -94,8 +94,8 @@ SCREEN_UPDATE_IND16( iqblock ) { iqblock_state *state = screen.machine().driver_data(); if (!state->m_videoenable) return 0; - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index d954f309933..b5705ef614a 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -82,14 +82,14 @@ WRITE8_HANDLER( ironhors_videoram_w ) { ironhors_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ironhors_colorram_w ) { ironhors_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ironhors_charbank_w ) @@ -98,7 +98,7 @@ WRITE8_HANDLER( ironhors_charbank_w ) if (state->m_charbank != (data & 0x03)) { state->m_charbank = data & 0x03; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } state->m_spriterambank = data & 0x08; @@ -112,7 +112,7 @@ WRITE8_HANDLER( ironhors_palettebank_w ) if (state->m_palettebank != (data & 0x07)) { state->m_palettebank = data & 0x07; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } coin_counter_w(space->machine(), 0, data & 0x10); @@ -129,7 +129,7 @@ WRITE8_HANDLER( ironhors_flipscreen_w ) if (flip_screen_get(space->machine()) != (~data & 0x08)) { flip_screen_set(space->machine(), ~data & 0x08); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* other bits are used too, but unknown */ @@ -152,7 +152,7 @@ VIDEO_START( ironhors ) ironhors_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -245,9 +245,9 @@ SCREEN_UPDATE_IND16( ironhors ) int row; for (row = 0; row < 32; row++) - tilemap_set_scrollx(state->m_bg_tilemap, row, state->m_scroll[row]); + state->m_bg_tilemap->set_scrollx(row, state->m_scroll[row]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -268,7 +268,7 @@ VIDEO_START( farwest ) ironhors_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, farwest_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); } static void farwest_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -358,9 +358,9 @@ SCREEN_UPDATE_IND16( farwest) int row; for (row = 0; row < 32; row++) - tilemap_set_scrollx(state->m_bg_tilemap, row, state->m_scroll[row]); + state->m_bg_tilemap->set_scrollx(row, state->m_scroll[row]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); farwest_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index e5d3ed562a7..31bd43803f5 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -14,14 +14,14 @@ WRITE8_HANDLER( jack_videoram_w ) { jack_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( jack_colorram_w ) { jack_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( jack_paletteram_w ) @@ -100,7 +100,7 @@ static void jack_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, c SCREEN_UPDATE_IND16( jack ) { jack_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); jack_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -185,7 +185,7 @@ static void joinem_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, SCREEN_UPDATE_IND16( joinem ) { jack_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); joinem_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index 4670b3dd4b5..994a6248ca9 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -58,7 +58,7 @@ static void set_pens( running_machine &machine ) void jackal_mark_tile_dirty( running_machine &machine, int offset ) { jackal_state *state = machine.driver_data(); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -87,32 +87,32 @@ static void draw_background( running_machine &machine, bitmap_ind16 &bitmap, con state->m_scrollram = &RAM[0x0020]; - tilemap_set_scroll_rows(state->m_bg_tilemap, 1); - tilemap_set_scroll_cols(state->m_bg_tilemap, 1); + state->m_bg_tilemap->set_scroll_rows(1); + state->m_bg_tilemap->set_scroll_cols(1); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_videoctrl[0]); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_videoctrl[1]); + state->m_bg_tilemap->set_scrolly(0, state->m_videoctrl[0]); + state->m_bg_tilemap->set_scrollx(0, state->m_videoctrl[1]); if (state->m_videoctrl[2] & 0x02) { if (state->m_videoctrl[2] & 0x08) { - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); for (i = 0; i < 32; i++) - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_scrollram[i]); + state->m_bg_tilemap->set_scrollx(i, state->m_scrollram[i]); } if (state->m_videoctrl[2] & 0x04) { - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); for (i = 0; i < 32; i++) - tilemap_set_scrolly(state->m_bg_tilemap, i, state->m_scrollram[i]); + state->m_bg_tilemap->set_scrolly(i, state->m_scrollram[i]); } } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); } #define DRAW_SPRITE(bank, code, sx, sy) drawgfx_transpen(bitmap, cliprect, machine.gfx[bank], code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c index 6e1723109d9..7b660e867f0 100644 --- a/src/mame/video/jailbrek.c +++ b/src/mame/video/jailbrek.c @@ -38,14 +38,14 @@ WRITE8_HANDLER( jailbrek_videoram_w ) { jailbrek_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( jailbrek_colorram_w ) { jailbrek_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -62,7 +62,7 @@ VIDEO_START( jailbrek ) { jailbrek_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 396 - 256); + state->m_bg_tilemap->set_scrolldx(0, 396 - 256); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -104,24 +104,24 @@ SCREEN_UPDATE_IND16( jailbrek ) // bit 2 appears to be horizontal/vertical scroll control if (state->m_scroll_dir[0] & 0x04) { - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 1); - tilemap_set_scrollx(state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scroll_cols(32); + state->m_bg_tilemap->set_scroll_rows(1); + state->m_bg_tilemap->set_scrollx(0, 0); for (i = 0; i < 32; i++) - tilemap_set_scrolly(state->m_bg_tilemap, i, ((state->m_scroll_x[i + 32] << 8) + state->m_scroll_x[i])); + state->m_bg_tilemap->set_scrolly(i, ((state->m_scroll_x[i + 32] << 8) + state->m_scroll_x[i])); } else { - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 1); - tilemap_set_scrolly(state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scroll_rows(32); + state->m_bg_tilemap->set_scroll_cols(1); + state->m_bg_tilemap->set_scrolly(0, 0); for (i = 0; i < 32; i++) - tilemap_set_scrollx(state->m_bg_tilemap, i, ((state->m_scroll_x[i + 32] << 8) + state->m_scroll_x[i])); + state->m_bg_tilemap->set_scrollx(i, ((state->m_scroll_x[i + 32] << 8) + state->m_scroll_x[i])); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index 1375ea12f41..bf64bbd7ae7 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -71,13 +71,13 @@ Offset: ***************************************************************************/ -INLINE void get_tile_info(running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, int _N_) +INLINE void get_tile_info(running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, int _N_) { kaneko16_state *state = machine.driver_data(); UINT16 code_hi = state->m_vram[_N_][ 2 * tile_index + 0]; UINT16 code_lo = state->m_vram[_N_][ 2 * tile_index + 1]; SET_TILE_INFO(1 + _N_/2, code_lo, (code_hi >> 2) & 0x3f, TILE_FLIPXY( code_hi & 3 )); - tileinfo->category = (code_hi >> 8) & 7; + tileinfo.category = (code_hi >> 8) & 7; } static TILE_GET_INFO( get_tile_info_0 ) { get_tile_info(machine, tileinfo, tile_index, 0); } @@ -89,7 +89,7 @@ INLINE void kaneko16_vram_w(address_space *space, offs_t offset, UINT16 data, UI { kaneko16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram[_N_][offset]); - tilemap_mark_tile_dirty(state->m_tmap[_N_], offset/2); + state->m_tmap[_N_]->mark_tile_dirty(offset/2); } WRITE16_HANDLER( kaneko16_vram_0_w ) { kaneko16_vram_w(space, offset, data, mem_mask, 0); } @@ -143,17 +143,17 @@ VIDEO_START( kaneko16_1xVIEW2_tilemaps ) default: dy = 0; } - tilemap_set_scrolldx( state->m_tmap[0], -dx, xdim + dx -1 ); - tilemap_set_scrolldx( state->m_tmap[1], -(dx+2), xdim + (dx + 2) - 1 ); + state->m_tmap[0]->set_scrolldx(-dx, xdim + dx -1 ); + state->m_tmap[1]->set_scrolldx(-(dx+2), xdim + (dx + 2) - 1 ); - tilemap_set_scrolldy( state->m_tmap[0], -dy, ydim + dy -1 ); - tilemap_set_scrolldy( state->m_tmap[1], -dy, ydim + dy -1 ); + state->m_tmap[0]->set_scrolldy(-dy, ydim + dy -1 ); + state->m_tmap[1]->set_scrolldy(-dy, ydim + dy -1 ); - tilemap_set_transparent_pen(state->m_tmap[0], 0); - tilemap_set_transparent_pen(state->m_tmap[1], 0); + state->m_tmap[0]->set_transparent_pen(0); + state->m_tmap[1]->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_tmap[0], 0x200); // Line Scroll - tilemap_set_scroll_rows(state->m_tmap[1], 0x200); + state->m_tmap[0]->set_scroll_rows(0x200); // Line Scroll + state->m_tmap[1]->set_scroll_rows(0x200); } } @@ -195,17 +195,17 @@ VIDEO_START( kaneko16_2xVIEW2 ) default: dy = 0; } - tilemap_set_scrolldx( state->m_tmap[2], -dx, xdim + dx -1 ); - tilemap_set_scrolldx( state->m_tmap[3], -(dx+2), xdim + (dx + 2) - 1 ); + state->m_tmap[2]->set_scrolldx(-dx, xdim + dx -1 ); + state->m_tmap[3]->set_scrolldx(-(dx+2), xdim + (dx + 2) - 1 ); - tilemap_set_scrolldy( state->m_tmap[2], -dy, ydim + dy -1 ); - tilemap_set_scrolldy( state->m_tmap[3], -dy, ydim + dy -1 ); + state->m_tmap[2]->set_scrolldy(-dy, ydim + dy -1 ); + state->m_tmap[3]->set_scrolldy(-dy, ydim + dy -1 ); - tilemap_set_transparent_pen(state->m_tmap[2], 0); - tilemap_set_transparent_pen(state->m_tmap[3], 0); + state->m_tmap[2]->set_transparent_pen(0); + state->m_tmap[3]->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_tmap[2], 0x200); // Line Scroll - tilemap_set_scroll_rows(state->m_tmap[3], 0x200); + state->m_tmap[2]->set_scroll_rows(0x200); // Line Scroll + state->m_tmap[3]->set_scroll_rows(0x200); } } @@ -214,8 +214,8 @@ VIDEO_START( sandscrp_1xVIEW2 ) kaneko16_state *state = machine.driver_data(); VIDEO_START_CALL(kaneko16_1xVIEW2); - tilemap_set_scrolldy( state->m_tmap[0], 0, 256 - 1 ); - tilemap_set_scrolldy( state->m_tmap[1], 0, 256 - 1 ); + state->m_tmap[0]->set_scrolldy(0, 256 - 1 ); + state->m_tmap[1]->set_scrolldy(0, 256 - 1 ); } @@ -302,17 +302,17 @@ VIDEO_START( galsnew ) int xdim = machine.primary_screen->width(); int ydim = machine.primary_screen->height(); - tilemap_set_scrolldx( state->m_tmap[0], -dx, xdim + dx -1 ); - tilemap_set_scrolldx( state->m_tmap[1], -(dx+2), xdim + (dx + 2) - 1 ); + state->m_tmap[0]->set_scrolldx(-dx, xdim + dx -1 ); + state->m_tmap[1]->set_scrolldx(-(dx+2), xdim + (dx + 2) - 1 ); - tilemap_set_scrolldy( state->m_tmap[0], -dy, ydim + dy -1 ); - tilemap_set_scrolldy( state->m_tmap[1], -dy, ydim + dy -1 ); + state->m_tmap[0]->set_scrolldy(-dy, ydim + dy -1 ); + state->m_tmap[1]->set_scrolldy(-dy, ydim + dy -1 ); - tilemap_set_transparent_pen(state->m_tmap[0], 0); - tilemap_set_transparent_pen(state->m_tmap[1], 0); + state->m_tmap[0]->set_transparent_pen(0); + state->m_tmap[1]->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_tmap[0], 0x200); // Line Scroll - tilemap_set_scroll_rows(state->m_tmap[1], 0x200); + state->m_tmap[0]->set_scroll_rows(0x200); // Line Scroll + state->m_tmap[1]->set_scroll_rows(0x200); } } @@ -864,13 +864,13 @@ static void kaneko16_prepare_first_tilemap_chip(running_machine &machine, bitmap layers_flip_0 = state->m_layers_0_regs[ 4 ]; /* Enable layers */ - tilemap_set_enable(state->m_tmap[0], ~layers_flip_0 & 0x1000); - tilemap_set_enable(state->m_tmap[1], ~layers_flip_0 & 0x0010); + state->m_tmap[0]->enable(~layers_flip_0 & 0x1000); + state->m_tmap[1]->enable(~layers_flip_0 & 0x0010); /* Flip layers */ - tilemap_set_flip(state->m_tmap[0], ((layers_flip_0 & 0x0100) ? TILEMAP_FLIPY : 0) | + state->m_tmap[0]->set_flip( ((layers_flip_0 & 0x0100) ? TILEMAP_FLIPY : 0) | ((layers_flip_0 & 0x0200) ? TILEMAP_FLIPX : 0) ); - tilemap_set_flip(state->m_tmap[1], ((layers_flip_0 & 0x0100) ? TILEMAP_FLIPY : 0) | + state->m_tmap[1]->set_flip( ((layers_flip_0 & 0x0100) ? TILEMAP_FLIPY : 0) | ((layers_flip_0 & 0x0200) ? TILEMAP_FLIPX : 0) ); /* Scroll layers */ @@ -879,16 +879,16 @@ static void kaneko16_prepare_first_tilemap_chip(running_machine &machine, bitmap layer1_scrollx = state->m_layers_0_regs[ 0 ]; layer1_scrolly = state->m_layers_0_regs[ 1 ] >> 6; - tilemap_set_scrolly(state->m_tmap[0],0,layer0_scrolly); - tilemap_set_scrolly(state->m_tmap[1],0,layer1_scrolly); + state->m_tmap[0]->set_scrolly(0,layer0_scrolly); + state->m_tmap[1]->set_scrolly(0,layer1_scrolly); for (i=0; i<0x200; i++) { UINT16 scroll; scroll = (layers_flip_0 & 0x0800) ? state->m_vscroll[0][i] : 0; - tilemap_set_scrollx(state->m_tmap[0],i,(layer0_scrollx + scroll) >> 6 ); + state->m_tmap[0]->set_scrollx(i,(layer0_scrollx + scroll) >> 6 ); scroll = (layers_flip_0 & 0x0008) ? state->m_vscroll[1][i] : 0; - tilemap_set_scrollx(state->m_tmap[1],i,(layer1_scrollx + scroll) >> 6 ); + state->m_tmap[1]->set_scrollx(i,(layer1_scrollx + scroll) >> 6 ); } } @@ -906,12 +906,12 @@ static void kaneko16_prepare_second_tilemap_chip(running_machine &machine, bitma { layers_flip_1 = state->m_layers_1_regs[ 4 ]; - tilemap_set_enable(state->m_tmap[2], ~layers_flip_1 & 0x1000); - tilemap_set_enable(state->m_tmap[3], ~layers_flip_1 & 0x0010); + state->m_tmap[2]->enable(~layers_flip_1 & 0x1000); + state->m_tmap[3]->enable(~layers_flip_1 & 0x0010); - tilemap_set_flip(state->m_tmap[2], ((layers_flip_1 & 0x0100) ? TILEMAP_FLIPY : 0) | + state->m_tmap[2]->set_flip( ((layers_flip_1 & 0x0100) ? TILEMAP_FLIPY : 0) | ((layers_flip_1 & 0x0200) ? TILEMAP_FLIPX : 0) ); - tilemap_set_flip(state->m_tmap[3], ((layers_flip_1 & 0x0100) ? TILEMAP_FLIPY : 0) | + state->m_tmap[3]->set_flip( ((layers_flip_1 & 0x0100) ? TILEMAP_FLIPY : 0) | ((layers_flip_1 & 0x0200) ? TILEMAP_FLIPX : 0) ); layer0_scrollx = state->m_layers_1_regs[ 2 ]; @@ -919,16 +919,16 @@ static void kaneko16_prepare_second_tilemap_chip(running_machine &machine, bitma layer1_scrollx = state->m_layers_1_regs[ 0 ]; layer1_scrolly = state->m_layers_1_regs[ 1 ] >> 6; - tilemap_set_scrolly(state->m_tmap[2],0,layer0_scrolly); - tilemap_set_scrolly(state->m_tmap[3],0,layer1_scrolly); + state->m_tmap[2]->set_scrolly(0,layer0_scrolly); + state->m_tmap[3]->set_scrolly(0,layer1_scrolly); for (i=0; i<0x200; i++) { UINT16 scroll; scroll = (layers_flip_1 & 0x0800) ? state->m_vscroll[2][i] : 0; - tilemap_set_scrollx(state->m_tmap[2],i,(layer0_scrollx + scroll) >> 6 ); + state->m_tmap[2]->set_scrollx(i,(layer0_scrollx + scroll) >> 6 ); scroll = (layers_flip_1 & 0x0008) ? state->m_vscroll[3][i] : 0; - tilemap_set_scrollx(state->m_tmap[3],i,(layer1_scrollx + scroll) >> 6 ); + state->m_tmap[3]->set_scrollx(i,(layer1_scrollx + scroll) >> 6 ); } } } @@ -936,8 +936,8 @@ static void kaneko16_prepare_second_tilemap_chip(running_machine &machine, bitma static void kaneko16_render_first_tilemap_chip(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri) { kaneko16_state *state = machine.driver_data(); - tilemap_draw_primask(bitmap,cliprect, state->m_tmap[0], pri, pri, 0); - tilemap_draw_primask(bitmap,cliprect, state->m_tmap[1], pri, pri, 0); + state->m_tmap[0]->draw(bitmap, cliprect, pri, pri, 0); + state->m_tmap[1]->draw(bitmap, cliprect, pri, pri, 0); } static void kaneko16_render_second_tilemap_chip(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri) @@ -945,8 +945,8 @@ static void kaneko16_render_second_tilemap_chip(running_machine &machine, bitmap kaneko16_state *state = machine.driver_data(); if (state->m_tmap[2]) { - tilemap_draw_primask(bitmap,cliprect, state->m_tmap[2], pri, state->m_priority.VIEW2_2_pri ? pri : 0, 0); - tilemap_draw_primask(bitmap,cliprect, state->m_tmap[3], pri, state->m_priority.VIEW2_2_pri ? pri : 0, 0); + state->m_tmap[2]->draw(bitmap, cliprect, pri, state->m_priority.VIEW2_2_pri ? pri : 0, 0); + state->m_tmap[3]->draw(bitmap, cliprect, pri, state->m_priority.VIEW2_2_pri ? pri : 0, 0); } } @@ -1045,11 +1045,11 @@ SCREEN_UPDATE_IND16( jchan_view2 ) /* override the offsets set in common - tuned to char select in jchan2 */ dx = 25;dy = 11; - tilemap_set_scrolldx( state->m_tmap[0], -dx, 320 + dx -1 ); - tilemap_set_scrolldx( state->m_tmap[1], -(dx+2), 320 + (dx + 2) - 1 ); + state->m_tmap[0]->set_scrolldx(-dx, 320 + dx -1 ); + state->m_tmap[1]->set_scrolldx(-(dx+2), 320 + (dx + 2) - 1 ); - tilemap_set_scrolldy( state->m_tmap[0], -dy, 240 + dy -1 ); - tilemap_set_scrolldy( state->m_tmap[1], -dy, 240 + dy -1 ); + state->m_tmap[0]->set_scrolldy(-dy, 240 + dy -1 ); + state->m_tmap[1]->set_scrolldy(-dy, 240 + dy -1 ); return 0; } diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 4364a262057..85e5e2acb9c 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -69,7 +69,7 @@ void karnov_flipscreen_w( running_machine &machine, int data ) { karnov_state *state = machine.driver_data(); state->m_flipscreen = data; - tilemap_set_flip_all(machine, state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + machine.tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } static void draw_background( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -128,7 +128,7 @@ SCREEN_UPDATE_IND16( karnov ) karnov_state *state = screen.machine().driver_data(); draw_background(screen.machine(), bitmap, cliprect); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().generic.buffered_spriteram.u16, 0x800, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -149,7 +149,7 @@ WRITE16_HANDLER( karnov_videoram_w ) { karnov_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fix_tilemap, offset); + state->m_fix_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( karnov_playfield_swap_w ) @@ -171,7 +171,7 @@ VIDEO_START( karnov ) state->save_item(NAME(*state->m_bitmap_f)); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); } VIDEO_START( wndrplnt ) @@ -184,7 +184,7 @@ VIDEO_START( wndrplnt ) state->save_item(NAME(*state->m_bitmap_f)); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); } /******************************************************************************/ diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c index 54c8baf11af..86acb2c0a52 100644 --- a/src/mame/video/kchamp.c +++ b/src/mame/video/kchamp.c @@ -28,14 +28,14 @@ WRITE8_HANDLER( kchamp_videoram_w ) { kchamp_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( kchamp_colorram_w ) { kchamp_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( kchamp_flipscreen_w ) @@ -131,7 +131,7 @@ SCREEN_UPDATE_IND16( kchamp ) { kchamp_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); kchamp_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -140,7 +140,7 @@ SCREEN_UPDATE_IND16( kchampvs ) { kchamp_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); kchampvs_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c index c59528ac4a8..6d9624de334 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -8,21 +8,21 @@ WRITE16_HANDLER( kickgoal_fgram_w ) { kickgoal_state *state = space->machine().driver_data(); state->m_fgram[offset] = data; - tilemap_mark_tile_dirty(state->m_fgtm, offset / 2); + state->m_fgtm->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( kickgoal_bgram_w ) { kickgoal_state *state = space->machine().driver_data(); state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bgtm, offset / 2); + state->m_bgtm->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( kickgoal_bg2ram_w ) { kickgoal_state *state = space->machine().driver_data(); state->m_bg2ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg2tm, offset / 2); + state->m_bg2tm->mark_tile_dirty(offset / 2); } @@ -86,8 +86,8 @@ VIDEO_START( kickgoal ) state->m_bgtm = tilemap_create(machine, get_kickgoal_bg_tile_info, tilemap_scan_kicksbg, 16, 32, 64, 64); state->m_bg2tm = tilemap_create(machine, get_kickgoal_bg2_tile_info, tilemap_scan_kicksbg2, 32, 64, 64, 64); - tilemap_set_transparent_pen(state->m_fgtm, 15); - tilemap_set_transparent_pen(state->m_bgtm, 15); + state->m_fgtm->set_transparent_pen(15); + state->m_bgtm->set_transparent_pen(15); } @@ -127,20 +127,20 @@ SCREEN_UPDATE_IND16( kickgoal ) kickgoal_state *state = screen.machine().driver_data(); /* set scroll */ - tilemap_set_scrollx(state->m_fgtm, 0, state->m_scrram[0]); - tilemap_set_scrolly(state->m_fgtm, 0, state->m_scrram[1] * 2); - tilemap_set_scrollx(state->m_bgtm, 0, state->m_scrram[2]); - tilemap_set_scrolly(state->m_bgtm, 0, state->m_scrram[3] * 2); - tilemap_set_scrollx(state->m_bg2tm, 0, state->m_scrram[4]); - tilemap_set_scrolly(state->m_bg2tm, 0, state->m_scrram[5] * 2); + state->m_fgtm->set_scrollx(0, state->m_scrram[0]); + state->m_fgtm->set_scrolly(0, state->m_scrram[1] * 2); + state->m_bgtm->set_scrollx(0, state->m_scrram[2]); + state->m_bgtm->set_scrolly(0, state->m_scrram[3] * 2); + state->m_bg2tm->set_scrollx(0, state->m_scrram[4]); + state->m_bg2tm->set_scrolly(0, state->m_scrram[5] * 2); /* draw */ - tilemap_draw(bitmap, cliprect, state->m_bg2tm, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bgtm, 0, 0); + state->m_bg2tm->draw(bitmap, cliprect, 0, 0); + state->m_bgtm->draw(bitmap, cliprect, 0, 0); kickgoal_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fgtm, 0, 0); + state->m_fgtm->draw(bitmap, cliprect, 0, 0); /* popmessage ("Regs %04x %04x %04x %04x %04x %04x %04x %04x", @@ -220,8 +220,8 @@ VIDEO_START( actionhw ) state->m_bgtm = tilemap_create(machine, get_actionhw_bg_tile_info, tilemap_scan_actionhwbg, 16, 16, 64, 64); state->m_bg2tm = tilemap_create(machine, get_actionhw_bg2_tile_info, tilemap_scan_actionhwbg2, 16, 16, 64, 64); - tilemap_set_transparent_pen(state->m_fgtm, 15); - tilemap_set_transparent_pen(state->m_bgtm, 15); + state->m_fgtm->set_transparent_pen(15); + state->m_bgtm->set_transparent_pen(15); } @@ -257,19 +257,19 @@ SCREEN_UPDATE_IND16( actionhw ) { kickgoal_state *state = screen.machine().driver_data(); /* set scroll */ - tilemap_set_scrollx(state->m_fgtm, 0, state->m_scrram[0]); - tilemap_set_scrolly(state->m_fgtm, 0, state->m_scrram[1]); - tilemap_set_scrollx(state->m_bgtm, 0, state->m_scrram[2]); - tilemap_set_scrolly(state->m_bgtm, 0, state->m_scrram[3]); - tilemap_set_scrollx(state->m_bg2tm, 0, state->m_scrram[4]); - tilemap_set_scrolly(state->m_bg2tm, 0, state->m_scrram[5]); + state->m_fgtm->set_scrollx(0, state->m_scrram[0]); + state->m_fgtm->set_scrolly(0, state->m_scrram[1]); + state->m_bgtm->set_scrollx(0, state->m_scrram[2]); + state->m_bgtm->set_scrolly(0, state->m_scrram[3]); + state->m_bg2tm->set_scrollx(0, state->m_scrram[4]); + state->m_bg2tm->set_scrolly(0, state->m_scrram[5]); /* draw */ - tilemap_draw(bitmap, cliprect, state->m_bg2tm, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bgtm, 0, 0); + state->m_bg2tm->draw(bitmap, cliprect, 0, 0); + state->m_bgtm->draw(bitmap, cliprect, 0, 0); actionhw_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fgtm, 0, 0); + state->m_fgtm->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index 3b569bf1c7d..f570226a887 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -135,28 +135,28 @@ WRITE8_HANDLER( kingofb_videoram_w ) { kingofb_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( kingofb_colorram_w ) { kingofb_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( kingofb_videoram2_w ) { kingofb_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( kingofb_colorram2_w ) { kingofb_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( kingofb_f800_w ) @@ -167,13 +167,13 @@ WRITE8_HANDLER( kingofb_f800_w ) if (state->m_palette_bank != ((data & 0x18) >> 3)) { state->m_palette_bank = (data & 0x18) >> 3; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } if (flip_screen_get(space->machine()) != (data & 0x80)) { flip_screen_set(space->machine(), data & 0x80); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -205,7 +205,7 @@ VIDEO_START( kingofb ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_y, 16, 16, 16, 16); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void kingofb_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -250,10 +250,10 @@ SCREEN_UPDATE_IND16( kingofb ) { kingofb_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, -(*state->m_scroll_y)); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrolly(0, -(*state->m_scroll_y)); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); kingofb_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -274,7 +274,7 @@ VIDEO_START( ringking ) state->m_bg_tilemap = tilemap_create(machine, ringking_get_bg_tile_info, tilemap_scan_cols_flip_y, 16, 16, 16, 16); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void ringking_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -312,9 +312,9 @@ SCREEN_UPDATE_IND16( ringking ) { kingofb_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, -(*state->m_scroll_y)); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrolly(0, -(*state->m_scroll_y)); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); ringking_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/klax.c b/src/mame/video/klax.c index 131a5b76936..576bebf1ac1 100644 --- a/src/mame/video/klax.c +++ b/src/mame/video/klax.c @@ -109,7 +109,7 @@ SCREEN_UPDATE_IND16( klax ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index f82a51fe4d9..0d9fcbe441b 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -106,7 +106,7 @@ VIDEO_START( kncljoe ) kncljoe_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 4); + state->m_bg_tilemap->set_scroll_rows(4); } @@ -121,7 +121,7 @@ WRITE8_HANDLER( kncljoe_videoram_w ) { kncljoe_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( kncljoe_control_w ) @@ -139,7 +139,7 @@ WRITE8_HANDLER( kncljoe_control_w ) set after IN0 - Coin 1 goes high AND the credit has been added */ state->m_flipscreen = data & 0x01; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? TILEMAP_FLIPX : TILEMAP_FLIPY); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? TILEMAP_FLIPX : TILEMAP_FLIPY); coin_counter_w(space->machine(), 0, data & 0x02); coin_counter_w(space->machine(), 1, data & 0x20); @@ -148,7 +148,7 @@ WRITE8_HANDLER( kncljoe_control_w ) if (state->m_tile_bank != i) { state->m_tile_bank = i; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } i = (data & 0x04) >> 2; @@ -166,10 +166,10 @@ WRITE8_HANDLER( kncljoe_scroll_w ) state->m_scrollregs[offset] = data; scrollx = state->m_scrollregs[0] | state->m_scrollregs[1] << 8; - tilemap_set_scrollx(state->m_bg_tilemap, 0, scrollx); - tilemap_set_scrollx(state->m_bg_tilemap, 1, scrollx); - tilemap_set_scrollx(state->m_bg_tilemap, 2, scrollx); - tilemap_set_scrollx(state->m_bg_tilemap, 3, 0); + state->m_bg_tilemap->set_scrollx(0, scrollx); + state->m_bg_tilemap->set_scrollx(1, scrollx); + state->m_bg_tilemap->set_scrollx(2, scrollx); + state->m_bg_tilemap->set_scrollx(3, 0); } @@ -242,7 +242,7 @@ SCREEN_UPDATE_IND16( kncljoe ) { kncljoe_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 905baeea345..45ec5c720b7 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -286,7 +286,7 @@ static void K053936GP_zoom_draw(running_machine &machine, UINT32 startx, starty; int incxx, incxy, incyx, incyy, y, maxy, clip; - bitmap_ind16 &src_bitmap = tilemap_get_pixmap(tmap); + bitmap_ind16 &src_bitmap = tmap->pixmap(); rectangle &src_cliprect = K053936_cliprect[chip]; clip = K053936_clip_enabled[chip]; @@ -1849,7 +1849,7 @@ WRITE32_HANDLER( konamigx_type3_psac2_bank_w ) /* handle this by creating 2 roz tilemaps instead, otherwise performance dies completely on dual screen mode if (konamigx_type3_psac2_actual_bank!=konamigx_type3_psac2_actual_last_bank) { - tilemap_mark_all_tiles_dirty (gx_psac_tilemap); + gx_psac_tilemap->mark_all_dirty(); konamigx_type3_psac2_actual_last_bank = konamigx_type3_psac2_actual_bank; } */ @@ -2164,7 +2164,7 @@ VIDEO_START(konamigx_type3) type3_roz_temp_bitmap = auto_bitmap_ind16_alloc(machine, width, height); - //tilemap_set_flip(gx_psac_tilemap, TILEMAP_FLIPX| TILEMAP_FLIPY); + //gx_psac_tilemap->set_flip(TILEMAP_FLIPX| TILEMAP_FLIPY); K053936_wraparound_enable(0, 1); // K053936GP_set_offset(0, -30, -1); @@ -2306,8 +2306,8 @@ VIDEO_START(opengolf) gx_psac_tilemap2 = tilemap_create(machine, get_gx_psac1b_tile_info, tilemap_scan_cols, 16, 16, 128, 128); // transparency will be handled manually in post-processing - //tilemap_set_transparent_pen(gx_psac_tilemap, 0); - //tilemap_set_transparent_pen(gx_psac_tilemap2, 0); + //gx_psac_tilemap->set_transparent_pen(0); + //gx_psac_tilemap2->set_transparent_pen(0); gx_rozenable = 0; gx_specialrozenable = 1; @@ -2344,8 +2344,8 @@ VIDEO_START(racinfrc) gx_psac_tilemap2 = tilemap_create(machine, get_gx_psac1b_tile_info, tilemap_scan_cols, 16, 16, 128, 128); // transparency will be handled manually in post-processing - //tilemap_set_transparent_pen(gx_psac_tilemap, 0); - //tilemap_set_transparent_pen(gx_psac_tilemap2, 0); + //gx_psac_tilemap->set_transparent_pen(0); + //gx_psac_tilemap2->set_transparent_pen(0); gx_rozenable = 0; gx_specialrozenable = 1; @@ -2409,10 +2409,10 @@ SCREEN_UPDATE_RGB32(konamigx) if (psac_colorbase != last_psac_colorbase) { - tilemap_mark_all_tiles_dirty(gx_psac_tilemap); + gx_psac_tilemap->mark_all_dirty(); if (gx_rozenable == 3) { - tilemap_mark_all_tiles_dirty(gx_psac_tilemap2); + gx_psac_tilemap2->mark_all_dirty(); } } } @@ -2658,8 +2658,8 @@ WRITE32_HANDLER( konamigx_tilebank_w ) WRITE32_HANDLER(konamigx_t1_psacmap_w) { COMBINE_DATA(&gx_psacram[offset]); - tilemap_mark_tile_dirty(gx_psac_tilemap, offset/2); - tilemap_mark_tile_dirty(gx_psac_tilemap2, offset/2); + gx_psac_tilemap->mark_tile_dirty(offset/2); + gx_psac_tilemap2->mark_tile_dirty(offset/2); } // type 4 RAM-based PSAC tilemap @@ -2667,7 +2667,7 @@ WRITE32_HANDLER( konamigx_t4_psacmap_w ) { COMBINE_DATA(&gx_psacram[offset]); - tilemap_mark_tile_dirty(gx_psac_tilemap, offset*2); - tilemap_mark_tile_dirty(gx_psac_tilemap, (offset*2)+1); + gx_psac_tilemap->mark_tile_dirty(offset*2); + gx_psac_tilemap->mark_tile_dirty((offset*2)+1); } diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index ee76732ee92..81b06806412 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -1581,7 +1581,7 @@ static void K053936_zoom_draw(int chip,UINT16 *ctrl,UINT16 *linectrl, bitmap_ind startx -= K053936_offset[chip][0] * incxx; starty -= K053936_offset[chip][0] * incxy; - tilemap_draw_roz(bitmap,my_clip,tmap,startx << 5,starty << 5, + tmap->draw_roz(bitmap, my_clip, startx << 5,starty << 5, incxx << 5,incxy << 5,0,0, K053936_wraparound[chip], flags,priority); @@ -1610,7 +1610,7 @@ static void K053936_zoom_draw(int chip,UINT16 *ctrl,UINT16 *linectrl, bitmap_ind startx -= K053936_offset[chip][0] * incxx; starty -= K053936_offset[chip][0] * incxy; - tilemap_draw_roz(bitmap,cliprect,tmap,startx << 5,starty << 5, + tmap->draw_roz(bitmap, cliprect, startx << 5,starty << 5, incxx << 5,incxy << 5,incyx << 5,incyy << 5, K053936_wraparound[chip], flags,priority); @@ -1785,7 +1785,7 @@ static int K056832_djmain_hack; static void K056832_mark_page_dirty(int page) { if (K056832_PageTileMode[page]) - tilemap_mark_all_tiles_dirty(K056832_tilemap[page]); + K056832_tilemap[page]->mark_all_dirty(); else K056832_mark_all_lines_dirty(page); } @@ -1875,7 +1875,7 @@ if (!(K056832_djmain_hack==1) || K056832_LayerAssociatedWithPage[pageIndex] == - static void (*K056832_callback)(running_machine &machine, int layer, int *code, int *color, int *flags); -INLINE void K056832_get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int pageIndex ) +INLINE void K056832_get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int pageIndex ) { static const struct K056832_SHIFTMASKS { @@ -2179,9 +2179,9 @@ void K056832_vh_start(running_machine &machine, const char *gfx_memory_region, i { tmap = K056832_tilemap[i]; - K056832_pixmap[i] = &tilemap_get_pixmap(tmap); + K056832_pixmap[i] = &tmap->pixmap(); - tilemap_set_transparent_pen(tmap, 0); + tmap->set_transparent_pen(0); } memset(K056832_videoram, 0x00, 0x20000); @@ -2400,7 +2400,7 @@ WRITE16_HANDLER( K056832_ram_word_w ) *tile_ptr = data; if (K056832_PageTileMode[K056832_SelectedPage]) - tilemap_mark_tile_dirty(K056832_tilemap[K056832_SelectedPage], offset); + K056832_tilemap[K056832_SelectedPage]->mark_tile_dirty(offset); else K056832_mark_line_dirty(K056832_SelectedPage, offset); } @@ -2423,7 +2423,7 @@ WRITE32_HANDLER( K056832_ram_long_w ) tile_ptr[1] = data; if (K056832_PageTileMode[K056832_SelectedPage]) - tilemap_mark_tile_dirty(K056832_tilemap[K056832_SelectedPage], offset); + K056832_tilemap[K056832_SelectedPage]->mark_tile_dirty(offset); else K056832_mark_line_dirty(K056832_SelectedPage, offset); } @@ -2455,7 +2455,7 @@ WRITE16_HANDLER( K056832_word_w ) if (new_data & 0x10) flip |= TILEMAP_FLIPX; for (i=0; iset_flip(flip); } } @@ -2579,8 +2579,8 @@ static int K056832_update_linemap(running_machine &machine, bitmap_rgb32 &bitmap UINT8 *xprdata; tmap = K056832_tilemap[page]; - bitmap_ind8 &xprmap = tilemap_get_flagsmap(tmap); - xprdata = tilemap_get_tile_flags(tmap); + bitmap_ind8 &xprmap = tmap->flagsmap(); + xprdata = tmap->tile_flags(); dirty = K056832_LineDirty[page]; all_dirty = K056832_AllLinesDirty[page]; @@ -2593,7 +2593,7 @@ static int K056832_update_linemap(running_machine &machine, bitmap_rgb32 &bitmap // force tilemap into a clean, static state // *really ugly but it minimizes alteration to tilemap.c memset (&zerorect, 0, sizeof(rectangle)); // zero dimension - tilemap_draw(bitmap, zerorect, tmap, 0, 0); // dummy call to reset tile_dirty_map + tmap->draw(bitmap, zerorect, 0, 0); // dummy call to reset tile_dirty_map xprmap.fill(0); // reset pixel transparency_bitmap; memset(xprdata, TILEMAP_PIXEL_LAYER0, 0x800); // reset tile transparency_data; } @@ -2889,7 +2889,7 @@ void K056832_tilemap_draw(running_machine &machine, bitmap_rgb32 &bitmap, const if (K056832_update_linemap(machine, bitmap, pageIndex, flags)) continue; tmap = K056832_tilemap[pageIndex]; - tilemap_set_scrolly(tmap, 0, ay); + tmap->set_scrolly(0, ay); last_dx = 0x100000; last_visible = 0; @@ -2962,10 +2962,10 @@ void K056832_tilemap_draw(running_machine &machine, bitmap_rgb32 &bitmap, const // logic, but it works. if ((drawrect.min_x>0) && (drawrect.max_x==511)) drawrect.max_x=cliprect.max_x; - tilemap_set_scrollx(tmap, 0, dx); + tmap->set_scrollx(0, dx); LINE_SHORTCIRCUIT: - tilemap_draw(bitmap, drawrect, tmap, flags, priority); + tmap->draw(bitmap, drawrect, flags, priority); } // end of line loop } // end of column loop diff --git a/src/mame/video/konamiic.h b/src/mame/video/konamiic.h index bef3388e650..dc4ce977893 100644 --- a/src/mame/video/konamiic.h +++ b/src/mame/video/konamiic.h @@ -43,7 +43,7 @@ void K053936_set_offset(int chip, int xoffs, int yoffs); /* - Note: K053251_w() automatically does a tilemap_mark_all_tiles_dirty(ALL_TILEMAPS) + Note: K053251_w() automatically does a ALL_TILEMAPS->mark_all_dirty() when some palette index changes. If ALL_TILEMAPS is too expensive, use K053251_set_tilemaps() to indicate which tilemap is associated with each index. */ diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index d95a2555669..d29698d8339 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -1377,7 +1377,7 @@ WRITE8_DEVICE_HANDLER( k007121_ctrl_w ) case 6: /* palette bank change */ if ((k007121->ctrlram[offset] & 0x30) != (data & 0x30)) - tilemap_mark_all_tiles_dirty_all(device->machine()); + device->machine().tilemap().mark_all_dirty(); break; case 7: k007121->flipscreen = data & 0x08; @@ -1638,9 +1638,9 @@ WRITE8_DEVICE_HANDLER( k007342_w ) k007342->ram[offset] = data; if (offset < 0x1000) /* layer 0 */ - tilemap_mark_tile_dirty(k007342->tilemap[0], offset & 0x7ff); + k007342->tilemap[0]->mark_tile_dirty(offset & 0x7ff); else /* layer 1 */ - tilemap_mark_tile_dirty(k007342->tilemap[1], offset & 0x7ff); + k007342->tilemap[1]->mark_tile_dirty(offset & 0x7ff); } READ8_DEVICE_HANDLER( k007342_scroll_r ) @@ -1664,12 +1664,12 @@ WRITE8_DEVICE_HANDLER( k007342_vreg_w ) /* bit 1: INT control */ k007342->int_enabled = data & 0x02; k007342->flipscreen = data & 0x10; - tilemap_set_flip(k007342->tilemap[0], k007342->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(k007342->tilemap[1], k007342->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + k007342->tilemap[0]->set_flip(k007342->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + k007342->tilemap[1]->set_flip(k007342->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); break; case 0x01: /* used for banking in Rock'n'Rage */ if (data != k007342->regs[1]) - tilemap_mark_all_tiles_dirty_all(device->machine()); + device->machine().tilemap().mark_all_dirty(); case 0x02: k007342->scrollx[0] = (k007342->scrollx[0] & 0xff) | ((data & 0x01) << 8); k007342->scrollx[1] = (k007342->scrollx[1] & 0xff) | ((data & 0x02) << 7); @@ -1701,27 +1701,27 @@ void k007342_tilemap_update( device_t *device ) { case 0x00: case 0x08: /* unknown, blades of steel shootout between periods */ - tilemap_set_scroll_rows(k007342->tilemap[0], 1); - tilemap_set_scroll_cols(k007342->tilemap[0], 1); - tilemap_set_scrollx(k007342->tilemap[0], 0, k007342->scrollx[0]); - tilemap_set_scrolly(k007342->tilemap[0], 0, k007342->scrolly[0]); + k007342->tilemap[0]->set_scroll_rows(1); + k007342->tilemap[0]->set_scroll_cols(1); + k007342->tilemap[0]->set_scrollx(0, k007342->scrollx[0]); + k007342->tilemap[0]->set_scrolly(0, k007342->scrolly[0]); break; case 0x0c: /* 32 columns */ - tilemap_set_scroll_rows(k007342->tilemap[0], 1); - tilemap_set_scroll_cols(k007342->tilemap[0], 512); - tilemap_set_scrollx(k007342->tilemap[0], 0, k007342->scrollx[0]); + k007342->tilemap[0]->set_scroll_rows(1); + k007342->tilemap[0]->set_scroll_cols(512); + k007342->tilemap[0]->set_scrollx(0, k007342->scrollx[0]); for (offs = 0; offs < 256; offs++) - tilemap_set_scrolly(k007342->tilemap[0], (offs + k007342->scrollx[0]) & 0x1ff, + k007342->tilemap[0]->set_scrolly((offs + k007342->scrollx[0]) & 0x1ff, k007342->scroll_ram[2 * (offs / 8)] + 256 * k007342->scroll_ram[2 * (offs / 8) + 1]); break; case 0x14: /* 256 rows */ - tilemap_set_scroll_rows(k007342->tilemap[0], 256); - tilemap_set_scroll_cols(k007342->tilemap[0], 1); - tilemap_set_scrolly(k007342->tilemap[0], 0, k007342->scrolly[0]); + k007342->tilemap[0]->set_scroll_rows(256); + k007342->tilemap[0]->set_scroll_cols(1); + k007342->tilemap[0]->set_scrolly(0, k007342->scrolly[0]); for (offs = 0; offs < 256; offs++) - tilemap_set_scrollx(k007342->tilemap[0], (offs + k007342->scrolly[0]) & 0xff, + k007342->tilemap[0]->set_scrollx((offs + k007342->scrolly[0]) & 0xff, k007342->scroll_ram[2 * offs] + 256 * k007342->scroll_ram[2 * offs + 1]); break; @@ -1730,16 +1730,16 @@ void k007342_tilemap_update( device_t *device ) break; } - tilemap_set_scrollx(k007342->tilemap[1], 0, k007342->scrollx[1]); - tilemap_set_scrolly(k007342->tilemap[1], 0, k007342->scrolly[1]); + k007342->tilemap[1]->set_scrollx(0, k007342->scrollx[1]); + k007342->tilemap[1]->set_scrolly(0, k007342->scrolly[1]); #if 0 { static int current_layer = 0; if (machine.input().code_pressed_once(KEYCODE_Z)) current_layer = !current_layer; - tilemap_set_enable(k007342->tilemap[current_layer], 1); - tilemap_set_enable(k007342->tilemap[!current_layer], 0); + k007342->tilemap[current_layer]->enable(1); + k007342->tilemap[!current_layer]->enable(0); popmessage("regs:%02x %02x %02x %02x-%02x %02x %02x %02x:%02x", k007342->regs[0], k007342->regs[1], k007342->regs[2], k007342->regs[3], @@ -1752,7 +1752,7 @@ void k007342_tilemap_update( device_t *device ) void k007342_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int num, int flags, UINT32 priority ) { k007342_state *k007342 = k007342_get_safe_token(device); - tilemap_draw(bitmap, cliprect, k007342->tilemap[num], flags, priority); + k007342->tilemap[num]->draw(bitmap, cliprect, flags, priority); } int k007342_is_int_enabled( device_t *device ) @@ -1784,7 +1784,7 @@ static TILEMAP_MAPPER( k007342_scan ) return (col & 0x1f) + ((row & 0x1f) << 5) + ((col & 0x20) << 5); } -INLINE void k007342_get_tile_info( device_t *device, tile_data *tileinfo, int tile_index, int layer, UINT8 *cram, UINT8 *vram ) +INLINE void k007342_get_tile_info( device_t *device, tile_data &tileinfo, int tile_index, int layer, UINT8 *cram, UINT8 *vram ) { k007342_state *k007342 = k007342_get_safe_token(device); int color, code, flags; @@ -1793,7 +1793,7 @@ INLINE void k007342_get_tile_info( device_t *device, tile_data *tileinfo, int ti code = vram[tile_index]; flags = TILE_FLIPYX((color & 0x30) >> 4); - tileinfo->category = (color & 0x80) >> 7; + tileinfo.category = (color & 0x80) >> 7; k007342->callback(device->machine(), layer, k007342->regs[1], &code, &color, &flags); @@ -1840,8 +1840,8 @@ static DEVICE_START( k007342 ) k007342->videoram_0 = &k007342->ram[0x0800]; k007342->videoram_1 = &k007342->ram[0x1800]; - tilemap_set_transparent_pen(k007342->tilemap[0], 0); - tilemap_set_transparent_pen(k007342->tilemap[1], 0); + k007342->tilemap[0]->set_transparent_pen(0); + k007342->tilemap[1]->set_transparent_pen(0); device->save_pointer(NAME(k007342->ram), 0x2000); device->save_pointer(NAME(k007342->scroll_ram), 0x0200); @@ -2246,7 +2246,7 @@ WRITE8_DEVICE_HANDLER( k052109_w ) k052109->has_extra_video_ram = 1; /* kludge for X-Men */ k052109->ram[offset] = data; - tilemap_mark_tile_dirty(k052109->tilemap[(offset & 0x1800) >> 11],offset & 0x7ff); + k052109->tilemap[(offset & 0x1800) >> 11]->mark_tile_dirty(offset & 0x7ff); } else /* control registers */ { @@ -2293,7 +2293,7 @@ WRITE8_DEVICE_HANDLER( k052109_w ) int bank = (k052109->ram[i]&0x0c) >> 2; if ((bank == 0 && (dirty & 1)) || (bank == 1 && (dirty & 2))) { - tilemap_mark_tile_dirty(k052109->tilemap[(i & 0x1800) >> 11], i & 0x7ff); + k052109->tilemap[(i & 0x1800) >> 11]->mark_tile_dirty(i & 0x7ff); } } } @@ -2306,16 +2306,16 @@ WRITE8_DEVICE_HANDLER( k052109_w ) else if (offset == 0x1e80) { //if ((data & 0xfe)) logerror("%04x: 052109 register 1e80 = %02x\n",cpu_get_pc(&space->device()),data); - tilemap_set_flip(k052109->tilemap[0], (data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(k052109->tilemap[1], (data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(k052109->tilemap[2], (data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + k052109->tilemap[0]->set_flip((data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + k052109->tilemap[1]->set_flip((data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + k052109->tilemap[2]->set_flip((data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (k052109->tileflip_enable != ((data & 0x06) >> 1)) { k052109->tileflip_enable = ((data & 0x06) >> 1); - tilemap_mark_all_tiles_dirty(k052109->tilemap[0]); - tilemap_mark_all_tiles_dirty(k052109->tilemap[1]); - tilemap_mark_all_tiles_dirty(k052109->tilemap[2]); + k052109->tilemap[0]->mark_all_dirty(); + k052109->tilemap[1]->mark_all_dirty(); + k052109->tilemap[2]->mark_all_dirty(); } } else if (offset == 0x1f00) @@ -2339,7 +2339,7 @@ WRITE8_DEVICE_HANDLER( k052109_w ) { int bank = (k052109->ram[i] & 0x0c) >> 2; if ((bank == 2 && (dirty & 1)) || (bank == 3 && (dirty & 2))) - tilemap_mark_tile_dirty(k052109->tilemap[(i & 0x1800) >> 11],i & 0x7ff); + k052109->tilemap[(i & 0x1800) >> 11]->mark_tile_dirty(i & 0x7ff); } } } @@ -2404,7 +2404,7 @@ int k052109_get_rmrd_line(device_t *device ) void k052109_tilemap_mark_dirty( device_t *device, int tmap_num ) { k052109_state *k052109 = k052109_get_safe_token(device); - tilemap_mark_all_tiles_dirty(k052109->tilemap[tmap_num]); + k052109->tilemap[tmap_num]->mark_all_dirty(); } @@ -2427,116 +2427,116 @@ popmessage("%x %x %x %x", { UINT8 *scrollram = &k052109->ram[0x1a00]; - tilemap_set_scroll_rows(k052109->tilemap[1], 256); - tilemap_set_scroll_cols(k052109->tilemap[1], 1); + k052109->tilemap[1]->set_scroll_rows(256); + k052109->tilemap[1]->set_scroll_cols(1); yscroll = k052109->ram[0x180c]; - tilemap_set_scrolly(k052109->tilemap[1], 0, yscroll + k052109->dy[1]); + k052109->tilemap[1]->set_scrolly(0, yscroll + k052109->dy[1]); for (offs = 0; offs < 256; offs++) { xscroll = scrollram[2 * (offs & 0xfff8) + 0] + 256 * scrollram[2 * (offs & 0xfff8) + 1]; xscroll -= 6; - tilemap_set_scrollx(k052109->tilemap[1], (offs + yscroll) & 0xff, xscroll + k052109->dx[1]); + k052109->tilemap[1]->set_scrollx((offs + yscroll) & 0xff, xscroll + k052109->dx[1]); } } else if ((k052109->scrollctrl & 0x03) == 0x03) { UINT8 *scrollram = &k052109->ram[0x1a00]; - tilemap_set_scroll_rows(k052109->tilemap[1], 256); - tilemap_set_scroll_cols(k052109->tilemap[1], 1); + k052109->tilemap[1]->set_scroll_rows(256); + k052109->tilemap[1]->set_scroll_cols(1); yscroll = k052109->ram[0x180c]; - tilemap_set_scrolly(k052109->tilemap[1], 0, yscroll + k052109->dy[1]); + k052109->tilemap[1]->set_scrolly(0, yscroll + k052109->dy[1]); for (offs = 0; offs < 256; offs++) { xscroll = scrollram[2 * offs + 0] + 256 * scrollram[2 * offs + 1]; xscroll -= 6; - tilemap_set_scrollx(k052109->tilemap[1], (offs + yscroll) & 0xff, xscroll + k052109->dx[1]); + k052109->tilemap[1]->set_scrollx((offs + yscroll) & 0xff, xscroll + k052109->dx[1]); } } else if ((k052109->scrollctrl & 0x04) == 0x04) { UINT8 *scrollram = &k052109->ram[0x1800]; - tilemap_set_scroll_rows(k052109->tilemap[1], 1); - tilemap_set_scroll_cols(k052109->tilemap[1], 512); + k052109->tilemap[1]->set_scroll_rows(1); + k052109->tilemap[1]->set_scroll_cols(512); xscroll = k052109->ram[0x1a00] + 256 * k052109->ram[0x1a01]; xscroll -= 6; - tilemap_set_scrollx(k052109->tilemap[1], 0, xscroll + k052109->dx[1]); + k052109->tilemap[1]->set_scrollx(0, xscroll + k052109->dx[1]); for (offs = 0; offs < 512; offs++) { yscroll = scrollram[offs / 8]; - tilemap_set_scrolly(k052109->tilemap[1], (offs + xscroll) & 0x1ff, yscroll + k052109->dy[1]); + k052109->tilemap[1]->set_scrolly((offs + xscroll) & 0x1ff, yscroll + k052109->dy[1]); } } else { UINT8 *scrollram = &k052109->ram[0x1a00]; - tilemap_set_scroll_rows(k052109->tilemap[1], 1); - tilemap_set_scroll_cols(k052109->tilemap[1], 1); + k052109->tilemap[1]->set_scroll_rows(1); + k052109->tilemap[1]->set_scroll_cols(1); xscroll = scrollram[0] + 256 * scrollram[1]; xscroll -= 6; yscroll = k052109->ram[0x180c]; - tilemap_set_scrollx(k052109->tilemap[1], 0, xscroll + k052109->dx[1]); - tilemap_set_scrolly(k052109->tilemap[1], 0, yscroll + k052109->dy[1]); + k052109->tilemap[1]->set_scrollx(0, xscroll + k052109->dx[1]); + k052109->tilemap[1]->set_scrolly(0, yscroll + k052109->dy[1]); } if ((k052109->scrollctrl & 0x18) == 0x10) { UINT8 *scrollram = &k052109->ram[0x3a00]; - tilemap_set_scroll_rows(k052109->tilemap[2], 256); - tilemap_set_scroll_cols(k052109->tilemap[2], 1); + k052109->tilemap[2]->set_scroll_rows(256); + k052109->tilemap[2]->set_scroll_cols(1); yscroll = k052109->ram[0x380c]; - tilemap_set_scrolly(k052109->tilemap[2], 0, yscroll + k052109->dy[2]); + k052109->tilemap[2]->set_scrolly(0, yscroll + k052109->dy[2]); for (offs = 0; offs < 256; offs++) { xscroll = scrollram[2 * (offs & 0xfff8) + 0] + 256 * scrollram[2 * (offs & 0xfff8) + 1]; xscroll -= 6; - tilemap_set_scrollx(k052109->tilemap[2], (offs + yscroll) & 0xff, xscroll + k052109->dx[2]); + k052109->tilemap[2]->set_scrollx((offs + yscroll) & 0xff, xscroll + k052109->dx[2]); } } else if ((k052109->scrollctrl & 0x18) == 0x18) { UINT8 *scrollram = &k052109->ram[0x3a00]; - tilemap_set_scroll_rows(k052109->tilemap[2], 256); - tilemap_set_scroll_cols(k052109->tilemap[2], 1); + k052109->tilemap[2]->set_scroll_rows(256); + k052109->tilemap[2]->set_scroll_cols(1); yscroll = k052109->ram[0x380c]; - tilemap_set_scrolly(k052109->tilemap[2], 0, yscroll + k052109->dy[2]); + k052109->tilemap[2]->set_scrolly(0, yscroll + k052109->dy[2]); for (offs = 0; offs < 256; offs++) { xscroll = scrollram[2 * offs + 0] + 256 * scrollram[2 * offs + 1]; xscroll -= 6; - tilemap_set_scrollx(k052109->tilemap[2], (offs + yscroll) & 0xff, xscroll + k052109->dx[2]); + k052109->tilemap[2]->set_scrollx((offs + yscroll) & 0xff, xscroll + k052109->dx[2]); } } else if ((k052109->scrollctrl & 0x20) == 0x20) { UINT8 *scrollram = &k052109->ram[0x3800]; - tilemap_set_scroll_rows(k052109->tilemap[2], 1); - tilemap_set_scroll_cols(k052109->tilemap[2], 512); + k052109->tilemap[2]->set_scroll_rows(1); + k052109->tilemap[2]->set_scroll_cols(512); xscroll = k052109->ram[0x3a00] + 256 * k052109->ram[0x3a01]; xscroll -= 6; - tilemap_set_scrollx(k052109->tilemap[2], 0, xscroll + k052109->dx[2]); + k052109->tilemap[2]->set_scrollx(0, xscroll + k052109->dx[2]); for (offs = 0; offs < 512; offs++) { yscroll = scrollram[offs / 8]; - tilemap_set_scrolly(k052109->tilemap[2], (offs + xscroll) & 0x1ff, yscroll + k052109->dy[2]); + k052109->tilemap[2]->set_scrolly((offs + xscroll) & 0x1ff, yscroll + k052109->dy[2]); } } else { UINT8 *scrollram = &k052109->ram[0x3a00]; - tilemap_set_scroll_rows(k052109->tilemap[2], 1); - tilemap_set_scroll_cols(k052109->tilemap[2], 1); + k052109->tilemap[2]->set_scroll_rows(1); + k052109->tilemap[2]->set_scroll_cols(1); xscroll = scrollram[0] + 256 * scrollram[1]; xscroll -= 6; yscroll = k052109->ram[0x380c]; - tilemap_set_scrollx(k052109->tilemap[2], 0, xscroll + k052109->dx[2]); - tilemap_set_scrolly(k052109->tilemap[2], 0, yscroll + k052109->dy[2]); + k052109->tilemap[2]->set_scrollx(0, xscroll + k052109->dx[2]); + k052109->tilemap[2]->set_scrolly(0, yscroll + k052109->dy[2]); } #if 0 @@ -2564,7 +2564,7 @@ if (machine.input().code_pressed(KEYCODE_F)) void k052109_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int tmap_num, UINT32 flags, UINT8 priority ) { k052109_state *k052109 = k052109_get_safe_token(device); - tilemap_draw(bitmap, cliprect, k052109->tilemap[tmap_num], flags, priority); + k052109->tilemap[tmap_num]->draw(bitmap, cliprect, flags, priority); } int k052109_is_irq_enabled( device_t *device ) @@ -2600,7 +2600,7 @@ void k052109_set_layer_offsets( device_t *device, int layer, int dx, int dy ) color RAM ------xx depends on external connections (usually banking, flip) */ -INLINE void k052109_get_tile_info( device_t *device, tile_data *tileinfo, int tile_index, int layer, UINT8 *cram, UINT8 *vram1, UINT8 *vram2 ) +INLINE void k052109_get_tile_info( device_t *device, tile_data &tileinfo, int tile_index, int layer, UINT8 *cram, UINT8 *vram1, UINT8 *vram2 ) { k052109_state *k052109 = k052109_get_safe_token(device); int flipy = 0; @@ -2633,7 +2633,7 @@ INLINE void k052109_get_tile_info( device_t *device, tile_data *tileinfo, int ti color, flags); - tileinfo->category = priority; + tileinfo.category = priority; } static TILE_GET_INFO_DEVICE( k052109_get_tile_info0 ) @@ -2658,9 +2658,9 @@ static TILE_GET_INFO_DEVICE( k052109_get_tile_info2 ) static void k052109_tileflip_reset(k052109_state *k052109) { int data = k052109->ram[0x1e80]; - tilemap_set_flip(k052109->tilemap[0], (data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(k052109->tilemap[1], (data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(k052109->tilemap[2], (data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + k052109->tilemap[0]->set_flip((data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + k052109->tilemap[1]->set_flip((data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + k052109->tilemap[2]->set_flip((data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); k052109->tileflip_enable = ((data & 0x06) >> 1); } @@ -2732,9 +2732,9 @@ static DEVICE_START( k052109 ) k052109->videoram2_A = &k052109->ram[0x4800]; k052109->videoram2_B = &k052109->ram[0x5000]; - tilemap_set_transparent_pen(k052109->tilemap[0], 0); - tilemap_set_transparent_pen(k052109->tilemap[1], 0); - tilemap_set_transparent_pen(k052109->tilemap[2], 0); + k052109->tilemap[0]->set_transparent_pen(0); + k052109->tilemap[1]->set_transparent_pen(0); + k052109->tilemap[2]->set_transparent_pen(0); device->save_pointer(NAME(k052109->ram), 0x6000); device->save_item(NAME(k052109->rmrd_line)); @@ -5162,7 +5162,7 @@ WRITE8_DEVICE_HANDLER( k051316_w ) k051316_state *k051316= k051316_get_safe_token(device); k051316->ram[offset] = data; - tilemap_mark_tile_dirty(k051316->tmap, offset & 0x3ff); + k051316->tmap->mark_tile_dirty(offset & 0x3ff); } @@ -5208,7 +5208,7 @@ void k051316_wraparound_enable( device_t *device, int status ) ***************************************************************************/ -INLINE void k051316_get_tile_info( device_t *device, tile_data *tileinfo, int tile_index ) +INLINE void k051316_get_tile_info( device_t *device, tile_data &tileinfo, int tile_index ) { k051316_state *k051316 = k051316_get_safe_token(device); int code = k051316->ram[tile_index]; @@ -5247,7 +5247,7 @@ void k051316_zoom_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle startx -= (89 + k051316->offset[0]) * incxx; starty -= (89 + k051316->offset[0]) * incxy; - tilemap_draw_roz(bitmap,cliprect,k051316->tmap,startx << 5,starty << 5, + k051316->tmap->draw_roz(bitmap, cliprect, startx << 5,starty << 5, incxx << 5,incxy << 5,incyx << 5,incyy << 5, k051316->wraparound, flags,priority); @@ -5377,11 +5377,11 @@ static DEVICE_START( k051316 ) k051316->ram = auto_alloc_array(machine, UINT8, 0x800); if (!intf->pen_is_mask) - tilemap_set_transparent_pen(k051316->tmap, intf->transparent_pen); + k051316->tmap->set_transparent_pen(intf->transparent_pen); else { - tilemap_map_pens_to_layer(k051316->tmap, 0, 0, 0, TILEMAP_PIXEL_LAYER1); - tilemap_map_pens_to_layer(k051316->tmap, 0, intf->transparent_pen, intf->transparent_pen, TILEMAP_PIXEL_LAYER0); + k051316->tmap->map_pens_to_layer(0, 0, 0, TILEMAP_PIXEL_LAYER1); + k051316->tmap->map_pens_to_layer(0, intf->transparent_pen, intf->transparent_pen, TILEMAP_PIXEL_LAYER0); } k051316->wraparound = intf->wrap; @@ -5532,7 +5532,7 @@ void k053936_zoom_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle startx -= k053936->offset[0] * incxx; starty -= k053936->offset[0] * incxy; - tilemap_draw_roz(bitmap,my_clip,tmap,startx << 5,starty << 5, + tmap->draw_roz(bitmap, my_clip, startx << 5,starty << 5, incxx << 5,incxy << 5,0,0, k053936->wraparound, flags,priority); @@ -5570,7 +5570,7 @@ void k053936_zoom_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle startx -= k053936->offset[0] * incxx; starty -= k053936->offset[0] * incxy; - tilemap_draw_roz(bitmap,cliprect,tmap,startx << 5,starty << 5, + tmap->draw_roz(bitmap, cliprect, startx << 5,starty << 5, incxx << 5,incxy << 5,incyx << 5,incyy << 5, k053936->wraparound, flags,priority); @@ -5681,7 +5681,7 @@ WRITE8_DEVICE_HANDLER( k053251_w ) } if (!k053251->tilemaps_set) - tilemap_mark_all_tiles_dirty_all(device->machine()); + device->machine().tilemap().mark_all_dirty(); } else if (offset == 10) { @@ -5697,7 +5697,7 @@ WRITE8_DEVICE_HANDLER( k053251_w ) } if (!k053251->tilemaps_set) - tilemap_mark_all_tiles_dirty_all(device->machine()); + device->machine().tilemap().mark_all_dirty(); } } } @@ -6139,7 +6139,7 @@ INLINE const k056832_interface *k056832_get_interface( device_t *device ) static void k056832_mark_page_dirty( k056832_state *k056832, int page ) { if (k056832->page_tile_mode[page]) - tilemap_mark_all_tiles_dirty(k056832->tilemap[page]); + k056832->tilemap[page]->mark_all_dirty(); else k056832_mark_all_lines_dirty(page); } @@ -6248,7 +6248,7 @@ int k056832_get_lookup( device_t *device, int bits ) return res; } -INLINE void k056832_get_tile_info( device_t *device, tile_data *tileinfo, int tile_index, int pageIndex ) +INLINE void k056832_get_tile_info( device_t *device, tile_data &tileinfo, int tile_index, int pageIndex ) { k056832_state *k056832 = k056832_get_safe_token(device); static const struct K056832_SHIFTMASKS @@ -6656,7 +6656,7 @@ WRITE8_DEVICE_HANDLER( k056832_ram_code_lo_w ) if (!(k056832->regs[0] & 0x02)) // external linescroll enable { if (k056832->page_tile_mode[k056832->selected_page]) - tilemap_mark_tile_dirty(k056832->tilemap[k056832->selected_page], offset); + k056832->tilemap[k056832->selected_page]->mark_tile_dirty(offset); else k056832_mark_line_dirty(k056832->selected_page, offset); } @@ -6673,7 +6673,7 @@ WRITE8_DEVICE_HANDLER( k056832_ram_code_hi_w ) if (!(k056832->regs[0] & 0x02)) // external linescroll enable { if (k056832->page_tile_mode[k056832->selected_page]) - tilemap_mark_tile_dirty(k056832->tilemap[k056832->selected_page], offset); + k056832->tilemap[k056832->selected_page]->mark_tile_dirty(offset); else k056832_mark_line_dirty(k056832->selected_page, offset); } @@ -6690,7 +6690,7 @@ WRITE8_DEVICE_HANDLER( k056832_ram_attr_lo_w ) if (!(k056832->regs[0] & 0x02)) // external linescroll enable { if (k056832->page_tile_mode[k056832->selected_page]) - tilemap_mark_tile_dirty(k056832->tilemap[k056832->selected_page], offset); + k056832->tilemap[k056832->selected_page]->mark_tile_dirty(offset); else k056832_mark_line_dirty(k056832->selected_page, offset); } @@ -6707,7 +6707,7 @@ WRITE8_DEVICE_HANDLER( k056832_ram_attr_hi_w ) if (!(k056832->regs[0] & 0x02)) // external linescroll enable { if (k056832->page_tile_mode[k056832->selected_page]) - tilemap_mark_tile_dirty(k056832->tilemap[k056832->selected_page], offset); + k056832->tilemap[k056832->selected_page]->mark_tile_dirty(offset); else k056832_mark_line_dirty(k056832->selected_page, offset); } @@ -6730,7 +6730,7 @@ WRITE16_DEVICE_HANDLER( k056832_ram_word_w ) *tile_ptr = data; if (k056832->page_tile_mode[k056832->selected_page]) - tilemap_mark_tile_dirty(k056832->tilemap[k056832->selected_page], offset); + k056832->tilemap[k056832->selected_page]->mark_tile_dirty(offset); else k056832_mark_line_dirty(k056832->selected_page, offset); } @@ -6750,7 +6750,7 @@ WRITE16_DEVICE_HANDLER( k056832_ram_half_word_w ) dofs >>= 1; if (k056832->page_tile_mode[k056832->selected_page]) - tilemap_mark_tile_dirty(k056832->tilemap[k056832->selected_page], dofs); + k056832->tilemap[k056832->selected_page]->mark_tile_dirty(dofs); else k056832_mark_line_dirty(k056832->selected_page, dofs); } @@ -6773,7 +6773,7 @@ WRITE32_DEVICE_HANDLER( k056832_ram_long_w ) tile_ptr[1] = data; if (k056832->page_tile_mode[k056832->selected_page]) - tilemap_mark_tile_dirty(k056832->tilemap[k056832->selected_page], offset); + k056832->tilemap[k056832->selected_page]->mark_tile_dirty(offset); else k056832_mark_line_dirty(k056832->selected_page, offset); } @@ -6796,7 +6796,7 @@ WRITE32_DEVICE_HANDLER( k056832_unpaged_ram_long_w ) tile_ptr[1] = data; if (k056832->page_tile_mode[offset/0x800]) - tilemap_mark_tile_dirty(k056832->tilemap[offset/0x800], offset&0x7ff); + k056832->tilemap[offset/0x800]->mark_tile_dirty(offset&0x7ff); else k056832_mark_line_dirty(offset/0x800, (offset&0x7ff)); } @@ -6829,7 +6829,7 @@ WRITE16_DEVICE_HANDLER( k056832_word_w ) if (new_data & 0x10) flip |= TILEMAP_FLIPX; for (i = 0; i < K056832_PAGE_COUNT; i++) { - tilemap_set_flip(k056832->tilemap[i], flip); + k056832->tilemap[i]->set_flip(flip); } } @@ -6991,8 +6991,8 @@ static int k056832_update_linemap( device_t *device, _BitmapClass &bitmap, int p UINT8 *xprdata; tmap = k056832->tilemap[page]; - bitmap_ind8 &xprmap = tilemap_get_flagsmap(tmap); - xprdata = tilemap_get_tile_flags(tmap); + bitmap_ind8 &xprmap = tmap->flagsmap(); + xprdata = tmap->tile_flags(); dirty = k056832->line_dirty[page]; all_dirty = k056832->all_lines_dirty[page]; @@ -7005,7 +7005,7 @@ static int k056832_update_linemap( device_t *device, _BitmapClass &bitmap, int p // force tilemap into a clean, static state // *really ugly but it minimizes alteration to tilemap.c memset(&zerorect, 0, sizeof(rectangle)); // zero dimension - tilemap_draw(bitmap, zerorect, tmap, 0, 0); // dummy call to reset tile_dirty_map + tmap->draw(bitmap, zerorect, 0, 0); // dummy call to reset tile_dirty_map xprmap.fill(0); // reset pixel transparency_bitmap; memset(xprdata, TILEMAP_PIXEL_LAYER0, 0x800); // reset tile transparency_data; } @@ -7330,7 +7330,7 @@ printf("\nend\n"); tmap = k056832->tilemap[pageIndex]; - tilemap_set_scrolly(tmap, 0, ay); + tmap->set_scrolly(0, ay); last_dx = 0x100000; last_visible = 0; @@ -7408,10 +7408,10 @@ printf("\nend\n"); if ((drawrect.min_x>0) && (drawrect.max_x==511)) drawrect.max_x=cliprect.max_x; - tilemap_set_scrollx(tmap, 0, dx); + tmap->set_scrollx(0, dx); LINE_SHORTCIRCUIT: - tilemap_draw(bitmap, drawrect, tmap, flags, priority); + tmap->draw(bitmap, drawrect, flags, priority); } // end of line loop } // end of column loop @@ -7611,7 +7611,7 @@ void k056832_tilemap_draw_dj( device_t *device, bitmap_rgb32 &bitmap, const rect continue; tmap = k056832->tilemap[pageIndex]; - tilemap_set_scrolly(tmap, 0, ay); + tmap->set_scrolly(0, ay); last_dx = 0x100000; last_visible = 0; @@ -7682,10 +7682,10 @@ void k056832_tilemap_draw_dj( device_t *device, bitmap_rgb32 &bitmap, const rect drawrect.min_x = (dminx < cminx ) ? cminx : dminx; drawrect.max_x = (dmaxx > cmaxx ) ? cmaxx : dmaxx; - tilemap_set_scrollx(tmap, 0, dx); + tmap->set_scrollx(0, dx); LINE_SHORTCIRCUIT: - tilemap_draw(bitmap, drawrect, tmap, flags, priority); + tmap->draw(bitmap, drawrect, flags, priority); } // end of line loop } // end of column loop @@ -7956,9 +7956,9 @@ static DEVICE_START( k056832 ) { tmap = k056832->tilemap[i]; - k056832->pixmap[i] = &tilemap_get_pixmap(tmap); + k056832->pixmap[i] = &tmap->pixmap(); - tilemap_set_transparent_pen(tmap, 0); + tmap->set_transparent_pen(0); } memset(k056832->videoram, 0x00, 0x20000); @@ -9738,7 +9738,7 @@ void k001604_draw_back_layer( device_t *device, bitmap_rgb32 &bitmap, const rect if ((k001604->reg[0x6c / 4] & (0x08 >> layer)) != 0) { - tilemap_draw_roz(bitmap, cliprect, k001604->layer_roz[layer], + k001604->layer_roz[layer]->draw_roz(bitmap, cliprect, x << 5, y << 5, xx << 5, xy << 5, yx << 5, yy << 5, 1, 0, 0); } } @@ -9748,8 +9748,8 @@ void k001604_draw_front_layer( device_t *device, bitmap_rgb32 &bitmap, const rec { k001604_state *k001604 = k001604_get_safe_token(device); - //tilemap_draw(bitmap, cliprect, k001604->layer_8x8[1], 0,0); - tilemap_draw(bitmap, cliprect, k001604->layer_8x8[0], 0,0); + //k001604->layer_8x8[1]->draw(bitmap, cliprect, 0,0); + k001604->layer_8x8[0]->draw(bitmap, cliprect, 0,0); } READ32_DEVICE_HANDLER( k001604_tile_r ) @@ -9813,32 +9813,32 @@ WRITE32_DEVICE_HANDLER( k001604_tile_w ) { if (x < 64) { - tilemap_mark_tile_dirty(k001604->layer_8x8[0], offset); + k001604->layer_8x8[0]->mark_tile_dirty(offset); } else if (x < 128) { - tilemap_mark_tile_dirty(k001604->layer_8x8[1], offset); + k001604->layer_8x8[1]->mark_tile_dirty(offset); } else if (x < 192) { - tilemap_mark_tile_dirty(k001604->layer_roz[0], offset); + k001604->layer_roz[0]->mark_tile_dirty(offset); } else { - tilemap_mark_tile_dirty(k001604->layer_roz[1], offset); + k001604->layer_roz[1]->mark_tile_dirty(offset); } } else { if (x < 64) { - tilemap_mark_tile_dirty(k001604->layer_8x8[0], offset); - tilemap_mark_tile_dirty(k001604->layer_roz[0], offset); + k001604->layer_8x8[0]->mark_tile_dirty(offset); + k001604->layer_roz[0]->mark_tile_dirty(offset); } else { - tilemap_mark_tile_dirty(k001604->layer_8x8[1], offset); - tilemap_mark_tile_dirty(k001604->layer_roz[1], offset); + k001604->layer_8x8[1]->mark_tile_dirty(offset); + k001604->layer_roz[1]->mark_tile_dirty(offset); } } } @@ -9934,8 +9934,8 @@ static DEVICE_START( k001604 ) k001604->layer_roz[1] = tilemap_create_device(device, k001604_tile_info_layer_roz, k001604_scan_layer_roz_1_size0, roz_tile_size, roz_tile_size, 64, 64); } - tilemap_set_transparent_pen(k001604->layer_8x8[0], 0); - tilemap_set_transparent_pen(k001604->layer_8x8[1], 0); + k001604->layer_8x8[0]->set_transparent_pen(0); + k001604->layer_8x8[1]->set_transparent_pen(0); device->machine().gfx[k001604->gfx_index[0]] = gfx_element_alloc(device->machine(), &k001604_char_layout_layer_8x8, (UINT8*)&k001604->char_ram[0], device->machine().total_colors() / 16, 0); device->machine().gfx[k001604->gfx_index[1]] = gfx_element_alloc(device->machine(), &k001604_char_layout_layer_16x16, (UINT8*)&k001604->char_ram[0], device->machine().total_colors() / 16, 0); @@ -10052,15 +10052,15 @@ void k037122_tile_draw( device_t *device, bitmap_rgb32 &bitmap, const rectangle if (k037122->reg[0xc] & 0x10000) { - tilemap_set_scrolldx(k037122->layer[1], visarea.min_x, visarea.min_x); - tilemap_set_scrolldy(k037122->layer[1], visarea.min_y, visarea.min_y); - tilemap_draw(bitmap, cliprect, k037122->layer[1], 0, 0); + k037122->layer[1]->set_scrolldx(visarea.min_x, visarea.min_x); + k037122->layer[1]->set_scrolldy(visarea.min_y, visarea.min_y); + k037122->layer[1]->draw(bitmap, cliprect, 0, 0); } else { - tilemap_set_scrolldx(k037122->layer[0], visarea.min_x, visarea.min_x); - tilemap_set_scrolldy(k037122->layer[0], visarea.min_y, visarea.min_y); - tilemap_draw(bitmap, cliprect, k037122->layer[0], 0, 0); + k037122->layer[0]->set_scrolldx(visarea.min_x, visarea.min_x); + k037122->layer[0]->set_scrolldy(visarea.min_y, visarea.min_y); + k037122->layer[0]->draw(bitmap, cliprect, 0, 0); } } @@ -10089,11 +10089,11 @@ WRITE32_DEVICE_HANDLER( k037122_sram_w ) { if (offset < 0x8000 / 4) { - tilemap_mark_tile_dirty(k037122->layer[1], offset); + k037122->layer[1]->mark_tile_dirty(offset); } else if (offset >= 0x8000 / 4 && offset < 0x18000 / 4) { - tilemap_mark_tile_dirty(k037122->layer[0], offset - (0x8000 / 4)); + k037122->layer[0]->mark_tile_dirty(offset - (0x8000 / 4)); } else if (offset >= 0x18000 / 4) { @@ -10108,11 +10108,11 @@ WRITE32_DEVICE_HANDLER( k037122_sram_w ) } else if (offset >= 0x8000 / 4 && offset < 0x18000 / 4) { - tilemap_mark_tile_dirty(k037122->layer[0], offset - (0x8000 / 4)); + k037122->layer[0]->mark_tile_dirty(offset - (0x8000 / 4)); } else if (offset >= 0x18000 / 4) { - tilemap_mark_tile_dirty(k037122->layer[1], offset - (0x18000 / 4)); + k037122->layer[1]->mark_tile_dirty(offset - (0x18000 / 4)); } } } @@ -10176,8 +10176,8 @@ static DEVICE_START( k037122 ) k037122->layer[0] = tilemap_create_device(device, k037122_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 64); k037122->layer[1] = tilemap_create_device(device, k037122_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64); - tilemap_set_transparent_pen(k037122->layer[0], 0); - tilemap_set_transparent_pen(k037122->layer[1], 0); + k037122->layer[0]->set_transparent_pen(0); + k037122->layer[1]->set_transparent_pen(0); device->machine().gfx[k037122->gfx_index] = gfx_element_alloc(device->machine(), &k037122_char_layout, (UINT8*)k037122->char_ram, device->machine().total_colors() / 16, 0); diff --git a/src/mame/video/konicdev.h b/src/mame/video/konicdev.h index 3eaa43f59e9..ce01c42942c 100644 --- a/src/mame/video/konicdev.h +++ b/src/mame/video/konicdev.h @@ -518,7 +518,7 @@ void k053936_set_offset(device_t *device, int xoffs, int yoffs); // shall we mer /** Konami 053251 **/ /* - Note: k053251_w() automatically does a tilemap_mark_all_tiles_dirty(ALL_TILEMAPS) + Note: k053251_w() automatically does a ALL_TILEMAPS->mark_all_dirty() when some palette index changes. If ALL_TILEMAPS is too expensive, use k053251_set_tilemaps() to indicate which tilemap is associated with each index. */ diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c index 4f412a4cce4..62ae50e62bc 100644 --- a/src/mame/video/kopunch.c +++ b/src/mame/video/kopunch.c @@ -36,26 +36,26 @@ WRITE8_HANDLER( kopunch_videoram_w ) { kopunch_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( kopunch_videoram2_w ) { kopunch_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( kopunch_scroll_x_w ) { kopunch_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); } WRITE8_HANDLER( kopunch_scroll_y_w ) { kopunch_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( kopunch_gfxbank_w ) @@ -64,10 +64,10 @@ WRITE8_HANDLER( kopunch_gfxbank_w ) if (state->m_gfxbank != (data & 0x07)) { state->m_gfxbank = data & 0x07; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } - tilemap_set_flip(state->m_bg_tilemap, (data & 0x08) ? TILEMAP_FLIPY : 0); + state->m_bg_tilemap->set_flip((data & 0x08) ? TILEMAP_FLIPY : 0); } static TILE_GET_INFO( get_fg_tile_info ) @@ -92,17 +92,17 @@ VIDEO_START( kopunch ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg_tilemap, 16, 16); + state->m_bg_tilemap->set_scrolldx(16, 16); } SCREEN_UPDATE_IND16( kopunch ) { kopunch_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index 2285acab010..70c8b597f5d 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -6,7 +6,7 @@ WRITE8_HANDLER(ksayakyu_videoram_w) { ksayakyu_state *state = space->machine().driver_data(); state->m_videoram[offset]=data; - tilemap_mark_tile_dirty(state->m_textmap, offset >> 1); + state->m_textmap->mark_tile_dirty(offset >> 1); } WRITE8_HANDLER(ksayakyu_videoctrl_w) @@ -25,11 +25,11 @@ WRITE8_HANDLER(ksayakyu_videoctrl_w) state->m_flipscreen = data & 4; flip_screen_set(space->machine(), state->m_flipscreen); - tilemap_set_scrolly(state->m_tilemap, 0, (data & 0xe0) << 3); + state->m_tilemap->set_scrolly(0, (data & 0xe0) << 3); if(state->m_flipscreen) - tilemap_set_flip(state->m_tilemap, (data & 2) ? TILEMAP_FLIPY : TILEMAP_FLIPX | TILEMAP_FLIPY); + state->m_tilemap->set_flip((data & 2) ? TILEMAP_FLIPY : TILEMAP_FLIPX | TILEMAP_FLIPY); else - tilemap_set_flip(state->m_tilemap, (data & 2) ? TILEMAP_FLIPX : 0); + state->m_tilemap->set_flip((data & 2) ? TILEMAP_FLIPX : 0); } PALETTE_INIT( ksayakyu ) @@ -121,7 +121,7 @@ VIDEO_START(ksayakyu) ksayakyu_state *state = machine.driver_data(); state->m_tilemap = tilemap_create(machine, get_ksayakyu_tile_info, tilemap_scan_rows, 8, 8, 32, 32 * 8); state->m_textmap = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_textmap, 0); + state->m_textmap->set_transparent_pen(0); } SCREEN_UPDATE_IND16(ksayakyu) @@ -131,9 +131,9 @@ SCREEN_UPDATE_IND16(ksayakyu) bitmap.fill(0, cliprect); if (state->m_video_ctrl & 1) - tilemap_draw(bitmap, cliprect,state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_textmap, 0, 0); + state->m_textmap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index a48cff64019..de3a07b28a7 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -52,10 +52,10 @@ VIDEO_START( kyugo ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_fg_tilemap, 0, 224); - tilemap_set_scrolldx(state->m_bg_tilemap, -32, 32); + state->m_fg_tilemap->set_scrolldx(0, 224); + state->m_bg_tilemap->set_scrolldx(-32, 32); } @@ -70,7 +70,7 @@ WRITE8_HANDLER( kyugo_fgvideoram_w ) kyugo_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -79,7 +79,7 @@ WRITE8_HANDLER( kyugo_bgvideoram_w ) kyugo_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -88,7 +88,7 @@ WRITE8_HANDLER( kyugo_bgattribram_w ) kyugo_state *state = space->machine().driver_data(); state->m_bgattribram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -120,14 +120,14 @@ WRITE8_HANDLER( kyugo_gfxctrl_w ) { state->m_fgcolor = (data & 0x20) >> 5; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } /* bit 6 is background palette bank */ if (state->m_bgpalbank != ((data & 0x40) >> 6)) { state->m_bgpalbank = (data & 0x40) >> 6; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } if (data & 0x9e) @@ -149,7 +149,7 @@ WRITE8_HANDLER( kyugo_flipscreen_w ) if (state->m_flipscreen != (data & 0x01)) { state->m_flipscreen = (data & 0x01); - tilemap_set_flip_all(space->machine(), (state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY): 0)); + space->machine().tilemap().set_flip_all((state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY): 0)); } } @@ -225,14 +225,14 @@ SCREEN_UPDATE_IND16( kyugo ) kyugo_state *state = screen.machine().driver_data(); if (state->m_flipscreen) - tilemap_set_scrollx(state->m_bg_tilemap, 0, -(state->m_scroll_x_lo + (state->m_scroll_x_hi * 256))); + state->m_bg_tilemap->set_scrollx(0, -(state->m_scroll_x_lo + (state->m_scroll_x_hi * 256))); else - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_x_lo + (state->m_scroll_x_hi * 256)); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_x_lo + (state->m_scroll_x_hi * 256)); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll_y); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll_y); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c index d7d914e032b..9205e76fef7 100644 --- a/src/mame/video/labyrunr.c +++ b/src/mame/video/labyrunr.c @@ -137,8 +137,8 @@ VIDEO_START( labyrunr ) state->m_layer0 = tilemap_create(machine, get_tile_info0, tilemap_scan_rows, 8, 8, 32, 32); state->m_layer1 = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_layer0, 0); - tilemap_set_transparent_pen(state->m_layer1, 0); + state->m_layer0->set_transparent_pen(0); + state->m_layer1->set_transparent_pen(0); state->m_clip0 = machine.primary_screen->visible_area(); state->m_clip0.min_x += 40; @@ -147,7 +147,7 @@ VIDEO_START( labyrunr ) state->m_clip1.max_x = 39; state->m_clip1.min_x = 0; - tilemap_set_scroll_cols(state->m_layer0, 32); + state->m_layer0->set_scroll_cols(32); } @@ -162,14 +162,14 @@ WRITE8_HANDLER( labyrunr_vram1_w ) { labyrunr_state *state = space->machine().driver_data(); state->m_videoram1[offset] = data; - tilemap_mark_tile_dirty(state->m_layer0, offset & 0x3ff); + state->m_layer0->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( labyrunr_vram2_w ) { labyrunr_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_layer1, offset & 0x3ff); + state->m_layer1->mark_tile_dirty(offset & 0x3ff); } @@ -201,22 +201,22 @@ SCREEN_UPDATE_IND16( labyrunr ) finalclip0 &= cliprect; finalclip1 &= cliprect; - tilemap_set_scrollx(state->m_layer0, 0, ctrl_0 - 40); - tilemap_set_scrollx(state->m_layer1, 0, 0); + state->m_layer0->set_scrollx(0, ctrl_0 - 40); + state->m_layer1->set_scrollx(0, 0); for(i = 0; i < 32; i++) { /* enable colscroll */ if((k007121_ctrlram_r(state->m_k007121, 1) & 6) == 6) // it's probably just one bit, but it's only used once in the game so I don't know which it's - tilemap_set_scrolly(state->m_layer0, (i + 2) & 0x1f, k007121_ctrlram_r(state->m_k007121, 2) + state->m_scrollram[i]); + state->m_layer0->set_scrolly((i + 2) & 0x1f, k007121_ctrlram_r(state->m_k007121, 2) + state->m_scrollram[i]); else - tilemap_set_scrolly(state->m_layer0, (i + 2) & 0x1f, k007121_ctrlram_r(state->m_k007121, 2)); + state->m_layer0->set_scrolly((i + 2) & 0x1f, k007121_ctrlram_r(state->m_k007121, 2)); } - tilemap_draw(bitmap, finalclip0, state->m_layer0, TILEMAP_DRAW_OPAQUE, 0); + state->m_layer0->draw(bitmap, finalclip0, TILEMAP_DRAW_OPAQUE, 0); k007121_sprites_draw(state->m_k007121, bitmap, cliprect, screen.machine().gfx[0], screen.machine().colortable, state->m_spriteram,(k007121_ctrlram_r(state->m_k007121, 6) & 0x30) * 2, 40,0,(k007121_ctrlram_r(state->m_k007121, 3) & 0x40) >> 5); /* we ignore the transparency because layer1 is drawn only at the top of the screen also covering sprites */ - tilemap_draw(bitmap, finalclip1, state->m_layer1, TILEMAP_DRAW_OPAQUE, 0); + state->m_layer1->draw(bitmap, finalclip1, TILEMAP_DRAW_OPAQUE, 0); } else { @@ -273,16 +273,16 @@ SCREEN_UPDATE_IND16( labyrunr ) finalclip3.max_x = 40 - ctrl_0 - 8; } - tilemap_set_scrollx(state->m_layer0, 0, ctrl_0 - 40); - tilemap_set_scrollx(state->m_layer1, 0, ctrl_0 - 40); + state->m_layer0->set_scrollx(0, ctrl_0 - 40); + state->m_layer1->set_scrollx(0, ctrl_0 - 40); - tilemap_draw(bitmap, finalclip0, state->m_layer0, 0, 1); + state->m_layer0->draw(bitmap, finalclip0, 0, 1); if(use_clip3[0]) - tilemap_draw(bitmap, finalclip3, state->m_layer0, 0, 1); + state->m_layer0->draw(bitmap, finalclip3, 0, 1); - tilemap_draw(bitmap, finalclip1, state->m_layer1, 0, 1); + state->m_layer1->draw(bitmap, finalclip1, 0, 1); if(use_clip3[1]) - tilemap_draw(bitmap, finalclip3, state->m_layer1, 0, 1); + state->m_layer1->draw(bitmap, finalclip3, 0, 1); k007121_sprites_draw(state->m_k007121, bitmap, cliprect, screen.machine().gfx[0], screen.machine().colortable, state->m_spriteram, (k007121_ctrlram_r(state->m_k007121, 6) & 0x30) * 2,40,0,(k007121_ctrlram_r(state->m_k007121, 3) & 0x40) >> 5); } diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c index ab7fdcd49fe..7a6ecf6cacb 100644 --- a/src/mame/video/ladybug.c +++ b/src/mame/video/ladybug.c @@ -139,14 +139,14 @@ WRITE8_HANDLER( ladybug_videoram_w ) { ladybug_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ladybug_colorram_w ) { ladybug_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ladybug_flipscreen_w ) @@ -154,7 +154,7 @@ WRITE8_HANDLER( ladybug_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -172,7 +172,7 @@ WRITE8_HANDLER( sraider_io_w ) if (flip_screen_get(space->machine()) != (data & 0x80)) { flip_screen_set(space->machine(), data & 0x80); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } state->m_grid_color = data & 0x70; @@ -214,8 +214,8 @@ VIDEO_START( ladybug ) ladybug_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_scroll_rows(32); + state->m_bg_tilemap->set_transparent_pen(0); } VIDEO_START( sraider ) @@ -223,12 +223,12 @@ VIDEO_START( sraider ) ladybug_state *state = machine.driver_data(); state->m_grid_tilemap = tilemap_create(machine, get_grid_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_grid_tilemap, 32); - tilemap_set_transparent_pen(state->m_grid_tilemap, 0); + state->m_grid_tilemap->set_scroll_rows(32); + state->m_grid_tilemap->set_transparent_pen(0); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_scroll_rows(32); + state->m_bg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -296,12 +296,12 @@ SCREEN_UPDATE_IND16( ladybug ) int sy = offs / 4; if (flip_screen_get(screen.machine())) - tilemap_set_scrollx(state->m_bg_tilemap, offs, -state->m_videoram[32 * sx + sy]); + state->m_bg_tilemap->set_scrollx(offs, -state->m_videoram[32 * sx + sy]); else - tilemap_set_scrollx(state->m_bg_tilemap, offs, state->m_videoram[32 * sx + sy]); + state->m_bg_tilemap->set_scrollx(offs, state->m_videoram[32 * sx + sy]); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -329,9 +329,9 @@ SCREEN_UPDATE_IND16( sraider ) int sy = offs / 4; if (flip_screen_get(screen.machine())) - tilemap_set_scrollx(state->m_bg_tilemap, offs, -state->m_videoram[32 * sx + sy]); + state->m_bg_tilemap->set_scrollx(offs, -state->m_videoram[32 * sx + sy]); else - tilemap_set_scrollx(state->m_bg_tilemap, offs, state->m_videoram[32 * sx + sy]); + state->m_bg_tilemap->set_scrollx(offs, state->m_videoram[32 * sx + sy]); } // clear the bg bitmap @@ -347,7 +347,7 @@ SCREEN_UPDATE_IND16( sraider ) colortable_palette_set_color(screen.machine().colortable, 0x40, MAKE_RGB(state->m_grid_color & 0x40 ? 0xff : 0, state->m_grid_color & 0x20 ? 0xff : 0, state->m_grid_color & 0x10 ? 0xff : 0)); - tilemap_draw(bitmap, cliprect, state->m_grid_tilemap, 0, flip_screen_get(screen.machine())); + state->m_grid_tilemap->draw(bitmap, cliprect, 0, flip_screen_get(screen.machine())); for (i = 0; i < 0x100; i++) { @@ -364,7 +364,7 @@ SCREEN_UPDATE_IND16( sraider ) } // now the chars - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, flip_screen_get(screen.machine())); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, flip_screen_get(screen.machine())); // now the sprites draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index beba5998472..30fd92f5ef8 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -37,7 +37,7 @@ WRITE8_HANDLER( ladyfrog_videoram_w ) { ladyfrog_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } READ8_HANDLER( ladyfrog_videoram_r ) @@ -76,7 +76,7 @@ WRITE8_HANDLER( ladyfrog_gfxctrl2_w ) { ladyfrog_state *state = space->machine().driver_data(); state->m_tilebank = ((data & 0x18) >> 3) ^ 3; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } @@ -100,7 +100,7 @@ WRITE8_HANDLER( ladyfrog_scrlram_w ) ladyfrog_state *state = space->machine().driver_data(); state->m_scrlram[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap, offset, data); + state->m_bg_tilemap->set_scrolly(offset, data); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -147,8 +147,8 @@ static VIDEO_START( ladyfrog_common ) machine.generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x200); machine.generic.paletteram2.u8 = auto_alloc_array(machine, UINT8, 0x200); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); - tilemap_set_scrolldy(state->m_bg_tilemap, 15, 15); + state->m_bg_tilemap->set_scroll_cols(32); + state->m_bg_tilemap->set_scrolldy(15, 15); state_save_register_global_pointer(machine, machine.generic.paletteram.u8, 0x200); state_save_register_global_pointer(machine, machine.generic.paletteram2.u8, 0x200); @@ -177,7 +177,7 @@ SCREEN_UPDATE_IND16( ladyfrog ) { ladyfrog_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index 6a8536d087b..f8ef9c60996 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -170,7 +170,7 @@ VIDEO_START( lasso ) /* create tilemap */ state->m_bg_tilemap = tilemap_create(machine, lasso_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); } VIDEO_START( wwjgtin ) @@ -181,7 +181,7 @@ VIDEO_START( wwjgtin ) state->m_bg_tilemap = tilemap_create(machine, lasso_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_track_tilemap = tilemap_create(machine, wwjgtin_get_track_tile_info, tilemap_scan_rows, 16, 16, 128, 64); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); } VIDEO_START( pinbo ) @@ -191,7 +191,7 @@ VIDEO_START( pinbo ) /* create tilemap */ state->m_bg_tilemap = tilemap_create(machine, pinbo_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); } @@ -205,14 +205,14 @@ WRITE8_HANDLER( lasso_videoram_w ) { lasso_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( lasso_colorram_w ) { lasso_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -222,7 +222,7 @@ static WRITE8_HANDLER( lasso_flip_screen_w ) flip_screen_x_set(space->machine(), data & 0x01); flip_screen_y_set(space->machine(), data & 0x02); - tilemap_set_flip_all(space->machine(), (flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0)); + space->machine().tilemap().set_flip_all((flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0)); } @@ -234,7 +234,7 @@ WRITE8_HANDLER( lasso_video_control_w ) if (state->m_gfxbank != bank) { state->m_gfxbank = bank; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } lasso_flip_screen_w(space, offset, data); @@ -249,7 +249,7 @@ WRITE8_HANDLER( wwjgtin_video_control_w ) if (state->m_gfxbank != bank) { state->m_gfxbank = bank; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } lasso_flip_screen_w(space, offset, data); @@ -373,7 +373,7 @@ SCREEN_UPDATE_IND16( lasso ) palette_set_color(screen.machine(), 0, get_color(*state->m_back_color)); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_lasso(screen.machine(), bitmap, cliprect); draw_sprites(screen.machine(), bitmap, cliprect, 0); @@ -386,7 +386,7 @@ SCREEN_UPDATE_IND16( chameleo ) palette_set_color(screen.machine(), 0, get_color(*state->m_back_color)); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); return 0; @@ -399,16 +399,16 @@ SCREEN_UPDATE_IND16( wwjgtin ) colortable_palette_set_color(screen.machine().colortable, 0, get_color(*state->m_back_color)); wwjgtin_set_last_four_colors(screen.machine(), screen.machine().colortable); - tilemap_set_scrollx(state->m_track_tilemap, 0, state->m_track_scroll[0] + state->m_track_scroll[1] * 256); - tilemap_set_scrolly(state->m_track_tilemap, 0, state->m_track_scroll[2] + state->m_track_scroll[3] * 256); + state->m_track_tilemap->set_scrollx(0, state->m_track_scroll[0] + state->m_track_scroll[1] * 256); + state->m_track_tilemap->set_scrolly(0, state->m_track_scroll[2] + state->m_track_scroll[3] * 256); if (state->m_track_enable) - tilemap_draw(bitmap, cliprect, state->m_track_tilemap, 0, 0); + state->m_track_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(get_black_pen(screen.machine()), cliprect); draw_sprites(screen.machine(), bitmap, cliprect, 1); // reverse order - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index 854717e7d99..5288a136c06 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -37,7 +37,7 @@ static TILE_GET_INFO( ld_get_fg_tile_info ) tile, color & 0xf, TILE_FLIPYX((color & 0x60) >> 5)); - tileinfo->group = (color & 0x80) >> 7; + tileinfo.group = (color & 0x80) >> 7; } static TILE_GET_INFO( get_bg_tile_info ) @@ -62,7 +62,7 @@ static TILE_GET_INFO( get_fg_tile_info ) tile, color & 0xf, TILE_FLIPYX((color & 0x60) >> 5)); - tileinfo->group = (color & 0x10) >> 4; + tileinfo.group = (color & 0x10) >> 4; } static TILE_GET_INFO( get_fix_info ) @@ -91,9 +91,9 @@ VIDEO_START( lastduel ) state->m_fg_tilemap = tilemap_create(machine, ld_get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_tx_tilemap = tilemap_create(machine, get_fix_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transmask(state->m_fg_tilemap, 0, 0xffff, 0x0001); - tilemap_set_transmask(state->m_fg_tilemap, 1, 0xf07f, 0x0f81); - tilemap_set_transparent_pen(state->m_tx_tilemap, 3); + state->m_fg_tilemap->set_transmask(0, 0xffff, 0x0001); + state->m_fg_tilemap->set_transmask(1, 0xf07f, 0x0f81); + state->m_tx_tilemap->set_transparent_pen(3); state->m_sprite_flipy_mask = 0x40; state->m_sprite_pri_mask = 0x00; @@ -107,10 +107,10 @@ VIDEO_START( madgear ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,16,16,64,32); state->m_tx_tilemap = tilemap_create(machine, get_fix_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_transmask(state->m_fg_tilemap, 0, 0xffff, 0x8000); - tilemap_set_transmask(state->m_fg_tilemap, 1, 0x80ff, 0xff00); - tilemap_set_transparent_pen(state->m_tx_tilemap, 3); - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); + state->m_fg_tilemap->set_transmask(0, 0xffff, 0x8000); + state->m_fg_tilemap->set_transmask(1, 0x80ff, 0xff00); + state->m_tx_tilemap->set_transparent_pen(3); + state->m_bg_tilemap->set_transparent_pen(15); state->m_sprite_flipy_mask = 0x80; state->m_sprite_pri_mask = 0x10; @@ -144,10 +144,10 @@ WRITE16_HANDLER( lastduel_scroll_w ) data = COMBINE_DATA(&state->m_scroll[offset]); switch (offset) { - case 0: tilemap_set_scrolly(state->m_fg_tilemap, 0, data); break; - case 1: tilemap_set_scrollx(state->m_fg_tilemap, 0, data); break; - case 2: tilemap_set_scrolly(state->m_bg_tilemap, 0, data); break; - case 3: tilemap_set_scrollx(state->m_bg_tilemap, 0, data); break; + case 0: state->m_fg_tilemap->set_scrolly(0, data); break; + case 1: state->m_fg_tilemap->set_scrollx(0, data); break; + case 2: state->m_bg_tilemap->set_scrolly(0, data); break; + case 3: state->m_bg_tilemap->set_scrollx(0, data); break; case 7: state->m_tilemap_priority = data; break; default: logerror("Unmapped video write %d %04x\n", offset, data); @@ -160,7 +160,7 @@ WRITE16_HANDLER( lastduel_scroll1_w ) lastduel_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll1[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( lastduel_scroll2_w ) @@ -168,7 +168,7 @@ WRITE16_HANDLER( lastduel_scroll2_w ) lastduel_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll2[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( lastduel_vram_w ) @@ -176,7 +176,7 @@ WRITE16_HANDLER( lastduel_vram_w ) lastduel_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( madgear_scroll1_w ) @@ -184,7 +184,7 @@ WRITE16_HANDLER( madgear_scroll1_w ) lastduel_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll1[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x7ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE16_HANDLER( madgear_scroll2_w ) @@ -192,7 +192,7 @@ WRITE16_HANDLER( madgear_scroll2_w ) lastduel_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll2[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE16_HANDLER( lastduel_palette_word_w ) @@ -273,12 +273,12 @@ SCREEN_UPDATE_IND16( lastduel ) { lastduel_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -288,21 +288,21 @@ SCREEN_UPDATE_IND16( madgear ) if (state->m_tilemap_priority) { - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_LAYER1 | TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | TILEMAP_DRAW_OPAQUE, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); } else { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); } - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c index e3b22e1e002..eee24c248f1 100644 --- a/src/mame/video/legionna.c +++ b/src/mame/video/legionna.c @@ -24,38 +24,38 @@ void denjinmk_setgfxbank(running_machine &machine, UINT16 data) state->m_back_gfx_bank = (data &0x4000) >> 2; state->m_mid_gfx_bank = (data &0x8000) >> 3;//??? - tilemap_mark_all_tiles_dirty (state->m_background_layer); - tilemap_mark_all_tiles_dirty (state->m_foreground_layer); - tilemap_mark_all_tiles_dirty (state->m_midground_layer); - tilemap_mark_all_tiles_dirty (state->m_text_layer); + state->m_background_layer->mark_all_dirty(); + state->m_foreground_layer->mark_all_dirty(); + state->m_midground_layer->mark_all_dirty(); + state->m_text_layer->mark_all_dirty(); } WRITE16_HANDLER( legionna_background_w ) { legionna_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_back_data[offset]); - tilemap_mark_tile_dirty(state->m_background_layer,offset); + state->m_background_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( legionna_midground_w ) { legionna_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_mid_data[offset]); - tilemap_mark_tile_dirty(state->m_midground_layer,offset); + state->m_midground_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( legionna_foreground_w ) { legionna_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fore_data[offset]); - tilemap_mark_tile_dirty(state->m_foreground_layer,offset); + state->m_foreground_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( legionna_text_w ) { legionna_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_textram[offset]); - tilemap_mark_tile_dirty(state->m_text_layer,offset); + state->m_text_layer->mark_tile_dirty(offset); } static TILE_GET_INFO( get_back_tile_info ) @@ -157,10 +157,10 @@ VIDEO_START( legionna ) state->m_has_extended_banking = 0; state->m_has_extended_priority = 0; - tilemap_set_transparent_pen(state->m_background_layer,15); - tilemap_set_transparent_pen(state->m_midground_layer,15); - tilemap_set_transparent_pen(state->m_foreground_layer,15); - tilemap_set_transparent_pen(state->m_text_layer,15); + state->m_background_layer->set_transparent_pen(15); + state->m_midground_layer->set_transparent_pen(15); + state->m_foreground_layer->set_transparent_pen(15); + state->m_text_layer->set_transparent_pen(15); } VIDEO_START( denjinmk ) @@ -178,10 +178,10 @@ VIDEO_START( denjinmk ) state->m_has_extended_banking = 1; state->m_has_extended_priority = 0; - tilemap_set_transparent_pen(state->m_background_layer,15); - tilemap_set_transparent_pen(state->m_midground_layer,15); - tilemap_set_transparent_pen(state->m_foreground_layer,15); - tilemap_set_transparent_pen(state->m_text_layer,7);//? + state->m_background_layer->set_transparent_pen(15); + state->m_midground_layer->set_transparent_pen(15); + state->m_foreground_layer->set_transparent_pen(15); + state->m_text_layer->set_transparent_pen(7);//? } VIDEO_START( cupsoc ) @@ -199,10 +199,10 @@ VIDEO_START( cupsoc ) state->m_has_extended_banking = 0; state->m_has_extended_priority = 1; - tilemap_set_transparent_pen(state->m_background_layer,15); - tilemap_set_transparent_pen(state->m_midground_layer,15); - tilemap_set_transparent_pen(state->m_foreground_layer,15); - tilemap_set_transparent_pen(state->m_text_layer,15); + state->m_background_layer->set_transparent_pen(15); + state->m_midground_layer->set_transparent_pen(15); + state->m_foreground_layer->set_transparent_pen(15); + state->m_text_layer->set_transparent_pen(15); } VIDEO_START(grainbow) @@ -419,24 +419,24 @@ SCREEN_UPDATE_IND16( legionna ) { legionna_state *state = screen.machine().driver_data(); /* Setup the tilemaps */ - tilemap_set_scrollx( state->m_background_layer, 0, state->m_scrollram16[0] ); - tilemap_set_scrolly( state->m_background_layer, 0, state->m_scrollram16[1] ); - tilemap_set_scrollx( state->m_midground_layer, 0, state->m_scrollram16[2] ); - tilemap_set_scrolly( state->m_midground_layer, 0, state->m_scrollram16[3] ); - tilemap_set_scrollx( state->m_foreground_layer, 0, state->m_scrollram16[4] ); - tilemap_set_scrolly( state->m_foreground_layer, 0, state->m_scrollram16[5] ); - tilemap_set_scrollx( state->m_text_layer, 0, 0/*state->m_scrollram16[6]*/ ); - tilemap_set_scrolly( state->m_text_layer, 0, 0/*state->m_scrollram16[7]*/ ); + state->m_background_layer->set_scrollx(0, state->m_scrollram16[0] ); + state->m_background_layer->set_scrolly(0, state->m_scrollram16[1] ); + state->m_midground_layer->set_scrollx(0, state->m_scrollram16[2] ); + state->m_midground_layer->set_scrolly(0, state->m_scrollram16[3] ); + state->m_foreground_layer->set_scrollx(0, state->m_scrollram16[4] ); + state->m_foreground_layer->set_scrolly(0, state->m_scrollram16[5] ); + state->m_text_layer->set_scrollx(0, 0/*state->m_scrollram16[6]*/ ); + state->m_text_layer->set_scrolly(0, 0/*state->m_scrollram16[7]*/ ); screen.machine().priority_bitmap.fill(0, cliprect); bitmap.fill(get_black_pen(screen.machine()), cliprect); /* wrong color? */ /* state->m_layer_disable is a guess based on 'stage 1' screen in heatbrl */ - if (!(state->m_layer_disable&0x0020)) tilemap_draw(bitmap,cliprect,state->m_foreground_layer,0, 0); - if (!(state->m_layer_disable&0x0010)) tilemap_draw(bitmap,cliprect,state->m_midground_layer,0, 0); - if (!(state->m_layer_disable&0x0002)) tilemap_draw(bitmap,cliprect,state->m_background_layer,0, 1); - if (!(state->m_layer_disable&0x0001)) tilemap_draw(bitmap,cliprect,state->m_text_layer,0, 2); + if (!(state->m_layer_disable&0x0020)) state->m_foreground_layer->draw(bitmap, cliprect, 0, 0); + if (!(state->m_layer_disable&0x0010)) state->m_midground_layer->draw(bitmap, cliprect, 0, 0); + if (!(state->m_layer_disable&0x0002)) state->m_background_layer->draw(bitmap, cliprect, 0, 1); + if (!(state->m_layer_disable&0x0001)) state->m_text_layer->draw(bitmap, cliprect, 0, 2); draw_sprites(screen.machine(),bitmap,cliprect); @@ -448,26 +448,26 @@ SCREEN_UPDATE_IND16( legionna ) SCREEN_UPDATE_IND16( godzilla ) { legionna_state *state = screen.machine().driver_data(); -// tilemap_set_scrollx( state->m_text_layer, 0, 0 ); -// tilemap_set_scrolly( state->m_text_layer, 0, 112 ); +// state->m_text_layer->set_scrollx(0, 0 ); +// state->m_text_layer->set_scrolly(0, 112 ); /* Setup the tilemaps */ - tilemap_set_scrollx( state->m_background_layer, 0, state->m_scrollram16[0] ); - tilemap_set_scrolly( state->m_background_layer, 0, state->m_scrollram16[1] ); - tilemap_set_scrollx( state->m_midground_layer, 0, state->m_scrollram16[2] ); - tilemap_set_scrolly( state->m_midground_layer, 0, state->m_scrollram16[3] ); - tilemap_set_scrollx( state->m_foreground_layer, 0, state->m_scrollram16[4] ); - tilemap_set_scrolly( state->m_foreground_layer, 0, state->m_scrollram16[5] ); - tilemap_set_scrollx( state->m_text_layer, 0, 0/*state->m_scrollram16[6]*/ ); - tilemap_set_scrolly( state->m_text_layer, 0, 0/*state->m_scrollram16[7]*/ ); + state->m_background_layer->set_scrollx(0, state->m_scrollram16[0] ); + state->m_background_layer->set_scrolly(0, state->m_scrollram16[1] ); + state->m_midground_layer->set_scrollx(0, state->m_scrollram16[2] ); + state->m_midground_layer->set_scrolly(0, state->m_scrollram16[3] ); + state->m_foreground_layer->set_scrollx(0, state->m_scrollram16[4] ); + state->m_foreground_layer->set_scrolly(0, state->m_scrollram16[5] ); + state->m_text_layer->set_scrollx(0, 0/*state->m_scrollram16[6]*/ ); + state->m_text_layer->set_scrolly(0, 0/*state->m_scrollram16[7]*/ ); bitmap.fill(0x0200, cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - if (!(state->m_layer_disable&0x0001)) tilemap_draw(bitmap,cliprect,state->m_background_layer,0,0); - if (!(state->m_layer_disable&0x0002)) tilemap_draw(bitmap,cliprect,state->m_midground_layer,0,0); - if (!(state->m_layer_disable&0x0004)) tilemap_draw(bitmap,cliprect,state->m_foreground_layer,0,1); - if (!(state->m_layer_disable&0x0008)) tilemap_draw(bitmap,cliprect,state->m_text_layer,0,2); + if (!(state->m_layer_disable&0x0001)) state->m_background_layer->draw(bitmap, cliprect, 0,0); + if (!(state->m_layer_disable&0x0002)) state->m_midground_layer->draw(bitmap, cliprect, 0,0); + if (!(state->m_layer_disable&0x0004)) state->m_foreground_layer->draw(bitmap, cliprect, 0,1); + if (!(state->m_layer_disable&0x0008)) state->m_text_layer->draw(bitmap, cliprect, 0,2); draw_sprites(screen.machine(),bitmap,cliprect); @@ -478,29 +478,29 @@ SCREEN_UPDATE_IND16( grainbow ) { legionna_state *state = screen.machine().driver_data(); /* Setup the tilemaps */ - tilemap_set_scrollx( state->m_background_layer, 0, state->m_scrollram16[0] ); - tilemap_set_scrolly( state->m_background_layer, 0, state->m_scrollram16[1] ); - tilemap_set_scrollx( state->m_midground_layer, 0, state->m_scrollram16[2] ); - tilemap_set_scrolly( state->m_midground_layer, 0, state->m_scrollram16[3] ); - tilemap_set_scrollx( state->m_foreground_layer, 0, state->m_scrollram16[4] ); - tilemap_set_scrolly( state->m_foreground_layer, 0, state->m_scrollram16[5] ); - tilemap_set_scrollx( state->m_text_layer, 0, 0/*state->m_scrollram16[6]*/ ); - tilemap_set_scrolly( state->m_text_layer, 0, 0/*state->m_scrollram16[7]*/ ); + state->m_background_layer->set_scrollx(0, state->m_scrollram16[0] ); + state->m_background_layer->set_scrolly(0, state->m_scrollram16[1] ); + state->m_midground_layer->set_scrollx(0, state->m_scrollram16[2] ); + state->m_midground_layer->set_scrolly(0, state->m_scrollram16[3] ); + state->m_foreground_layer->set_scrollx(0, state->m_scrollram16[4] ); + state->m_foreground_layer->set_scrolly(0, state->m_scrollram16[5] ); + state->m_text_layer->set_scrollx(0, 0/*state->m_scrollram16[6]*/ ); + state->m_text_layer->set_scrolly(0, 0/*state->m_scrollram16[7]*/ ); bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); if(!(state->m_layer_disable & 1)) - tilemap_draw(bitmap,cliprect,state->m_background_layer,0,1); + state->m_background_layer->draw(bitmap, cliprect, 0,1); if(!(state->m_layer_disable & 2)) - tilemap_draw(bitmap,cliprect,state->m_midground_layer,0,2); + state->m_midground_layer->draw(bitmap, cliprect, 0,2); if(!(state->m_layer_disable & 4)) - tilemap_draw(bitmap,cliprect,state->m_foreground_layer,0,4); + state->m_foreground_layer->draw(bitmap, cliprect, 0,4); if(!(state->m_layer_disable & 8)) - tilemap_draw(bitmap,cliprect,state->m_text_layer,0,8); + state->m_text_layer->draw(bitmap, cliprect, 0,8); draw_sprites(screen.machine(),bitmap,cliprect); diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c index 56f3c06f64d..9e418006d03 100644 --- a/src/mame/video/lemmings.c +++ b/src/mame/video/lemmings.c @@ -94,7 +94,7 @@ VIDEO_START( lemmings ) state->m_sprite_triple_buffer_0 = auto_alloc_array(machine, UINT16, 0x800 / 2); state->m_sprite_triple_buffer_1 = auto_alloc_array(machine, UINT16, 0x800 / 2); - tilemap_set_transparent_pen(state->m_vram_tilemap, 0); + state->m_vram_tilemap->set_transparent_pen(0); state->m_bitmap0->fill(0x100); gfx_element_set_source(machine.gfx[2], state->m_vram_buffer); @@ -167,7 +167,7 @@ WRITE16_HANDLER( lemmings_vram_w ) { lemmings_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_data[offset]); - tilemap_mark_tile_dirty(state->m_vram_tilemap, offset); + state->m_vram_tilemap->mark_tile_dirty(offset); } SCREEN_UPDATE_IND16( lemmings ) @@ -197,7 +197,7 @@ SCREEN_UPDATE_IND16( lemmings ) } draw_sprites(screen.machine(), bitmap, cliprect, state->m_sprite_triple_buffer_0, 0, 0x0000); draw_sprites(screen.machine(), bitmap, cliprect, state->m_sprite_triple_buffer_1, 1, 0x2000); - tilemap_draw(bitmap, cliprect, state->m_vram_tilemap, 0, 0); + state->m_vram_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, state->m_sprite_triple_buffer_0, 0, 0x2000); return 0; } diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index f2465640149..7e1894fce77 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -107,7 +107,7 @@ WRITE8_HANDLER( deco16_io_w ) liberate_state *state = space->machine().driver_data(); state->m_io_ram[offset] = data; if (offset > 1 && offset < 6) - tilemap_mark_all_tiles_dirty(state->m_back_tilemap); + state->m_back_tilemap->mark_all_dirty(); switch (offset) { @@ -115,7 +115,7 @@ WRITE8_HANDLER( deco16_io_w ) if (((data >> 4) & 3) != state->m_background_color) { state->m_background_color = (data >> 4) & 3; - tilemap_mark_all_tiles_dirty(state->m_back_tilemap); + state->m_back_tilemap->mark_all_dirty(); } state->m_background_disable = data & 0x4; flip_screen_set(space->machine(), data & 0x01); @@ -138,7 +138,7 @@ WRITE8_HANDLER( prosoccr_io_w ) liberate_state *state = space->machine().driver_data(); state->m_io_ram[offset] = data; if (offset > 1 && offset < 6) - tilemap_mark_all_tiles_dirty(state->m_back_tilemap); + state->m_back_tilemap->mark_all_dirty(); // popmessage("%02x %02x",state->m_io_ram[6],state->m_io_ram[7]); @@ -173,7 +173,7 @@ WRITE8_HANDLER( prosport_io_w ) case 0: //background_disable = ~data & 0x80; flip_screen_set(space->machine(), data & 0x80); - tilemap_mark_all_tiles_dirty(state->m_back_tilemap); + state->m_back_tilemap->mark_all_dirty(); break; case 2: /* Sound */ soundlatch_w(space, 0, data); @@ -189,21 +189,21 @@ WRITE8_HANDLER( liberate_videoram_w ) { liberate_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fix_tilemap, offset); + state->m_fix_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( liberate_colorram_w ) { liberate_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fix_tilemap, offset); + state->m_fix_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( prosport_bg_vram_w ) { liberate_state *state = space->machine().driver_data(); state->m_bg_vram[offset] = data; - tilemap_mark_tile_dirty(state->m_back_tilemap, offset); + state->m_back_tilemap->mark_tile_dirty(offset); } /***************************************************************************/ @@ -214,7 +214,7 @@ VIDEO_START( prosoccr ) state->m_back_tilemap = tilemap_create(machine, get_back_tile_info, back_scan, 16, 16, 32, 32); state->m_fix_tilemap = tilemap_create(machine, get_fix_tile_info, fix_scan, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); state->m_charram = auto_alloc_array(machine, UINT8, 0x1800 * 2); } @@ -225,8 +225,8 @@ VIDEO_START( boomrang ) state->m_back_tilemap = tilemap_create(machine, get_back_tile_info, back_scan, 16, 16, 32, 32); state->m_fix_tilemap = tilemap_create(machine, get_fix_tile_info, fix_scan, 8, 8, 32, 32); - tilemap_set_transmask(state->m_back_tilemap, 0, 0x0001, 0x007e); /* Bottom 1 pen/Top 7 pens */ - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_back_tilemap->set_transmask(0, 0x0001, 0x007e); /* Bottom 1 pen/Top 7 pens */ + state->m_fix_tilemap->set_transparent_pen(0); } VIDEO_START( liberate ) @@ -235,7 +235,7 @@ VIDEO_START( liberate ) state->m_back_tilemap = tilemap_create(machine, get_back_tile_info, back_scan, 16, 16, 32, 32); state->m_fix_tilemap = tilemap_create(machine, get_fix_tile_info, fix_scan, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); } VIDEO_START( prosport ) @@ -244,7 +244,7 @@ VIDEO_START( prosport ) state->m_back_tilemap = tilemap_create(machine, prosport_get_back_tile_info, back_scan, 16, 16, 32, 32); state->m_fix_tilemap = tilemap_create(machine, get_fix_tile_info, fix_scan, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fix_tilemap, 0); + state->m_fix_tilemap->set_transparent_pen(0); } /***************************************************************************/ @@ -515,15 +515,15 @@ static void prosoccr_draw_sprites( running_machine &machine, bitmap_ind16 &bitma SCREEN_UPDATE_IND16( prosoccr ) { liberate_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_back_tilemap, 0, state->m_io_ram[1]); - tilemap_set_scrollx(state->m_back_tilemap, 0, -state->m_io_ram[0]); + state->m_back_tilemap->set_scrolly(0, state->m_io_ram[1]); + state->m_back_tilemap->set_scrollx(0, -state->m_io_ram[0]); if (state->m_background_disable) bitmap.fill(32, cliprect); else - tilemap_draw(bitmap, cliprect, state->m_back_tilemap, 0, 0); + state->m_back_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); prosoccr_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -544,10 +544,10 @@ SCREEN_UPDATE_IND16( prosport ) scrolly = ((state->m_io_ram[0] & 0x8) << 5); scrollx = ((state->m_io_ram[0] & 0x2) << 7) | (state->m_io_ram[1]); - tilemap_set_scrolly(state->m_back_tilemap, 0, scrolly); - tilemap_set_scrollx(state->m_back_tilemap, 0, -scrollx); + state->m_back_tilemap->set_scrolly(0, scrolly); + state->m_back_tilemap->set_scrollx(0, -scrollx); - tilemap_draw(bitmap, cliprect, state->m_back_tilemap, 0, 0); + state->m_back_tilemap->draw(bitmap, cliprect, 0, 0); // popmessage("%d %02x %02x %02x %02x %02x %02x %02x %02x",scrollx,deco16_io_ram[0],deco16_io_ram[1],deco16_io_ram[2],deco16_io_ram[3] // ,deco16_io_ram[4],deco16_io_ram[5],deco16_io_ram[6],deco16_io_ram[7]); @@ -576,35 +576,35 @@ SCREEN_UPDATE_IND16( prosport ) SCREEN_UPDATE_IND16( boomrang ) { liberate_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_back_tilemap, 0, state->m_io_ram[1]); - tilemap_set_scrollx(state->m_back_tilemap, 0, -state->m_io_ram[0]); + state->m_back_tilemap->set_scrolly(0, state->m_io_ram[1]); + state->m_back_tilemap->set_scrollx(0, -state->m_io_ram[0]); if (state->m_background_disable) bitmap.fill(32, cliprect); else - tilemap_draw(bitmap, cliprect, state->m_back_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_back_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); boomrang_draw_sprites(screen.machine(),bitmap,cliprect,8); if (!state->m_background_disable) - tilemap_draw(bitmap, cliprect, state->m_back_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_back_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); boomrang_draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } SCREEN_UPDATE_IND16( liberate ) { liberate_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_back_tilemap, 0, state->m_io_ram[1]); - tilemap_set_scrollx(state->m_back_tilemap, 0, -state->m_io_ram[0]); + state->m_back_tilemap->set_scrolly(0, state->m_io_ram[1]); + state->m_back_tilemap->set_scrollx(0, -state->m_io_ram[0]); if (state->m_background_disable) bitmap.fill(32, cliprect); else - tilemap_draw(bitmap, cliprect, state->m_back_tilemap, 0, 0); + state->m_back_tilemap->draw(bitmap, cliprect, 0, 0); liberate_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fix_tilemap, 0, 0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index aa87013e3d4..eb282c84dd3 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -50,15 +50,15 @@ WRITE8_HANDLER( lkage_videoram_w ) switch (offset / 0x400) { case 0: - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset & 0x3ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); break; case 1: - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); break; case 2: - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); break; default: @@ -95,12 +95,12 @@ VIDEO_START( lkage ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg_tilemap, -5, -5 + 24); - tilemap_set_scrolldx(state->m_fg_tilemap, -3, -3 + 24); - tilemap_set_scrolldx(state->m_tx_tilemap, -1, -1 + 24); + state->m_bg_tilemap->set_scrolldx(-5, -5 + 24); + state->m_fg_tilemap->set_scrolldx(-3, -3 + 24); + state->m_tx_tilemap->set_scrolldx(-1, -1 + 24); } @@ -185,47 +185,47 @@ SCREEN_UPDATE_IND16( lkage ) if (state->m_bg_tile_bank != bank) { state->m_bg_tile_bank = bank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } bank = state->m_vreg[0]&0x04; if (state->m_fg_tile_bank != bank) { state->m_fg_tile_bank = bank; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } bank = state->m_vreg[0]&0x02; if (state->m_tx_tile_bank != bank) { state->m_tx_tile_bank = bank; - tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); + state->m_tx_tilemap->mark_all_dirty(); } - tilemap_set_palette_offset(state->m_bg_tilemap, 0x300 + (state->m_vreg[1] & 0xf0)); - tilemap_set_palette_offset(state->m_fg_tilemap, 0x200 + (state->m_vreg[1] & 0xf0)); - tilemap_set_palette_offset(state->m_tx_tilemap, 0x110); + state->m_bg_tilemap->set_palette_offset(0x300 + (state->m_vreg[1] & 0xf0)); + state->m_fg_tilemap->set_palette_offset(0x200 + (state->m_vreg[1] & 0xf0)); + state->m_tx_tilemap->set_palette_offset(0x110); - tilemap_set_scrollx(state->m_tx_tilemap, 0, state->m_scroll[0]); - tilemap_set_scrolly(state->m_tx_tilemap, 0, state->m_scroll[1]); + state->m_tx_tilemap->set_scrollx(0, state->m_scroll[0]); + state->m_tx_tilemap->set_scrolly(0, state->m_scroll[1]); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scroll[2]); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_scroll[3]); + state->m_fg_tilemap->set_scrollx(0, state->m_scroll[2]); + state->m_fg_tilemap->set_scrolly(0, state->m_scroll[3]); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll[4]); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll[5]); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll[4]); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll[5]); screen.machine().priority_bitmap.fill(0, cliprect); if ((state->m_vreg[2] & 0xf0) == 0xf0) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, (state->m_vreg[1] & 2) ? 2 : 4); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, (state->m_vreg[1] & 2) ? 2 : 4); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect); } else { - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, TILEMAP_DRAW_OPAQUE, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); } return 0; diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index 8c2551cd9ba..cfbf6d95782 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -136,7 +136,7 @@ WRITE16_HANDLER( lockon_char_w ) { lockon_state *state = space->machine().driver_data(); state->m_char_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_lockon_tile_info ) @@ -908,7 +908,7 @@ VIDEO_START( lockon ) lockon_state *state = machine.driver_data(); state->m_tilemap = tilemap_create(machine, get_lockon_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_tilemap, 0); + state->m_tilemap->set_transparent_pen(0); /* Allocate the two frame buffers for rotation */ state->m_back_buffer = auto_bitmap_ind16_alloc(machine, 512, 512); @@ -944,7 +944,7 @@ SCREEN_UPDATE_IND16( lockon ) rotate_draw(screen.machine(), bitmap, cliprect); /* Draw the character tilemap */ - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); /* Draw the HUD */ hud_draw(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index 1bf2e4a4572..67d3d6f3a23 100644 --- a/src/mame/video/lordgun.c +++ b/src/mame/video/lordgun.c @@ -61,7 +61,7 @@ WRITE16_HANDLER( lordgun_paletteram_w ) ***************************************************************************/ -INLINE void get_tile_info(running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, int _N_) +INLINE void get_tile_info(running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, int _N_) { lordgun_state *state = machine.driver_data(); UINT16 attr = state->m_vram[_N_][tile_index * 2 + 0 ]; @@ -79,7 +79,7 @@ INLINE void lordgun_vram_w(address_space *space, offs_t offset, UINT16 data, UIN { lordgun_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram[_N_][offset]); - tilemap_mark_tile_dirty(state->m_tilemap[_N_], offset/2); + state->m_tilemap[_N_]->mark_tile_dirty(offset/2); } WRITE16_HANDLER( lordgun_vram_0_w ) { lordgun_vram_w(space, offset, data, mem_mask, 0); } @@ -117,22 +117,22 @@ VIDEO_START( lordgun ) state->m_tilemap[3] = tilemap_create( machine, get_tile_info_3, tilemap_scan_rows, 8,8, 0x40,0x20 ); - tilemap_set_scroll_rows(state->m_tilemap[0],1); - tilemap_set_scroll_cols(state->m_tilemap[0],1); - tilemap_set_transparent_pen(state->m_tilemap[0],0x3f); + state->m_tilemap[0]->set_scroll_rows(1); + state->m_tilemap[0]->set_scroll_cols(1); + state->m_tilemap[0]->set_transparent_pen(0x3f); // Has line scroll - tilemap_set_scroll_rows(state->m_tilemap[1],0x200); - tilemap_set_scroll_cols(state->m_tilemap[1],1); - tilemap_set_transparent_pen(state->m_tilemap[1],0x3f); + state->m_tilemap[1]->set_scroll_rows(0x200); + state->m_tilemap[1]->set_scroll_cols(1); + state->m_tilemap[1]->set_transparent_pen(0x3f); - tilemap_set_scroll_rows(state->m_tilemap[2],1); - tilemap_set_scroll_cols(state->m_tilemap[2],1); - tilemap_set_transparent_pen(state->m_tilemap[2],0x3f); + state->m_tilemap[2]->set_scroll_rows(1); + state->m_tilemap[2]->set_scroll_cols(1); + state->m_tilemap[2]->set_transparent_pen(0x3f); - tilemap_set_scroll_rows(state->m_tilemap[3],1); - tilemap_set_scroll_cols(state->m_tilemap[3],1); - tilemap_set_transparent_pen(state->m_tilemap[3],0x3f); + state->m_tilemap[3]->set_scroll_rows(1); + state->m_tilemap[3]->set_scroll_cols(1); + state->m_tilemap[3]->set_transparent_pen(0x3f); // Buffer bitmaps for 4 tilemaps (0-3) + sprites (4) for (i = 0; i < 5; i++) @@ -351,18 +351,18 @@ SCREEN_UPDATE_IND16( lordgun ) int x, y; - tilemap_set_scrollx( state->m_tilemap[0], 0, *state->m_scroll_x[0] ); - tilemap_set_scrolly( state->m_tilemap[0], 0, *state->m_scroll_y[0] ); + state->m_tilemap[0]->set_scrollx(0, *state->m_scroll_x[0] ); + state->m_tilemap[0]->set_scrolly(0, *state->m_scroll_y[0] ); for (y = 0; y < 0x200; y++) - tilemap_set_scrollx( state->m_tilemap[1], y, (*state->m_scroll_x[1]) + state->m_scrollram[y * 4/2 + 2/2]); - tilemap_set_scrolly( state->m_tilemap[1], 0, *state->m_scroll_y[1] ); + state->m_tilemap[1]->set_scrollx(y, (*state->m_scroll_x[1]) + state->m_scrollram[y * 4/2 + 2/2]); + state->m_tilemap[1]->set_scrolly(0, *state->m_scroll_y[1] ); - tilemap_set_scrollx( state->m_tilemap[2], 0, *state->m_scroll_x[2] ); - tilemap_set_scrolly( state->m_tilemap[2], 0, *state->m_scroll_y[2] ); + state->m_tilemap[2]->set_scrollx(0, *state->m_scroll_x[2] ); + state->m_tilemap[2]->set_scrolly(0, *state->m_scroll_y[2] ); - tilemap_set_scrollx( state->m_tilemap[3], 0, *state->m_scroll_x[3] ); - tilemap_set_scrolly( state->m_tilemap[3], 0, *state->m_scroll_y[3] ); + state->m_tilemap[3]->set_scrollx(0, *state->m_scroll_x[3] ); + state->m_tilemap[3]->set_scrolly(0, *state->m_scroll_y[3] ); // Rendering: @@ -375,10 +375,10 @@ SCREEN_UPDATE_IND16( lordgun ) for (l = 0; l < 5; l++) state->m_bitmaps[l]->fill(trans_pen, cliprect); - if (layers_ctrl & 1) tilemap_draw(*state->m_bitmaps[0], cliprect, state->m_tilemap[0], 0, 0); - if (layers_ctrl & 2) tilemap_draw(*state->m_bitmaps[1], cliprect, state->m_tilemap[1], 0, 0); - if (layers_ctrl & 4) tilemap_draw(*state->m_bitmaps[2], cliprect, state->m_tilemap[2], 0, 0); - if (layers_ctrl & 8) tilemap_draw(*state->m_bitmaps[3], cliprect, state->m_tilemap[3], 0, 0); + if (layers_ctrl & 1) state->m_tilemap[0]->draw(*state->m_bitmaps[0], cliprect, 0, 0); + if (layers_ctrl & 2) state->m_tilemap[1]->draw(*state->m_bitmaps[1], cliprect, 0, 0); + if (layers_ctrl & 4) state->m_tilemap[2]->draw(*state->m_bitmaps[2], cliprect, 0, 0); + if (layers_ctrl & 8) state->m_tilemap[3]->draw(*state->m_bitmaps[3], cliprect, 0, 0); if (layers_ctrl & 16) draw_sprites(screen.machine(), *state->m_bitmaps[4], cliprect); // copy to screen bitmap diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c index 914a5c985d2..a057bb77050 100644 --- a/src/mame/video/lucky74.c +++ b/src/mame/video/lucky74.c @@ -102,28 +102,28 @@ WRITE8_HANDLER( lucky74_fg_videoram_w ) { lucky74_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( lucky74_fg_colorram_w ) { lucky74_state *state = space->machine().driver_data(); state->m_fg_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( lucky74_bg_videoram_w ) { lucky74_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( lucky74_bg_colorram_w ) { lucky74_state *state = space->machine().driver_data(); state->m_bg_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -238,14 +238,14 @@ VIDEO_START( lucky74 ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } SCREEN_UPDATE_IND16( lucky74 ) { lucky74_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/lvcards.c b/src/mame/video/lvcards.c index 9d176c7ee9b..9fb104cbfd8 100644 --- a/src/mame/video/lvcards.c +++ b/src/mame/video/lvcards.c @@ -84,14 +84,14 @@ WRITE8_HANDLER( lvcards_videoram_w ) { lvcards_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( lvcards_colorram_w ) { lvcards_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -115,6 +115,6 @@ VIDEO_START( lvcards ) SCREEN_UPDATE_IND16( lvcards ) { lvcards_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index b0830bc0c7d..0d17e330579 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -56,7 +56,7 @@ static TILE_GET_INFO( trojan_get_bg1_tile_info ) state->m_bg2_avenger_hw ? ((color & 7) ^ 6) : (color & 7), ((color & 0x10) ? TILE_FLIPX : 0)); - tileinfo->group = (color & 0x08) >> 3; + tileinfo.group = (color & 0x08) >> 3; } static TILE_GET_INFO( get_bg2_tile_info ) @@ -89,7 +89,7 @@ VIDEO_START( lwings ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg1_tilemap = tilemap_create(machine, lwings_get_bg1_tile_info, tilemap_scan_cols, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 3); + state->m_fg_tilemap->set_transparent_pen(3); } VIDEO_START( trojan ) @@ -100,9 +100,9 @@ VIDEO_START( trojan ) state->m_bg1_tilemap = tilemap_create(machine, trojan_get_bg1_tile_info,tilemap_scan_cols, 16, 16, 32, 32); state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, get_bg2_memory_offset, 16, 16, 32, 16); - tilemap_set_transparent_pen(state->m_fg_tilemap, 3); - tilemap_set_transmask(state->m_bg1_tilemap, 0, 0xffff, 0x0001); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg1_tilemap, 1, 0xf07f, 0x0f81); /* split type 1 has pens 7-11 opaque in front half */ + state->m_fg_tilemap->set_transparent_pen(3); + state->m_bg1_tilemap->set_transmask(0, 0xffff, 0x0001); /* split type 0 is totally transparent in front half */ + state->m_bg1_tilemap->set_transmask(1, 0xf07f, 0x0f81); /* split type 1 has pens 7-11 opaque in front half */ state->m_bg2_avenger_hw = 0; } @@ -125,14 +125,14 @@ WRITE8_HANDLER( lwings_fgvideoram_w ) { lwings_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( lwings_bg1videoram_w ) { lwings_state *state = space->machine().driver_data(); state->m_bg1videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg1_tilemap, offset & 0x3ff); + state->m_bg1_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -140,20 +140,20 @@ WRITE8_HANDLER( lwings_bg1_scrollx_w ) { lwings_state *state = space->machine().driver_data(); state->m_scroll_x[offset] = data; - tilemap_set_scrollx(state->m_bg1_tilemap, 0, state->m_scroll_x[0] | (state->m_scroll_x[1] << 8)); + state->m_bg1_tilemap->set_scrollx(0, state->m_scroll_x[0] | (state->m_scroll_x[1] << 8)); } WRITE8_HANDLER( lwings_bg1_scrolly_w ) { lwings_state *state = space->machine().driver_data(); state->m_scroll_y[offset] = data; - tilemap_set_scrolly(state->m_bg1_tilemap, 0, state->m_scroll_y[0] | (state->m_scroll_y[1] << 8)); + state->m_bg1_tilemap->set_scrolly(0, state->m_scroll_y[0] | (state->m_scroll_y[1] << 8)); } WRITE8_HANDLER( trojan_bg2_scrollx_w ) { lwings_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, data); + state->m_bg2_tilemap->set_scrollx(0, data); } WRITE8_HANDLER( trojan_bg2_image_w ) @@ -163,7 +163,7 @@ WRITE8_HANDLER( trojan_bg2_image_w ) if (state->m_bg2_image != data) { state->m_bg2_image = data; - tilemap_mark_all_tiles_dirty(state->m_bg2_tilemap); + state->m_bg2_tilemap->mark_all_dirty(); } } @@ -273,9 +273,9 @@ SCREEN_UPDATE_IND16( lwings ) { lwings_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); lwings_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -283,11 +283,11 @@ SCREEN_UPDATE_IND16( trojan ) { lwings_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); trojan_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 32bc48ae7af..bfc9f45e131 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -48,7 +48,7 @@ static TILEMAP_MAPPER( tilemap_scan ) } -static void get_tile_info( running_machine &machine, tile_data *tileinfo, tilemap_memory_index tile_index, void *param ) +static void get_tile_info( running_machine &machine, tile_data &tileinfo, tilemap_memory_index tile_index, void *param ) { m10_state *state = machine.driver_data(); @@ -62,7 +62,7 @@ WRITE8_HANDLER( m10_colorram_w ) if (state->m_colorram[offset] != data) { - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); state->m_colorram[offset] = data; } } @@ -108,9 +108,9 @@ VIDEO_START( m10 ) m10_state *state = machine.driver_data(); state->m_tx_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); - tilemap_set_scrolldx(state->m_tx_tilemap, 0, 62); - tilemap_set_scrolldy(state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_scrolldx(0, 62); + state->m_tx_tilemap->set_scrolldy(0, 0); state->m_back_gfx = gfx_element_alloc(machine, &backlayout, state->m_chargen, 8, 0); @@ -125,8 +125,8 @@ VIDEO_START( m15 ) machine.gfx[0] = gfx_element_alloc(machine, &charlayout, state->m_chargen, 8, 0); state->m_tx_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan, 8, 8, 32, 32); - tilemap_set_scrolldx(state->m_tx_tilemap, 0, 116); - tilemap_set_scrolldy(state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->set_scrolldx(0, 116); + state->m_tx_tilemap->set_scrolldy(0, 0); return ; } @@ -162,10 +162,10 @@ SCREEN_UPDATE_IND16( m10 ) } for (offs = state->m_videoram_size - 1; offs >= 0; offs--) - tilemap_mark_tile_dirty(state->m_tx_tilemap, offs); + state->m_tx_tilemap->mark_tile_dirty(offs); - tilemap_set_flip(state->m_tx_tilemap, state->m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->set_flip(state->m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -183,11 +183,11 @@ SCREEN_UPDATE_IND16( m15 ) int offs; for (offs = state->m_videoram_size - 1; offs >= 0; offs--) - tilemap_mark_tile_dirty(state->m_tx_tilemap, offs); + state->m_tx_tilemap->mark_tile_dirty(offs); - //tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); - tilemap_set_flip(state->m_tx_tilemap, state->m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + //state->m_tx_tilemap->mark_all_dirty(); + state->m_tx_tilemap->set_flip(state->m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c index 117f7be9f48..6a4cbd626e8 100644 --- a/src/mame/video/m107.c +++ b/src/mame/video/m107.c @@ -59,7 +59,7 @@ static TILE_GET_INFO( get_pf_tile_info ) TILE_FLIPYX(attrib >> 10)); /* Priority 1 = tile appears above sprites */ - tileinfo->category = (attrib >> 9) & 1; + tileinfo.category = (attrib >> 9) & 1; } /*****************************************************************************/ @@ -72,7 +72,7 @@ WRITE16_HANDLER( m107_vram_w ) COMBINE_DATA(&state->m_vram_data[offset]); for (laynum = 0; laynum < 4; laynum++) if ((offset & 0x6000) == state->m_pf_layer[laynum].vram_base) - tilemap_mark_tile_dirty(state->m_pf_layer[laynum].tmap, (offset & 0x1fff) / 2); + state->m_pf_layer[laynum].tmap->mark_tile_dirty((offset & 0x1fff) / 2); } /*****************************************************************************/ @@ -97,11 +97,11 @@ WRITE16_HANDLER( m107_control_w ) layer->vram_base = ((state->m_control[offset] >> 8) & 15) * 0x800; /* update enable (bit 7) */ - tilemap_set_enable(layer->tmap, (~state->m_control[offset] >> 7) & 1); + layer->tmap->enable((~state->m_control[offset] >> 7) & 1); /* mark everything dirty of the VRAM base changes */ if ((old ^ state->m_control[offset]) & 0x0f00) - tilemap_mark_all_tiles_dirty(layer->tmap); + layer->tmap->mark_all_dirty(); if(state->m_control[offset] & 0xf07c) printf("%04x %02x\n",state->m_control[offset],offset*2); @@ -134,15 +134,15 @@ VIDEO_START( m107 ) layer->tmap = tilemap_create(machine, get_pf_tile_info, tilemap_scan_rows, 8,8, 64,64); /* set the user data to point to the layer */ - tilemap_set_user_data(layer->tmap, &state->m_pf_layer[laynum]); + layer->tmap->set_user_data(&state->m_pf_layer[laynum]); /* set scroll offsets */ - tilemap_set_scrolldx(layer->tmap, -3 + 2 * laynum, -3 + 2 * laynum); - tilemap_set_scrolldy(layer->tmap, -128, -128); + layer->tmap->set_scrolldx(-3 + 2 * laynum, -3 + 2 * laynum); + layer->tmap->set_scrolldy(-128, -128); /* set pen 0 to transparent for all tilemaps except #4 */ if (laynum != 3) - tilemap_set_transparent_pen(layer->tmap, 0); + layer->tmap->set_transparent_pen(0); } state->m_buffered_spriteram = auto_alloc_array_clear(machine, UINT16, 0x1000/2); @@ -296,18 +296,18 @@ static void m107_update_scroll_positions(running_machine &machine) { const UINT16 *scrolldata = state->m_vram_data + (0xe000 + 0x200 * laynum) / 2; - tilemap_set_scroll_rows(layer->tmap, 512); + layer->tmap->set_scroll_rows(512); for (i = 0; i < 512; i++) - tilemap_set_scrollx(layer->tmap, i, scrolldata[((i+0xff80)-(scrolly))&0x1ff] + scrollx); + layer->tmap->set_scrollx(i, scrolldata[((i+0xff80)-(scrolly))&0x1ff] + scrollx); } else { - tilemap_set_scroll_rows(layer->tmap, 1); - tilemap_set_scrollx(layer->tmap, 0, scrollx); + layer->tmap->set_scroll_rows(1); + layer->tmap->set_scrollx(0, scrollx); } - tilemap_set_scrolly(layer->tmap, 0,scrolly); + layer->tmap->set_scrolly(0,scrolly); } } @@ -328,14 +328,14 @@ static void m107_tilemap_draw(running_machine &machine, bitmap_ind16 &bitmap, co const UINT16 *scrolldata = state->m_vram_data + (0xe800 + 0x200 * laynum) / 2; clip.min_y = clip.max_y = line; - tilemap_set_scrollx(state->m_pf_layer[laynum].tmap,0, state->m_control[1 + 2 * laynum]); - tilemap_set_scrolly(state->m_pf_layer[laynum].tmap,0, (state->m_control[0 + 2 * laynum] + scrolldata[line])); + state->m_pf_layer[laynum].tmap->set_scrollx(0, state->m_control[1 + 2 * laynum]); + state->m_pf_layer[laynum].tmap->set_scrolly(0, (state->m_control[0 + 2 * laynum] + scrolldata[line])); - tilemap_draw(bitmap, clip, state->m_pf_layer[laynum].tmap, category | opaque, category); + state->m_pf_layer[laynum].tmap->draw(bitmap, clip, category | opaque, category); } } else - tilemap_draw(bitmap, cliprect, state->m_pf_layer[laynum].tmap, category | opaque, category); + state->m_pf_layer[laynum].tmap->draw(bitmap, cliprect, category | opaque, category); } diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index fc24a252bef..2ddca534926 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -152,10 +152,10 @@ VIDEO_START( m52 ) state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, 128 - 1, -1); - tilemap_set_scrolldy(state->m_bg_tilemap, 16, 16); - tilemap_set_scroll_rows(state->m_bg_tilemap, 4); /* only lines 192-256 scroll */ + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scrolldx(128 - 1, -1); + state->m_bg_tilemap->set_scrolldy(16, 16); + state->m_bg_tilemap->set_scroll_rows(4); /* only lines 192-256 scroll */ state->save_item(NAME(state->m_bg1xpos)); state->save_item(NAME(state->m_bg1ypos)); @@ -182,10 +182,10 @@ WRITE8_HANDLER( m52_scroll_w ) So we set the first 3 quarters to 255 and the last to the scroll value */ - tilemap_set_scrollx(state->m_bg_tilemap, 0, 255); - tilemap_set_scrollx(state->m_bg_tilemap, 1, 255); - tilemap_set_scrollx(state->m_bg_tilemap, 2, 255); - tilemap_set_scrollx(state->m_bg_tilemap, 3, -data); + state->m_bg_tilemap->set_scrollx(0, 255); + state->m_bg_tilemap->set_scrollx(1, 255); + state->m_bg_tilemap->set_scrollx(2, 255); + state->m_bg_tilemap->set_scrollx(3, -data); } @@ -201,7 +201,7 @@ WRITE8_HANDLER( m52_videoram_w ) m52_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -210,7 +210,7 @@ WRITE8_HANDLER( m52_colorram_w ) m52_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -379,9 +379,9 @@ SCREEN_UPDATE_IND16( m52 ) draw_background(screen.machine(), bitmap, cliprect, state->m_bg1xpos, state->m_bg1ypos, 4); /* cityscape */ } - tilemap_set_flip(state->m_bg_tilemap, flip_screen_get(screen.machine()) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_bg_tilemap->set_flip(flip_screen_get(screen.machine()) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ for (offs = 0xfc; offs >= 0; offs -= 4) diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index 935b8e3a4f8..5172240ad6c 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -131,7 +131,7 @@ WRITE8_HANDLER( m57_videoram_w ) m57_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -146,7 +146,7 @@ VIDEO_START( m57 ) m57_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 256); + state->m_bg_tilemap->set_scroll_rows(256); state->save_item(NAME(state->m_flipscreen)); } @@ -164,7 +164,7 @@ WRITE8_HANDLER( m57_flipscreen_w ) /* screen flip is handled both by software and hardware */ state->m_flipscreen = (data & 0x01) ^ (~input_port_read(space->machine(), "DSW2") & 0x01); - tilemap_set_flip(state->m_bg_tilemap, state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_bg_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); coin_counter_w(space->machine(), 0,data & 0x02); coin_counter_w(space->machine(), 1,data & 0x20); @@ -185,9 +185,9 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons // from 64 to 127: not wrapped for (y = 64; y < 128; y++) - tilemap_set_scrollx(state->m_bg_tilemap, y, state->m_scrollram[0x40]); + state->m_bg_tilemap->set_scrollx(y, state->m_scrollram[0x40]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); // from 128 to 255: wrapped for (y = 128; y <= cliprect.max_y; y++) diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index b74ef896c77..50de5597dcb 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -108,7 +108,7 @@ WRITE8_HANDLER( yard_videoram_w ) m58_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -185,8 +185,8 @@ VIDEO_START( yard ) const rectangle &visarea = machine.primary_screen->visible_area(); state->m_bg_tilemap = tilemap_create(machine, yard_get_bg_tile_info, yard_tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_scrolldx(state->m_bg_tilemap, visarea.min_x, width - (visarea.max_x + 1)); - tilemap_set_scrolldy(state->m_bg_tilemap, visarea.min_y - 8, height + 16 - (visarea.max_y + 1)); + state->m_bg_tilemap->set_scrolldx(visarea.min_x, width - (visarea.max_x + 1)); + state->m_bg_tilemap->set_scrolldy(visarea.min_y - 8, height + 16 - (visarea.max_y + 1)); state->m_scroll_panel_bitmap = auto_bitmap_ind16_alloc(machine, SCROLL_PANEL_WIDTH, height); } @@ -307,10 +307,10 @@ SCREEN_UPDATE_IND16( yard ) { m58_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, (*state->m_yard_scroll_x_high * 0x100) + *state->m_yard_scroll_x_low); - tilemap_set_scrolly(state->m_bg_tilemap, 0, *state->m_yard_scroll_y_low); + state->m_bg_tilemap->set_scrollx(0, (*state->m_yard_scroll_x_high * 0x100) + *state->m_yard_scroll_x_low); + state->m_bg_tilemap->set_scrolly(0, *state->m_yard_scroll_y_low); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); draw_panel(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index 478c0a08dd0..b1cee773671 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -306,9 +306,9 @@ WRITE8_HANDLER( m62_flipscreen_w ) state->m_flipscreen = data & 0x01; if (state->m_flipscreen) - tilemap_set_flip_all(space->machine(), TILEMAP_FLIPX | TILEMAP_FLIPY); + space->machine().tilemap().set_flip_all(TILEMAP_FLIPX | TILEMAP_FLIPY); else - tilemap_set_flip_all(space->machine(), 0); + space->machine().tilemap().set_flip_all(0); coin_counter_w(space->machine(), 0, data & 2); coin_counter_w(space->machine(), 1, data & 4); @@ -342,14 +342,14 @@ WRITE8_HANDLER( m62_tileram_w ) { m62_state *state = space->machine().driver_data(); state->m_m62_tileram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } WRITE8_HANDLER( m62_textram_w ) { m62_state *state = space->machine().driver_data(); state->m_m62_textram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset >> 1); + state->m_fg_tilemap->mark_tile_dirty(offset >> 1); } @@ -420,10 +420,10 @@ static void m62_start( running_machine &machine, tile_get_info_func tile_get_inf register_savestate(machine); if (rows != 0) - tilemap_set_scroll_rows(state->m_bg_tilemap, rows); + state->m_bg_tilemap->set_scroll_rows(rows); if (cols != 0) - tilemap_set_scroll_cols(state->m_bg_tilemap, cols); + state->m_bg_tilemap->set_scroll_cols(cols); } static void m62_textlayer( running_machine &machine, tile_get_info_func tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ) @@ -432,17 +432,17 @@ static void m62_textlayer( running_machine &machine, tile_get_info_func tile_get state->m_fg_tilemap = tilemap_create(machine, tile_get_info, tilemap_scan_rows, x1, y1, x2, y2); if (rows != 0) - tilemap_set_scroll_rows(state->m_fg_tilemap, rows); + state->m_fg_tilemap->set_scroll_rows(rows); if (cols != 0) - tilemap_set_scroll_cols(state->m_fg_tilemap, cols); + state->m_fg_tilemap->set_scroll_cols(cols); } WRITE8_HANDLER( kungfum_tileram_w ) { m62_state *state = space->machine().driver_data(); state->m_m62_tileram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } static TILE_GET_INFO( get_kungfum_bg_tile_info ) @@ -462,9 +462,9 @@ static TILE_GET_INFO( get_kungfum_bg_tile_info ) /* is the following right? */ if ((tile_index / 64) < 6 || ((color & 0x1f) >> 1) > 0x0c) - tileinfo->category = 1; + tileinfo.category = 1; else - tileinfo->category = 0; + tileinfo.category = 0; } VIDEO_START( kungfum ) @@ -478,15 +478,15 @@ SCREEN_UPDATE_IND16( kungfum ) int i; for (i = 0; i < 6; i++) { - tilemap_set_scrollx(state->m_bg_tilemap, i, 0); + state->m_bg_tilemap->set_scrollx(i, 0); } for (i = 6; i < 32; i++) { - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_m62_background_hscroll); + state->m_bg_tilemap->set_scrollx(i, state->m_m62_background_hscroll); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); return 0; } @@ -507,9 +507,9 @@ static TILE_GET_INFO( get_ldrun_bg_tile_info ) } SET_TILE_INFO(0, code | ((color & 0xc0) << 2), color & 0x1f, flags); if (((color & 0x1f) >> 1) >= 0x0c) - tileinfo->group = 1; + tileinfo.group = 1; else - tileinfo->group = 0; + tileinfo.group = 0; } VIDEO_START( ldrun ) @@ -517,19 +517,19 @@ VIDEO_START( ldrun ) m62_state *state = machine.driver_data(); m62_start(machine, get_ldrun_bg_tile_info, 1, 1, 8, 8, 64, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ + state->m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } SCREEN_UPDATE_IND16( ldrun ) { m62_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_m62_background_hscroll); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_m62_background_vscroll); + state->m_bg_tilemap->set_scrollx(0, state->m_m62_background_hscroll); + state->m_bg_tilemap->set_scrolly(0, state->m_m62_background_vscroll); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0x10, 0x00); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0x10, 0x10); return 0; } @@ -549,17 +549,17 @@ static TILE_GET_INFO( get_ldrun2_bg_tile_info ) } SET_TILE_INFO(0, code | ((color & 0xc0) << 2), color & 0x1f, flags); if (((color & 0x1f) >> 1) >= 0x04) - tileinfo->group = 1; + tileinfo.group = 1; else - tileinfo->group = 0; + tileinfo.group = 0; } VIDEO_START( ldrun2 ) { m62_state *state = machine.driver_data(); m62_start(machine, get_ldrun2_bg_tile_info, 1, 1, 8, 8, 64, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ + state->m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } @@ -606,9 +606,9 @@ static TILE_GET_INFO( get_battroad_bg_tile_info ) } SET_TILE_INFO(0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, flags); if (((color & 0x1f) >> 1) >= 0x04) - tileinfo->group = 1; + tileinfo.group = 1; else - tileinfo->group = 0; + tileinfo.group = 0; } static TILE_GET_INFO( get_battroad_fg_tile_info ) @@ -626,24 +626,24 @@ VIDEO_START( battroad ) m62_state *state = machine.driver_data(); m62_start(machine, get_battroad_bg_tile_info, 1, 1, 8, 8, 64, 32); m62_textlayer(machine, get_battroad_fg_tile_info, 1, 1, 8, 8, 32, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ + state->m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } SCREEN_UPDATE_IND16( battroad ) { m62_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_m62_background_hscroll); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_m62_background_vscroll); - tilemap_set_scrollx(state->m_fg_tilemap, 0, 128); - tilemap_set_scrolly(state->m_fg_tilemap, 0, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_m62_background_hscroll); + state->m_bg_tilemap->set_scrolly(0, state->m_m62_background_vscroll); + state->m_fg_tilemap->set_scrollx(0, 128); + state->m_fg_tilemap->set_scrolly(0, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0x10, 0x00); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0x10, 0x10); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -668,9 +668,9 @@ VIDEO_START( ldrun4 ) SCREEN_UPDATE_IND16( ldrun4 ) { m62_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_m62_background_hscroll - 2); + state->m_bg_tilemap->set_scrollx(0, state->m_m62_background_hscroll - 2); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00); return 0; } @@ -711,14 +711,14 @@ VIDEO_START( lotlot ) SCREEN_UPDATE_IND16( lotlot ) { m62_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_m62_background_hscroll - 64); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_m62_background_vscroll + 32); - tilemap_set_scrollx(state->m_fg_tilemap, 0, -64); - tilemap_set_scrolly(state->m_fg_tilemap, 0, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_m62_background_hscroll - 64); + state->m_bg_tilemap->set_scrolly(0, state->m_m62_background_vscroll + 32); + state->m_fg_tilemap->set_scrollx(0, -64); + state->m_fg_tilemap->set_scrolly(0, 32); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00); return 0; } @@ -742,7 +742,7 @@ WRITE8_HANDLER( kidniki_background_bank_w ) if (state->m_kidniki_background_bank != (data & 1)) { state->m_kidniki_background_bank = data & 1; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -754,7 +754,7 @@ static TILE_GET_INFO( get_kidniki_bg_tile_info ) code = state->m_m62_tileram[tile_index << 1]; color = state->m_m62_tileram[(tile_index << 1) | 1]; SET_TILE_INFO(0, code | ((color & 0xe0) << 3) | (state->m_kidniki_background_bank << 11), color & 0x1f, 0); - tileinfo->group = ((color & 0xe0) == 0xe0) ? 1 : 0; + tileinfo.group = ((color & 0xe0) == 0xe0) ? 1 : 0; } static TILE_GET_INFO( get_kidniki_fg_tile_info ) @@ -772,8 +772,8 @@ VIDEO_START( kidniki ) m62_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_kidniki_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ + state->m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ register_savestate(machine); @@ -783,15 +783,15 @@ VIDEO_START( kidniki ) SCREEN_UPDATE_IND16( kidniki ) { m62_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_m62_background_hscroll); - tilemap_set_scrollx(state->m_fg_tilemap, 0, -64); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_kidniki_text_vscroll + 128); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_m62_background_hscroll); + state->m_fg_tilemap->set_scrollx(0, -64); + state->m_fg_tilemap->set_scrolly(0, state->m_kidniki_text_vscroll + 128); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -802,8 +802,8 @@ WRITE8_HANDLER( spelunkr_palbank_w ) if (state->m_spelunkr_palbank != (data & 0x01)) { state->m_spelunkr_palbank = data & 0x01; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); + state->m_fg_tilemap->mark_all_dirty(); } } @@ -837,15 +837,15 @@ VIDEO_START( spelunkr ) SCREEN_UPDATE_IND16( spelunkr ) { m62_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_m62_background_hscroll); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_m62_background_vscroll + 128); - tilemap_set_scrollx(state->m_fg_tilemap, 0, -64); - tilemap_set_scrolly(state->m_fg_tilemap, 0, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_m62_background_hscroll); + state->m_bg_tilemap->set_scrolly(0, state->m_m62_background_vscroll + 128); + state->m_fg_tilemap->set_scrollx(0, -64); + state->m_fg_tilemap->set_scrolly(0, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -858,8 +858,8 @@ WRITE8_HANDLER( spelunk2_gfxport_w ) if (state->m_spelunkr_palbank != ((data & 0x0c) >> 2)) { state->m_spelunkr_palbank = (data & 0x0c) >> 2; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); + state->m_fg_tilemap->mark_all_dirty(); } } @@ -882,15 +882,15 @@ VIDEO_START( spelunk2 ) SCREEN_UPDATE_IND16( spelunk2 ) { m62_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_m62_background_hscroll - 1); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_m62_background_vscroll + 128); - tilemap_set_scrollx(state->m_fg_tilemap, 0, -65); - tilemap_set_scrolly(state->m_fg_tilemap, 0, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_m62_background_hscroll - 1); + state->m_bg_tilemap->set_scrolly(0, state->m_m62_background_vscroll + 128); + state->m_fg_tilemap->set_scrollx(0, -65); + state->m_fg_tilemap->set_scrolly(0, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -904,9 +904,9 @@ static TILE_GET_INFO( get_youjyudn_bg_tile_info ) color = state->m_m62_tileram[(tile_index << 1) | 1]; SET_TILE_INFO( 0, code | ((color & 0x60) << 3), color & 0x1f, 0); if (((color & 0x1f) >> 1) >= 0x08) - tileinfo->group = 1; + tileinfo.group = 1; else - tileinfo->group = 0; + tileinfo.group = 0; } static TILE_GET_INFO( get_youjyudn_fg_tile_info ) @@ -924,22 +924,22 @@ VIDEO_START( youjyudn ) m62_state *state = machine.driver_data(); m62_start(machine, get_youjyudn_bg_tile_info, 1, 0, 8, 16, 64, 16); m62_textlayer(machine, get_youjyudn_fg_tile_info, 1, 1, 12, 8, 32, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ + state->m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } SCREEN_UPDATE_IND16( youjyudn ) { m62_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_m62_background_hscroll); - tilemap_set_scrollx(state->m_fg_tilemap, 0, -64); - tilemap_set_scrolly(state->m_fg_tilemap, 0, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_m62_background_hscroll); + state->m_fg_tilemap->set_scrollx(0, -64); + state->m_fg_tilemap->set_scrolly(0, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -960,17 +960,17 @@ static TILE_GET_INFO( get_horizon_bg_tile_info ) SET_TILE_INFO(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0); if (((color & 0x1f) >> 1) >= 0x08) - tileinfo->group = 1; + tileinfo.group = 1; else - tileinfo->group = 0; + tileinfo.group = 0; } VIDEO_START( horizon ) { m62_state *state = machine.driver_data(); m62_start(machine, get_horizon_bg_tile_info, 32, 0, 8, 8, 64, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ + state->m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } SCREEN_UPDATE_IND16( horizon ) @@ -979,10 +979,10 @@ SCREEN_UPDATE_IND16( horizon ) int i; for (i = 0; i < 32; i++) { - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_scrollram[i << 1] | (state->m_scrollram[(i << 1) | 1] << 8)); + state->m_bg_tilemap->set_scrollx(i, state->m_scrollram[i << 1] | (state->m_scrollram[(i << 1) | 1] << 8)); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c index d2c1f6da0b5..79f8a7d527d 100644 --- a/src/mame/video/m72.c +++ b/src/mame/video/m72.c @@ -8,7 +8,7 @@ ***************************************************************************/ -INLINE void m72_get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,const UINT16 *vram,int gfxnum) +INLINE void m72_get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,const UINT16 *vram,int gfxnum) { int code,attr,color,pri; @@ -28,10 +28,10 @@ INLINE void m72_get_tile_info(running_machine &machine,tile_data *tileinfo,int t code + ((attr & 0x3f) << 8), color & 0x0f, TILE_FLIPYX((attr & 0xc0) >> 6)); - tileinfo->group = pri; + tileinfo.group = pri; } -INLINE void rtype2_get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,const UINT16 *vram,int gfxnum) +INLINE void rtype2_get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,const UINT16 *vram,int gfxnum) { int code,attr,color,pri; @@ -53,7 +53,7 @@ INLINE void rtype2_get_tile_info(running_machine &machine,tile_data *tileinfo,in code, color & 0x0f, TILE_FLIPYX((color & 0x60) >> 5)); - tileinfo->group = pri; + tileinfo.group = pri; } @@ -122,22 +122,22 @@ VIDEO_START( m72 ) state->m_buffered_spriteram = auto_alloc_array(machine, UINT16, state->m_spriteram_size/2); - tilemap_set_transmask(state->m_fg_tilemap,0,0xffff,0x0001); - tilemap_set_transmask(state->m_fg_tilemap,1,0x00ff,0xff01); - tilemap_set_transmask(state->m_fg_tilemap,2,0x0001,0xffff); + state->m_fg_tilemap->set_transmask(0,0xffff,0x0001); + state->m_fg_tilemap->set_transmask(1,0x00ff,0xff01); + state->m_fg_tilemap->set_transmask(2,0x0001,0xffff); - tilemap_set_transmask(state->m_bg_tilemap,0,0xffff,0x0000); - tilemap_set_transmask(state->m_bg_tilemap,1,0x00ff,0xff00); - //tilemap_set_transmask(state->m_bg_tilemap,2,0x0001,0xfffe); - tilemap_set_transmask(state->m_bg_tilemap,2,0x0007,0xfff8); + state->m_bg_tilemap->set_transmask(0,0xffff,0x0000); + state->m_bg_tilemap->set_transmask(1,0x00ff,0xff00); + //state->m_bg_tilemap->set_transmask(2,0x0001,0xfffe); + state->m_bg_tilemap->set_transmask(2,0x0007,0xfff8); memset(state->m_buffered_spriteram,0,state->m_spriteram_size); - tilemap_set_scrolldx(state->m_fg_tilemap,0,0); - tilemap_set_scrolldy(state->m_fg_tilemap,-128,16); + state->m_fg_tilemap->set_scrolldx(0,0); + state->m_fg_tilemap->set_scrolldy(-128,16); - tilemap_set_scrolldx(state->m_bg_tilemap,0,0); - tilemap_set_scrolldy(state->m_bg_tilemap,-128,16); + state->m_bg_tilemap->set_scrolldx(0,0); + state->m_bg_tilemap->set_scrolldy(-128,16); register_savestate(machine); } @@ -147,8 +147,8 @@ VIDEO_START( xmultipl ) m72_state *state = machine.driver_data(); VIDEO_START_CALL(m72); - tilemap_set_scrolldx(state->m_fg_tilemap,4,0); - tilemap_set_scrolldx(state->m_bg_tilemap,6,0); + state->m_fg_tilemap->set_scrolldx(4,0); + state->m_bg_tilemap->set_scrolldx(6,0); } VIDEO_START( rtype2 ) @@ -159,21 +159,21 @@ VIDEO_START( rtype2 ) state->m_buffered_spriteram = auto_alloc_array(machine, UINT16, state->m_spriteram_size/2); - tilemap_set_transmask(state->m_fg_tilemap,0,0xffff,0x0001); - tilemap_set_transmask(state->m_fg_tilemap,1,0x00ff,0xff01); - tilemap_set_transmask(state->m_fg_tilemap,2,0x0001,0xffff); + state->m_fg_tilemap->set_transmask(0,0xffff,0x0001); + state->m_fg_tilemap->set_transmask(1,0x00ff,0xff01); + state->m_fg_tilemap->set_transmask(2,0x0001,0xffff); - tilemap_set_transmask(state->m_bg_tilemap,0,0xffff,0x0000); - tilemap_set_transmask(state->m_bg_tilemap,1,0x00ff,0xff00); - tilemap_set_transmask(state->m_bg_tilemap,2,0x0001,0xfffe); + state->m_bg_tilemap->set_transmask(0,0xffff,0x0000); + state->m_bg_tilemap->set_transmask(1,0x00ff,0xff00); + state->m_bg_tilemap->set_transmask(2,0x0001,0xfffe); memset(state->m_buffered_spriteram,0,state->m_spriteram_size); - tilemap_set_scrolldx(state->m_fg_tilemap,4,0); - tilemap_set_scrolldy(state->m_fg_tilemap,-128,16); + state->m_fg_tilemap->set_scrolldx(4,0); + state->m_fg_tilemap->set_scrolldy(-128,16); - tilemap_set_scrolldx(state->m_bg_tilemap,4,0); - tilemap_set_scrolldy(state->m_bg_tilemap,-128,16); + state->m_bg_tilemap->set_scrolldx(4,0); + state->m_bg_tilemap->set_scrolldy(-128,16); register_savestate(machine); } @@ -183,8 +183,8 @@ VIDEO_START( poundfor ) m72_state *state = machine.driver_data(); VIDEO_START_CALL(rtype2); - tilemap_set_scrolldx(state->m_fg_tilemap,6,0); - tilemap_set_scrolldx(state->m_bg_tilemap,6,0); + state->m_fg_tilemap->set_scrolldx(6,0); + state->m_bg_tilemap->set_scrolldx(6,0); } VIDEO_START( hharryu ) @@ -192,8 +192,8 @@ VIDEO_START( hharryu ) m72_state *state = machine.driver_data(); VIDEO_START_CALL(rtype2); - tilemap_set_scrolldx(state->m_fg_tilemap,4,0); - tilemap_set_scrolldx(state->m_bg_tilemap,6,0); + state->m_fg_tilemap->set_scrolldx(4,0); + state->m_bg_tilemap->set_scrolldx(6,0); } /* Major Title has a larger background RAM, and rowscroll */ @@ -208,21 +208,21 @@ VIDEO_START( majtitle ) state->m_buffered_spriteram = auto_alloc_array(machine, UINT16, state->m_spriteram_size/2); - tilemap_set_transmask(state->m_fg_tilemap,0,0xffff,0x0001); - tilemap_set_transmask(state->m_fg_tilemap,1,0x00ff,0xff01); - tilemap_set_transmask(state->m_fg_tilemap,2,0x0001,0xffff); + state->m_fg_tilemap->set_transmask(0,0xffff,0x0001); + state->m_fg_tilemap->set_transmask(1,0x00ff,0xff01); + state->m_fg_tilemap->set_transmask(2,0x0001,0xffff); - tilemap_set_transmask(state->m_bg_tilemap,0,0xffff,0x0000); - tilemap_set_transmask(state->m_bg_tilemap,1,0x00ff,0xff00); - tilemap_set_transmask(state->m_bg_tilemap,2,0x0001,0xfffe); + state->m_bg_tilemap->set_transmask(0,0xffff,0x0000); + state->m_bg_tilemap->set_transmask(1,0x00ff,0xff00); + state->m_bg_tilemap->set_transmask(2,0x0001,0xfffe); memset(state->m_buffered_spriteram,0,state->m_spriteram_size); - tilemap_set_scrolldx(state->m_fg_tilemap,4,0); - tilemap_set_scrolldy(state->m_fg_tilemap,-128,16); + state->m_fg_tilemap->set_scrolldx(4,0); + state->m_fg_tilemap->set_scrolldy(-128,16); - tilemap_set_scrolldx(state->m_bg_tilemap,4,0); - tilemap_set_scrolldy(state->m_bg_tilemap,-128,16); + state->m_bg_tilemap->set_scrolldx(4,0); + state->m_bg_tilemap->set_scrolldy(-128,16); register_savestate(machine); } @@ -235,21 +235,21 @@ VIDEO_START( hharry ) state->m_buffered_spriteram = auto_alloc_array(machine, UINT16, state->m_spriteram_size/2); - tilemap_set_transmask(state->m_fg_tilemap,0,0xffff,0x0001); - tilemap_set_transmask(state->m_fg_tilemap,1,0x00ff,0xff01); - tilemap_set_transmask(state->m_fg_tilemap,2,0x0001,0xffff); + state->m_fg_tilemap->set_transmask(0,0xffff,0x0001); + state->m_fg_tilemap->set_transmask(1,0x00ff,0xff01); + state->m_fg_tilemap->set_transmask(2,0x0001,0xffff); - tilemap_set_transmask(state->m_bg_tilemap,0,0xffff,0x0000); - tilemap_set_transmask(state->m_bg_tilemap,1,0x00ff,0xff00); - tilemap_set_transmask(state->m_bg_tilemap,2,0x0001,0xfffe); + state->m_bg_tilemap->set_transmask(0,0xffff,0x0000); + state->m_bg_tilemap->set_transmask(1,0x00ff,0xff00); + state->m_bg_tilemap->set_transmask(2,0x0001,0xfffe); memset(state->m_buffered_spriteram,0,state->m_spriteram_size); - tilemap_set_scrolldx(state->m_fg_tilemap,4,0); - tilemap_set_scrolldy(state->m_fg_tilemap,-128,16); + state->m_fg_tilemap->set_scrolldx(4,0); + state->m_fg_tilemap->set_scrolldy(-128,16); - tilemap_set_scrolldx(state->m_bg_tilemap,6,0); - tilemap_set_scrolldy(state->m_bg_tilemap,-128,16); + state->m_bg_tilemap->set_scrolldx(6,0); + state->m_bg_tilemap->set_scrolldy(-128,16); register_savestate(machine); } @@ -314,14 +314,14 @@ WRITE16_HANDLER( m72_videoram1_w ) { m72_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram1[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset/2); + state->m_fg_tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( m72_videoram2_w ) { m72_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram2[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset/2); + state->m_bg_tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( m72_irq_line_w ) @@ -544,17 +544,17 @@ SCREEN_UPDATE_IND16( m72 ) return 0; } - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scrollx1); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scrolly1); + state->m_fg_tilemap->set_scrollx(0,state->m_scrollx1); + state->m_fg_tilemap->set_scrolly(0,state->m_scrolly1); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scrollx2); - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scrolly2); + state->m_bg_tilemap->set_scrollx(0,state->m_scrollx2); + state->m_bg_tilemap->set_scrolly(0,state->m_scrolly2); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_LAYER1,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,TILEMAP_DRAW_LAYER1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0); m72_draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_LAYER0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,TILEMAP_DRAW_LAYER0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0); return 0; } @@ -570,28 +570,28 @@ SCREEN_UPDATE_IND16( majtitle ) return 0; } - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scrollx1); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scrolly1); + state->m_fg_tilemap->set_scrollx(0,state->m_scrollx1); + state->m_fg_tilemap->set_scrolly(0,state->m_scrolly1); if (state->m_majtitle_rowscroll) { - tilemap_set_scroll_rows(state->m_bg_tilemap,512); + state->m_bg_tilemap->set_scroll_rows(512); for (i = 0;i < 512;i++) - tilemap_set_scrollx(state->m_bg_tilemap,(i+state->m_scrolly2)&0x1ff, + state->m_bg_tilemap->set_scrollx((i+state->m_scrolly2)&0x1ff, 256 + state->m_majtitle_rowscrollram[i]); } else { - tilemap_set_scroll_rows(state->m_bg_tilemap,1); - tilemap_set_scrollx(state->m_bg_tilemap,0,256 + state->m_scrollx2); + state->m_bg_tilemap->set_scroll_rows(1); + state->m_bg_tilemap->set_scrollx(0,256 + state->m_scrollx2); } - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scrolly2); + state->m_bg_tilemap->set_scrolly(0,state->m_scrolly2); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_LAYER1,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,TILEMAP_DRAW_LAYER1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0); majtitle_draw_sprites(screen.machine(), bitmap,cliprect); m72_draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_LAYER0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,TILEMAP_DRAW_LAYER0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0); return 0; } diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c index 4ca817ed7af..c87fd3927ff 100644 --- a/src/mame/video/m90.c +++ b/src/mame/video/m90.c @@ -30,7 +30,7 @@ #include "includes/m90.h" -INLINE void get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,int layer,int page_mask) +INLINE void get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,int layer,int page_mask) { m90_state *state = machine.driver_data(); int tile,color; @@ -43,10 +43,10 @@ INLINE void get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_ tile, color&0xf, TILE_FLIPYX((color & 0xc0) >> 6)); - tileinfo->category = (color & 0x30) ? 1 : 0; + tileinfo.category = (color & 0x30) ? 1 : 0; } -INLINE void bomblord_get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,int layer) +INLINE void bomblord_get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,int layer) { m90_state *state = machine.driver_data(); int tile,color; @@ -59,10 +59,10 @@ INLINE void bomblord_get_tile_info(running_machine &machine,tile_data *tileinfo, tile, color&0xf, TILE_FLIPYX((color & 0xc0) >> 6)); - tileinfo->category = (color & 0x30) ? 1 : 0; + tileinfo.category = (color & 0x30) ? 1 : 0; } -INLINE void dynablsb_get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,int layer) +INLINE void dynablsb_get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,int layer) { m90_state *state = machine.driver_data(); int tile,color; @@ -75,7 +75,7 @@ INLINE void dynablsb_get_tile_info(running_machine &machine,tile_data *tileinfo, tile, color&0xf, TILE_FLIPYX((color & 0xc0) >> 6)); - tileinfo->category = (color & 0x30) ? 1 : 0; + tileinfo.category = (color & 0x30) ? 1 : 0; } static TILE_GET_INFO( get_pf1_tile_info ) { get_tile_info(machine,tileinfo,tile_index,0,0x3); } @@ -101,8 +101,8 @@ VIDEO_START( m90 ) state->m_pf2_layer = tilemap_create(machine, get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); state->m_pf2_wide_layer = tilemap_create(machine, get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); - tilemap_set_transparent_pen(state->m_pf1_layer,0); - tilemap_set_transparent_pen(state->m_pf1_wide_layer,0); + state->m_pf1_layer->set_transparent_pen(0); + state->m_pf1_wide_layer->set_transparent_pen(0); state_save_register_global_array(machine, state->m_video_control_data); state_save_register_global(machine, state->m_last_pf1); @@ -117,10 +117,10 @@ VIDEO_START( bomblord ) state->m_pf2_layer = tilemap_create(machine, bomblord_get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); state->m_pf2_wide_layer = tilemap_create(machine, bomblord_get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); - tilemap_set_transparent_pen(state->m_pf2_layer,0); - tilemap_set_transparent_pen(state->m_pf2_wide_layer,0); - tilemap_set_transparent_pen(state->m_pf1_layer,0); - tilemap_set_transparent_pen(state->m_pf1_wide_layer,0); + state->m_pf2_layer->set_transparent_pen(0); + state->m_pf2_wide_layer->set_transparent_pen(0); + state->m_pf1_layer->set_transparent_pen(0); + state->m_pf1_wide_layer->set_transparent_pen(0); state_save_register_global_array(machine, state->m_video_control_data); } @@ -133,8 +133,8 @@ VIDEO_START( dynablsb ) state->m_pf2_layer = tilemap_create(machine, dynablsb_get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); state->m_pf2_wide_layer = tilemap_create(machine, dynablsb_get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); - tilemap_set_transparent_pen(state->m_pf2_layer,0); - tilemap_set_transparent_pen(state->m_pf2_wide_layer,0); + state->m_pf2_layer->set_transparent_pen(0); + state->m_pf2_wide_layer->set_transparent_pen(0); state_save_register_global_array(machine, state->m_video_control_data); } @@ -283,7 +283,7 @@ static void markdirty(tilemap_t *tmap,int page,offs_t offset) offset -= page * 0x2000; if (offset >= 0 && offset < 0x2000) - tilemap_mark_tile_dirty(tmap,offset/2); + tmap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( m90_video_w ) @@ -308,21 +308,21 @@ SCREEN_UPDATE_IND16( m90 ) if (state->m_video_control_data[5]&0x10) pf1_enable=0; else pf1_enable=1; if (state->m_video_control_data[6]&0x10) pf2_enable=0; else pf2_enable=1; -// tilemap_set_enable(state->m_pf1_layer,pf1_enable); -// tilemap_set_enable(state->m_pf2_layer,pf2_enable); -// tilemap_set_enable(state->m_pf1_wide_layer,pf1_enable); -// tilemap_set_enable(state->m_pf2_wide_layer,pf2_enable); +// state->m_pf1_layer->enable(pf1_enable); +// state->m_pf2_layer->enable(pf2_enable); +// state->m_pf1_wide_layer->enable(pf1_enable); +// state->m_pf2_wide_layer->enable(pf2_enable); /* Dirty tilemaps if VRAM base changes */ if (pf1_base!=state->m_last_pf1) { - tilemap_mark_all_tiles_dirty(state->m_pf1_layer); - tilemap_mark_all_tiles_dirty(state->m_pf1_wide_layer); + state->m_pf1_layer->mark_all_dirty(); + state->m_pf1_wide_layer->mark_all_dirty(); } if (pf2_base!=state->m_last_pf2) { - tilemap_mark_all_tiles_dirty(state->m_pf2_layer); - tilemap_mark_all_tiles_dirty(state->m_pf2_wide_layer); + state->m_pf2_layer->mark_all_dirty(); + state->m_pf2_wide_layer->mark_all_dirty(); } state->m_last_pf1=pf1_base; state->m_last_pf2=pf2_base; @@ -330,37 +330,37 @@ SCREEN_UPDATE_IND16( m90 ) /* Setup scrolling */ if (state->m_video_control_data[5]&0x20) { - tilemap_set_scroll_rows(state->m_pf1_layer,512); - tilemap_set_scroll_rows(state->m_pf1_wide_layer,512); + state->m_pf1_layer->set_scroll_rows(512); + state->m_pf1_wide_layer->set_scroll_rows(512); for (i=0; i<512; i++) - tilemap_set_scrollx( state->m_pf1_layer,i, state->m_video_data[0xf000/2+i]+2); + state->m_pf1_layer->set_scrollx(i, state->m_video_data[0xf000/2+i]+2); for (i=0; i<512; i++) - tilemap_set_scrollx( state->m_pf1_wide_layer,i, state->m_video_data[0xf000/2+i]+256+2); + state->m_pf1_wide_layer->set_scrollx(i, state->m_video_data[0xf000/2+i]+256+2); } else { - tilemap_set_scroll_rows(state->m_pf1_layer,1); - tilemap_set_scroll_rows(state->m_pf1_wide_layer,1); - tilemap_set_scrollx( state->m_pf1_layer,0, state->m_video_control_data[1]+2); - tilemap_set_scrollx( state->m_pf1_wide_layer,0, state->m_video_control_data[1]+256+2); + state->m_pf1_layer->set_scroll_rows(1); + state->m_pf1_wide_layer->set_scroll_rows(1); + state->m_pf1_layer->set_scrollx(0, state->m_video_control_data[1]+2); + state->m_pf1_wide_layer->set_scrollx(0, state->m_video_control_data[1]+256+2); } /* Setup scrolling */ if (state->m_video_control_data[6]&0x20) { - tilemap_set_scroll_rows(state->m_pf2_layer,512); - tilemap_set_scroll_rows(state->m_pf2_wide_layer,512); + state->m_pf2_layer->set_scroll_rows(512); + state->m_pf2_wide_layer->set_scroll_rows(512); for (i=0; i<512; i++) - tilemap_set_scrollx( state->m_pf2_layer,i, state->m_video_data[0xf400/2+i]-2); + state->m_pf2_layer->set_scrollx(i, state->m_video_data[0xf400/2+i]-2); for (i=0; i<512; i++) - tilemap_set_scrollx( state->m_pf2_wide_layer,i, state->m_video_data[0xf400/2+i]+256-2); + state->m_pf2_wide_layer->set_scrollx(i, state->m_video_data[0xf400/2+i]+256-2); } else { - tilemap_set_scroll_rows(state->m_pf2_layer,1); - tilemap_set_scroll_rows(state->m_pf2_wide_layer,1); - tilemap_set_scrollx( state->m_pf2_layer,0, state->m_video_control_data[3]-2); - tilemap_set_scrollx( state->m_pf2_wide_layer,0, state->m_video_control_data[3]+256-2 ); + state->m_pf2_layer->set_scroll_rows(1); + state->m_pf2_wide_layer->set_scroll_rows(1); + state->m_pf2_layer->set_scrollx(0, state->m_video_control_data[3]-2); + state->m_pf2_wide_layer->set_scrollx(0, state->m_video_control_data[3]+256-2 ); } screen.machine().priority_bitmap.fill(0, cliprect); @@ -384,13 +384,13 @@ SCREEN_UPDATE_IND16( m90 ) if (state->m_video_control_data[6] & 0x4) { - tilemap_set_scrolly(state->m_pf2_wide_layer, 0, 0x200 + state->m_video_data[0xfc00/2 + line]); - tilemap_draw(bitmap,clip,state->m_pf2_wide_layer,0,0); - tilemap_draw(bitmap,clip,state->m_pf2_wide_layer,1,1); + state->m_pf2_wide_layer->set_scrolly(0, 0x200 + state->m_video_data[0xfc00/2 + line]); + state->m_pf2_wide_layer->draw(bitmap, clip, 0,0); + state->m_pf2_wide_layer->draw(bitmap, clip, 1,1); } else { - tilemap_set_scrolly(state->m_pf2_layer, 0, 0x200 + state->m_video_data[0xfc00/2 + line]); - tilemap_draw(bitmap,clip,state->m_pf2_layer,0,0); - tilemap_draw(bitmap,clip,state->m_pf2_layer,1,1); + state->m_pf2_layer->set_scrolly(0, 0x200 + state->m_video_data[0xfc00/2 + line]); + state->m_pf2_layer->draw(bitmap, clip, 0,0); + state->m_pf2_layer->draw(bitmap, clip, 1,1); } } } @@ -398,13 +398,13 @@ SCREEN_UPDATE_IND16( m90 ) { if (state->m_video_control_data[6] & 0x4) { - tilemap_set_scrolly( state->m_pf2_wide_layer,0, state->m_video_control_data[2] ); - tilemap_draw(bitmap,cliprect,state->m_pf2_wide_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf2_wide_layer,1,1); + state->m_pf2_wide_layer->set_scrolly(0, state->m_video_control_data[2] ); + state->m_pf2_wide_layer->draw(bitmap, cliprect, 0,0); + state->m_pf2_wide_layer->draw(bitmap, cliprect, 1,1); } else { - tilemap_set_scrolly( state->m_pf2_layer,0, state->m_video_control_data[2] ); - tilemap_draw(bitmap,cliprect,state->m_pf2_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf2_layer,1,1); + state->m_pf2_layer->set_scrolly(0, state->m_video_control_data[2] ); + state->m_pf2_layer->draw(bitmap, cliprect, 0,0); + state->m_pf2_layer->draw(bitmap, cliprect, 1,1); } } } @@ -429,13 +429,13 @@ SCREEN_UPDATE_IND16( m90 ) if (state->m_video_control_data[5] & 0x4) { - tilemap_set_scrolly(state->m_pf1_wide_layer, 0, 0x200 + state->m_video_data[0xf800/2 + line]); - tilemap_draw(bitmap,clip,state->m_pf1_wide_layer,0,0); - tilemap_draw(bitmap,clip,state->m_pf1_wide_layer,1,1); + state->m_pf1_wide_layer->set_scrolly(0, 0x200 + state->m_video_data[0xf800/2 + line]); + state->m_pf1_wide_layer->draw(bitmap, clip, 0,0); + state->m_pf1_wide_layer->draw(bitmap, clip, 1,1); } else { - tilemap_set_scrolly(state->m_pf1_layer, 0, 0x200 + state->m_video_data[0xf800/2 + line]); - tilemap_draw(bitmap,clip,state->m_pf1_layer,0,0); - tilemap_draw(bitmap,clip,state->m_pf1_layer,1,1); + state->m_pf1_layer->set_scrolly(0, 0x200 + state->m_video_data[0xf800/2 + line]); + state->m_pf1_layer->draw(bitmap, clip, 0,0); + state->m_pf1_layer->draw(bitmap, clip, 1,1); } } } @@ -443,13 +443,13 @@ SCREEN_UPDATE_IND16( m90 ) { if (state->m_video_control_data[5] & 0x4) { - tilemap_set_scrolly( state->m_pf1_wide_layer,0, state->m_video_control_data[0] ); - tilemap_draw(bitmap,cliprect,state->m_pf1_wide_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf1_wide_layer,1,1); + state->m_pf1_wide_layer->set_scrolly(0, state->m_video_control_data[0] ); + state->m_pf1_wide_layer->draw(bitmap, cliprect, 0,0); + state->m_pf1_wide_layer->draw(bitmap, cliprect, 1,1); } else { - tilemap_set_scrolly( state->m_pf1_layer,0, state->m_video_control_data[0] ); - tilemap_draw(bitmap,cliprect,state->m_pf1_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf1_layer,1,1); + state->m_pf1_layer->set_scrolly(0, state->m_video_control_data[0] ); + state->m_pf1_layer->draw(bitmap, cliprect, 0,0); + state->m_pf1_layer->draw(bitmap, cliprect, 1,1); } } } @@ -472,43 +472,43 @@ SCREEN_UPDATE_IND16( bomblord ) /* Setup scrolling */ if (state->m_video_control_data[6]&0x20) { - tilemap_set_scroll_rows(state->m_pf1_layer,512); - tilemap_set_scroll_rows(state->m_pf1_wide_layer,512); + state->m_pf1_layer->set_scroll_rows(512); + state->m_pf1_wide_layer->set_scroll_rows(512); for (i=0; i<512; i++) - tilemap_set_scrollx( state->m_pf1_layer,i, state->m_video_data[0xf400/2+i]-12); + state->m_pf1_layer->set_scrollx(i, state->m_video_data[0xf400/2+i]-12); for (i=0; i<512; i++) - tilemap_set_scrollx( state->m_pf1_wide_layer,i, state->m_video_data[0xf400/2+i]-12+256); + state->m_pf1_wide_layer->set_scrollx(i, state->m_video_data[0xf400/2+i]-12+256); } else { - tilemap_set_scroll_rows(state->m_pf1_layer,1); - tilemap_set_scroll_rows(state->m_pf1_wide_layer,1); - tilemap_set_scrollx( state->m_pf1_layer,0, state->m_video_data[0xf004/2]-12); - tilemap_set_scrollx( state->m_pf1_wide_layer,0, state->m_video_data[0xf004/2]-12 ); + state->m_pf1_layer->set_scroll_rows(1); + state->m_pf1_wide_layer->set_scroll_rows(1); + state->m_pf1_layer->set_scrollx(0, state->m_video_data[0xf004/2]-12); + state->m_pf1_wide_layer->set_scrollx(0, state->m_video_data[0xf004/2]-12 ); } if (state->m_video_control_data[6] & 0x02) { - tilemap_mark_all_tiles_dirty(state->m_pf2_wide_layer); - tilemap_set_scrollx( state->m_pf2_wide_layer,0, state->m_video_data[0xf000/2]-16 ); - tilemap_set_scrolly( state->m_pf2_wide_layer,0, state->m_video_data[0xf008/2]+388 ); - tilemap_draw(bitmap,cliprect,state->m_pf2_wide_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf2_wide_layer,1,1); + state->m_pf2_wide_layer->mark_all_dirty(); + state->m_pf2_wide_layer->set_scrollx(0, state->m_video_data[0xf000/2]-16 ); + state->m_pf2_wide_layer->set_scrolly(0, state->m_video_data[0xf008/2]+388 ); + state->m_pf2_wide_layer->draw(bitmap, cliprect, 0,0); + state->m_pf2_wide_layer->draw(bitmap, cliprect, 1,1); } else { - tilemap_mark_all_tiles_dirty(state->m_pf2_layer); - tilemap_set_scrollx( state->m_pf2_layer,0, state->m_video_data[0xf000/2]-16 ); - tilemap_set_scrolly( state->m_pf2_layer,0, state->m_video_data[0xf008/2]-120 ); - tilemap_draw(bitmap,cliprect,state->m_pf2_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf2_layer,1,1); + state->m_pf2_layer->mark_all_dirty(); + state->m_pf2_layer->set_scrollx(0, state->m_video_data[0xf000/2]-16 ); + state->m_pf2_layer->set_scrolly(0, state->m_video_data[0xf008/2]-120 ); + state->m_pf2_layer->draw(bitmap, cliprect, 0,0); + state->m_pf2_layer->draw(bitmap, cliprect, 1,1); } if (state->m_video_control_data[6] & 0x04) { - tilemap_mark_all_tiles_dirty(state->m_pf1_wide_layer); - tilemap_set_scrolly( state->m_pf1_wide_layer,0, state->m_video_data[0xf00c/2]+392 ); - tilemap_draw(bitmap,cliprect,state->m_pf1_wide_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf1_wide_layer,1,1); + state->m_pf1_wide_layer->mark_all_dirty(); + state->m_pf1_wide_layer->set_scrolly(0, state->m_video_data[0xf00c/2]+392 ); + state->m_pf1_wide_layer->draw(bitmap, cliprect, 0,0); + state->m_pf1_wide_layer->draw(bitmap, cliprect, 1,1); } else { - tilemap_mark_all_tiles_dirty(state->m_pf1_layer); - tilemap_set_scrolly( state->m_pf1_layer,0, state->m_video_data[0xf00c/2]-116 ); - tilemap_draw(bitmap,cliprect,state->m_pf1_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf1_layer,1,1); + state->m_pf1_layer->mark_all_dirty(); + state->m_pf1_layer->set_scrolly(0, state->m_video_data[0xf00c/2]-116 ); + state->m_pf1_layer->draw(bitmap, cliprect, 0,0); + state->m_pf1_layer->draw(bitmap, cliprect, 1,1); } bomblord_draw_sprites(screen.machine(),bitmap,cliprect); @@ -523,35 +523,35 @@ SCREEN_UPDATE_IND16( dynablsb ) bitmap.fill(get_black_pen(screen.machine()), cliprect); if (!(state->m_video_data[0xf008/2] & 0x4000)) { - tilemap_mark_all_tiles_dirty(state->m_pf1_wide_layer); - tilemap_set_scroll_rows(state->m_pf1_wide_layer,1); - tilemap_set_scrollx( state->m_pf1_wide_layer,0, state->m_video_data[0xf004/2]+64); - tilemap_set_scrolly( state->m_pf1_wide_layer,0, state->m_video_data[0xf006/2]+512); - tilemap_draw(bitmap,cliprect,state->m_pf1_wide_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf1_wide_layer,1,1); + state->m_pf1_wide_layer->mark_all_dirty(); + state->m_pf1_wide_layer->set_scroll_rows(1); + state->m_pf1_wide_layer->set_scrollx(0, state->m_video_data[0xf004/2]+64); + state->m_pf1_wide_layer->set_scrolly(0, state->m_video_data[0xf006/2]+512); + state->m_pf1_wide_layer->draw(bitmap, cliprect, 0,0); + state->m_pf1_wide_layer->draw(bitmap, cliprect, 1,1); } else { - tilemap_mark_all_tiles_dirty(state->m_pf1_layer); - tilemap_set_scroll_rows(state->m_pf1_layer,1); - tilemap_set_scrollx( state->m_pf1_layer,0, state->m_video_data[0xf004/2]+64); - tilemap_set_scrolly( state->m_pf1_layer,0, state->m_video_data[0xf006/2]+4); - tilemap_draw(bitmap,cliprect,state->m_pf1_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf1_layer,1,1); + state->m_pf1_layer->mark_all_dirty(); + state->m_pf1_layer->set_scroll_rows(1); + state->m_pf1_layer->set_scrollx(0, state->m_video_data[0xf004/2]+64); + state->m_pf1_layer->set_scrolly(0, state->m_video_data[0xf006/2]+4); + state->m_pf1_layer->draw(bitmap, cliprect, 0,0); + state->m_pf1_layer->draw(bitmap, cliprect, 1,1); } if (!(state->m_video_data[0xf008/2] & 0x8000)) { - tilemap_mark_all_tiles_dirty(state->m_pf2_wide_layer); - tilemap_set_scroll_rows(state->m_pf2_wide_layer,1); - tilemap_set_scrollx( state->m_pf2_wide_layer,0, state->m_video_data[0xf000/2]+68); - tilemap_set_scrolly( state->m_pf2_wide_layer,0, state->m_video_data[0xf002/2]+512); - tilemap_draw(bitmap,cliprect,state->m_pf2_wide_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf2_wide_layer,1,1); + state->m_pf2_wide_layer->mark_all_dirty(); + state->m_pf2_wide_layer->set_scroll_rows(1); + state->m_pf2_wide_layer->set_scrollx(0, state->m_video_data[0xf000/2]+68); + state->m_pf2_wide_layer->set_scrolly(0, state->m_video_data[0xf002/2]+512); + state->m_pf2_wide_layer->draw(bitmap, cliprect, 0,0); + state->m_pf2_wide_layer->draw(bitmap, cliprect, 1,1); } else { - tilemap_mark_all_tiles_dirty(state->m_pf2_layer); - tilemap_set_scroll_rows(state->m_pf2_layer,1); - tilemap_set_scrollx( state->m_pf2_layer,0, state->m_video_data[0xf000/2]+68); - tilemap_set_scrolly( state->m_pf2_layer,0, state->m_video_data[0xf002/2]+4); - tilemap_draw(bitmap,cliprect,state->m_pf2_layer,0,0); - tilemap_draw(bitmap,cliprect,state->m_pf2_layer,1,1); + state->m_pf2_layer->mark_all_dirty(); + state->m_pf2_layer->set_scroll_rows(1); + state->m_pf2_layer->set_scrollx(0, state->m_video_data[0xf000/2]+68); + state->m_pf2_layer->set_scrolly(0, state->m_video_data[0xf002/2]+4); + state->m_pf2_layer->draw(bitmap, cliprect, 0,0); + state->m_pf2_layer->draw(bitmap, cliprect, 1,1); } dynablsb_draw_sprites(screen.machine(),bitmap,cliprect); diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index e0bc5d464a4..d97cb544d78 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -155,9 +155,9 @@ static TILE_GET_INFO( get_pf_tile_info ) tile, attrib & 0x7f, TILE_FLIPYX(attrib >> 9)); - if (attrib & 0x100) tileinfo->group = 2; - else if (attrib & 0x80) tileinfo->group = 1; - else tileinfo->group = 0; + if (attrib & 0x100) tileinfo.group = 2; + else if (attrib & 0x80) tileinfo.group = 1; + else tileinfo.group = 0; } /*****************************************************************************/ @@ -173,11 +173,11 @@ WRITE16_HANDLER( m92_vram_w ) { if ((offset & 0x6000) == state->m_pf_layer[laynum].vram_base) { - tilemap_mark_tile_dirty(state->m_pf_layer[laynum].tmap, (offset & 0x1fff) / 2); - tilemap_mark_tile_dirty(state->m_pf_layer[laynum].wide_tmap, (offset & 0x3fff) / 2); + state->m_pf_layer[laynum].tmap->mark_tile_dirty((offset & 0x1fff) / 2); + state->m_pf_layer[laynum].wide_tmap->mark_tile_dirty((offset & 0x3fff) / 2); } if ((offset & 0x6000) == state->m_pf_layer[laynum].vram_base + 0x2000) - tilemap_mark_tile_dirty(state->m_pf_layer[laynum].wide_tmap, (offset & 0x3fff) / 2); + state->m_pf_layer[laynum].wide_tmap->mark_tile_dirty((offset & 0x3fff) / 2); } } @@ -222,20 +222,20 @@ WRITE16_HANDLER( m92_master_control_w ) /* update size (bit 2) */ if (state->m_pf_master_control[offset] & 0x04) { - tilemap_set_enable(layer->tmap, FALSE); - tilemap_set_enable(layer->wide_tmap, (~state->m_pf_master_control[offset] >> 4) & 1); + layer->tmap->enable(FALSE); + layer->wide_tmap->enable((~state->m_pf_master_control[offset] >> 4) & 1); } else { - tilemap_set_enable(layer->tmap, (~state->m_pf_master_control[offset] >> 4) & 1); - tilemap_set_enable(layer->wide_tmap, FALSE); + layer->tmap->enable((~state->m_pf_master_control[offset] >> 4) & 1); + layer->wide_tmap->enable(FALSE); } /* mark everything dirty of the VRAM base or size changes */ if ((old ^ state->m_pf_master_control[offset]) & 0x07) { - tilemap_mark_all_tiles_dirty(layer->tmap); - tilemap_mark_all_tiles_dirty(layer->wide_tmap); + layer->tmap->mark_all_dirty(); + layer->wide_tmap->mark_all_dirty(); } break; @@ -262,26 +262,26 @@ VIDEO_START( m92 ) layer->wide_tmap = tilemap_create(machine, get_pf_tile_info, tilemap_scan_rows, 8,8, 128,64); /* set the user data for each one to point to the layer */ - tilemap_set_user_data(layer->tmap, &state->m_pf_layer[laynum]); - tilemap_set_user_data(layer->wide_tmap, &state->m_pf_layer[laynum]); + layer->tmap->set_user_data(&state->m_pf_layer[laynum]); + layer->wide_tmap->set_user_data(&state->m_pf_layer[laynum]); /* set scroll offsets */ - tilemap_set_scrolldx(layer->tmap, 2 * laynum, -2 * laynum + 8); - tilemap_set_scrolldy(layer->tmap, -128, -128); - tilemap_set_scrolldx(layer->wide_tmap, 2 * laynum - 256, -2 * laynum + 8 - 256); - tilemap_set_scrolldy(layer->wide_tmap, -128, -128); + layer->tmap->set_scrolldx(2 * laynum, -2 * laynum + 8); + layer->tmap->set_scrolldy(-128, -128); + layer->wide_tmap->set_scrolldx(2 * laynum - 256, -2 * laynum + 8 - 256); + layer->wide_tmap->set_scrolldy(-128, -128); /* layer group 0 - totally transparent in front half */ - tilemap_set_transmask(layer->tmap, 0, 0xffff, (laynum == 2) ? 0x0000 : 0x0001); - tilemap_set_transmask(layer->wide_tmap, 0, 0xffff, (laynum == 2) ? 0x0000 : 0x0001); + layer->tmap->set_transmask(0, 0xffff, (laynum == 2) ? 0x0000 : 0x0001); + layer->wide_tmap->set_transmask(0, 0xffff, (laynum == 2) ? 0x0000 : 0x0001); /* layer group 1 - pens 0-7 transparent in front half */ - tilemap_set_transmask(layer->tmap, 1, 0x00ff, (laynum == 2) ? 0xff00 : 0xff01); - tilemap_set_transmask(layer->wide_tmap, 1, 0x00ff, (laynum == 2) ? 0xff00 : 0xff01); + layer->tmap->set_transmask(1, 0x00ff, (laynum == 2) ? 0xff00 : 0xff01); + layer->wide_tmap->set_transmask(1, 0x00ff, (laynum == 2) ? 0xff00 : 0xff01); /* layer group 2 - pen 0 transparent in front half */ - tilemap_set_transmask(layer->tmap, 2, 0x0001, (laynum == 2) ? 0xfffe : 0xffff); - tilemap_set_transmask(layer->wide_tmap, 2, 0x0001, (laynum == 2) ? 0xfffe : 0xffff); + layer->tmap->set_transmask(2, 0x0001, (laynum == 2) ? 0xfffe : 0xffff); + layer->wide_tmap->set_transmask(2, 0x0001, (laynum == 2) ? 0xfffe : 0xffff); state_save_register_item(machine, "layer", NULL, laynum, layer->vram_base); state_save_register_item_array(machine, "layer", NULL, laynum, layer->control); @@ -314,10 +314,10 @@ VIDEO_START( ppan ) pf_layer_info *layer = &state->m_pf_layer[laynum]; /* set scroll offsets */ - tilemap_set_scrolldx(layer->tmap, 2 * laynum + 11, -2 * laynum + 11); - tilemap_set_scrolldy(layer->tmap, -8, -8); - tilemap_set_scrolldx(layer->wide_tmap, 2 * laynum - 256 + 11, -2 * laynum + 11 - 256); - tilemap_set_scrolldy(layer->wide_tmap, -8, -8); + layer->tmap->set_scrolldx(2 * laynum + 11, -2 * laynum + 11); + layer->tmap->set_scrolldy(-8, -8); + layer->wide_tmap->set_scrolldx(2 * laynum - 256 + 11, -2 * laynum + 11 - 256); + layer->wide_tmap->set_scrolldy(-8, -8); } } @@ -498,24 +498,24 @@ static void m92_update_scroll_positions(running_machine &machine) { const UINT16 *scrolldata = state->m_vram_data + (0xf400 + 0x400 * laynum) / 2; - tilemap_set_scroll_rows(layer->tmap, 512); - tilemap_set_scroll_rows(layer->wide_tmap, 512); + layer->tmap->set_scroll_rows(512); + layer->wide_tmap->set_scroll_rows(512); for (i = 0; i < 512; i++) { - tilemap_set_scrollx(layer->tmap, i, scrolldata[i]); - tilemap_set_scrollx(layer->wide_tmap, i, scrolldata[i]); + layer->tmap->set_scrollx(i, scrolldata[i]); + layer->wide_tmap->set_scrollx(i, scrolldata[i]); } } else { - tilemap_set_scroll_rows(layer->tmap, 1); - tilemap_set_scroll_rows(layer->wide_tmap, 1); - tilemap_set_scrollx(layer->tmap, 0, layer->control[2]); - tilemap_set_scrollx(layer->wide_tmap, 0, layer->control[2]); + layer->tmap->set_scroll_rows(1); + layer->wide_tmap->set_scroll_rows(1); + layer->tmap->set_scrollx(0, layer->control[2]); + layer->wide_tmap->set_scrollx(0, layer->control[2]); } - tilemap_set_scrolly(layer->tmap, 0, layer->control[0]); - tilemap_set_scrolly(layer->wide_tmap, 0, layer->control[0]); + layer->tmap->set_scrolly(0, layer->control[0]); + layer->wide_tmap->set_scrolly(0, layer->control[0]); } } @@ -527,21 +527,21 @@ static void m92_draw_tiles(running_machine &machine, bitmap_ind16 &bitmap,const if ((~state->m_pf_master_control[2] >> 4) & 1) { - tilemap_draw(bitmap, cliprect, state->m_pf_layer[2].wide_tmap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[2].tmap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[2].wide_tmap, TILEMAP_DRAW_LAYER0, 1); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[2].tmap, TILEMAP_DRAW_LAYER0, 1); + state->m_pf_layer[2].wide_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_pf_layer[2].tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_pf_layer[2].wide_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); + state->m_pf_layer[2].tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); } - tilemap_draw(bitmap, cliprect, state->m_pf_layer[1].wide_tmap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[1].tmap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[1].wide_tmap, TILEMAP_DRAW_LAYER0, 1); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[1].tmap, TILEMAP_DRAW_LAYER0, 1); + state->m_pf_layer[1].wide_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_pf_layer[1].tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_pf_layer[1].wide_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); + state->m_pf_layer[1].tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[0].wide_tmap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[0].tmap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[0].wide_tmap, TILEMAP_DRAW_LAYER0, 1); - tilemap_draw(bitmap, cliprect, state->m_pf_layer[0].tmap, TILEMAP_DRAW_LAYER0, 1); + state->m_pf_layer[0].wide_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_pf_layer[0].tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_pf_layer[0].wide_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); + state->m_pf_layer[0].tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); } diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index ebde07e9b8e..b40eb0bdac0 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -12,7 +12,7 @@ WRITE32_HANDLER( macrossp_scra_videoram_w ) COMBINE_DATA(&state->m_scra_videoram[offset]); - tilemap_mark_tile_dirty(state->m_scra_tilemap, offset); + state->m_scra_tilemap->mark_tile_dirty(offset); } @@ -50,7 +50,7 @@ WRITE32_HANDLER( macrossp_scrb_videoram_w ) COMBINE_DATA(&state->m_scrb_videoram[offset]); - tilemap_mark_tile_dirty(state->m_scrb_tilemap, offset); + state->m_scrb_tilemap->mark_tile_dirty(offset); } @@ -88,7 +88,7 @@ WRITE32_HANDLER( macrossp_scrc_videoram_w ) COMBINE_DATA(&state->m_scrc_videoram[offset]); - tilemap_mark_tile_dirty(state->m_scrc_tilemap, offset); + state->m_scrc_tilemap->mark_tile_dirty(offset); } @@ -126,7 +126,7 @@ WRITE32_HANDLER( macrossp_text_videoram_w ) COMBINE_DATA(&state->m_text_videoram[offset]); - tilemap_mark_tile_dirty(state->m_text_tilemap, offset); + state->m_text_tilemap->mark_tile_dirty(offset); } @@ -157,10 +157,10 @@ VIDEO_START( macrossp ) state->m_scrb_tilemap = tilemap_create(machine, get_macrossp_scrb_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_scrc_tilemap = tilemap_create(machine, get_macrossp_scrc_tile_info, tilemap_scan_rows, 16, 16, 64, 64); - tilemap_set_transparent_pen(state->m_text_tilemap, 0); - tilemap_set_transparent_pen(state->m_scra_tilemap, 0); - tilemap_set_transparent_pen(state->m_scrb_tilemap, 0); - tilemap_set_transparent_pen(state->m_scrc_tilemap, 0); + state->m_text_tilemap->set_transparent_pen(0); + state->m_scra_tilemap->set_transparent_pen(0); + state->m_scrb_tilemap->set_transparent_pen(0); + state->m_scrc_tilemap->set_transparent_pen(0); machine.gfx[0]->color_granularity = 64; machine.gfx[1]->color_granularity = 64; @@ -358,16 +358,16 @@ static void draw_layer( running_machine &machine, bitmap_rgb32 &bitmap, const re startx -= (368/2) * inc; starty -= (240/2) * inc; - tilemap_draw_roz(bitmap,cliprect,tm, + tm->draw_roz(bitmap, cliprect, startx,starty,inc,0,0,inc, 1, /* wraparound */ 0,0); } else { - tilemap_set_scrollx( tm, 0, ((vr[0] & 0x000003ff) >> 0 ) ); - tilemap_set_scrolly( tm, 0, ((vr[0] & 0x03ff0000) >> 16) ); - tilemap_draw(bitmap, cliprect, tm, 0, 0); + tm->set_scrollx(0, ((vr[0] & 0x000003ff) >> 0 ) ); + tm->set_scrolly(0, ((vr[0] & 0x03ff0000) >> 16) ); + tm->draw(bitmap, cliprect, 0, 0); } } @@ -410,7 +410,7 @@ SCREEN_UPDATE_RGB32( macrossp ) draw_layer(screen.machine(), bitmap, cliprect, layers[2]); draw_sprites(screen.machine(), bitmap, cliprect, 2); draw_sprites(screen.machine(), bitmap, cliprect, 3); - tilemap_draw(bitmap, cliprect, state->m_text_tilemap, 0, 0); + state->m_text_tilemap->draw(bitmap, cliprect, 0, 0); #if 0 popmessage ("scra - %08x %08x %08x\nscrb - %08x %08x %08x\nscrc - %08x %08x %08x", diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index 3b4967d0650..7cba81e9409 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -116,7 +116,7 @@ WRITE8_HANDLER( madalien_videoram_w ) { madalien_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_fg, offset); + state->m_tilemap_fg->mark_tile_dirty(offset); } @@ -136,19 +136,19 @@ static VIDEO_START( madalien ) }; state->m_tilemap_fg = tilemap_create(machine, get_tile_info_FG, tilemap_scan_cols_flip_x, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tilemap_fg, 0); - tilemap_set_scrolldx(state->m_tilemap_fg, 0, 0x50); - tilemap_set_scrolldy(state->m_tilemap_fg, 0, 0x20); + state->m_tilemap_fg->set_transparent_pen(0); + state->m_tilemap_fg->set_scrolldx(0, 0x50); + state->m_tilemap_fg->set_scrolldy(0, 0x20); for (i = 0; i < 4; i++) { state->m_tilemap_edge1[i] = tilemap_create(machine, get_tile_info_BG_1, scan_functions[i], 16, 16, tilemap_cols[i], 8); - tilemap_set_scrolldx(state->m_tilemap_edge1[i], 0, 0x50); - tilemap_set_scrolldy(state->m_tilemap_edge1[i], 0, 0x20); + state->m_tilemap_edge1[i]->set_scrolldx(0, 0x50); + state->m_tilemap_edge1[i]->set_scrolldy(0, 0x20); state->m_tilemap_edge2[i] = tilemap_create(machine, get_tile_info_BG_2, scan_functions[i], 16, 16, tilemap_cols[i], 8); - tilemap_set_scrolldx(state->m_tilemap_edge2[i], 0, 0x50); - tilemap_set_scrolldy(state->m_tilemap_edge2[i], 0, machine.primary_screen->height() - 256); + state->m_tilemap_edge2[i]->set_scrolldx(0, 0x50); + state->m_tilemap_edge2[i]->set_scrolldy(0, machine.primary_screen->height() - 256); } state->m_headlight_bitmap = auto_bitmap_ind16_alloc(machine, 128, 128); @@ -183,19 +183,19 @@ static void draw_edges(running_machine &machine, bitmap_ind16 &bitmap, const rec clip_edge1 &= cliprect; clip_edge2 &= cliprect; - tilemap_mark_all_tiles_dirty(state->m_tilemap_edge1[scroll_mode]); - tilemap_mark_all_tiles_dirty(state->m_tilemap_edge2[scroll_mode]); + state->m_tilemap_edge1[scroll_mode]->mark_all_dirty(); + state->m_tilemap_edge2[scroll_mode]->mark_all_dirty(); - tilemap_set_flip(state->m_tilemap_edge1[scroll_mode], flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_scrollx(state->m_tilemap_edge1[scroll_mode], 0, -(*state->m_scroll & 0xfc)); - tilemap_set_scrolly(state->m_tilemap_edge1[scroll_mode], 0, *state->m_edge1_pos & 0x7f); + state->m_tilemap_edge1[scroll_mode]->set_flip(flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_tilemap_edge1[scroll_mode]->set_scrollx(0, -(*state->m_scroll & 0xfc)); + state->m_tilemap_edge1[scroll_mode]->set_scrolly(0, *state->m_edge1_pos & 0x7f); - tilemap_set_flip(state->m_tilemap_edge2[scroll_mode], flip ? TILEMAP_FLIPX : TILEMAP_FLIPY); - tilemap_set_scrollx(state->m_tilemap_edge2[scroll_mode], 0, -(*state->m_scroll & 0xfc)); - tilemap_set_scrolly(state->m_tilemap_edge2[scroll_mode], 0, *state->m_edge2_pos & 0x7f); + state->m_tilemap_edge2[scroll_mode]->set_flip(flip ? TILEMAP_FLIPX : TILEMAP_FLIPY); + state->m_tilemap_edge2[scroll_mode]->set_scrollx(0, -(*state->m_scroll & 0xfc)); + state->m_tilemap_edge2[scroll_mode]->set_scrolly(0, *state->m_edge2_pos & 0x7f); - tilemap_draw(bitmap, clip_edge1, state->m_tilemap_edge1[scroll_mode], 0, 0); - tilemap_draw(bitmap, clip_edge2, state->m_tilemap_edge2[scroll_mode], 0, 0); + state->m_tilemap_edge1[scroll_mode]->draw(bitmap, clip_edge1, 0, 0); + state->m_tilemap_edge2[scroll_mode]->draw(bitmap, clip_edge2, 0, 0); } @@ -238,8 +238,8 @@ static void draw_headlight(running_machine &machine, bitmap_ind16 &bitmap, const static void draw_foreground(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int flip) { madalien_state *state = machine.driver_data(); - tilemap_set_flip(state->m_tilemap_fg, flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap_fg, 0, 0); + state->m_tilemap_fg->set_flip(flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 0); } diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index 2bdc5b5eb80..7bce4138419 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -27,7 +27,7 @@ SCREEN_UPDATE_IND16( madmotor ) madmotor_state *state = screen.machine().driver_data(); flip_screen_set(screen.machine(), screen.machine().device("tilegen1")->get_flip_state()); -// tilemap_set_flip_all(screen.machine(), screen.machine().device("tilegen1")->get_flip_state() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); +// screen.machine().tilemap().set_flip_all(screen.machine().device("tilegen1")->get_flip_state() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); screen.machine().device("tilegen3")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); screen.machine().device("tilegen2")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00); diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c index 577bf35078d..e030236abc9 100644 --- a/src/mame/video/mainsnk.c +++ b/src/mame/video/mainsnk.c @@ -75,11 +75,11 @@ VIDEO_START(mainsnk) state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); - tilemap_set_scrolldy(state->m_tx_tilemap, 8, 8); + state->m_tx_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_scrolldy(8, 8); - tilemap_set_scrolldx(state->m_bg_tilemap, 16, 16); - tilemap_set_scrolldy(state->m_bg_tilemap, 8, 8); + state->m_bg_tilemap->set_scrolldx(16, 16); + state->m_bg_tilemap->set_scrolldy(8, 8); } @@ -91,8 +91,8 @@ WRITE8_HANDLER(mainsnk_c600_w) flip_screen_set(space->machine(), ~data & 0x80); - tilemap_set_palette_offset(state->m_bg_tilemap, (data & 0x07) << 4); - tilemap_set_palette_offset(state->m_tx_tilemap, (data & 0x07) << 4); + state->m_bg_tilemap->set_palette_offset((data & 0x07) << 4); + state->m_tx_tilemap->set_palette_offset((data & 0x07) << 4); bank = 0; if (total_elements == 0x400) // mainsnk @@ -103,7 +103,7 @@ WRITE8_HANDLER(mainsnk_c600_w) if (state->m_bg_tile_offset != (bank << 8)) { state->m_bg_tile_offset = bank << 8; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -112,7 +112,7 @@ WRITE8_HANDLER( mainsnk_fgram_w ) mainsnk_state *state = space->machine().driver_data(); state->m_fgram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mainsnk_bgram_w ) @@ -120,7 +120,7 @@ WRITE8_HANDLER( mainsnk_bgram_w ) mainsnk_state *state = space->machine().driver_data(); state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -172,9 +172,9 @@ SCREEN_UPDATE_IND16(mainsnk) { mainsnk_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c index 1c5ffc936ad..c99b79bc643 100644 --- a/src/mame/video/mappy.c +++ b/src/mame/video/mappy.c @@ -273,8 +273,8 @@ static TILE_GET_INFO( superpac_get_tile_info ) mappy_state *state = machine.driver_data(); UINT8 attr = state->m_videoram[tile_index + 0x400]; - tileinfo->category = (attr & 0x40) >> 6; - tileinfo->group = attr & 0x3f; + tileinfo.category = (attr & 0x40) >> 6; + tileinfo.group = attr & 0x3f; SET_TILE_INFO( 0, state->m_videoram[tile_index], @@ -287,8 +287,8 @@ static TILE_GET_INFO( phozon_get_tile_info ) mappy_state *state = machine.driver_data(); UINT8 attr = state->m_videoram[tile_index + 0x400]; - tileinfo->category = (attr & 0x40) >> 6; - tileinfo->group = attr & 0x3f; + tileinfo.category = (attr & 0x40) >> 6; + tileinfo.group = attr & 0x3f; SET_TILE_INFO( 0, state->m_videoram[tile_index] + ((attr & 0x80) << 1), @@ -301,8 +301,8 @@ static TILE_GET_INFO( mappy_get_tile_info ) mappy_state *state = machine.driver_data(); UINT8 attr = state->m_videoram[tile_index + 0x800]; - tileinfo->category = (attr & 0x40) >> 6; - tileinfo->group = attr & 0x3f; + tileinfo.category = (attr & 0x40) >> 6; + tileinfo.group = attr & 0x3f; SET_TILE_INFO( 0, state->m_videoram[tile_index], @@ -346,7 +346,7 @@ VIDEO_START( mappy ) state->m_bg_tilemap = tilemap_create(machine, mappy_get_tile_info,mappy_tilemap_scan,8,8,36,60); colortable_configure_tilemap_groups(machine.colortable, state->m_bg_tilemap, machine.gfx[0], 31); - tilemap_set_scroll_cols(state->m_bg_tilemap, 36); + state->m_bg_tilemap->set_scroll_cols(36); } @@ -362,7 +362,7 @@ WRITE8_HANDLER( superpac_videoram_w ) mappy_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( mappy_videoram_w ) @@ -370,7 +370,7 @@ WRITE8_HANDLER( mappy_videoram_w ) mappy_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE8_HANDLER( superpac_flipscreen_w ) @@ -543,14 +543,14 @@ SCREEN_UPDATE_IND16( superpac ) bitmap_ind16 &sprite_bitmap = state->m_sprite_bitmap; int x,y; - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0); sprite_bitmap.fill(15, cliprect); mappy_draw_sprites(screen.machine(),sprite_bitmap,cliprect,state->m_spriteram); copybitmap_trans(bitmap,sprite_bitmap,0,0,0,0,cliprect,15); /* Redraw the high priority characters */ - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1,0); /* sprite color 0/1 still has priority over that (ghost eyes in Pac 'n Pal) */ for (y = 0;y < sprite_bitmap.height();y++) @@ -573,12 +573,12 @@ SCREEN_UPDATE_IND16( phozon ) /* flip screen control is embedded in RAM */ flip_screen_set(screen.machine(), state->m_spriteram[0x1f7f-0x800] & 1); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0); phozon_draw_sprites(screen.machine(),bitmap,cliprect,state->m_spriteram); /* Redraw the high priority characters */ - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1,0); return 0; } @@ -588,13 +588,13 @@ SCREEN_UPDATE_IND16( mappy ) int offs; for (offs = 2;offs < 34;offs++) - tilemap_set_scrolly(state->m_bg_tilemap,offs,state->m_scroll); + state->m_bg_tilemap->set_scrolly(offs,state->m_scroll); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0); mappy_draw_sprites(screen.machine(),bitmap,cliprect,state->m_spriteram); /* Redraw the high priority characters */ - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1,0); return 0; } diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c index 49e96218e4e..2a244222997 100644 --- a/src/mame/video/marineb.c +++ b/src/mame/video/marineb.c @@ -70,7 +70,7 @@ VIDEO_START( marineb ) marineb_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); state->save_item(NAME(state->m_palette_bank)); state->save_item(NAME(state->m_column_scroll)); @@ -91,7 +91,7 @@ WRITE8_HANDLER( marineb_videoram_w ) marineb_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -100,7 +100,7 @@ WRITE8_HANDLER( marineb_colorram_w ) marineb_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -120,7 +120,7 @@ WRITE8_HANDLER( marineb_palette_bank_0_w ) if (old != state->m_palette_bank) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -134,7 +134,7 @@ WRITE8_HANDLER( marineb_palette_bank_1_w ) if (old != state->m_palette_bank) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -144,7 +144,7 @@ WRITE8_HANDLER( marineb_flipscreen_x_w ) marineb_state *state = space->machine().driver_data(); state->m_flipscreen_x = data ^ state->m_marineb_active_low_flipscreen; - tilemap_set_flip(state->m_bg_tilemap, (state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); } @@ -153,7 +153,7 @@ WRITE8_HANDLER( marineb_flipscreen_y_w ) marineb_state *state = space->machine().driver_data(); state->m_flipscreen_y = data ^ state->m_marineb_active_low_flipscreen; - tilemap_set_flip(state->m_bg_tilemap, (state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); + state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0)); } @@ -170,10 +170,10 @@ static void set_tilemap_scrolly( running_machine &machine, int cols ) int col; for (col = 0; col < cols; col++) - tilemap_set_scrolly(state->m_bg_tilemap, col, state->m_column_scroll); + state->m_bg_tilemap->set_scrolly(col, state->m_column_scroll); for (; col < 32; col++) - tilemap_set_scrolly(state->m_bg_tilemap, col, 0); + state->m_bg_tilemap->set_scrolly(col, 0); } @@ -183,7 +183,7 @@ SCREEN_UPDATE_IND16( marineb ) int offs; set_tilemap_scrolly(screen.machine(), 24); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ for (offs = 0x0f; offs >= 0; offs--) @@ -245,7 +245,7 @@ SCREEN_UPDATE_IND16( changes ) int offs, sx, sy, code, col, flipx, flipy; set_tilemap_scrolly(screen.machine(), 26); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the small sprites */ for (offs = 0x05; offs >= 0; offs--) @@ -324,7 +324,7 @@ SCREEN_UPDATE_IND16( springer ) int offs; set_tilemap_scrolly(screen.machine(), 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ for (offs = 0x0f; offs >= 0; offs--) @@ -384,7 +384,7 @@ SCREEN_UPDATE_IND16( hoccer ) int offs; set_tilemap_scrolly(screen.machine(), 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ for (offs = 0x07; offs >= 0; offs--) @@ -428,7 +428,7 @@ SCREEN_UPDATE_IND16( hopprobo ) int offs; set_tilemap_scrolly(screen.machine(), 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ for (offs = 0x0f; offs >= 0; offs--) diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index de02b3a4e87..ea5d08de34c 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -82,7 +82,7 @@ WRITE8_HANDLER( mario_videoram_w ) mario_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mario_gfxbank_w ) @@ -92,7 +92,7 @@ WRITE8_HANDLER( mario_gfxbank_w ) if (state->m_gfx_bank != (data & 0x01)) { state->m_gfx_bank = data & 0x01; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -103,7 +103,7 @@ WRITE8_HANDLER( mario_palettebank_w ) if (state->m_palette_bank != (data & 0x01)) { state->m_palette_bank = data & 0x01; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -122,10 +122,10 @@ WRITE8_HANDLER( mario_flip_w ) { state->m_flip = data & 0x01; if (state->m_flip) - tilemap_set_flip_all(space->machine(), TILEMAP_FLIPX | TILEMAP_FLIPY); + space->machine().tilemap().set_flip_all(TILEMAP_FLIPX | TILEMAP_FLIPY); else - tilemap_set_flip_all(space->machine(), 0); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().set_flip_all(0); + space->machine().tilemap().mark_all_dirty(); } } @@ -217,13 +217,13 @@ SCREEN_UPDATE_IND16( mario ) if (t != state->m_monitor) { state->m_monitor = t; - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); } - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_flip ? (HTOTAL-HBSTART) : 0); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_gfx_scroll - (state->m_flip ? 8 : 0)); + state->m_bg_tilemap->set_scrollx(0, state->m_flip ? (HTOTAL-HBSTART) : 0); + state->m_bg_tilemap->set_scrolly(0, state->m_gfx_scroll - (state->m_flip ? 8 : 0)); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index c1e0cc09f9c..aea541a709b 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -43,7 +43,7 @@ WRITE8_HANDLER( markham_videoram_w ) { markham_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( markham_flipscreen_w ) @@ -51,7 +51,7 @@ WRITE8_HANDLER( markham_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -70,7 +70,7 @@ VIDEO_START( markham ) markham_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -125,12 +125,12 @@ SCREEN_UPDATE_IND16( markham ) for (i = 0; i < 32; i++) { if ((i > 3) && (i < 16)) - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_xscroll[0]); + state->m_bg_tilemap->set_scrollx(i, state->m_xscroll[0]); if (i >= 16) - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_xscroll[1]); + state->m_bg_tilemap->set_scrollx(i, state->m_xscroll[1]); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index 3a9893ee934..6212a7145da 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -22,7 +22,7 @@ static TILE_GET_INFO( get_mcatadv_tile_info1 ) int pri = (state->m_videoram1[tile_index * 2] & 0xc000) >> 14; SET_TILE_INFO(0,tileno,colour + state->m_palette_bank1 * 0x40, 0); - tileinfo->category = pri; + tileinfo.category = pri; } WRITE16_HANDLER( mcatadv_videoram1_w ) @@ -30,7 +30,7 @@ WRITE16_HANDLER( mcatadv_videoram1_w ) mcatadv_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram1[offset]); - tilemap_mark_tile_dirty(state->m_tilemap1, offset / 2); + state->m_tilemap1->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_mcatadv_tile_info2 ) @@ -41,7 +41,7 @@ static TILE_GET_INFO( get_mcatadv_tile_info2 ) int pri = (state->m_videoram2[tile_index * 2] & 0xc000) >> 14; SET_TILE_INFO(1, tileno, colour + state->m_palette_bank2 * 0x40, 0); - tileinfo->category = pri; + tileinfo.category = pri; } WRITE16_HANDLER( mcatadv_videoram2_w ) @@ -49,7 +49,7 @@ WRITE16_HANDLER( mcatadv_videoram2_w ) mcatadv_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram2[offset]); - tilemap_mark_tile_dirty(state->m_tilemap2, offset / 2); + state->m_tilemap2->mark_tile_dirty(offset / 2); } @@ -192,11 +192,11 @@ static void mcatadv_draw_tilemap_part( UINT16* current_scroll, UINT16* current_v if (!(current_scroll[1] & 0x8000)) scrolly -= 0x141; flip = ((current_scroll[0] & 0x8000) ? 0 : TILEMAP_FLIPX) | ((current_scroll[1] & 0x8000) ? 0 : TILEMAP_FLIPY); - tilemap_set_scrollx(current_tilemap, 0, scrollx); - tilemap_set_scrolly(current_tilemap, 0, scrolly); - tilemap_set_flip(current_tilemap, flip); + current_tilemap->set_scrollx(0, scrollx); + current_tilemap->set_scrolly(0, scrolly); + current_tilemap->set_flip(flip); - tilemap_draw(bitmap, clip, current_tilemap, i, i); + current_tilemap->draw(bitmap, clip, i, i); } } @@ -211,13 +211,13 @@ SCREEN_UPDATE_IND16( mcatadv ) if (state->m_scroll1[2] != state->m_palette_bank1) { state->m_palette_bank1 = state->m_scroll1[2]; - tilemap_mark_all_tiles_dirty(state->m_tilemap1); + state->m_tilemap1->mark_all_dirty(); } if (state->m_scroll2[2] != state->m_palette_bank2) { state->m_palette_bank2 = state->m_scroll2[2]; - tilemap_mark_all_tiles_dirty(state->m_tilemap2); + state->m_tilemap2->mark_all_dirty(); } /* @@ -254,10 +254,10 @@ VIDEO_START( mcatadv ) { mcatadv_state *state = machine.driver_data(); state->m_tilemap1 = tilemap_create(machine, get_mcatadv_tile_info1, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tilemap1, 0); + state->m_tilemap1->set_transparent_pen(0); state->m_tilemap2 = tilemap_create(machine, get_mcatadv_tile_info2, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tilemap2, 0); + state->m_tilemap2->set_transparent_pen(0); state->m_spriteram_old = auto_alloc_array_clear(machine, UINT16, state->m_spriteram_size / 2); state->m_vidregs_old = auto_alloc_array(machine, UINT16, (0x0f + 1) / 2); diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c index a4c62aaa5fb..34abc8ab8f5 100644 --- a/src/mame/video/mcr.c +++ b/src/mame/video/mcr.c @@ -33,7 +33,7 @@ static TILE_GET_INFO( mcr_90009_get_tile_info ) SET_TILE_INFO(0, videoram[tile_index], 0, 0); /* sprite color base is constant 0x10 */ - tileinfo->category = 1; + tileinfo.category = 1; } @@ -60,7 +60,7 @@ static TILE_GET_INFO( mcr_90010_get_tile_info ) SET_TILE_INFO(0, code, color, TILE_FLIPYX((data >> 9) & 3)); /* sprite color base comes from the top 2 bits */ - tileinfo->category = (data >> 14) & 3; + tileinfo.category = (data >> 14) & 3; } @@ -87,7 +87,7 @@ static TILE_GET_INFO( mcr_91490_get_tile_info ) SET_TILE_INFO(0, code, color, TILE_FLIPYX((data >> 10) & 3)); /* sprite color base might come from the top 2 bits */ - tileinfo->category = (data >> 14) & 3; + tileinfo.category = (data >> 14) & 3; } @@ -188,7 +188,7 @@ WRITE8_HANDLER( mcr_90009_videoram_w ) mcr_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(bg_tilemap, offset); + bg_tilemap->mark_tile_dirty(offset); } @@ -197,7 +197,7 @@ WRITE8_HANDLER( mcr_90010_videoram_w ) mcr_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(bg_tilemap, offset / 2); + bg_tilemap->mark_tile_dirty(offset / 2); /* palette RAM is mapped into the upper 0x80 bytes here */ if ((offset & 0x780) == 0x780) @@ -227,7 +227,7 @@ WRITE8_HANDLER( twotiger_videoram_w ) int effoffs = ((offset << 1) & 0x7fe) | ((offset >> 10) & 1); videoram[effoffs] = data; - tilemap_mark_tile_dirty(bg_tilemap, effoffs / 2); + bg_tilemap->mark_tile_dirty(effoffs / 2); /* palette RAM is mapped into the upper 0x80 bytes here */ if ((effoffs & 0x780) == 0x780) @@ -240,7 +240,7 @@ WRITE8_HANDLER( mcr_91490_videoram_w ) mcr_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(bg_tilemap, offset / 2); + bg_tilemap->mark_tile_dirty(offset / 2); } @@ -404,14 +404,14 @@ static void render_sprites_91464(running_machine &machine, bitmap_ind16 &bitmap, SCREEN_UPDATE_IND16( mcr ) { /* update the flip state */ - tilemap_set_flip(bg_tilemap, mcr_cocktail_flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + bg_tilemap->set_flip(mcr_cocktail_flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); /* draw the background */ screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0x00); - tilemap_draw(bitmap, cliprect, bg_tilemap, 1, 0x10); - tilemap_draw(bitmap, cliprect, bg_tilemap, 2, 0x20); - tilemap_draw(bitmap, cliprect, bg_tilemap, 3, 0x30); + bg_tilemap->draw(bitmap, cliprect, 0, 0x00); + bg_tilemap->draw(bitmap, cliprect, 1, 0x10); + bg_tilemap->draw(bitmap, cliprect, 2, 0x20); + bg_tilemap->draw(bitmap, cliprect, 3, 0x30); /* update the sprites and render them */ switch (mcr_sprite_board) diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c index fa86e922650..fab9eea2faf 100644 --- a/src/mame/video/mcr3.c +++ b/src/mame/video/mcr3.c @@ -114,8 +114,8 @@ VIDEO_START( spyhunt ) /* initialize the text tilemap */ state->m_alpha_tilemap = tilemap_create(machine, spyhunt_get_alpha_tile_info, tilemap_scan_cols, 16,16, 32,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); - tilemap_set_scrollx(state->m_alpha_tilemap, 0, 16); + state->m_alpha_tilemap->set_transparent_pen(0); + state->m_alpha_tilemap->set_scrollx(0, 16); state_save_register_global(machine, state->m_spyhunt_sprite_color_mask); state_save_register_global(machine, state->m_spyhunt_scrollx); @@ -153,7 +153,7 @@ WRITE8_HANDLER( mcr3_videoram_w ) mcr3_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -162,7 +162,7 @@ WRITE8_HANDLER( spyhunt_videoram_w ) mcr3_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -170,7 +170,7 @@ WRITE8_HANDLER( spyhunt_alpharam_w ) { mcr3_state *state = space->machine().driver_data(); state->m_spyhunt_alpharam[offset] = data; - tilemap_mark_tile_dirty(state->m_alpha_tilemap, offset); + state->m_alpha_tilemap->mark_tile_dirty(offset); } @@ -284,10 +284,10 @@ SCREEN_UPDATE_IND16( mcr3 ) { mcr3_state *state = screen.machine().driver_data(); /* update the flip state */ - tilemap_set_flip(state->m_bg_tilemap, mcr_cocktail_flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + state->m_bg_tilemap->set_flip(mcr_cocktail_flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ mcr3_update_sprites(screen.machine(), bitmap, cliprect, 0x03, 0, 0, 0); @@ -300,14 +300,14 @@ SCREEN_UPDATE_IND16( spyhunt ) mcr3_state *state = screen.machine().driver_data(); /* for every character in the Video RAM, check if it has been modified */ /* since last time and update it accordingly. */ - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_spyhunt_scrollx * 2 + state->m_spyhunt_scroll_offset); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_spyhunt_scrolly * 2); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_spyhunt_scrollx * 2 + state->m_spyhunt_scroll_offset); + state->m_bg_tilemap->set_scrolly(0, state->m_spyhunt_scrolly * 2); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ mcr3_update_sprites(screen.machine(), bitmap, cliprect, state->m_spyhunt_sprite_color_mask, 0, -12, 0); /* render any characters on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index abf375c55d3..3a8409c9566 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -26,7 +26,7 @@ static TILE_GET_INFO( get_bg_tile_info ) int color = (~data >> 12) & 3; SET_TILE_INFO(0, code, color, TILE_FLIPYX((data >> 10) & 3)); if (machine.gfx[0]->total_elements < 0x1000) - tileinfo->category = (data >> 15) & 1; + tileinfo.category = (data >> 15) & 1; } @@ -47,7 +47,7 @@ static TILE_GET_INFO( zwackery_get_fg_tile_info ) int data = videoram[tile_index]; int color = (data >> 13) & 7; SET_TILE_INFO(2, data & 0x3ff, color, TILE_FLIPYX((data >> 11) & 3)); - tileinfo->category = (color != 0); + tileinfo.category = (color != 0); } @@ -63,7 +63,7 @@ VIDEO_START( mcr68 ) mcr68_state *state = machine.driver_data(); /* initialize the background tilemap */ state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16,16, 32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); } @@ -82,7 +82,7 @@ VIDEO_START( zwackery ) /* initialize the foreground tilemap */ state->m_fg_tilemap = tilemap_create(machine, zwackery_get_fg_tile_info, tilemap_scan_rows, 16,16, 32,32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); /* allocate memory for the assembled gfx data */ srcdata0 = auto_alloc_array(machine, UINT8, gfx0->total_elements * gfx0->width * gfx0->height); @@ -181,7 +181,7 @@ WRITE16_HANDLER( mcr68_videoram_w ) mcr68_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -190,8 +190,8 @@ WRITE16_HANDLER( zwackery_videoram_w ) mcr68_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -335,13 +335,13 @@ SCREEN_UPDATE_IND16( mcr68 ) { mcr68_state *state = screen.machine().driver_data(); /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); /* draw the low-priority sprites */ mcr68_update_sprites(screen.machine(), bitmap, cliprect, 0); /* redraw tiles with priority over sprites */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); /* draw the high-priority sprites */ mcr68_update_sprites(screen.machine(), bitmap, cliprect, 1); @@ -353,13 +353,13 @@ SCREEN_UPDATE_IND16( zwackery ) { mcr68_state *state = screen.machine().driver_data(); /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the low-priority sprites */ zwackery_update_sprites(screen.machine(), bitmap, cliprect, 0); /* redraw tiles with priority over sprites */ - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 1, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 1, 0); /* draw the high-priority sprites */ zwackery_update_sprites(screen.machine(), bitmap, cliprect, 1); diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c index a76eca1e2d8..abcfd2e5e08 100644 --- a/src/mame/video/meadows.c +++ b/src/mame/video/meadows.c @@ -52,7 +52,7 @@ WRITE8_HANDLER( meadows_videoram_w ) meadows_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -109,7 +109,7 @@ SCREEN_UPDATE_IND16( meadows ) { meadows_state *state = screen.machine().driver_data(); /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ if (screen.machine().gfx[1]) diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index 5d07590f5a4..8ceedb02653 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -299,14 +299,14 @@ INLINE void scrollram_w(address_space *space, offs_t offset, UINT16 data, UINT16 { if (state->m_scroll_flag[which] & 0x10) /* tiles are 8x8 */ { - tilemap_mark_tile_dirty(state->m_tmap[which], offset ); + state->m_tmap[which]->mark_tile_dirty(offset ); } else { - tilemap_mark_tile_dirty(state->m_tmap[which], offset*4 + 0); - tilemap_mark_tile_dirty(state->m_tmap[which], offset*4 + 1); - tilemap_mark_tile_dirty(state->m_tmap[which], offset*4 + 2); - tilemap_mark_tile_dirty(state->m_tmap[which], offset*4 + 3); + state->m_tmap[which]->mark_tile_dirty(offset*4 + 0); + state->m_tmap[which]->mark_tile_dirty(offset*4 + 1); + state->m_tmap[which]->mark_tile_dirty(offset*4 + 2); + state->m_tmap[which]->mark_tile_dirty(offset*4 + 3); } } } @@ -395,8 +395,8 @@ static void create_tilemaps(running_machine &machine) /* set user data and transparency */ for (i = 0; i < 8; i++) { - tilemap_set_user_data(state->m_tilemap[layer][i/4][i%4], (void *)(FPTR)layer); - tilemap_set_transparent_pen(state->m_tilemap[layer][i/4][i%4], 15); + state->m_tilemap[layer][i/4][i%4]->set_user_data((void *)(FPTR)layer); + state->m_tilemap[layer][i/4][i%4]->set_transparent_pen(15); } } } @@ -407,7 +407,7 @@ static void megasys1_set_vreg_flag(megasys1_state *state, int which, int data) { state->m_scroll_flag[which] = data; state->m_tmap[which] = state->m_tilemap[which][(data >> 4) & 1][data & 3]; - tilemap_mark_all_tiles_dirty(state->m_tmap[which]); + state->m_tmap[which]->mark_all_dirty(); } } @@ -960,16 +960,16 @@ SCREEN_UPDATE_IND16( megasys1 ) active_layers |= 1 << ((pri & 0xf0000) >> 16); // bottom layer can't be disabled } - tilemap_set_flip_all( screen.machine(), (state->m_screen_flag & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0 ); + screen.machine().tilemap().set_flip_all((state->m_screen_flag & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0 ); for (i = 0;i < 3;i++) { if (state->m_tmap[i]) { - tilemap_set_enable(state->m_tmap[i],active_layers & (1 << i)); + state->m_tmap[i]->enable(active_layers & (1 << i)); - tilemap_set_scrollx(state->m_tmap[i],0,state->m_scrollx[i]); - tilemap_set_scrolly(state->m_tmap[i],0,state->m_scrolly[i]); + state->m_tmap[i]->set_scrollx(0,state->m_scrollx[i]); + state->m_tmap[i]->set_scrolly(0,state->m_scrolly[i]); } } @@ -990,7 +990,7 @@ SCREEN_UPDATE_IND16( megasys1 ) case 2: if ( (state->m_tmap[layer]) && (active_layers & (1 << layer) ) ) { - tilemap_draw(bitmap,cliprect,state->m_tmap[layer],flag,primask); + state->m_tmap[layer]->draw(bitmap, cliprect, flag,primask); flag = 0; } break; diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 2dca683673e..ba76e2142a6 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -67,21 +67,21 @@ WRITE8_HANDLER( mermaid_videoram2_w ) { mermaid_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mermaid_videoram_w ) { mermaid_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mermaid_colorram_w ) { mermaid_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mermaid_flip_screen_x_w ) @@ -98,14 +98,14 @@ WRITE8_HANDLER( mermaid_bg_scroll_w ) { mermaid_state *state = space->machine().driver_data(); state->m_bg_scrollram[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap, offset, data); + state->m_bg_tilemap->set_scrolly(offset, data); } WRITE8_HANDLER( mermaid_fg_scroll_w ) { mermaid_state *state = space->machine().driver_data(); state->m_fg_scrollram[offset] = data; - tilemap_set_scrolly(state->m_fg_tilemap, offset, data); + state->m_fg_tilemap->set_scrolly(offset, data); } WRITE8_HANDLER( rougien_gfxbankswitch1_w ) @@ -178,11 +178,11 @@ VIDEO_START( mermaid ) mermaid_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_fg_tilemap, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_scroll_cols(32); + state->m_fg_tilemap->set_transparent_pen(0); machine.primary_screen->register_screen_bitmap(state->m_helper); machine.primary_screen->register_screen_bitmap(state->m_helper2); @@ -234,8 +234,8 @@ SCREEN_UPDATE_IND16( mermaid ) { mermaid_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -323,7 +323,7 @@ SCREEN_VBLANK( mermaid ) state->m_helper.fill(0, rect); state->m_helper2.fill(0, rect); - tilemap_draw(state->m_helper, rect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(state->m_helper, rect, 0, 0); drawgfx_transpen(state->m_helper2, rect, screen.machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0); @@ -334,7 +334,7 @@ SCREEN_VBLANK( mermaid ) state->m_helper.fill(0, rect); state->m_helper2.fill(0, rect); - tilemap_draw(state->m_helper, rect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(state->m_helper, rect, 0, 0); drawgfx_transpen(state->m_helper2, rect, screen.machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 118448c43cd..c26d79e7d0d 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -44,7 +44,7 @@ WRITE8_HANDLER( metlclsh_gfxbank_w ) if (!(data & 4) && (state->m_gfxbank != data)) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_gfxbank = data & 3; } } @@ -98,7 +98,7 @@ WRITE8_HANDLER( metlclsh_bgram_w ) { /* tilemap */ state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x1ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x1ff); } } @@ -121,14 +121,14 @@ static TILE_GET_INFO( get_fg_tile_info ) UINT8 code = state->m_fgram[tile_index + 0x000]; UINT8 attr = state->m_fgram[tile_index + 0x400]; SET_TILE_INFO(2, code + ((attr & 0x03) << 8), (attr >> 5) & 3, 0); - tileinfo->category = ((attr & 0x80) ? 1 : 2); + tileinfo.category = ((attr & 0x80) ? 1 : 2); } WRITE8_HANDLER( metlclsh_fgram_w ) { metlclsh_state *state = space->machine().driver_data(); state->m_fgram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -147,8 +147,8 @@ VIDEO_START( metlclsh ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, metlclsh_bgtilemap_scan, 16, 16, 32, 16); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); state->save_pointer(NAME(state->m_otherram), 0x800); } @@ -248,17 +248,17 @@ SCREEN_UPDATE_IND16( metlclsh ) bitmap.fill(0x10, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 1, 0); // low priority tiles of foreground + state->m_fg_tilemap->draw(bitmap, cliprect, 1, 0); // low priority tiles of foreground if (state->m_scrollx[0] & 0x08) // background (if enabled) { /* The background seems to be always flipped along x */ - tilemap_set_flip(state->m_bg_tilemap, (flip_screen_get(screen.machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0) ^ TILEMAP_FLIPX); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx[1] + ((state->m_scrollx[0] & 0x02) << 7) ); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_flip((flip_screen_get(screen.machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0) ^ TILEMAP_FLIPX); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx[1] + ((state->m_scrollx[0] & 0x02) << 7) ); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); } draw_sprites(screen.machine(), bitmap, cliprect); // sprites - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 2, 0); // high priority tiles of foreground + state->m_fg_tilemap->draw(bitmap, cliprect, 2, 0); // high priority tiles of foreground // popmessage("%02X", state->m_scrollx[0]); return 0; diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 603e87896ce..a5d2dc4a0f6 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -83,7 +83,7 @@ WRITE16_HANDLER( metro_k053936_w ) { metro_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_k053936_ram[offset]); - tilemap_mark_tile_dirty(state->m_k053936_tilemap, offset); + state->m_k053936_tilemap->mark_tile_dirty(offset); } static TILEMAP_MAPPER( tilemap_scan_gstrik2 ) diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index a265a240651..b27125f943e 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -92,7 +92,7 @@ WRITE8_HANDLER( mikie_videoram_w ) mikie_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mikie_colorram_w ) @@ -100,7 +100,7 @@ WRITE8_HANDLER( mikie_colorram_w ) mikie_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mikie_palettebank_w ) @@ -110,7 +110,7 @@ WRITE8_HANDLER( mikie_palettebank_w ) if (state->m_palettebank != (data & 0x07)) { state->m_palettebank = data & 0x07; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -119,7 +119,7 @@ WRITE8_HANDLER( mikie_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -130,9 +130,9 @@ static TILE_GET_INFO( get_bg_tile_info ) int color = (state->m_colorram[tile_index] & 0x0f) + 16 * state->m_palettebank; int flags = ((state->m_colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((state->m_colorram[tile_index] & 0x80) ? TILE_FLIPY : 0); if (state->m_colorram[tile_index] & 0x10) - tileinfo->category = 1; + tileinfo.category = 1; else - tileinfo->category = 0; + tileinfo.category = 0; SET_TILE_INFO(0, code, color, flags); @@ -178,8 +178,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( mikie ) { mikie_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_CATEGORY(0), 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0), 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_CATEGORY(1), 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1), 0); return 0; } diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index 57483f5a224..c9d5f613509 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -39,7 +39,7 @@ VIDEO_START( pang ) mitchell_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); + state->m_bg_tilemap->set_transparent_pen(15); /* OBJ RAM */ state->m_objram = auto_alloc_array_clear(machine, UINT8, state->m_videoram_size); @@ -85,7 +85,7 @@ WRITE8_HANDLER( mgakuen_videoram_w ) mitchell_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } READ8_HANDLER( mgakuen_videoram_r ) @@ -135,7 +135,7 @@ WRITE8_HANDLER( pang_colorram_w ) mitchell_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( pang_colorram_r ) @@ -170,7 +170,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data); if (state->m_flipscreen != (data & 0x04)) { state->m_flipscreen = data & 0x04; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } /* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */ @@ -210,7 +210,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data); if (state->m_flipscreen != (data & 0x04)) { state->m_flipscreen = data & 0x04; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } /* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */ @@ -246,7 +246,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data); if (state->m_flipscreen != (data & 0x04)) { state->m_flipscreen = data & 0x04; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } /* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */ @@ -333,7 +333,7 @@ SCREEN_UPDATE_IND16( pang ) mitchell_state *state = screen.machine().driver_data(); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index d4c1a77233b..ef591927c48 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -45,7 +45,7 @@ WRITE8_HANDLER( mjkjidai_videoram_w ) mjkjidai_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE8_HANDLER( mjkjidai_ctrl_w ) @@ -136,7 +136,7 @@ SCREEN_UPDATE_IND16( mjkjidai ) bitmap.fill(get_black_pen(screen.machine()), cliprect); else { - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); } return 0; diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c index 16a628c535f..892bcc571bf 100644 --- a/src/mame/video/mosaic.c +++ b/src/mame/video/mosaic.c @@ -52,7 +52,7 @@ VIDEO_START( mosaic ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0xff); + state->m_fg_tilemap->set_transparent_pen(0xff); } @@ -67,7 +67,7 @@ WRITE8_HANDLER( mosaic_fgvideoram_w ) mosaic_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( mosaic_bgvideoram_w ) @@ -75,7 +75,7 @@ WRITE8_HANDLER( mosaic_bgvideoram_w ) mosaic_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -84,7 +84,7 @@ SCREEN_UPDATE_IND16( mosaic ) { mosaic_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index da435ae29f9..29757f5dbd6 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -170,13 +170,13 @@ VIDEO_START( mrdo ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,32,32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 56); - tilemap_set_scrolldx(state->m_fg_tilemap, 0, 56); - tilemap_set_scrolldy(state->m_bg_tilemap, 0, 6); - tilemap_set_scrolldy(state->m_fg_tilemap, 0, 6); + state->m_bg_tilemap->set_scrolldx(0, 56); + state->m_fg_tilemap->set_scrolldx(0, 56); + state->m_bg_tilemap->set_scrolldy(0, 6); + state->m_fg_tilemap->set_scrolldy(0, 6); state->m_flipscreen = 0; @@ -195,21 +195,21 @@ WRITE8_HANDLER( mrdo_bgvideoram_w ) { mrdo_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( mrdo_fgvideoram_w ) { mrdo_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( mrdo_scrollx_w ) { mrdo_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); } WRITE8_HANDLER( mrdo_scrolly_w ) @@ -218,9 +218,9 @@ WRITE8_HANDLER( mrdo_scrolly_w ) /* This is NOT affected by flipscreen (so stop it happening) */ if (state->m_flipscreen) - tilemap_set_scrolly(state->m_bg_tilemap, 0,((256 - data) & 0xff)); + state->m_bg_tilemap->set_scrolly(0,((256 - data) & 0xff)); else - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } @@ -232,7 +232,7 @@ WRITE8_HANDLER( mrdo_flipscreen_w ) /* Mr. Do! so we don't emulate them */ state->m_flipscreen = data & 0x01; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } @@ -266,8 +266,8 @@ SCREEN_UPDATE_IND16( mrdo ) mrdo_state *state = screen.machine().driver_data(); bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index a0bcef033b9..1f813664189 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -72,14 +72,14 @@ WRITE8_HANDLER( mrjong_videoram_w ) { mrjong_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mrjong_colorram_w ) { mrjong_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( mrjong_flipscreen_w ) @@ -87,7 +87,7 @@ WRITE8_HANDLER( mrjong_flipscreen_w ) if (flip_screen_get(space->machine()) != BIT(data, 2)) { flip_screen_set(space->machine(), BIT(data, 2)); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -148,7 +148,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( mrjong ) { mrjong_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c index f30a9d25162..b06fc5d1bc4 100644 --- a/src/mame/video/ms32.c +++ b/src/mame/video/ms32.c @@ -93,10 +93,10 @@ VIDEO_START( ms32 ) state->m_temp_bitmap_sprites.fill(0); state->m_temp_bitmap_sprites_pri.fill(0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_transparent_pen(state->m_bg_tilemap_alt,0); - tilemap_set_transparent_pen(state->m_roz_tilemap,0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap_alt->set_transparent_pen(0); + state->m_roz_tilemap->set_transparent_pen(0); state->m_reverse_sprite_order = 1; @@ -188,9 +188,9 @@ WRITE32_HANDLER( ms32_gfxctrl_w ) { /* bit 1 = flip screen */ state->m_flipscreen = data & 0x02; - tilemap_set_flip(state->m_tx_tilemap,state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(state->m_bg_tilemap,state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_flip(state->m_bg_tilemap_alt,state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_tx_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_bg_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_bg_tilemap_alt->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* bit 2 used by f1superb, unknown */ @@ -315,7 +315,7 @@ static void draw_roz(running_machine &machine, bitmap_ind16 &bitmap, const recta if (incxx & 0x10000) incxx |= ~0x1ffff; if (incxy & 0x10000) incxy |= ~0x1ffff; - tilemap_draw_roz(bitmap, my_clip, state->m_roz_tilemap, + state->m_roz_tilemap->draw_roz(bitmap, my_clip, (start2x+startx+offsx)<<16, (start2y+starty+offsy)<<16, incxx<<8, incxy<<8, 0, 0, 1, // Wrap @@ -346,7 +346,7 @@ static void draw_roz(running_machine &machine, bitmap_ind16 &bitmap, const recta if (incyy & 0x10000) incyy |= ~0x1ffff; if (incyx & 0x10000) incyx |= ~0x1ffff; - tilemap_draw_roz(bitmap, cliprect, state->m_roz_tilemap, + state->m_roz_tilemap->draw_roz(bitmap, cliprect, (startx+offsx)<<16, (starty+offsy)<<16, incxx<<8, incxy<<8, incyx<<8, incyy<<8, 1, // Wrap @@ -379,15 +379,15 @@ SCREEN_UPDATE_RGB32( ms32 ) scrollx = state->m_tx_scroll[0x00/4] + state->m_tx_scroll[0x08/4] + 0x18; scrolly = state->m_tx_scroll[0x0c/4] + state->m_tx_scroll[0x14/4]; - tilemap_set_scrollx(state->m_tx_tilemap, 0, scrollx); - tilemap_set_scrolly(state->m_tx_tilemap, 0, scrolly); + state->m_tx_tilemap->set_scrollx(0, scrollx); + state->m_tx_tilemap->set_scrolly(0, scrolly); scrollx = state->m_bg_scroll[0x00/4] + state->m_bg_scroll[0x08/4] + 0x10; scrolly = state->m_bg_scroll[0x0c/4] + state->m_bg_scroll[0x14/4]; - tilemap_set_scrollx(state->m_bg_tilemap, 0, scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, scrolly); - tilemap_set_scrollx(state->m_bg_tilemap_alt, 0, scrollx); - tilemap_set_scrolly(state->m_bg_tilemap_alt, 0, scrolly); + state->m_bg_tilemap->set_scrollx(0, scrollx); + state->m_bg_tilemap->set_scrolly(0, scrolly); + state->m_bg_tilemap_alt->set_scrollx(0, scrollx); + state->m_bg_tilemap_alt->set_scrolly(0, scrolly); screen.machine().priority_bitmap.fill(0, cliprect); @@ -429,42 +429,42 @@ SCREEN_UPDATE_RGB32( ms32 ) else if (scr_pri == 0) if (state->m_tilemaplayoutcontrol&1) { - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_bg_tilemap_alt, 0, 1 << 0); + state->m_bg_tilemap_alt->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 0); } else { - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_bg_tilemap, 0, 1 << 0); + state->m_bg_tilemap->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 0); } else if (asc_pri == 0) - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_tx_tilemap, 0, 1 << 2); + state->m_tx_tilemap->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 2); if (rot_pri == 1) draw_roz(screen.machine(), state->m_temp_bitmap_tilemaps, cliprect, 1 << 1); else if (scr_pri == 1) if (state->m_tilemaplayoutcontrol&1) { - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_bg_tilemap_alt, 0, 1 << 0); + state->m_bg_tilemap_alt->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 0); } else { - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_bg_tilemap, 0, 1 << 0); + state->m_bg_tilemap->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 0); } else if (asc_pri == 1) - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_tx_tilemap, 0, 1 << 2); + state->m_tx_tilemap->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 2); if (rot_pri == 2) draw_roz(screen.machine(), state->m_temp_bitmap_tilemaps, cliprect, 1 << 1); else if (scr_pri == 2) if (state->m_tilemaplayoutcontrol&1) { - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_bg_tilemap_alt, 0, 1 << 0); + state->m_bg_tilemap_alt->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 0); } else { - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_bg_tilemap, 0, 1 << 0); + state->m_bg_tilemap->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 0); } else if (asc_pri == 2) - tilemap_draw(state->m_temp_bitmap_tilemaps,cliprect, state->m_tx_tilemap, 0, 1 << 2); + state->m_tx_tilemap->draw(state->m_temp_bitmap_tilemaps, cliprect, 0, 1 << 2); /* MIX it! */ /* this mixing isn't 100% accurate, it should be using ALL the data in diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c index b065adb3764..7be0357c41d 100644 --- a/src/mame/video/msisaac.c +++ b/src/mame/video/msisaac.c @@ -59,8 +59,8 @@ VIDEO_START( msisaac ) state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg2_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg2_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -73,37 +73,37 @@ VIDEO_START( msisaac ) WRITE8_HANDLER( msisaac_fg_scrolly_w ) { msisaac_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_fg_tilemap, 0, data); + state->m_fg_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( msisaac_fg_scrollx_w ) { msisaac_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_fg_tilemap, 0, 9 + data); + state->m_fg_tilemap->set_scrollx(0, 9 + data); } WRITE8_HANDLER( msisaac_bg2_scrolly_w ) { msisaac_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, data); + state->m_bg2_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( msisaac_bg2_scrollx_w ) { msisaac_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, 9 + 2 + data); + state->m_bg2_tilemap->set_scrollx(0, 9 + 2 + data); } WRITE8_HANDLER( msisaac_bg_scrolly_w ) { msisaac_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( msisaac_bg_scrollx_w ) { msisaac_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, 9 + 4 + data); + state->m_bg_tilemap->set_scrollx(0, 9 + 4 + data); } @@ -113,7 +113,7 @@ WRITE8_HANDLER( msisaac_textbank1_w ) if (textbank1!=data) { textbank1 = data; - tilemap_mark_all_tiles_dirty(fg_tilemap); + fg_tilemap->mark_all_dirty(); } } #endif @@ -124,7 +124,7 @@ WRITE8_HANDLER( msisaac_bg2_textbank_w ) if (state->m_bg2_textbank != data ) { state->m_bg2_textbank = data; - tilemap_mark_all_tiles_dirty(state->m_bg2_tilemap); + state->m_bg2_tilemap->mark_all_dirty(); //check if we are correct on this one if ((data != 8) && (data != 0)) @@ -138,21 +138,21 @@ WRITE8_HANDLER( msisaac_bg_videoram_w ) { msisaac_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( msisaac_bg2_videoram_w ) { msisaac_state *state = space->machine().driver_data(); state->m_videoram3[offset] = data; - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset); + state->m_bg2_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( msisaac_fg_videoram_w ) { msisaac_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -247,9 +247,9 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( msisaac ) { msisaac_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index 24500459a58..3973c76c9b9 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -85,7 +85,7 @@ WRITE16_HANDLER( mugsmash_videoram1_w ) mugsmash_state *state = space->machine().driver_data(); state->m_videoram1[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap1, offset / 2); + state->m_tilemap1->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_mugsmash_tile_info2 ) @@ -114,7 +114,7 @@ WRITE16_HANDLER( mugsmash_videoram2_w ) mugsmash_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap2, offset / 2); + state->m_tilemap2->mark_tile_dirty(offset / 2); } WRITE16_HANDLER (mugsmash_reg_w) @@ -127,16 +127,16 @@ WRITE16_HANDLER (mugsmash_reg_w) switch (offset) { case 0: - tilemap_set_scrollx(state->m_tilemap2, 0, state->m_regs1[2] + 7); + state->m_tilemap2->set_scrollx(0, state->m_regs1[2] + 7); break; case 1: - tilemap_set_scrolly(state->m_tilemap2, 0, state->m_regs1[3] + 4); + state->m_tilemap2->set_scrolly(0, state->m_regs1[3] + 4); break; case 2: - tilemap_set_scrollx(state->m_tilemap1, 0, state->m_regs1[0] + 3); + state->m_tilemap1->set_scrollx(0, state->m_regs1[0] + 3); break; case 3: - tilemap_set_scrolly(state->m_tilemap1, 0, state->m_regs1[1] + 4); + state->m_tilemap1->set_scrolly(0, state->m_regs1[1] + 4); break; } } @@ -146,7 +146,7 @@ VIDEO_START( mugsmash ) mugsmash_state *state = machine.driver_data(); state->m_tilemap1 = tilemap_create(machine, get_mugsmash_tile_info1, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tilemap1, 0); + state->m_tilemap1->set_transparent_pen(0); state->m_tilemap2 = tilemap_create(machine, get_mugsmash_tile_info2, tilemap_scan_rows, 16, 16, 32, 32); } @@ -155,8 +155,8 @@ SCREEN_UPDATE_IND16( mugsmash ) { mugsmash_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tilemap2, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap1, 0, 0); + state->m_tilemap2->draw(bitmap, cliprect, 0, 0); + state->m_tilemap1->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c index 1e922119867..bc48f4a0a18 100644 --- a/src/mame/video/mustache.c +++ b/src/mame/video/mustache.c @@ -48,7 +48,7 @@ WRITE8_HANDLER( mustache_videoram_w ) mustache_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER (mustache_video_control_w) @@ -57,7 +57,7 @@ WRITE8_HANDLER (mustache_video_control_w) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* tile bank */ @@ -65,17 +65,17 @@ WRITE8_HANDLER (mustache_video_control_w) if ((state->m_control_byte ^ data) & 0x08) { state->m_control_byte = data; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } WRITE8_HANDLER( mustache_scroll_w ) { mustache_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, 0x100 - data); - tilemap_set_scrollx(state->m_bg_tilemap, 1, 0x100 - data); - tilemap_set_scrollx(state->m_bg_tilemap, 2, 0x100 - data); - tilemap_set_scrollx(state->m_bg_tilemap, 3, 0x100); + state->m_bg_tilemap->set_scrollx(0, 0x100 - data); + state->m_bg_tilemap->set_scrollx(1, 0x100 - data); + state->m_bg_tilemap->set_scrollx(2, 0x100 - data); + state->m_bg_tilemap->set_scrollx(3, 0x100); } static TILE_GET_INFO( get_bg_tile_info ) @@ -97,7 +97,7 @@ VIDEO_START( mustache ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows_flip_x, 8, 8, 64, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 4); + state->m_bg_tilemap->set_scroll_rows(4); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -146,7 +146,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( mustache ) { mustache_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index 62175adee27..9f43aa8e8ef 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -225,7 +225,7 @@ static VIDEO_START( mystston ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_x, 16, 16, 16, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_x, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); /* create the interrupt timer */ state->m_interrupt_timer = machine.scheduler().timer_alloc(FUNC(interrupt_callback)); @@ -262,13 +262,13 @@ static SCREEN_UPDATE_IND16( mystston ) set_palette(screen.machine(), state); - tilemap_mark_all_tiles_dirty_all(screen.machine()); - tilemap_set_scrolly(state->m_bg_tilemap, 0, *state->m_scroll); - tilemap_set_flip_all(screen.machine(), flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().mark_all_dirty(); + state->m_bg_tilemap->set_scrolly(0, *state->m_scroll); + screen.machine().tilemap().set_flip_all(flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(bitmap, cliprect, screen.machine().gfx[2], flip); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c index d00f289c6a3..6064491ab01 100644 --- a/src/mame/video/mystwarr.c +++ b/src/mame/video/mystwarr.c @@ -186,7 +186,7 @@ VIDEO_START(gaiapols) K053936GP_set_offset(0, -10, 0); // floor tiles in demo loop2 (Elaine vs. boss) state->m_ult_936_tilemap = tilemap_create(machine, get_gai_936_tile_info, tilemap_scan_rows, 16, 16, 512, 512); - tilemap_set_transparent_pen(state->m_ult_936_tilemap, 0); + state->m_ult_936_tilemap->set_transparent_pen(0); } static TILE_GET_INFO( get_ult_936_tile_info ) @@ -230,7 +230,7 @@ VIDEO_START(dadandrn) K053936GP_set_offset(0, -8, 0); // Brainy's laser state->m_ult_936_tilemap = tilemap_create(machine, get_ult_936_tile_info, tilemap_scan_rows, 16, 16, 512, 512); - tilemap_set_transparent_pen(state->m_ult_936_tilemap, 0); + state->m_ult_936_tilemap->set_transparent_pen(0); } VIDEO_START(mystwarr) @@ -547,7 +547,7 @@ SCREEN_UPDATE_RGB32(dadandrn) /* and gaiapols */ if (state->m_last_psac_colorbase != state->m_sub1_colorbase) { - tilemap_mark_all_tiles_dirty(state->m_ult_936_tilemap); + state->m_ult_936_tilemap->mark_all_dirty(); if (MW_VERBOSE) popmessage("K053936: PSAC colorbase changed"); diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c index 629bc231bf5..e288d56e6cf 100644 --- a/src/mame/video/namcona1.c +++ b/src/mame/video/namcona1.c @@ -12,7 +12,7 @@ TODO: static void tilemap_get_info( running_machine &machine, - tile_data *tileinfo, + tile_data &tileinfo, int tile_index, const UINT16 *tilemap_videoram, int tilemap_color, @@ -44,7 +44,7 @@ static void tilemap_get_info( { SET_TILE_INFO( gfx,tile,tilemap_color,0 ); if (ENDIANNESS_NATIVE == ENDIANNESS_BIG) - tileinfo->mask_data = (UINT8 *)(state->m_shaperam+4*tile); + tileinfo.mask_data = (UINT8 *)(state->m_shaperam+4*tile); else { UINT8 *mask_data = state->m_mask_data; @@ -57,7 +57,7 @@ static void tilemap_get_info( mask_data[5] = source[2]&0xff; mask_data[6] = source[3]>>8; mask_data[7] = source[3]&0xff; - tileinfo->mask_data = mask_data; + tileinfo.mask_data = mask_data; } } } /* tilemap_get_info */ @@ -130,7 +130,7 @@ static TILE_GET_INFO( roz_get_info ) mask_data = conv_data; } SET_TILE_INFO( gfx,tile,tilemap_color,0 ); - tileinfo->mask_data = mask_data; + tileinfo.mask_data = mask_data; } } /* roz_get_info */ @@ -143,11 +143,11 @@ WRITE16_HANDLER( namcona1_videoram_w ) COMBINE_DATA( &videoram[offset] ); if( offset<0x8000/2 ) { - tilemap_mark_tile_dirty( state->m_bg_tilemap[offset/0x1000], offset&0xfff ); + state->m_bg_tilemap[offset/0x1000]->mark_tile_dirty(offset&0xfff ); } else if( offset<0xa000/2 ) { - tilemap_mark_all_tiles_dirty( state->m_roz_tilemap ); + state->m_roz_tilemap ->mark_all_dirty(); } } /* namcona1_videoram_w */ @@ -621,14 +621,14 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons int dy = -8; /* vertical adjust */ UINT32 startx = (xoffset<<12)+incxx*dx+incyx*dy; UINT32 starty = (yoffset<<12)+incxy*dx+incyy*dy; - tilemap_draw_roz_primask(bitmap, clip, state->m_roz_tilemap, + state->m_roz_tilemap->draw_roz(bitmap, clip, startx, starty, incxx, incxy, incyx, incyy, 0, 0, primask, 0); } else { - tilemap_set_scrollx( state->m_bg_tilemap[which], 0, scrollx ); - tilemap_set_scrolly( state->m_bg_tilemap[which], 0, scrolly ); - tilemap_draw_primask( bitmap, clip, state->m_bg_tilemap[which], 0, primask, 0 ); + state->m_bg_tilemap[which]->set_scrollx(0, scrollx ); + state->m_bg_tilemap[which]->set_scrolly(0, scrolly ); + state->m_bg_tilemap[which]->draw(bitmap, clip, 0, primask, 0 ); } } } @@ -660,7 +660,7 @@ SCREEN_UPDATE_IND16( namcona1 ) int tilemap_color = state->m_vreg[0xb0/2+(which&3)]&0xf; if( tilemap_color!=state->m_tilemap_palette_bank[which] ) { - tilemap_mark_all_tiles_dirty( state->m_bg_tilemap[which] ); + state->m_bg_tilemap[which] ->mark_all_dirty(); state->m_tilemap_palette_bank[which] = tilemap_color; } } /* next tilemap */ @@ -669,7 +669,7 @@ SCREEN_UPDATE_IND16( namcona1 ) int color = state->m_vreg[0xba/2]&0xf; if( color != state->m_roz_palette ) { - tilemap_mark_all_tiles_dirty( state->m_roz_tilemap ); + state->m_roz_tilemap ->mark_all_dirty(); state->m_roz_palette = color; } } diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c index 900c5183073..c838fd93a66 100644 --- a/src/mame/video/namcos1.c +++ b/src/mame/video/namcos1.c @@ -50,7 +50,7 @@ Namco System 1 Video Hardware ***************************************************************************/ -INLINE void bg_get_info(running_machine &machine,tile_data *tileinfo,int tile_index,UINT8 *info_vram) +INLINE void bg_get_info(running_machine &machine,tile_data &tileinfo,int tile_index,UINT8 *info_vram) { namcos1_state *state = machine.driver_data(); int code; @@ -58,10 +58,10 @@ INLINE void bg_get_info(running_machine &machine,tile_data *tileinfo,int tile_in tile_index <<= 1; code = info_vram[tile_index + 1] + ((info_vram[tile_index] & 0x3f) << 8); SET_TILE_INFO(0,code,0,0); - tileinfo->mask_data = &state->m_tilemap_maskdata[code << 3]; + tileinfo.mask_data = &state->m_tilemap_maskdata[code << 3]; } -INLINE void fg_get_info(running_machine &machine,tile_data *tileinfo,int tile_index,UINT8 *info_vram) +INLINE void fg_get_info(running_machine &machine,tile_data &tileinfo,int tile_index,UINT8 *info_vram) { namcos1_state *state = machine.driver_data(); int code; @@ -69,7 +69,7 @@ INLINE void fg_get_info(running_machine &machine,tile_data *tileinfo,int tile_in tile_index <<= 1; code = info_vram[tile_index + 1] + ((info_vram[tile_index] & 0x3f) << 8); SET_TILE_INFO(0,code,0,0); - tileinfo->mask_data = &state->m_tilemap_maskdata[code << 3]; + tileinfo.mask_data = &state->m_tilemap_maskdata[code << 3]; } static TILE_GET_INFO( bg_get_info0 ) @@ -135,10 +135,10 @@ VIDEO_START( namcos1 ) state->m_bg_tilemap[4] = tilemap_create(machine, fg_get_info4,tilemap_scan_rows,8,8,36,28); state->m_bg_tilemap[5] = tilemap_create(machine, fg_get_info5,tilemap_scan_rows,8,8,36,28); - tilemap_set_scrolldx(state->m_bg_tilemap[4],73,512-73); - tilemap_set_scrolldx(state->m_bg_tilemap[5],73,512-73); - tilemap_set_scrolldy(state->m_bg_tilemap[4],0x10,0x110); - tilemap_set_scrolldy(state->m_bg_tilemap[5],0x10,0x110); + state->m_bg_tilemap[4]->set_scrolldx(73,512-73); + state->m_bg_tilemap[5]->set_scrolldx(73,512-73); + state->m_bg_tilemap[4]->set_scrolldy(0x10,0x110); + state->m_bg_tilemap[5]->set_scrolldy(0x10,0x110); /* register videoram to the save state system (post-allocation) */ state_save_register_global_pointer(machine, state->m_videoram, 0x8000); @@ -190,14 +190,14 @@ WRITE8_HANDLER( namcos1_videoram_w ) { /* background 0-3 */ int layer = offset >> 13; int num = (offset & 0x1fff) >> 1; - tilemap_mark_tile_dirty(state->m_bg_tilemap[layer],num); + state->m_bg_tilemap[layer]->mark_tile_dirty(num); } else { /* foreground 4-5 */ int layer = (offset >> 11 & 1) + 4; int num = ((offset & 0x7ff) - 0x10) >> 1; if (num >= 0 && num < 0x3f0) - tilemap_mark_tile_dirty(state->m_bg_tilemap[layer],num); + state->m_bg_tilemap[layer]->mark_tile_dirty(num); } } @@ -379,7 +379,7 @@ SCREEN_UPDATE_IND16( namcos1 ) /* flip screen is embedded in the sprite control registers */ /* can't use flip_screen_set(screen.machine(), ) because the visible area is asymmetrical */ flip_screen_set_no_update(screen.machine(), state->m_spriteram[0x0ff6] & 1); - tilemap_set_flip_all(screen.machine(),flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* background color */ @@ -401,7 +401,7 @@ SCREEN_UPDATE_IND16( namcos1 ) /* set palette base */ for (i = 0;i < 6;i++) - tilemap_set_palette_offset(state->m_bg_tilemap[i],(state->m_playfield_control[i + 24] & 7) * 256); + state->m_bg_tilemap[i]->set_palette_offset((state->m_playfield_control[i + 24] & 7) * 256); for (i = 0;i < 4;i++) { @@ -417,8 +417,8 @@ SCREEN_UPDATE_IND16( namcos1 ) scrolly = -scrolly; } - tilemap_set_scrollx(state->m_bg_tilemap[i],0,scrollx); - tilemap_set_scrolly(state->m_bg_tilemap[i],0,scrolly); + state->m_bg_tilemap[i]->set_scrollx(0,scrollx); + state->m_bg_tilemap[i]->set_scrolly(0,scrolly); } @@ -431,7 +431,7 @@ SCREEN_UPDATE_IND16( namcos1 ) for (i = 0;i < 6;i++) { if (state->m_playfield_control[16 + i] == priority) - tilemap_draw_primask(bitmap,new_clip,state->m_bg_tilemap[i],0,priority,0); + state->m_bg_tilemap[i]->draw(bitmap, new_clip, 0,priority,0); } } diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c index 15a1bbaafcb..ce33223f34f 100644 --- a/src/mame/video/namcos2.c +++ b/src/mame/video/namcos2.c @@ -128,7 +128,7 @@ DrawRozHelper( const rectangle &clip, const struct RozParam *rozInfo ) { - tilemap_set_palette_offset( tmap, rozInfo->color ); + tmap->set_palette_offset(rozInfo->color ); if( bitmap.bpp() == 16 ) { @@ -162,8 +162,8 @@ DrawRozHelper( #define ROZ_BLOCK_SIZE 8 UINT32 size_mask = rozInfo->size - 1; - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(tmap); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap(tmap); + bitmap_ind16 &srcbitmap = tmap->pixmap(); + bitmap_ind8 &flagsbitmap = tmap->flagsmap(); UINT32 srcx = (rozInfo->startx + (clip.min_x * rozInfo->incxx) + (clip.min_y * rozInfo->incyx)); UINT32 srcy = (rozInfo->starty + (clip.min_x * rozInfo->incxy) + @@ -235,8 +235,8 @@ DrawRozHelper( } else { - tilemap_draw_roz( - bitmap, clip, tmap, + tmap->draw_roz( + bitmap, clip, rozInfo->startx, rozInfo->starty, rozInfo->incxx, rozInfo->incxy, rozInfo->incyx, rozInfo->incyy, @@ -313,7 +313,7 @@ READ16_HANDLER( namcos2_68k_roz_ram_r ) WRITE16_HANDLER( namcos2_68k_roz_ram_w ) { COMBINE_DATA(&namcos2_68k_roz_ram[offset]); - tilemap_mark_tile_dirty(tilemap_roz,offset); + tilemap_roz->mark_tile_dirty(offset); // if( space->machine().input().code_pressed(KEYCODE_Q) ) // { // debugger_break(space->machine()); @@ -445,7 +445,7 @@ VIDEO_START( namcos2 ) { namco_tilemap_init(machine,2,machine.region("gfx4")->base(),TilemapCB); tilemap_roz = tilemap_create(machine, get_tile_info_roz,tilemap_scan_rows,8,8,256,256); - tilemap_set_transparent_pen(tilemap_roz,0xff); + tilemap_roz->set_transparent_pen(0xff); DrawSpriteInit(machine); } @@ -470,7 +470,7 @@ SCREEN_UPDATE_IND16( namcos2_default ) ApplyClip( clip, cliprect ); /* HACK: enable ROZ layer only if it has priority > 0 */ - tilemap_set_enable(tilemap_roz,(namcos2_gfx_ctrl & 0x7000) ? 1 : 0); + tilemap_roz->enable((namcos2_gfx_ctrl & 0x7000) ? 1 : 0); for( pri=0; pri<16; pri++ ) { diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index bdf3f97758d..2059d48ef12 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -1821,8 +1821,8 @@ WRITE32_HANDLER( namcos22_textram_w ) { namcos22_state *state = space->machine().driver_data(); COMBINE_DATA( &state->m_textram[offset] ); - tilemap_mark_tile_dirty( state->m_bgtilemap, offset*2 ); - tilemap_mark_tile_dirty( state->m_bgtilemap, offset*2+1 ); + state->m_bgtilemap->mark_tile_dirty(offset*2 ); + state->m_bgtilemap->mark_tile_dirty(offset*2+1 ); } READ32_HANDLER( namcos22_tilemapattr_r ) @@ -2096,18 +2096,18 @@ static void DrawCharacterLayer(running_machine &machine, bitmap_rgb32 &bitmap, c int scroll_x = (state->m_tilemapattr[0]>>16) - 0x35c; int scroll_y = state->m_tilemapattr[0]&0xffff; - tilemap_set_scrollx( state->m_bgtilemap,0, scroll_x & 0x3ff ); - tilemap_set_scrolly( state->m_bgtilemap,0, scroll_y & 0x3ff ); - tilemap_set_palette_offset( state->m_bgtilemap, mixer.palBase*256 ); + state->m_bgtilemap->set_scrollx(0, scroll_x & 0x3ff ); + state->m_bgtilemap->set_scrolly(0, scroll_y & 0x3ff ); + state->m_bgtilemap->set_palette_offset(mixer.palBase*256 ); if (state->m_mbSuperSystem22) { - tilemap_draw_primask(*state->m_mix_bitmap, cliprect, state->m_bgtilemap, 0, 4, 4); + state->m_bgtilemap->draw(*state->m_mix_bitmap, cliprect, 0, 4, 4); namcos22s_mix_textlayer(machine, bitmap, cliprect, 4); } else { - tilemap_draw_primask(*state->m_mix_bitmap, cliprect, state->m_bgtilemap, 0, 2, 3); + state->m_bgtilemap->draw(*state->m_mix_bitmap, cliprect, 0, 2, 3); namcos22_mix_textlayer(machine, bitmap, cliprect); } } @@ -2750,7 +2750,7 @@ static VIDEO_START( common ) state->m_mix_bitmap = auto_bitmap_ind16_alloc(machine,640,480); state->m_bgtilemap = tilemap_create( machine, TextTilemapGetInfo,tilemap_scan_rows,16,16,64,64 ); - tilemap_set_transparent_pen(state->m_bgtilemap, 0xf); + state->m_bgtilemap->set_transparent_pen(0xf); state->m_mbDSPisActive = 0; memset( state->m_polygonram, 0xcc, 0x20000 ); diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c index 51982a9c12a..69a4f2aab21 100644 --- a/src/mame/video/namcos86.c +++ b/src/mame/video/namcos86.c @@ -87,7 +87,7 @@ PALETTE_INIT( namcos86 ) ***************************************************************************/ -INLINE void get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,int layer,UINT8 *vram) +INLINE void get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,int layer,UINT8 *vram) { namcos86_state *state = machine.driver_data(); int attr = vram[2*tile_index + 1]; @@ -143,10 +143,10 @@ VIDEO_START( namcos86 ) state->m_bg_tilemap[2] = tilemap_create(machine, get_tile_info2,tilemap_scan_rows,8,8,64,32); state->m_bg_tilemap[3] = tilemap_create(machine, get_tile_info3,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_bg_tilemap[0],7); - tilemap_set_transparent_pen(state->m_bg_tilemap[1],7); - tilemap_set_transparent_pen(state->m_bg_tilemap[2],7); - tilemap_set_transparent_pen(state->m_bg_tilemap[3],7); + state->m_bg_tilemap[0]->set_transparent_pen(7); + state->m_bg_tilemap[1]->set_transparent_pen(7); + state->m_bg_tilemap[2]->set_transparent_pen(7); + state->m_bg_tilemap[3]->set_transparent_pen(7); state->m_spriteram = state->m_rthunder_spriteram + 0x1800; } @@ -169,7 +169,7 @@ WRITE8_HANDLER( rthunder_videoram1_w ) { namcos86_state *state = space->machine().driver_data(); state->m_rthunder_videoram1[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap[offset/0x1000],(offset & 0xfff)/2); + state->m_bg_tilemap[offset/0x1000]->mark_tile_dirty((offset & 0xfff)/2); } READ8_HANDLER( rthunder_videoram2_r ) @@ -182,7 +182,7 @@ WRITE8_HANDLER( rthunder_videoram2_w ) { namcos86_state *state = space->machine().driver_data(); state->m_rthunder_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap[2+offset/0x1000],(offset & 0xfff)/2); + state->m_bg_tilemap[2+offset/0x1000]->mark_tile_dirty((offset & 0xfff)/2); } WRITE8_HANDLER( rthunder_tilebank_select_w ) @@ -192,8 +192,8 @@ WRITE8_HANDLER( rthunder_tilebank_select_w ) if (state->m_tilebank != bit) { state->m_tilebank = bit; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[0]); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap[1]); + state->m_bg_tilemap[0]->mark_all_dirty(); + state->m_bg_tilemap[1]->mark_all_dirty(); } } @@ -357,8 +357,8 @@ static void set_scroll(running_machine &machine, int layer) scrollx = -scrollx; scrolly = -scrolly; } - tilemap_set_scrollx(state->m_bg_tilemap[layer], 0, scrollx); - tilemap_set_scrolly(state->m_bg_tilemap[layer], 0, scrolly); + state->m_bg_tilemap[layer]->set_scrollx(0, scrollx); + state->m_bg_tilemap[layer]->set_scrolly(0, scrolly); } @@ -370,7 +370,7 @@ SCREEN_UPDATE_IND16( namcos86 ) /* flip screen is embedded in the sprite control registers */ /* can't use flip_screen_set(screen.machine(), ) because the visible area is asymmetrical */ flip_screen_set_no_update(screen.machine(), state->m_spriteram[0x07f6] & 1); - tilemap_set_flip_all(screen.machine(),flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); set_scroll(screen.machine(), 0); set_scroll(screen.machine(), 1); set_scroll(screen.machine(), 2); @@ -387,7 +387,7 @@ SCREEN_UPDATE_IND16( namcos86 ) for (i = 3;i >= 0;i--) { if (((state->m_xscroll[i] & 0x0e00) >> 9) == layer) - tilemap_draw_primask(bitmap,cliprect,state->m_bg_tilemap[i],0,layer,0); + state->m_bg_tilemap[i]->draw(bitmap, cliprect, 0,layer,0); } } diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index de59540a9a2..4c4e447f07c 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -46,7 +46,7 @@ static TILE_GET_INFO( get_bg_tile_info ) else { SET_TILE_INFO( 0, 0, 0x00, 0 ); - tileinfo->pen_data = state->m_blank_tile; + tileinfo.pen_data = state->m_blank_tile; } mask = (code & 0x1000) >> 12; @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_bg_tile_info ) if (mask && !layer) layer = 1; - tileinfo->category = mask | (layer << 1); + tileinfo.category = mask | (layer << 1); } static TILE_GET_INFO( get_fg_tile_info ) @@ -82,7 +82,7 @@ static TILE_GET_INFO( get_fg_tile_info ) else { SET_TILE_INFO( 0, 0, 0x00, 0 ); - tileinfo->pen_data = state->m_blank_tile; + tileinfo.pen_data = state->m_blank_tile; } mask = (code & 0x1000) >> 12; @@ -90,7 +90,7 @@ static TILE_GET_INFO( get_fg_tile_info ) if (mask && !layer) layer = 1; - tileinfo->category = mask | (layer << 1); + tileinfo.category = mask | (layer << 1); } @@ -107,7 +107,7 @@ WRITE16_HANDLER( nemesis_gfx_flipx_word_w ) else state->m_tilemap_flip &= ~TILEMAP_FLIPX; - tilemap_set_flip_all(space->machine(), state->m_tilemap_flip); + space->machine().tilemap().set_flip_all(state->m_tilemap_flip); } if (ACCESSING_BITS_8_15) @@ -128,7 +128,7 @@ WRITE16_HANDLER( nemesis_gfx_flipy_word_w ) else state->m_tilemap_flip &= ~TILEMAP_FLIPY; - tilemap_set_flip_all(space->machine(), state->m_tilemap_flip); + space->machine().tilemap().set_flip_all(state->m_tilemap_flip); } } @@ -156,7 +156,7 @@ WRITE16_HANDLER( salamand_control_port_word_w ) state->m_tilemap_flip &= ~TILEMAP_FLIPY; if (accessing_bits & 0x0c) - tilemap_set_flip_all(space->machine(), state->m_tilemap_flip); + space->machine().tilemap().set_flip_all(state->m_tilemap_flip); state->m_irq_port_last = data; } @@ -233,7 +233,7 @@ WRITE16_HANDLER( nemesis_videoram1_word_w ) nemesis_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_videoram1 + offset); - tilemap_mark_tile_dirty(state->m_foreground, offset); + state->m_foreground->mark_tile_dirty(offset); } WRITE16_HANDLER( nemesis_videoram2_word_w ) @@ -241,7 +241,7 @@ WRITE16_HANDLER( nemesis_videoram2_word_w ) nemesis_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_videoram2 + offset); - tilemap_mark_tile_dirty(state->m_background, offset); + state->m_background->mark_tile_dirty(offset); } WRITE16_HANDLER( nemesis_colorram1_word_w ) @@ -249,7 +249,7 @@ WRITE16_HANDLER( nemesis_colorram1_word_w ) nemesis_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_colorram1 + offset); - tilemap_mark_tile_dirty(state->m_foreground, offset); + state->m_foreground->mark_tile_dirty(offset); } WRITE16_HANDLER( nemesis_colorram2_word_w ) @@ -257,7 +257,7 @@ WRITE16_HANDLER( nemesis_colorram2_word_w ) nemesis_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_colorram2 + offset); - tilemap_mark_tile_dirty(state->m_background, offset); + state->m_background->mark_tile_dirty(offset); } @@ -297,8 +297,8 @@ static void nemesis_postload(running_machine &machine) gfx_element_mark_dirty(machine.gfx[sprite_data[i].char_type], offs * 4 / (w * h)); } } - tilemap_mark_all_tiles_dirty(state->m_background); - tilemap_mark_all_tiles_dirty(state->m_foreground); + state->m_background->mark_all_dirty(); + state->m_foreground->mark_all_dirty(); } @@ -312,10 +312,10 @@ VIDEO_START( nemesis ) state->m_background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_foreground = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_background, 0); - tilemap_set_transparent_pen(state->m_foreground, 0); - tilemap_set_scroll_rows(state->m_background, 256); - tilemap_set_scroll_rows(state->m_foreground, 256); + state->m_background->set_transparent_pen(0); + state->m_foreground->set_transparent_pen(0); + state->m_background->set_scroll_rows(256); + state->m_foreground->set_scroll_rows(256); memset(state->m_charram, 0, state->m_charram_size); memset(state->m_blank_tile, 0, ARRAY_LENGTH(state->m_blank_tile)); @@ -437,10 +437,10 @@ SCREEN_UPDATE_IND16( nemesis ) clip.min_x = 0; clip.max_x = 255; - tilemap_set_scroll_cols(state->m_background, 64); - tilemap_set_scroll_cols(state->m_foreground, 64); - tilemap_set_scroll_rows(state->m_background, 1); - tilemap_set_scroll_rows(state->m_foreground, 1); + state->m_background->set_scroll_cols(64); + state->m_foreground->set_scroll_cols(64); + state->m_background->set_scroll_rows(1); + state->m_foreground->set_scroll_rows(1); for (offs = 0; offs < 64; offs++) { @@ -449,8 +449,8 @@ SCREEN_UPDATE_IND16( nemesis ) if (state->m_flipscreen) offset_x = (offs + 0x20) & 0x3f; - tilemap_set_scrolly(state->m_background, offs, state->m_yscroll2[offset_x]); - tilemap_set_scrolly(state->m_foreground, offs, state->m_yscroll1[offset_x]); + state->m_background->set_scrolly(offs, state->m_yscroll2[offset_x]); + state->m_foreground->set_scrolly(offs, state->m_yscroll1[offset_x]); } for (offs = cliprect.min_y; offs <= cliprect.max_y; offs++) @@ -464,15 +464,15 @@ SCREEN_UPDATE_IND16( nemesis ) if (state->m_flipscreen) offset_y = 255 - offs; - tilemap_set_scrollx(state->m_background, 0, (state->m_xscroll2[offset_y] & 0xff) + ((state->m_xscroll2[0x100 + offset_y] & 0x01) << 8) - (state->m_flipscreen ? 0x107 : 0)); - tilemap_set_scrollx(state->m_foreground, 0, (state->m_xscroll1[offset_y] & 0xff) + ((state->m_xscroll1[0x100 + offset_y] & 0x01) << 8) - (state->m_flipscreen ? 0x107 : 0)); + state->m_background->set_scrollx(0, (state->m_xscroll2[offset_y] & 0xff) + ((state->m_xscroll2[0x100 + offset_y] & 0x01) << 8) - (state->m_flipscreen ? 0x107 : 0)); + state->m_foreground->set_scrollx(0, (state->m_xscroll1[offset_y] & 0xff) + ((state->m_xscroll1[0x100 + offset_y] & 0x01) << 8) - (state->m_flipscreen ? 0x107 : 0)); for (i = 0; i < 4; i += 2) { - tilemap_draw(bitmap, clip, state->m_background, TILEMAP_DRAW_CATEGORY(i + 0), 1); - tilemap_draw(bitmap, clip, state->m_background, TILEMAP_DRAW_CATEGORY(i + 1), 2); - tilemap_draw(bitmap, clip, state->m_foreground, TILEMAP_DRAW_CATEGORY(i + 0), 1); - tilemap_draw(bitmap, clip, state->m_foreground, TILEMAP_DRAW_CATEGORY(i + 1), 2); + state->m_background->draw(bitmap, clip, TILEMAP_DRAW_CATEGORY(i + 0), 1); + state->m_background->draw(bitmap, clip, TILEMAP_DRAW_CATEGORY(i + 1), 2); + state->m_foreground->draw(bitmap, clip, TILEMAP_DRAW_CATEGORY(i + 0), 1); + state->m_foreground->draw(bitmap, clip, TILEMAP_DRAW_CATEGORY(i + 1), 2); } } diff --git a/src/mame/video/news.c b/src/mame/video/news.c index c3d8f2087cc..965426c3767 100644 --- a/src/mame/video/news.c +++ b/src/mame/video/news.c @@ -49,7 +49,7 @@ VIDEO_START( news ) news_state *state = machine.driver_data(); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } @@ -67,7 +67,7 @@ WRITE8_HANDLER( news_fgram_w ) news_state *state = space->machine().driver_data(); state->m_fgram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( news_bgram_w ) @@ -75,7 +75,7 @@ WRITE8_HANDLER( news_bgram_w ) news_state *state = space->machine().driver_data(); state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( news_bgpic_w ) @@ -85,7 +85,7 @@ WRITE8_HANDLER( news_bgpic_w ) if (state->m_bgpic != data) { state->m_bgpic = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -100,7 +100,7 @@ WRITE8_HANDLER( news_bgpic_w ) SCREEN_UPDATE_IND16( news ) { news_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c index 6c85e17e22c..8e0f9fe02ce 100644 --- a/src/mame/video/ninjakd2.c +++ b/src/mame/video/ninjakd2.c @@ -70,7 +70,7 @@ static TILEMAP_MAPPER( omegaf_bg_scan ) return (col & 0x0f) | ((row & 0x1f) << 4) | ((col & 0x70) << 5); } -static void robokid_get_bg_tile_info(running_machine& machine, tile_data* const tileinfo, tilemap_memory_index const tile_index, int const gfxnum, const UINT8* const videoram) +static void robokid_get_bg_tile_info(running_machine& machine, tile_data& tileinfo, tilemap_memory_index const tile_index, int const gfxnum, const UINT8* const videoram) { int const lo = videoram[(tile_index << 1)]; int const hi = videoram[(tile_index << 1) | 1]; @@ -138,7 +138,7 @@ VIDEO_START( ninjakd2 ) state->m_fg_tilemap = tilemap_create( machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, ninjakd2_get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, TRANSPARENTCODE); + state->m_fg_tilemap->set_transparent_pen(TRANSPARENTCODE); state->m_robokid_sprites = 0; state->m_stencil_compare_function = stencil_ninjakd2; @@ -152,7 +152,7 @@ VIDEO_START( mnight ) state->m_fg_tilemap = tilemap_create( machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, mnight_get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, TRANSPARENTCODE); + state->m_fg_tilemap->set_transparent_pen(TRANSPARENTCODE); state->m_robokid_sprites = 0; state->m_stencil_compare_function = stencil_mnight; @@ -166,7 +166,7 @@ VIDEO_START( arkarea ) state->m_fg_tilemap = tilemap_create( machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_bg_tilemap = tilemap_create(machine, mnight_get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, TRANSPARENTCODE); + state->m_fg_tilemap->set_transparent_pen(TRANSPARENTCODE); state->m_robokid_sprites = 0; state->m_stencil_compare_function = stencil_arkarea; @@ -184,9 +184,9 @@ VIDEO_START( robokid ) state->m_bg1_tilemap = tilemap_create(machine, robokid_get_bg1_tile_info, robokid_bg_scan, 16, 16, 32, 32); state->m_bg2_tilemap = tilemap_create(machine, robokid_get_bg2_tile_info, robokid_bg_scan, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, TRANSPARENTCODE); - tilemap_set_transparent_pen(state->m_bg1_tilemap, TRANSPARENTCODE); - tilemap_set_transparent_pen(state->m_bg2_tilemap, TRANSPARENTCODE); + state->m_fg_tilemap->set_transparent_pen(TRANSPARENTCODE); + state->m_bg1_tilemap->set_transparent_pen(TRANSPARENTCODE); + state->m_bg2_tilemap->set_transparent_pen(TRANSPARENTCODE); state->m_robokid_sprites = 1; state->m_stencil_compare_function = stencil_robokid; @@ -204,10 +204,10 @@ VIDEO_START( omegaf ) state->m_bg1_tilemap = tilemap_create(machine, robokid_get_bg1_tile_info, omegaf_bg_scan, 16, 16, 128, 32); state->m_bg2_tilemap = tilemap_create(machine, robokid_get_bg2_tile_info, omegaf_bg_scan, 16, 16, 128, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, TRANSPARENTCODE); - tilemap_set_transparent_pen(state->m_bg0_tilemap, TRANSPARENTCODE); - tilemap_set_transparent_pen(state->m_bg1_tilemap, TRANSPARENTCODE); - tilemap_set_transparent_pen(state->m_bg2_tilemap, TRANSPARENTCODE); + state->m_fg_tilemap->set_transparent_pen(TRANSPARENTCODE); + state->m_bg0_tilemap->set_transparent_pen(TRANSPARENTCODE); + state->m_bg1_tilemap->set_transparent_pen(TRANSPARENTCODE); + state->m_bg2_tilemap->set_transparent_pen(TRANSPARENTCODE); state->m_robokid_sprites = 1; state->m_stencil_compare_function = stencil_omegaf; @@ -225,14 +225,14 @@ WRITE8_HANDLER( ninjakd2_bgvideoram_w ) { ninjakd2_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } WRITE8_HANDLER( ninjakd2_fgvideoram_w ) { ninjakd2_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset >> 1); + state->m_fg_tilemap->mark_tile_dirty(offset >> 1); } @@ -279,7 +279,7 @@ WRITE8_HANDLER( robokid_bg0_videoram_w ) int const address = (state->m_robokid_bg0_bank << 10 ) | offset; state->m_robokid_bg0_videoram[address] = data; - tilemap_mark_tile_dirty(state->m_bg0_tilemap, address >> 1); + state->m_bg0_tilemap->mark_tile_dirty(address >> 1); } WRITE8_HANDLER( robokid_bg1_videoram_w ) @@ -288,7 +288,7 @@ WRITE8_HANDLER( robokid_bg1_videoram_w ) int const address = (state->m_robokid_bg1_bank << 10 ) | offset; state->m_robokid_bg1_videoram[address] = data; - tilemap_mark_tile_dirty(state->m_bg1_tilemap, address >> 1); + state->m_bg1_tilemap->mark_tile_dirty(address >> 1); } WRITE8_HANDLER( robokid_bg2_videoram_w ) @@ -297,15 +297,15 @@ WRITE8_HANDLER( robokid_bg2_videoram_w ) int const address = (state->m_robokid_bg2_bank << 10 ) | offset; state->m_robokid_bg2_videoram[address] = data; - tilemap_mark_tile_dirty(state->m_bg2_tilemap, address >> 1); + state->m_bg2_tilemap->mark_tile_dirty(address >> 1); } static void bg_ctrl(int offset, int data, tilemap_t* tilemap) { - int scrollx = tilemap_get_scrollx(tilemap, 0); - int scrolly = tilemap_get_scrolly(tilemap, 0); + int scrollx = tilemap->scrollx(0); + int scrolly = tilemap->scrolly(0); switch (offset) { @@ -313,11 +313,11 @@ static void bg_ctrl(int offset, int data, tilemap_t* tilemap) case 1: scrollx = ((scrollx & 0x0ff) | (data << 8)); break; case 2: scrolly = ((scrolly & 0x100) | data); break; case 3: scrolly = ((scrolly & 0x0ff) | (data << 8)); break; - case 4: tilemap_set_enable(tilemap, data & 1); break; + case 4: tilemap->enable(data & 1); break; } - tilemap_set_scrollx(tilemap, 0, scrollx); - tilemap_set_scrolly(tilemap, 0, scrolly); + tilemap->set_scrollx(0, scrollx); + tilemap->set_scrolly(0, scrolly); } WRITE8_HANDLER( ninjakd2_bg_ctrl_w ) @@ -494,11 +494,11 @@ SCREEN_UPDATE_IND16( ninjakd2 ) bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); copybitmap_trans(bitmap, state->m_sp_bitmap, 0, 0, 0, 0, cliprect, TRANSPARENTCODE); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -511,15 +511,15 @@ SCREEN_UPDATE_IND16( robokid ) bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg0_tilemap, 0, 0); + state->m_bg0_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); copybitmap_trans(bitmap, state->m_sp_bitmap, 0, 0, 0, 0, cliprect, TRANSPARENTCODE); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -532,15 +532,15 @@ SCREEN_UPDATE_IND16( omegaf ) bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg0_tilemap, 0, 0); + state->m_bg0_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); copybitmap_trans(bitmap, state->m_sp_bitmap, 0, 0, 0, 0, cliprect, TRANSPARENTCODE); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c index a87cee19dc9..e36e5e4e9d3 100644 --- a/src/mame/video/nitedrvr.c +++ b/src/mame/video/nitedrvr.c @@ -12,7 +12,7 @@ WRITE8_HANDLER( nitedrvr_videoram_w ) nitedrvr_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( nitedrvr_hvc_w ) @@ -77,7 +77,7 @@ SCREEN_UPDATE_IND16( nitedrvr ) { nitedrvr_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_roadway(screen.machine(), bitmap); return 0; } diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c index 3479ec1ef01..761fe5037a8 100644 --- a/src/mame/video/nmk16.c +++ b/src/mame/video/nmk16.c @@ -134,8 +134,8 @@ VIDEO_START( bioship ) state->m_bg_tilemap0 = tilemap_create(machine, macross_get_bg0_tile_info, afega_tilemap_scan_pages,16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); state->m_tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap0,15); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); + state->m_bg_tilemap0->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); nmk16_video_init(machine); state->m_background_bitmap = auto_bitmap_ind16_alloc(machine,8192,512); @@ -151,8 +151,8 @@ VIDEO_START( strahl ) state->m_fg_tilemap = tilemap_create(machine, strahl_get_fg_tile_info, afega_tilemap_scan_pages,16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); state->m_tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,15); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); nmk16_video_init(machine); } @@ -163,7 +163,7 @@ VIDEO_START( macross ) state->m_bg_tilemap0 = tilemap_create(machine, macross_get_bg0_tile_info, afega_tilemap_scan_pages,16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); state->m_tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); + state->m_tx_tilemap->set_transparent_pen(15); nmk16_video_init(machine); } @@ -174,8 +174,8 @@ VIDEO_START( gunnail ) state->m_bg_tilemap0 = tilemap_create(machine, macross_get_bg0_tile_info, afega_tilemap_scan_pages,16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); state->m_tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,64,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); - tilemap_set_scroll_rows(state->m_bg_tilemap0,512); + state->m_tx_tilemap->set_transparent_pen(15); + state->m_bg_tilemap0->set_scroll_rows(512); nmk16_video_init(machine); state->m_videoshift = 64; /* 384x224 screen, leftmost 64 pixels have to be retrieved */ @@ -193,7 +193,7 @@ VIDEO_START( macross2 ) state->m_tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,64,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); + state->m_tx_tilemap->set_transparent_pen(15); nmk16_video_init(machine); state->m_videoshift = 64; /* 384x224 screen, leftmost 64 pixels have to be retrieved */ @@ -229,42 +229,42 @@ WRITE16_HANDLER( nmk_bgvideoram0_w ) { nmk16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_nmk_bgvideoram0[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap0,offset); + state->m_bg_tilemap0->mark_tile_dirty(offset); } WRITE16_HANDLER( nmk_bgvideoram1_w ) { nmk16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_nmk_bgvideoram1[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap1,offset); + state->m_bg_tilemap1->mark_tile_dirty(offset); } WRITE16_HANDLER( nmk_bgvideoram2_w ) { nmk16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_nmk_bgvideoram2[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap2,offset); + state->m_bg_tilemap2->mark_tile_dirty(offset); } WRITE16_HANDLER( nmk_bgvideoram3_w ) { nmk16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_nmk_bgvideoram3[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap3,offset); + state->m_bg_tilemap3->mark_tile_dirty(offset); } WRITE16_HANDLER( nmk_fgvideoram_w ) { nmk16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_nmk_fgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( nmk_txvideoram_w ) { nmk16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_nmk_txvideoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } @@ -293,7 +293,7 @@ WRITE16_HANDLER( mustang_scroll_w ) break; } - tilemap_set_scrollx(state->m_bg_tilemap0,0,state->m_mustang_bg_xscroll - state->m_videoshift); + state->m_bg_tilemap0->set_scrollx(0,state->m_mustang_bg_xscroll - state->m_videoshift); } WRITE16_HANDLER( bioshipbg_scroll_w ) @@ -305,9 +305,9 @@ WRITE16_HANDLER( bioshipbg_scroll_w ) state->m_scroll[offset] = (data >> 8) & 0xff; if (offset & 2) - tilemap_set_scrolly(state->m_bg_tilemap0,0,state->m_scroll[2] * 256 + state->m_scroll[3]); + state->m_bg_tilemap0->set_scrolly(0,state->m_scroll[2] * 256 + state->m_scroll[3]); else - tilemap_set_scrollx(state->m_bg_tilemap0,0,state->m_scroll[0] * 256 + state->m_scroll[1] - state->m_videoshift); + state->m_bg_tilemap0->set_scrollx(0,state->m_scroll[0] * 256 + state->m_scroll[1] - state->m_videoshift); } } @@ -320,9 +320,9 @@ WRITE16_HANDLER( nmk_scroll_w ) state->m_scroll[offset] = data & 0xff; if (offset & 2) - tilemap_set_scrolly(state->m_bg_tilemap0,0,state->m_scroll[2] * 256 + state->m_scroll[3]); + state->m_bg_tilemap0->set_scrolly(0,state->m_scroll[2] * 256 + state->m_scroll[3]); else - tilemap_set_scrollx(state->m_bg_tilemap0,0,state->m_scroll[0] * 256 + state->m_scroll[1] - state->m_videoshift); + state->m_bg_tilemap0->set_scrollx(0,state->m_scroll[0] * 256 + state->m_scroll[1] - state->m_videoshift); } } @@ -335,9 +335,9 @@ WRITE16_HANDLER( nmk_scroll_2_w ) state->m_scroll_2[offset] = data & 0xff; if (offset & 2) - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scroll_2[2] * 256 + state->m_scroll_2[3]); + state->m_fg_tilemap->set_scrolly(0,state->m_scroll_2[2] * 256 + state->m_scroll_2[3]); else - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scroll_2[0] * 256 + state->m_scroll_2[1] - state->m_videoshift); + state->m_fg_tilemap->set_scrollx(0,state->m_scroll_2[0] * 256 + state->m_scroll_2[1] - state->m_videoshift); } } @@ -347,8 +347,8 @@ WRITE16_HANDLER( vandyke_scroll_w ) state->m_vscroll[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap0,0,state->m_vscroll[0] * 256 + (state->m_vscroll[1] >> 8)); - tilemap_set_scrolly(state->m_bg_tilemap0,0,state->m_vscroll[2] * 256 + (state->m_vscroll[3] >> 8)); + state->m_bg_tilemap0->set_scrollx(0,state->m_vscroll[0] * 256 + (state->m_vscroll[1] >> 8)); + state->m_bg_tilemap0->set_scrolly(0,state->m_vscroll[2] * 256 + (state->m_vscroll[3] >> 8)); } WRITE16_HANDLER( vandykeb_scroll_w ) @@ -363,8 +363,8 @@ WRITE16_HANDLER( vandykeb_scroll_w ) case 6: COMBINE_DATA(&state->m_vscroll[0]); break; } - tilemap_set_scrollx(state->m_bg_tilemap0,0,state->m_vscroll[0] * 256 + (state->m_vscroll[1] >> 8)); - tilemap_set_scrolly(state->m_bg_tilemap0,0,state->m_vscroll[2] * 256 + (state->m_vscroll[3] >> 8)); + state->m_bg_tilemap0->set_scrollx(0,state->m_vscroll[0] * 256 + (state->m_vscroll[1] >> 8)); + state->m_bg_tilemap0->set_scrolly(0,state->m_vscroll[2] * 256 + (state->m_vscroll[3] >> 8)); } WRITE16_HANDLER( manybloc_scroll_w ) @@ -372,8 +372,8 @@ WRITE16_HANDLER( manybloc_scroll_w ) nmk16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_gunnail_scrollram[offset]); - tilemap_set_scrollx(state->m_bg_tilemap0,0,state->m_gunnail_scrollram[0x82/2]-state->m_videoshift); - tilemap_set_scrolly(state->m_bg_tilemap0,0,state->m_gunnail_scrollram[0xc2/2]); + state->m_bg_tilemap0->set_scrollx(0,state->m_gunnail_scrollram[0x82/2]-state->m_videoshift); + state->m_bg_tilemap0->set_scrolly(0,state->m_gunnail_scrollram[0xc2/2]); } WRITE16_HANDLER( nmk_flipscreen_w ) @@ -390,7 +390,7 @@ WRITE16_HANDLER( nmk_tilebank_w ) if (state->m_bgbank != (data & 0xff)) { state->m_bgbank = data & 0xff; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap0); + state->m_bg_tilemap0->mark_all_dirty(); } } } @@ -543,16 +543,16 @@ static void nmk16_draw_sprites_flipsupported(running_machine &machine, bitmap_in SCREEN_UPDATE_IND16( macross ) { nmk16_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_tx_tilemap,0,-state->m_videoshift); + state->m_tx_tilemap->set_scrollx(0,-state->m_videoshift); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,2); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -561,16 +561,16 @@ SCREEN_UPDATE_IND16( tdragon ) nmk16_state *state = screen.machine().driver_data(); // mcu_run(screen.machine(), 1); - tilemap_set_scrollx(state->m_tx_tilemap,0,-state->m_videoshift); + state->m_tx_tilemap->set_scrollx(0,-state->m_videoshift); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,2); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -579,32 +579,32 @@ SCREEN_UPDATE_IND16( hachamf ) nmk16_state *state = screen.machine().driver_data(); // mcu_run(screen.machine(), 0); - tilemap_set_scrollx(state->m_tx_tilemap,0,-state->m_videoshift); + state->m_tx_tilemap->set_scrollx(0,-state->m_videoshift); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,2); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } SCREEN_UPDATE_IND16( manybloc ) { nmk16_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_tx_tilemap,0,-state->m_videoshift); + state->m_tx_tilemap->set_scrollx(0,-state->m_videoshift); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,2); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -614,16 +614,16 @@ SCREEN_UPDATE_IND16( tharrier ) /* I think the protection device probably copies this to the regs... */ UINT16 tharrier_scroll = state->m_mainram[0x9f00/2]; - tilemap_set_scrollx(state->m_tx_tilemap,0,-state->m_videoshift); - tilemap_set_scrollx(state->m_bg_tilemap0,0,tharrier_scroll); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_tx_tilemap->set_scrollx(0,-state->m_videoshift); + state->m_bg_tilemap0->set_scrollx(0,tharrier_scroll); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,2); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -659,12 +659,12 @@ SCREEN_UPDATE_IND16( gunnail ) case 3: if (state->m_bg_tilemap3) bg_tilemap = state->m_bg_tilemap3; break; } - tilemap_set_scroll_rows(bg_tilemap,512); + bg_tilemap->set_scroll_rows(512); - tilemap_set_scrolly(bg_tilemap, 0, yscroll); - tilemap_set_scrollx(bg_tilemap,(i + yscroll) & 0x1ff, state->m_gunnail_scrollram[0] + state->m_gunnail_scrollram[i] - state->m_videoshift); + bg_tilemap->set_scrolly(0, yscroll); + bg_tilemap->set_scrollx((i + yscroll) & 0x1ff, state->m_gunnail_scrollram[0] + state->m_gunnail_scrollram[i] - state->m_videoshift); - tilemap_draw(bitmap,bgclip,bg_tilemap,0,0); + bg_tilemap->draw(bitmap, bgclip, 0,0); y1++; i++; @@ -688,12 +688,12 @@ SCREEN_UPDATE_IND16( gunnail ) case 3: if (state->m_bg_tilemap3) bg_tilemap = state->m_bg_tilemap3; break; } - tilemap_set_scroll_rows(bg_tilemap,1); + bg_tilemap->set_scroll_rows(1); - tilemap_set_scrolly(bg_tilemap, 0, yscroll); - tilemap_set_scrollx(bg_tilemap, 0, xscroll - state->m_videoshift); + bg_tilemap->set_scrolly(0, yscroll); + bg_tilemap->set_scrollx(0, xscroll - state->m_videoshift); - tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); + bg_tilemap->draw(bitmap, cliprect, 0,0); } nmk16_draw_sprites(screen.machine(), bitmap,cliprect,3); @@ -701,8 +701,8 @@ SCREEN_UPDATE_IND16( gunnail ) nmk16_draw_sprites(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_set_scrollx(state->m_tx_tilemap,0,-state->m_videoshift); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->set_scrollx(0,-state->m_videoshift); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -713,7 +713,7 @@ SCREEN_UPDATE_IND16( bioship ) int scrollx=-(state->m_bioship_scroll[1] + state->m_bioship_scroll[0]*256); int scrolly=-(state->m_bioship_scroll[3] + state->m_bioship_scroll[2]*256); - tilemap_set_scrollx(state->m_tx_tilemap,0,-state->m_videoshift); + state->m_tx_tilemap->set_scrollx(0,-state->m_videoshift); if (state->m_redraw_bitmap) { @@ -748,40 +748,40 @@ SCREEN_UPDATE_IND16( bioship ) } copyscrollbitmap(bitmap,*state->m_background_bitmap,1,&scrollx,1,&scrolly,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,2); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } SCREEN_UPDATE_IND16( strahl ) { nmk16_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_tx_tilemap,0,-state->m_videoshift); + state->m_tx_tilemap->set_scrollx(0,-state->m_videoshift); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,2); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } SCREEN_UPDATE_IND16( bjtwin ) { nmk16_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap0,0,-state->m_videoshift); + state->m_bg_tilemap0->set_scrollx(0,-state->m_videoshift); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites(screen.machine(), bitmap,cliprect,2); @@ -852,7 +852,7 @@ VIDEO_START( afega ) 8,8, 32,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,0xf); + state->m_tx_tilemap->set_transparent_pen(0xf); } @@ -873,7 +873,7 @@ VIDEO_START( grdnstrm ) 8,8, 32,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,0xf); + state->m_tx_tilemap->set_transparent_pen(0xf); } @@ -894,7 +894,7 @@ VIDEO_START( firehawk ) 8,8, 32,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,0xf); + state->m_tx_tilemap->set_transparent_pen(0xf); } @@ -924,21 +924,21 @@ static void video_update(running_machine &machine, bitmap_ind16 &bitmap, const r } - tilemap_set_scrollx(state->m_bg_tilemap0, 0, state->m_afega_scroll_0[1] + xoffset); - tilemap_set_scrolly(state->m_bg_tilemap0, 0, state->m_afega_scroll_0[0] + yoffset); + state->m_bg_tilemap0->set_scrollx(0, state->m_afega_scroll_0[1] + xoffset); + state->m_bg_tilemap0->set_scrolly(0, state->m_afega_scroll_0[0] + yoffset); - tilemap_set_scrollx(state->m_tx_tilemap, 0, state->m_afega_scroll_1[1]); - tilemap_set_scrolly(state->m_tx_tilemap, 0, state->m_afega_scroll_1[0]); + state->m_tx_tilemap->set_scrollx(0, state->m_afega_scroll_1[1]); + state->m_tx_tilemap->set_scrolly(0, state->m_afega_scroll_1[0]); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,3); nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,2); nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,1); nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); } static void redhawki_video_update(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -946,10 +946,10 @@ static void redhawki_video_update(running_machine &machine, bitmap_ind16 &bitmap nmk16_state *state = machine.driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap0, 0, state->m_afega_scroll_1[0]&0xff); - tilemap_set_scrolly(state->m_bg_tilemap0, 0, state->m_afega_scroll_1[1]&0xff); + state->m_bg_tilemap0->set_scrollx(0, state->m_afega_scroll_1[0]&0xff); + state->m_bg_tilemap0->set_scrolly(0, state->m_afega_scroll_1[1]&0xff); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,3); nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,2); @@ -965,17 +965,17 @@ SCREEN_UPDATE_IND16( redhawki ) { redhawki_video_update(screen.machine(),bitmap, SCREEN_UPDATE_IND16( firehawk ) { nmk16_state *state = screen.machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap0, 0, state->m_afega_scroll_1[1] + 0x100); - tilemap_set_scrollx(state->m_bg_tilemap0, 0, state->m_afega_scroll_1[0]); + state->m_bg_tilemap0->set_scrolly(0, state->m_afega_scroll_1[1] + 0x100); + state->m_bg_tilemap0->set_scrollx(0, state->m_afega_scroll_1[0]); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap0,0,0); + state->m_bg_tilemap0->draw(bitmap, cliprect, 0,0); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,3); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,2); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,1); nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index 65d4d622fef..201af2fa433 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -94,7 +94,7 @@ static TILE_GET_INFO( nova2001_get_fg_tile_info ) SET_TILE_INFO(1, code, color, 0); - tileinfo->category = (attr & 0x10) >> 4; + tileinfo.category = (attr & 0x10) >> 4; } static TILE_GET_INFO( ninjakun_get_bg_tile_info ) @@ -116,7 +116,7 @@ static TILE_GET_INFO( ninjakun_get_fg_tile_info ) SET_TILE_INFO(1, code, color, 0); - tileinfo->category = (attr & 0x10) >> 4; + tileinfo.category = (attr & 0x10) >> 4; } static TILE_GET_INFO( pkunwar_get_bg_tile_info ) @@ -128,7 +128,7 @@ static TILE_GET_INFO( pkunwar_get_bg_tile_info ) SET_TILE_INFO(1, code, color, 0); - tileinfo->category = (attr & 0x08) >> 3; + tileinfo.category = (attr & 0x08) >> 3; } static TILE_GET_INFO( raiders5_get_bg_tile_info ) @@ -163,15 +163,15 @@ VIDEO_START( nova2001 ) nova2001_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, nova2001_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, nova2001_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, -7); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scrolldx(0, -7); } VIDEO_START( pkunwar ) { nova2001_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, pkunwar_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); } VIDEO_START( ninjakun ) @@ -179,8 +179,8 @@ VIDEO_START( ninjakun ) nova2001_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, ninjakun_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, ninjakun_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, 7, 0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scrolldx(7, 0); } VIDEO_START( raiders5 ) @@ -188,8 +188,8 @@ VIDEO_START( raiders5 ) nova2001_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, raiders5_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, raiders5_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, 7, 0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scrolldx(7, 0); } @@ -204,34 +204,34 @@ WRITE8_HANDLER( nova2001_fg_videoram_w ) { nova2001_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( nova2001_bg_videoram_w ) { nova2001_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( ninjakun_bg_videoram_w ) { nova2001_state *state = space->machine().driver_data(); - int x = tilemap_get_scrollx(state->m_bg_tilemap, 0) >> 3; - int y = tilemap_get_scrolly(state->m_bg_tilemap, 0) >> 3; + int x = state->m_bg_tilemap->scrollx(0) >> 3; + int y = state->m_bg_tilemap->scrolly(0) >> 3; // add scroll registers to address offset = ((offset + x + (y << 5)) & 0x3ff) + (offset & 0x400); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } READ8_HANDLER( ninjakun_bg_videoram_r ) { nova2001_state *state = space->machine().driver_data(); - int x = tilemap_get_scrollx(state->m_bg_tilemap, 0) >> 3; - int y = tilemap_get_scrolly(state->m_bg_tilemap, 0) >> 3; + int x = state->m_bg_tilemap->scrollx(0) >> 3; + int y = state->m_bg_tilemap->scrolly(0) >> 3; // add scroll registers to address offset = ((offset + x + (y << 5)) & 0x3ff) + (offset & 0x400); @@ -242,13 +242,13 @@ READ8_HANDLER( ninjakun_bg_videoram_r ) WRITE8_HANDLER( nova2001_scroll_x_w ) { nova2001_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); } WRITE8_HANDLER( nova2001_scroll_y_w ) { nova2001_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( nova2001_flipscreen_w ) @@ -358,14 +358,14 @@ static void pkunwar_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, SCREEN_UPDATE_IND16( nova2001 ) { nova2001_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); nova2001_draw_sprites(screen.machine(), bitmap, cliprect); // according to the schematics, fg category 0 should be drawn behind sprites, // but it doesn't look right that way - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 1, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 1, 0); return 0; } @@ -373,11 +373,11 @@ SCREEN_UPDATE_IND16( nova2001 ) SCREEN_UPDATE_IND16( pkunwar ) { nova2001_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); pkunwar_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); return 0; } @@ -385,13 +385,13 @@ SCREEN_UPDATE_IND16( pkunwar ) SCREEN_UPDATE_IND16( ninjakun ) { nova2001_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 1, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 1, 0); nova2001_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -399,11 +399,11 @@ SCREEN_UPDATE_IND16( ninjakun ) SCREEN_UPDATE_IND16( raiders5 ) { nova2001_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); pkunwar_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index afb88078a70..1351ba0546c 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -41,21 +41,21 @@ static TILE_GET_INFO( get_tile_info ) { nycaptor_state *state = machine.driver_data(); int pal = state->m_videoram[tile_index * 2 + 1] & 0x0f; - tileinfo->category = (state->m_videoram[tile_index * 2 + 1] & 0x30) >> 4; + tileinfo.category = (state->m_videoram[tile_index * 2 + 1] & 0x30) >> 4; - tileinfo->group = 0; + tileinfo.group = 0; if ((!nycaptor_spot(machine)) && (pal == 6)) - tileinfo->group = 1; + tileinfo.group = 1; if (((nycaptor_spot(machine) == 3) && (pal == 8)) || ((nycaptor_spot(machine) == 1) && (pal == 0xc))) - tileinfo->group = 2; + tileinfo.group = 2; - if ((nycaptor_spot(machine) == 1) && (tileinfo->category == 2)) - tileinfo->group = 3; + if ((nycaptor_spot(machine) == 1) && (tileinfo.category == 2)) + tileinfo.group = 3; #if NYCAPTOR_DEBUG - if (state->m_mask & (1 << tileinfo->category)) + if (state->m_mask & (1 << tileinfo.category)) { if (nycaptor_spot(machine)) pal = 0xe; @@ -79,14 +79,14 @@ VIDEO_START( nycaptor ) state->m_spriteram = auto_alloc_array(machine, UINT8, 160); state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32 ); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xf800, 0x7ff); //split 0 - tilemap_set_transmask(state->m_bg_tilemap, 1, 0xfe00, 0x01ff);//split 1 - tilemap_set_transmask(state->m_bg_tilemap, 2, 0xfffc, 0x0003);//split 2 - tilemap_set_transmask(state->m_bg_tilemap, 3, 0xfff0, 0x000f);//split 3 + state->m_bg_tilemap->set_transmask(0, 0xf800, 0x7ff); //split 0 + state->m_bg_tilemap->set_transmask(1, 0xfe00, 0x01ff);//split 1 + state->m_bg_tilemap->set_transmask(2, 0xfffc, 0x0003);//split 2 + state->m_bg_tilemap->set_transmask(3, 0xfff0, 0x000f);//split 3 machine.generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x200); machine.generic.paletteram2.u8 = auto_alloc_array(machine, UINT8, 0x200); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); state->save_pointer(NAME(state->m_spriteram), 160); state_save_register_global_pointer(machine, machine.generic.paletteram.u8, 0x200); @@ -97,7 +97,7 @@ WRITE8_HANDLER( nycaptor_videoram_w ) { nycaptor_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } READ8_HANDLER( nycaptor_videoram_r ) @@ -141,7 +141,7 @@ WRITE8_HANDLER( nycaptor_gfxctrl_w ) if (state->m_char_bank != ((data & 0x18) >> 3)) { state->m_char_bank = ((data & 0x18) >> 3); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } state->m_palette_bank = BIT(data, 5); @@ -164,7 +164,7 @@ WRITE8_HANDLER( nycaptor_scrlram_w ) { nycaptor_state *state = space->machine().driver_data(); state->m_scrlram[offset] = data; - tilemap_set_scrolly(state->m_bg_tilemap, offset, data); + state->m_bg_tilemap->set_scrolly(offset, data); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ) @@ -224,7 +224,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const x - no bg/sprite pri. */ -#define mKEY_MASK(x,y) if (machine.input().code_pressed_once(x)) { state->m_mask |= y; tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); } +#define mKEY_MASK(x,y) if (machine.input().code_pressed_once(x)) { state->m_mask |= y; state->m_bg_tilemap->mark_all_dirty(); } static void nycaptor_setmask( running_machine &machine ) { @@ -244,8 +244,8 @@ static void nycaptor_setmask( running_machine &machine ) mKEY_MASK(KEYCODE_J, 0x400); mKEY_MASK(KEYCODE_K, 0x800); - if (machine.input().code_pressed_once(KEYCODE_Z)){state->m_mask = 0; tilemap_mark_all_tiles_dirty(state->m_bg_tilemap);} /* disable */ - if (machine.input().code_pressed_once(KEYCODE_X)){state->m_mask |= 0x1000; tilemap_mark_all_tiles_dirty(state->m_bg_tilemap);} /* no layers */ + if (machine.input().code_pressed_once(KEYCODE_Z)){state->m_mask = 0; state->m_bg_tilemap->mark_all_dirty();} /* disable */ + if (machine.input().code_pressed_once(KEYCODE_X)){state->m_mask |= 0x1000; state->m_bg_tilemap->mark_all_dirty();} /* no layers */ } #endif @@ -257,14 +257,14 @@ SCREEN_UPDATE_IND16( nycaptor ) nycaptor_setmask(screen.machine()); if (state->m_mask & 0x1000) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 3, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 3, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 2, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 2, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 1, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 1, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); draw_sprites(screen.machine(), bitmap, cliprect, 2); @@ -279,56 +279,56 @@ SCREEN_UPDATE_IND16( nycaptor ) switch (nycaptor_spot(screen.machine()) & 3) { case 0: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 3, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0); draw_sprites(screen.machine(), bitmap, cliprect, 6); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 3, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 2, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 2, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 3); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); draw_sprites(screen.machine(), bitmap, cliprect, 2); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0); break; case 1: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 3, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0); draw_sprites(screen.machine(), bitmap, cliprect, 3); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 3, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 0); draw_sprites(screen.machine(), bitmap, cliprect, 2); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 2, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 1, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 2, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0); break; case 2: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 3, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 3, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 1, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 2, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 2, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0); break; case 3: - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1 | 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0); break; } diff --git a/src/mame/video/offtwall.c b/src/mame/video/offtwall.c index 926e43c691b..553c9ae51a7 100644 --- a/src/mame/video/offtwall.c +++ b/src/mame/video/offtwall.c @@ -97,7 +97,7 @@ SCREEN_UPDATE_IND16( offtwall ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index 7673be970c0..9f4d9e4d7e9 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -45,7 +45,7 @@ WRITE16_HANDLER( ohmygod_videoram_w ) { ohmygod_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( ohmygod_spritebank_w ) @@ -59,14 +59,14 @@ WRITE16_HANDLER( ohmygod_scrollx_w ) { ohmygod_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scrollx); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx - 0x81ec); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx - 0x81ec); } WRITE16_HANDLER( ohmygod_scrolly_w ) { ohmygod_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scrolly); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrolly - 0x81ef); + state->m_bg_tilemap->set_scrolly(0, state->m_scrolly - 0x81ef); } @@ -109,7 +109,7 @@ SCREEN_UPDATE_IND16( ohmygod ) { ohmygod_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index afa54ea071a..96521322f46 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -114,14 +114,14 @@ WRITE8_HANDLER( ojankohs_videoram_w ) { ojankohs_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ojankohs_colorram_w ) { ojankohs_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ojankohs_gfxreg_w ) @@ -131,7 +131,7 @@ WRITE8_HANDLER( ojankohs_gfxreg_w ) if (state->m_gfxreg != data) { state->m_gfxreg = data; - tilemap_mark_all_tiles_dirty(state->m_tilemap); + state->m_tilemap->mark_all_dirty(); } } @@ -144,7 +144,7 @@ WRITE8_HANDLER( ojankohs_flipscreen_w ) state->m_flipscreen = BIT(data, 0); - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); if (state->m_flipscreen) { @@ -316,10 +316,10 @@ SCREEN_UPDATE_IND16( ojankohs ) { ojankohs_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_tilemap, 0, state->m_scrollx); - tilemap_set_scrolly(state->m_tilemap, 0, state->m_scrolly); + state->m_tilemap->set_scrollx(0, state->m_scrollx); + state->m_tilemap->set_scrolly(0, state->m_scrolly); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 0ec5adae6ed..bc4c2a01c2b 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -17,7 +17,7 @@ WRITE16_HANDLER( oneshot_bg_videoram_w ) { oneshot_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } /* mid tilemap */ @@ -33,7 +33,7 @@ WRITE16_HANDLER( oneshot_mid_videoram_w ) { oneshot_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_mid_videoram[offset]); - tilemap_mark_tile_dirty(state->m_mid_tilemap, offset / 2); + state->m_mid_tilemap->mark_tile_dirty(offset / 2); } @@ -50,7 +50,7 @@ WRITE16_HANDLER( oneshot_fg_videoram_w ) { oneshot_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } VIDEO_START( oneshot ) @@ -61,9 +61,9 @@ VIDEO_START( oneshot ) state->m_mid_tilemap = tilemap_create(machine, get_oneshot_mid_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_oneshot_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); - tilemap_set_transparent_pen(state->m_mid_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_mid_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_crosshairs( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -162,13 +162,13 @@ SCREEN_UPDATE_IND16( oneshot ) bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_set_scrollx(state->m_mid_tilemap, 0, state->m_scroll[0] - 0x1f5); - tilemap_set_scrolly(state->m_mid_tilemap, 0, state->m_scroll[1]); + state->m_mid_tilemap->set_scrollx(0, state->m_scroll[0] - 0x1f5); + state->m_mid_tilemap->set_scrolly(0, state->m_scroll[1]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_mid_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_mid_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_crosshairs(screen.machine(), bitmap, cliprect); return 0; } @@ -179,11 +179,11 @@ SCREEN_UPDATE_IND16( maddonna ) bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_set_scrolly(state->m_mid_tilemap, 0, state->m_scroll[1]); // other registers aren't used so we don't know which layers they relate to + state->m_mid_tilemap->set_scrolly(0, state->m_scroll[1]); // other registers aren't used so we don't know which layers they relate to - tilemap_draw(bitmap, cliprect, state->m_mid_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_mid_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); // popmessage ("%04x %04x %04x %04x %04x %04x %04x %04x", state->m_scroll[0], state->m_scroll[1], state->m_scroll[2], state->m_scroll[3], state->m_scroll[4], state->m_scroll[5], state->m_scroll[6], state->m_scroll[7]); diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index c76b53e347f..1d51e1fc75a 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -11,7 +11,7 @@ WRITE8_HANDLER( orbit_playfield_w ) { orbit_state *state = space->machine().driver_data(); state->m_playfield_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -85,7 +85,7 @@ SCREEN_UPDATE_IND16( orbit ) state->m_flip_screen = input_port_read(screen.machine(), "DSW2") & 8; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c index 48ace537b63..88cf76ba1b2 100644 --- a/src/mame/video/othldrby.c +++ b/src/mame/video/othldrby.c @@ -13,7 +13,7 @@ ***************************************************************************/ -INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int plane ) +INLINE void get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int plane ) { othldrby_state *state = machine.driver_data(); UINT16 attr; @@ -25,7 +25,7 @@ INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int ti state->m_vram[tile_index + 1], attr & 0x7f, 0); - tileinfo->category = (attr & 0x0600) >> 9; + tileinfo.category = (attr & 0x0600) >> 9; } static TILE_GET_INFO( get_tile_info0 ) @@ -63,9 +63,9 @@ VIDEO_START( othldrby ) state->m_buf_spriteram = auto_alloc_array(machine, UINT16, 2 * SPRITERAM_SIZE); state->m_buf_spriteram2 = state->m_buf_spriteram + SPRITERAM_SIZE; - tilemap_set_transparent_pen(state->m_bg_tilemap[0], 0); - tilemap_set_transparent_pen(state->m_bg_tilemap[1], 0); - tilemap_set_transparent_pen(state->m_bg_tilemap[2], 0); + state->m_bg_tilemap[0]->set_transparent_pen(0); + state->m_bg_tilemap[1]->set_transparent_pen(0); + state->m_bg_tilemap[2]->set_transparent_pen(0); state->save_pointer(NAME(state->m_vram), VIDEORAM_SIZE); state->save_pointer(NAME(state->m_buf_spriteram), 2 * SPRITERAM_SIZE); @@ -105,7 +105,7 @@ WRITE16_HANDLER( othldrby_videoram_w ) if (state->m_vram_addr < VIDEORAM_SIZE) { if (state->m_vram_addr < SPRITERAM_START) - tilemap_mark_tile_dirty(state->m_bg_tilemap[state->m_vram_addr / 0x800], (state->m_vram_addr & 0x7ff) / 2); + state->m_bg_tilemap[state->m_vram_addr / 0x800]->mark_tile_dirty((state->m_vram_addr & 0x7ff) / 2); state->m_vram[state->m_vram_addr++] = data; } else @@ -191,13 +191,13 @@ SCREEN_UPDATE_IND16( othldrby ) { if (flip_screen_get(screen.machine())) { - tilemap_set_scrollx(state->m_bg_tilemap[layer], 0, state->m_vreg[2 * layer] + 59); - tilemap_set_scrolly(state->m_bg_tilemap[layer], 0, state->m_vreg[2 * layer + 1] + 248); + state->m_bg_tilemap[layer]->set_scrollx(0, state->m_vreg[2 * layer] + 59); + state->m_bg_tilemap[layer]->set_scrolly(0, state->m_vreg[2 * layer + 1] + 248); } else { - tilemap_set_scrollx(state->m_bg_tilemap[layer], 0, state->m_vreg[2 * layer] - 58); - tilemap_set_scrolly(state->m_bg_tilemap[layer], 0, state->m_vreg[2 * layer+1] + 9); + state->m_bg_tilemap[layer]->set_scrollx(0, state->m_vreg[2 * layer] - 58); + state->m_bg_tilemap[layer]->set_scrolly(0, state->m_vreg[2 * layer+1] + 9); } } @@ -206,19 +206,19 @@ SCREEN_UPDATE_IND16( othldrby ) bitmap.fill(0, cliprect); for (layer = 0; layer < 3; layer++) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[layer], 0, 0); + state->m_bg_tilemap[layer]->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); for (layer = 0; layer < 3; layer++) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[layer], 1, 0); + state->m_bg_tilemap[layer]->draw(bitmap, cliprect, 1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); for (layer = 0; layer < 3; layer++) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[layer], 2, 0); + state->m_bg_tilemap[layer]->draw(bitmap, cliprect, 2, 0); draw_sprites(screen.machine(), bitmap, cliprect, 2); for (layer = 0; layer < 3; layer++) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[layer], 3, 0); + state->m_bg_tilemap[layer]->draw(bitmap, cliprect, 3, 0); draw_sprites(screen.machine(), bitmap, cliprect, 3); return 0; diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index aa0128ec3e6..e580949cc9a 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -177,8 +177,8 @@ static TILE_GET_INFO( get_fg_tile_info ) int color = ((attr & 0x1e) >> 1) + ((code & 0x1e0) >> 1); int flags = TILE_FLIPYX(attr >> 6); - tileinfo->category = (attr & 0x20) ? 1 : 0; - tileinfo->group = color; + tileinfo.category = (attr & 0x20) ? 1 : 0; + tileinfo.group = color; SET_TILE_INFO(0, code, color, flags); } @@ -202,7 +202,7 @@ VIDEO_START( pacland ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_scroll_rows(state->m_fg_tilemap, 32); + state->m_fg_tilemap->set_scroll_rows(32); /* create one group per color code; for each group, set the transparency mask to correspond to the pens that are 0x7f or 0xff */ @@ -211,7 +211,7 @@ VIDEO_START( pacland ) { UINT32 mask = colortable_get_transpen_mask(machine.colortable, machine.gfx[0], color, 0x7f); mask |= colortable_get_transpen_mask(machine.colortable, machine.gfx[0], color, 0xff); - tilemap_set_transmask(state->m_fg_tilemap, color, mask, 0); + state->m_fg_tilemap->set_transmask(color, mask, 0); } state_save_register_global(machine, state->m_palette_bank); @@ -231,14 +231,14 @@ WRITE8_HANDLER( pacland_videoram_w ) { pacland_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( pacland_videoram2_w ) { pacland_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( pacland_scroll0_w ) @@ -348,7 +348,7 @@ static void draw_fg(running_machine &machine, bitmap_ind16 &bitmap, const rectan /* draw tilemap transparently over it; this will leave invalid pens (0xffff) anywhere where the fg_tilemap should be transparent; note that we assume the fg_bitmap has been pre-erased to 0xffff */ - tilemap_draw(state->m_fg_bitmap, cliprect, state->m_fg_tilemap, priority, 0); + state->m_fg_tilemap->draw(state->m_fg_bitmap, cliprect, priority, 0); /* now copy the fg_bitmap to the destination wherever the sprite pixel allows */ for (y = cliprect.min_y; y <= cliprect.max_y; y++) @@ -379,8 +379,8 @@ SCREEN_UPDATE_IND16( pacland ) int row; for (row = 5; row < 29; row++) - tilemap_set_scrollx(state->m_fg_tilemap, row, flip_screen_get(screen.machine()) ? state->m_scroll0-7 : state->m_scroll0); - tilemap_set_scrollx(state->m_bg_tilemap, 0, flip_screen_get(screen.machine()) ? state->m_scroll1-4 : state->m_scroll1-3); + state->m_fg_tilemap->set_scrollx(row, flip_screen_get(screen.machine()) ? state->m_scroll0-7 : state->m_scroll0); + state->m_bg_tilemap->set_scrollx(0, flip_screen_get(screen.machine()) ? state->m_scroll1-4 : state->m_scroll1-3); /* draw high priority sprite pixels, setting priority bitmap to non-zero wherever there is a high-priority pixel; note that we draw to the bitmap @@ -389,7 +389,7 @@ SCREEN_UPDATE_IND16( pacland ) draw_sprites(screen.machine(), bitmap, cliprect, 0); /* draw background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw low priority fg tiles */ draw_fg(screen.machine(), bitmap, cliprect, 0); diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index 884dbaf3df6..673e699ae3d 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -178,8 +178,8 @@ VIDEO_START( pacman ) state->m_bg_tilemap = tilemap_create( machine, pacman_get_tile_info, pacman_scan_rows, 8, 8, 36, 28 ); - tilemap_set_scrolldx( state->m_bg_tilemap, 0, 384 - 288 ); - tilemap_set_scrolldy( state->m_bg_tilemap, 0, 264 - 224 ); + state->m_bg_tilemap->set_scrolldx(0, 384 - 288 ); + state->m_bg_tilemap->set_scrolldy(0, 264 - 224 ); } VIDEO_START( birdiy ) @@ -195,21 +195,21 @@ WRITE8_HANDLER( pacman_videoram_w ) { pacman_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty( state->m_bg_tilemap, offset ); + state->m_bg_tilemap->mark_tile_dirty(offset ); } WRITE8_HANDLER( pacman_colorram_w ) { pacman_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty( state->m_bg_tilemap, offset ); + state->m_bg_tilemap->mark_tile_dirty(offset ); } WRITE8_HANDLER( pacman_flipscreen_w ) { pacman_state *state = space->machine().driver_data(); state->m_flipscreen = data & 1; - tilemap_set_flip( state->m_bg_tilemap, state->m_flipscreen * ( TILEMAP_FLIPX + TILEMAP_FLIPY ) ); + state->m_bg_tilemap->set_flip(state->m_flipscreen * ( TILEMAP_FLIPX + TILEMAP_FLIPY ) ); } @@ -219,7 +219,7 @@ SCREEN_UPDATE_IND16( pacman ) if (state->m_bgpriority != 0) bitmap.fill(0, cliprect); else - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_OPAQUE,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); if( screen.machine().generic.spriteram_size ) { @@ -310,7 +310,7 @@ SCREEN_UPDATE_IND16( pacman ) } if (state->m_bgpriority != 0) - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -337,8 +337,8 @@ VIDEO_START( pengo ) state->m_bg_tilemap = tilemap_create( machine, pacman_get_tile_info, pacman_scan_rows, 8, 8, 36, 28 ); - tilemap_set_scrolldx( state->m_bg_tilemap, 0, 384 - 288 ); - tilemap_set_scrolldy( state->m_bg_tilemap, 0, 264 - 224 ); + state->m_bg_tilemap->set_scrolldx(0, 384 - 288 ); + state->m_bg_tilemap->set_scrolldy(0, 264 - 224 ); } WRITE8_HANDLER( pengo_palettebank_w ) @@ -347,7 +347,7 @@ WRITE8_HANDLER( pengo_palettebank_w ) if (state->m_palettebank != data) { state->m_palettebank = data; - tilemap_mark_all_tiles_dirty( state->m_bg_tilemap ); + state->m_bg_tilemap ->mark_all_dirty(); } } @@ -357,7 +357,7 @@ WRITE8_HANDLER( pengo_colortablebank_w ) if (state->m_colortablebank != data) { state->m_colortablebank = data; - tilemap_mark_all_tiles_dirty( state->m_bg_tilemap ); + state->m_bg_tilemap ->mark_all_dirty(); } } @@ -368,7 +368,7 @@ WRITE8_HANDLER( pengo_gfxbank_w ) { state->m_spritebank = data & 1; state->m_charbank = data & 1; - tilemap_mark_all_tiles_dirty( state->m_bg_tilemap ); + state->m_bg_tilemap ->mark_all_dirty(); } } @@ -408,7 +408,7 @@ VIDEO_START( s2650games ) state->m_bg_tilemap = tilemap_create( machine, s2650_get_tile_info,tilemap_scan_rows,8,8,32,32 ); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); } SCREEN_UPDATE_IND16( s2650games ) @@ -418,7 +418,7 @@ SCREEN_UPDATE_IND16( s2650games ) UINT8 *spriteram_2 = screen.machine().generic.spriteram2.u8; int offs; - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); for (offs = screen.machine().generic.spriteram_size - 2;offs > 2*2;offs -= 2) { @@ -465,7 +465,7 @@ WRITE8_HANDLER( s2650games_videoram_w ) { pacman_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( s2650games_colorram_w ) @@ -474,20 +474,20 @@ WRITE8_HANDLER( s2650games_colorram_w ) int i; state->m_colorram[offset & 0x1f] = data; for (i = offset; i < 0x0400; i += 32) - tilemap_mark_tile_dirty(state->m_bg_tilemap, i); + state->m_bg_tilemap->mark_tile_dirty(i); } WRITE8_HANDLER( s2650games_scroll_w ) { pacman_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, offset, data); + state->m_bg_tilemap->set_scrolly(offset, data); } WRITE8_HANDLER( s2650games_tilesbank_w ) { pacman_state *state = space->machine().driver_data(); state->m_s2650games_tileram[offset] = data; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } @@ -553,18 +553,18 @@ static void jrpacman_mark_tile_dirty( running_machine &machine, int offset ) int i; for( i = 2 * 0x20; i < 56 * 0x20; i += 0x20 ) { - tilemap_mark_tile_dirty( state->m_bg_tilemap, offset + i ); + state->m_bg_tilemap->mark_tile_dirty(offset + i ); } } else if (offset < 1792) { /* tiles for playfield */ - tilemap_mark_tile_dirty( state->m_bg_tilemap, offset ); + state->m_bg_tilemap->mark_tile_dirty(offset ); } else { /* tiles & colors for top and bottom two rows */ - tilemap_mark_tile_dirty( state->m_bg_tilemap, offset & ~0x80 ); + state->m_bg_tilemap->mark_tile_dirty(offset & ~0x80 ); } } @@ -589,8 +589,8 @@ VIDEO_START( jrpacman ) state->m_bg_tilemap = tilemap_create( machine, jrpacman_get_tile_info,jrpacman_scan_rows,8,8,36,54 ); - tilemap_set_transparent_pen( state->m_bg_tilemap, 0 ); - tilemap_set_scroll_cols( state->m_bg_tilemap, 36 ); + state->m_bg_tilemap->set_transparent_pen(0 ); + state->m_bg_tilemap->set_scroll_cols(36 ); } WRITE8_HANDLER( jrpacman_videoram_w ) @@ -606,7 +606,7 @@ WRITE8_HANDLER( jrpacman_charbank_w ) if (state->m_charbank != (data & 1)) { state->m_charbank = data & 1; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -622,7 +622,7 @@ WRITE8_HANDLER( jrpacman_scroll_w ) int i; for( i = 2; i < 34; i++ ) { - tilemap_set_scrolly( state->m_bg_tilemap, i, data ); + state->m_bg_tilemap->set_scrolly(i, data ); } } diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index ba87b66e736..e0a9186f0dd 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -96,7 +96,7 @@ static TILE_GET_INFO( get_tile_info0 ) state->m_videoram[tile_index] + ((attr & 0x10) << 4), attr & 0x0f, TILE_FLIPYX((attr & 0xc0) >> 6)); - tileinfo->category = (attr & 0x20) >> 5; + tileinfo.category = (attr & 0x20) >> 5; } /*************************************************************************** @@ -123,7 +123,7 @@ WRITE8_HANDLER( pandoras_vram_w ) { pandoras_state *state = space->machine().driver_data(); - tilemap_mark_tile_dirty(state->m_layer0, offset); + state->m_layer0->mark_tile_dirty(offset); state->m_videoram[offset] = data; } @@ -131,7 +131,7 @@ WRITE8_HANDLER( pandoras_cram_w ) { pandoras_state *state = space->machine().driver_data(); - tilemap_mark_tile_dirty(state->m_layer0, offset); + state->m_layer0->mark_tile_dirty(offset); state->m_colorram[offset] = data; } @@ -139,7 +139,7 @@ WRITE8_HANDLER( pandoras_scrolly_w ) { pandoras_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_layer0, 0, data); + state->m_layer0->set_scrolly(0, data); } WRITE8_HANDLER( pandoras_flipscreen_w ) @@ -147,7 +147,7 @@ WRITE8_HANDLER( pandoras_flipscreen_w ) pandoras_state *state = space->machine().driver_data(); state->m_flipscreen = data; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } /*************************************************************************** @@ -180,8 +180,8 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( pandoras ) { pandoras_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect, state->m_layer0, 1 ,0); + state->m_layer0->draw(bitmap, cliprect, 1 ,0); draw_sprites(screen.machine(), bitmap, cliprect, &state->m_spriteram[0x800] ); - tilemap_draw(bitmap,cliprect, state->m_layer0, 0 ,0); + state->m_layer0->draw(bitmap, cliprect, 0 ,0); return 0; } diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index 38859c29075..0d79249ce87 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -77,7 +77,7 @@ WRITE8_HANDLER( paradise_vram_0_w ) { paradise_state *state = space->machine().driver_data(); state->m_vram_0[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_0, offset % 0x400); + state->m_tilemap_0->mark_tile_dirty(offset % 0x400); } /* 16 color tiles with paradise_palbank as color code */ @@ -94,7 +94,7 @@ WRITE8_HANDLER( paradise_palbank_w ) if (state->m_palbank != bank1) { state->m_palbank = bank1; - tilemap_mark_all_tiles_dirty(state->m_tilemap_0); + state->m_tilemap_0->mark_all_dirty(); } } @@ -111,7 +111,7 @@ WRITE8_HANDLER( paradise_vram_1_w ) { paradise_state *state = space->machine().driver_data(); state->m_vram_1[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_1, offset % 0x400); + state->m_tilemap_1->mark_tile_dirty(offset % 0x400); } static TILE_GET_INFO( get_tile_info_1 ) @@ -127,7 +127,7 @@ WRITE8_HANDLER( paradise_vram_2_w ) { paradise_state *state = space->machine().driver_data(); state->m_vram_2[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_2, offset % 0x400); + state->m_tilemap_2->mark_tile_dirty(offset % 0x400); } static TILE_GET_INFO( get_tile_info_2 ) @@ -171,9 +171,9 @@ VIDEO_START( paradise ) /* pixmap */ machine.primary_screen->register_screen_bitmap(state->m_tmpbitmap); - tilemap_set_transparent_pen(state->m_tilemap_0, 0x0f); - tilemap_set_transparent_pen(state->m_tilemap_1, 0xff); - tilemap_set_transparent_pen(state->m_tilemap_2, 0xff); + state->m_tilemap_0->set_transparent_pen(0x0f); + state->m_tilemap_1->set_transparent_pen(0xff); + state->m_tilemap_2->set_transparent_pen(0xff); state->save_item(NAME(state->m_tmpbitmap)); } @@ -268,8 +268,8 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) if (layers_ctrl & 16) draw_sprites(screen.machine(), bitmap, cliprect); - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 0); - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 0); + if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); + if (layers_ctrl & 2) state->m_tilemap_1->draw(bitmap, cliprect, 0, 0); if (layers_ctrl & 4) copybitmap_trans(bitmap, state->m_tmpbitmap, flip_screen_get(screen.machine()), flip_screen_get(screen.machine()), 0, 0, cliprect, 0x80f); if (state->m_priority & 2) @@ -278,12 +278,12 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) if (layers_ctrl & 16) draw_sprites(screen.machine(), bitmap, cliprect); if (layers_ctrl & 8) - tilemap_draw(bitmap,cliprect, state->m_tilemap_2, 0, 0); + state->m_tilemap_2->draw(bitmap, cliprect, 0, 0); } else { if (layers_ctrl & 8) - tilemap_draw(bitmap, cliprect, state->m_tilemap_2, 0, 0); + state->m_tilemap_2->draw(bitmap, cliprect, 0, 0); if (!(state->m_priority & 1)) if (layers_ctrl & 16) draw_sprites(screen.machine(), bitmap, cliprect); @@ -304,18 +304,18 @@ SCREEN_UPDATE_IND16( torus ) if (state->m_priority & 1) draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0,0); + state->m_tilemap_1->draw(bitmap, cliprect, 0,0); if (state->m_priority & 4) { if (!(state->m_priority & 1)) draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tilemap_2, 0, 0); + state->m_tilemap_2->draw(bitmap, cliprect, 0, 0); } else { - tilemap_draw(bitmap, cliprect, state->m_tilemap_2, 0, 0); + state->m_tilemap_2->draw(bitmap, cliprect, 0, 0); if (!(state->m_priority & 1)) draw_sprites(screen.machine(), bitmap,cliprect); @@ -329,9 +329,9 @@ SCREEN_UPDATE_IND16( madball ) paradise_state *state = screen.machine().driver_data(); bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap_2, 0, 0); + state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); + state->m_tilemap_1->draw(bitmap, cliprect, 0, 0); + state->m_tilemap_2->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c index 79fdb87983b..0f41e36f928 100644 --- a/src/mame/video/pass.c +++ b/src/mame/video/pass.c @@ -21,7 +21,7 @@ WRITE16_HANDLER( pass_bg_videoram_w ) pass_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } /* foreground 'sprites' tilemap stuff */ @@ -42,7 +42,7 @@ WRITE16_HANDLER( pass_fg_videoram_w ) { pass_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } /* video update / start */ @@ -54,15 +54,15 @@ VIDEO_START( pass ) state->m_bg_tilemap = tilemap_create(machine, get_pass_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_fg_tilemap = tilemap_create(machine, get_pass_fg_tile_info, tilemap_scan_rows, 4, 4, 128, 64); - tilemap_set_transparent_pen(state->m_fg_tilemap, 255); + state->m_fg_tilemap->set_transparent_pen(255); } SCREEN_UPDATE_IND16( pass ) { pass_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index 7bdfbfd5c55..62227d5f5b2 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -13,28 +13,28 @@ WRITE8_HANDLER( pbaction_videoram_w ) { pbaction_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( pbaction_colorram_w ) { pbaction_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( pbaction_videoram2_w ) { pbaction_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( pbaction_colorram2_w ) { pbaction_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( pbaction_scroll_w ) @@ -44,8 +44,8 @@ WRITE8_HANDLER( pbaction_scroll_w ) if (flip_screen_get(space->machine())) state->m_scroll = -state->m_scroll; - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_scroll); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll); + state->m_fg_tilemap->set_scrollx(0, state->m_scroll); } WRITE8_HANDLER( pbaction_flipscreen_w ) @@ -81,7 +81,7 @@ VIDEO_START( pbaction ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -136,8 +136,8 @@ SCREEN_UPDATE_IND16( pbaction ) { pbaction_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c index 2cc0fb4472d..475f9c6f968 100644 --- a/src/mame/video/pgm.c +++ b/src/mame/video/pgm.c @@ -559,7 +559,7 @@ WRITE16_HANDLER( pgm_tx_videoram_w ) { pgm_state *state = space->machine().driver_data(); state->m_tx_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset / 2); + state->m_tx_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_pgm_tx_tilemap_tile_info ) @@ -595,7 +595,7 @@ WRITE16_HANDLER( pgm_bg_videoram_w ) { pgm_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_pgm_bg_tilemap_tile_info ) @@ -628,11 +628,11 @@ VIDEO_START( pgm ) state->m_boffset = 0; state->m_tx_tilemap = tilemap_create(machine, get_pgm_tx_tilemap_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_tx_tilemap->set_transparent_pen(15); state->m_bg_tilemap = tilemap_create(machine, get_pgm_bg_tilemap_tile_info, tilemap_scan_rows, 32, 32, 64, 16); - tilemap_set_transparent_pen(state->m_bg_tilemap, 31); - tilemap_set_scroll_rows(state->m_bg_tilemap, 16 * 32); + state->m_bg_tilemap->set_transparent_pen(31); + state->m_bg_tilemap->set_scroll_rows(16 * 32); for (i = 0; i < 0x1200 / 2; i++) palette_set_color(machine, i, MAKE_RGB(0, 0, 0)); @@ -652,21 +652,21 @@ SCREEN_UPDATE_IND16( pgm ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_set_scrolly(state->m_bg_tilemap,0, state->m_videoregs[0x2000/2]); + state->m_bg_tilemap->set_scrolly(0, state->m_videoregs[0x2000/2]); for (y = 0; y < 224; y++) - tilemap_set_scrollx(state->m_bg_tilemap, (y + state->m_videoregs[0x2000 / 2]) & 0x1ff, state->m_videoregs[0x3000 / 2] + state->m_rowscrollram[y]); + state->m_bg_tilemap->set_scrollx((y + state->m_videoregs[0x2000 / 2]) & 0x1ff, state->m_videoregs[0x3000 / 2] + state->m_rowscrollram[y]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 2); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 2); draw_sprites(state, screen.machine(), bitmap, state->m_spritebufferram, screen.machine().priority_bitmap); - tilemap_set_scrolly(state->m_tx_tilemap, 0, state->m_videoregs[0x5000/2]); - tilemap_set_scrollx(state->m_tx_tilemap, 0, state->m_videoregs[0x6000/2]); // Check + state->m_tx_tilemap->set_scrolly(0, state->m_videoregs[0x5000/2]); + state->m_tx_tilemap->set_scrollx(0, state->m_videoregs[0x6000/2]); // Check - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c index fbf748fbb1f..da767953300 100644 --- a/src/mame/video/phoenix.c +++ b/src/mame/video/phoenix.c @@ -186,12 +186,12 @@ VIDEO_START( phoenix ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_fg_tilemap, 0, (HTOTAL - HBSTART)); - tilemap_set_scrolldx(state->m_bg_tilemap, 0, (HTOTAL - HBSTART)); - tilemap_set_scrolldy(state->m_fg_tilemap, 0, (VTOTAL - VBSTART)); - tilemap_set_scrolldy(state->m_bg_tilemap, 0, (VTOTAL - VBSTART)); + state->m_fg_tilemap->set_scrolldx(0, (HTOTAL - HBSTART)); + state->m_bg_tilemap->set_scrolldx(0, (HTOTAL - HBSTART)); + state->m_fg_tilemap->set_scrolldy(0, (VTOTAL - VBSTART)); + state->m_bg_tilemap->set_scrolldy(0, (VTOTAL - VBSTART)); state_save_register_global_pointer(machine, state->m_videoram_pg[0], 0x1000); state_save_register_global_pointer(machine, state->m_videoram_pg[1], 0x1000); @@ -231,9 +231,9 @@ WRITE8_HANDLER( phoenix_videoram_w ) if ((offset & 0x7ff) < 0x340) { if (offset & 0x800) - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); else - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } /* as part of the protecion, Survival executes code from $43a4 */ @@ -252,8 +252,8 @@ WRITE8_HANDLER( phoenix_videoreg_w ) state->m_cocktail_mode = state->m_videoram_pg_index && (input_port_read(space->machine(), "CAB") & 0x01); - tilemap_set_flip_all(space->machine(), state->m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().set_flip_all(state->m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().mark_all_dirty(); } /* Phoenix has only one palette select effecting both layers */ @@ -261,7 +261,7 @@ WRITE8_HANDLER( phoenix_videoreg_w ) { state->m_palette_bank = (data >> 1) & 1; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -276,8 +276,8 @@ WRITE8_HANDLER( pleiads_videoreg_w ) state->m_cocktail_mode = state->m_videoram_pg_index && (input_port_read(space->machine(), "CAB") & 0x01); - tilemap_set_flip_all(space->machine(), state->m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().set_flip_all(state->m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().mark_all_dirty(); } @@ -289,7 +289,7 @@ WRITE8_HANDLER( pleiads_videoreg_w ) { state->m_palette_bank = ((data >> 1) & 3); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); logerror("Palette: %02X\n", (data & 0x06) >> 1); } @@ -304,7 +304,7 @@ WRITE8_HANDLER( pleiads_videoreg_w ) WRITE8_HANDLER( phoenix_scroll_w ) { phoenix_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,data); + state->m_bg_tilemap->set_scrollx(0,data); } @@ -453,7 +453,7 @@ READ_LINE_DEVICE_HANDLER( survival_sid_callback ) SCREEN_UPDATE_IND16( phoenix ) { phoenix_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c index bced0ecb544..b4e559d0ef7 100644 --- a/src/mame/video/pingpong.c +++ b/src/mame/video/pingpong.c @@ -86,14 +86,14 @@ WRITE8_HANDLER( pingpong_videoram_w ) { pingpong_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( pingpong_colorram_w ) { pingpong_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -149,7 +149,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( pingpong ) { pingpong_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c index ca87c953970..781134970e7 100644 --- a/src/mame/video/pirates.c +++ b/src/mame/video/pirates.c @@ -45,8 +45,8 @@ VIDEO_START(pirates) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,8,8,64,32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols, 8,8,64,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -55,21 +55,21 @@ WRITE16_HANDLER( pirates_tx_tileram_w ) { pirates_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_tx_tileram+offset); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset/2); + state->m_tx_tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( pirates_fg_tileram_w ) { pirates_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_fg_tileram+offset); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset/2); + state->m_fg_tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( pirates_bg_tileram_w ) { pirates_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_bg_tileram+offset); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset/2); + state->m_bg_tilemap->mark_tile_dirty(offset/2); } @@ -110,11 +110,11 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16(pirates) { pirates_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scroll[0]); - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scroll[0]); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->set_scrollx(0,state->m_scroll[0]); + state->m_fg_tilemap->set_scrollx(0,state->m_scroll[0]); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index 793828cc2eb..a5e293203d1 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -51,14 +51,14 @@ WRITE8_HANDLER( pitnrun_videoram_w ) pitnrun_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_all_tiles_dirty( state->m_fg ); + state->m_fg ->mark_all_dirty(); } WRITE8_HANDLER( pitnrun_videoram2_w ) { pitnrun_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_all_tiles_dirty( state->m_bg ); + state->m_bg ->mark_all_dirty(); } WRITE8_HANDLER( pitnrun_char_bank_select ) @@ -66,7 +66,7 @@ WRITE8_HANDLER( pitnrun_char_bank_select ) pitnrun_state *state = space->machine().driver_data(); if(state->m_char_bank!=data) { - tilemap_mark_all_tiles_dirty( state->m_bg ); + state->m_bg ->mark_all_dirty(); state->m_char_bank=data; } } @@ -76,7 +76,7 @@ WRITE8_HANDLER( pitnrun_scroll_w ) { pitnrun_state *state = space->machine().driver_data(); state->m_scroll = (state->m_scroll & (0xff<<((offset)?0:8))) |( data<<((offset)?8:0)); - tilemap_set_scrollx( state->m_bg, 0, state->m_scroll); + state->m_bg->set_scrollx(0, state->m_scroll); } WRITE8_HANDLER(pitnrun_ha_w) @@ -101,7 +101,7 @@ WRITE8_HANDLER(pitnrun_color_select_w) { pitnrun_state *state = space->machine().driver_data(); state->m_color_select=data; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } static void pitnrun_spotlights(running_machine &machine) @@ -174,7 +174,7 @@ VIDEO_START(pitnrun) pitnrun_state *state = machine.driver_data(); state->m_fg = tilemap_create( machine, get_tile_info1,tilemap_scan_rows,8,8,32,32 ); state->m_bg = tilemap_create( machine, get_tile_info2,tilemap_scan_rows,8,8,32*4,32 ); - tilemap_set_transparent_pen( state->m_fg, 0 ); + state->m_fg->set_transparent_pen(0 ); state->m_tmp_bitmap[0] = auto_bitmap_ind16_alloc(machine,128,128); state->m_tmp_bitmap[1] = auto_bitmap_ind16_alloc(machine,128,128); state->m_tmp_bitmap[2] = auto_bitmap_ind16_alloc(machine,128,128); @@ -247,7 +247,7 @@ SCREEN_UPDATE_IND16( pitnrun ) bitmap.fill(0, cliprect); if(!(state->m_ha&4)) - tilemap_draw(bitmap,cliprect,state->m_bg, 0,0); + state->m_bg->draw(bitmap, cliprect, 0,0); else { dx=128-state->m_h_heed+((state->m_ha&8)<<5)+3; @@ -262,14 +262,14 @@ SCREEN_UPDATE_IND16( pitnrun ) myclip.set(dx, dx+127, dy, dy+127); myclip &= cliprect; - tilemap_draw(bitmap,myclip,state->m_bg, 0,0); + state->m_bg->draw(bitmap, myclip, 0,0); } draw_sprites(screen.machine(),bitmap,myclip); if(state->m_ha&4) copybitmap_trans(bitmap,*state->m_tmp_bitmap[state->m_ha&3],flip_screen_x_get(screen.machine()),flip_screen_y_get(screen.machine()),dx,dy,myclip, 1); - tilemap_draw(bitmap,cliprect,state->m_fg, 0,0); + state->m_fg->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index 9f666fd4f6c..7ffb7882cb0 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -11,7 +11,7 @@ WRITE8_HANDLER( playch10_videoram_w ) if (state->m_pc10_sdcs) { videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } } @@ -145,7 +145,7 @@ SCREEN_UPDATE_IND16( playch10_single ) { /* When the bios is accessing vram, the video circuitry can't access it */ if ( !state->m_pc10_sdcs ) - tilemap_draw(bitmap, top_monitor, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, top_monitor, 0, 0); } return 0; } @@ -179,7 +179,7 @@ SCREEN_UPDATE_IND16( playch10_bottom ) /* When the bios is accessing vram, the video circuitry can't access it */ if ( !state->m_pc10_sdcs ) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(0, cliprect); diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index b4fd37512f2..e2587b6c5c1 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -120,7 +120,7 @@ VIDEO_START( bigtwin ) state->m_tx_tilemap = tilemap_create(machine, bigtwin_get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_fg_tilemap = tilemap_create(machine, bigtwin_get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); + state->m_tx_tilemap->set_transparent_pen(0); state->m_xoffset = 0; state->m_yoffset = 0; @@ -140,10 +140,10 @@ VIDEO_START( bigtwinb ) state->m_fg_tilemap = tilemap_create(machine, hrdtimes_get_fg_tile_info,tilemap_scan_rows, 16, 16, 32, 32); state->m_bg_tilemap = tilemap_create(machine, hrdtimes_get_bg_tile_info,tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg_tilemap, -4, -4); + state->m_bg_tilemap->set_scrolldx(-4, -4); state->m_xoffset = 1; state->m_yoffset = 0; @@ -163,8 +163,8 @@ VIDEO_START( wbeachvl ) state->m_fg_tilemap = tilemap_create(machine, wbeachvl_get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); state->m_bg_tilemap = tilemap_create(machine, wbeachvl_get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_xoffset = 0; state->m_yoffset = 0; @@ -182,7 +182,7 @@ VIDEO_START( excelsr ) state->m_tx_tilemap = tilemap_create(machine, bigtwin_get_tx_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_fg_tilemap = tilemap_create(machine, bigtwin_get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); + state->m_tx_tilemap->set_transparent_pen(0); state->m_xoffset = 0; state->m_yoffset = 0; @@ -201,12 +201,12 @@ VIDEO_START( hotmind ) state->m_fg_tilemap = tilemap_create(machine, hrdtimes_get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_bg_tilemap = tilemap_create(machine, hrdtimes_get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_tx_tilemap, -14, -14); - tilemap_set_scrolldx(state->m_fg_tilemap, -14, -14); - tilemap_set_scrolldx(state->m_bg_tilemap, -14, -14); + state->m_tx_tilemap->set_scrolldx(-14, -14); + state->m_fg_tilemap->set_scrolldx(-14, -14); + state->m_bg_tilemap->set_scrolldx(-14, -14); state->m_xoffset = -9; state->m_yoffset = -8; @@ -225,12 +225,12 @@ VIDEO_START( hrdtimes ) state->m_fg_tilemap = tilemap_create(machine, hrdtimes_get_fg_tile_info,tilemap_scan_rows, 16, 16, 32, 32); state->m_bg_tilemap = tilemap_create(machine, hrdtimes_get_bg_tile_info,tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_tx_tilemap, -14, -14); - tilemap_set_scrolldx(state->m_fg_tilemap, -10, -10); - tilemap_set_scrolldx(state->m_bg_tilemap, -12, -12); + state->m_tx_tilemap->set_scrolldx(-14, -14); + state->m_fg_tilemap->set_scrolldx(-10, -10); + state->m_bg_tilemap->set_scrolldx(-12, -12); state->m_xoffset = -8; state->m_yoffset = -8; @@ -252,7 +252,7 @@ WRITE16_HANDLER( wbeachvl_txvideoram_w ) playmark_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram1[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset / 2); + state->m_tx_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( wbeachvl_fgvideoram_w ) @@ -260,7 +260,7 @@ WRITE16_HANDLER( wbeachvl_fgvideoram_w ) playmark_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram2[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset / 2); + state->m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( wbeachvl_bgvideoram_w ) @@ -268,7 +268,7 @@ WRITE16_HANDLER( wbeachvl_bgvideoram_w ) playmark_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram3[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( hrdtimes_txvideoram_w ) @@ -276,7 +276,7 @@ WRITE16_HANDLER( hrdtimes_txvideoram_w ) playmark_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram1[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( hrdtimes_fgvideoram_w ) @@ -284,7 +284,7 @@ WRITE16_HANDLER( hrdtimes_fgvideoram_w ) playmark_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram2[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( hrdtimes_bgvideoram_w ) @@ -292,7 +292,7 @@ WRITE16_HANDLER( hrdtimes_bgvideoram_w ) playmark_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram3[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -322,15 +322,15 @@ WRITE16_HANDLER( bigtwin_scroll_w ) switch (offset) { - case 0: tilemap_set_scrollx(state->m_tx_tilemap, 0, data + 2); break; - case 1: tilemap_set_scrolly(state->m_tx_tilemap, 0, data); break; + case 0: state->m_tx_tilemap->set_scrollx(0, data + 2); break; + case 1: state->m_tx_tilemap->set_scrolly(0, data); break; case 2: state->m_bgscrollx = -(data + 4); break; case 3: state->m_bgscrolly = (-data) & 0x1ff; state->m_bg_enable = data & 0x0200; state->m_bg_full_size = data & 0x0400; break; - case 4: tilemap_set_scrollx(state->m_fg_tilemap, 0, data + 6); break; - case 5: tilemap_set_scrolly(state->m_fg_tilemap, 0, data); break; + case 4: state->m_fg_tilemap->set_scrollx(0, data + 6); break; + case 5: state->m_fg_tilemap->set_scrolly(0, data); break; } } @@ -342,14 +342,14 @@ WRITE16_HANDLER( wbeachvl_scroll_w ) switch (offset) { - case 0: tilemap_set_scrollx(state->m_tx_tilemap, 0, data + 2); break; - case 1: tilemap_set_scrolly(state->m_tx_tilemap, 0, data); break; + case 0: state->m_tx_tilemap->set_scrollx(0, data + 2); break; + case 1: state->m_tx_tilemap->set_scrolly(0, data); break; case 2: state->m_fgscrollx = data + 4;break; - case 3: tilemap_set_scrolly(state->m_fg_tilemap, 0, data & 0x3ff); + case 3: state->m_fg_tilemap->set_scrolly(0, data & 0x3ff); state->m_fg_rowscroll_enable = data & 0x0800; break; - case 4: tilemap_set_scrollx(state->m_bg_tilemap, 0, data + 6); break; - case 5: tilemap_set_scrolly(state->m_bg_tilemap, 0, data); break; + case 4: state->m_bg_tilemap->set_scrollx(0, data + 6); break; + case 5: state->m_bg_tilemap->set_scrolly(0, data); break; } } @@ -361,15 +361,15 @@ WRITE16_HANDLER( excelsr_scroll_w ) switch (offset) { - case 0: tilemap_set_scrollx(state->m_tx_tilemap, 0, data + 2); break; - case 1: tilemap_set_scrolly(state->m_tx_tilemap, 0, data); break; + case 0: state->m_tx_tilemap->set_scrollx(0, data + 2); break; + case 1: state->m_tx_tilemap->set_scrolly(0, data); break; case 2: state->m_bgscrollx = -data; break; case 3: state->m_bgscrolly = (-data + 2)& 0x1ff; state->m_bg_enable = data & 0x0200; state->m_bg_full_size = data & 0x0400; break; - case 4: tilemap_set_scrollx(state->m_fg_tilemap, 0, data + 6); break; - case 5: tilemap_set_scrolly(state->m_fg_tilemap, 0, data); break; + case 4: state->m_fg_tilemap->set_scrollx(0, data + 6); break; + case 5: state->m_fg_tilemap->set_scrolly(0, data); break; } } @@ -381,12 +381,12 @@ WRITE16_HANDLER( hrdtimes_scroll_w ) switch (offset) { - case 0: tilemap_set_scrollx(state->m_tx_tilemap, 0, data); break; - case 1: tilemap_set_scrolly(state->m_tx_tilemap, 0, data); break; - case 2: tilemap_set_scrollx(state->m_fg_tilemap, 0, data); break; - case 3: tilemap_set_scrolly(state->m_fg_tilemap, 0, data); break; - case 4: tilemap_set_scrollx(state->m_bg_tilemap, 0, data); break; - case 5: tilemap_set_scrolly(state->m_bg_tilemap, 0, data); break; + case 0: state->m_tx_tilemap->set_scrollx(0, data); break; + case 1: state->m_tx_tilemap->set_scrolly(0, data); break; + case 2: state->m_fg_tilemap->set_scrollx(0, data); break; + case 3: state->m_fg_tilemap->set_scrolly(0, data); break; + case 4: state->m_bg_tilemap->set_scrollx(0, data); break; + case 5: state->m_bg_tilemap->set_scrolly(0, data); break; } } @@ -524,11 +524,11 @@ SCREEN_UPDATE_IND16( bigtwin ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_bg_enable) draw_bitmap(screen.machine(), bitmap, cliprect); draw_sprites(screen.machine(), bitmap, cliprect, 4); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -540,10 +540,10 @@ SCREEN_UPDATE_IND16( bigtwinb ) // video enabled if (state->m_scroll[6] & 1) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); bigtwinb_draw_sprites(screen.machine(), bitmap, cliprect, 4); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); } else bitmap.fill(get_black_pen(screen.machine()), cliprect); @@ -556,10 +556,10 @@ SCREEN_UPDATE_IND16( excelsr ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 1); if (state->m_bg_enable) draw_bitmap(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 4); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 4); draw_sprites(screen.machine(), bitmap, cliprect, 2); return 0; } @@ -572,22 +572,22 @@ SCREEN_UPDATE_IND16( wbeachvl ) { int i; - tilemap_set_scroll_rows(state->m_fg_tilemap, 512); + state->m_fg_tilemap->set_scroll_rows(512); for (i = 0; i < 256; i++) - tilemap_set_scrollx(state->m_fg_tilemap, i + 1, state->m_rowscroll[8 * i]); + state->m_fg_tilemap->set_scrollx(i + 1, state->m_rowscroll[8 * i]); } else { - tilemap_set_scroll_rows(state->m_fg_tilemap, 1); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_fgscrollx); + state->m_fg_tilemap->set_scroll_rows(1); + state->m_fg_tilemap->set_scrollx(0, state->m_fgscrollx); } screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -600,10 +600,10 @@ SCREEN_UPDATE_IND16( hrdtimes ) // video enabled if (state->m_scroll[6] & 1) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); draw_sprites(screen.machine(), bitmap, cliprect, 2); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); } else bitmap.fill(get_black_pen(screen.machine()), cliprect); diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c index 1dd74f655a5..f95b66976bd 100644 --- a/src/mame/video/plygonet.c +++ b/src/mame/video/plygonet.c @@ -51,8 +51,8 @@ WRITE32_HANDLER( polygonet_ttl_ram_w ) COMBINE_DATA(&vram[offset]); - tilemap_mark_tile_dirty(state->m_ttl_tilemap, offset*2); - tilemap_mark_tile_dirty(state->m_ttl_tilemap, offset*2+1); + state->m_ttl_tilemap->mark_tile_dirty(offset*2); + state->m_ttl_tilemap->mark_tile_dirty(offset*2+1); } READ32_HANDLER( polygonet_roz_ram_r ) @@ -70,8 +70,8 @@ WRITE32_HANDLER( polygonet_roz_ram_w ) COMBINE_DATA(&vram[offset]); - tilemap_mark_tile_dirty(state->m_roz_tilemap, offset*2); - tilemap_mark_tile_dirty(state->m_roz_tilemap, offset*2+1); + state->m_roz_tilemap->mark_tile_dirty(offset*2); + state->m_roz_tilemap->mark_tile_dirty(offset*2+1); } static TILEMAP_MAPPER( plygonet_scan ) @@ -111,11 +111,11 @@ VIDEO_START( polygonet ) /* create the tilemap */ state->m_ttl_tilemap = tilemap_create(machine, ttl_get_tile_info, plygonet_scan, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_ttl_tilemap, 0); + state->m_ttl_tilemap->set_transparent_pen(0); /* set up the roz t-map too */ state->m_roz_tilemap = tilemap_create(machine, roz_get_tile_info, plygonet_scan_cols, 16, 16, 32, 64); - tilemap_set_transparent_pen(state->m_roz_tilemap, 0); + state->m_roz_tilemap->set_transparent_pen(0); /* save states */ state->save_item(NAME(state->m_ttl_gfx_index)); @@ -132,7 +132,7 @@ SCREEN_UPDATE_IND16( polygonet ) k053936_zoom_draw(k053936, bitmap, cliprect, state->m_roz_tilemap, 0, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_ttl_tilemap, 0, 1<<0); + state->m_ttl_tilemap->draw(bitmap, cliprect, 0, 1<<0); return 0; } diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c index 167d9352059..34c12bd43a3 100644 --- a/src/mame/video/pokechmp.c +++ b/src/mame/video/pokechmp.c @@ -9,7 +9,7 @@ WRITE8_HANDLER( pokechmp_videoram_w ) pokechmp_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( pokechmp_flipscreen_w ) @@ -17,7 +17,7 @@ WRITE8_HANDLER( pokechmp_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x80)) { flip_screen_set(space->machine(), data & 0x80); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -75,7 +75,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( pokechmp ) { pokechmp_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c index 3d537dd1de9..fc6a19efa77 100644 --- a/src/mame/video/polepos.c +++ b/src/mame/video/polepos.c @@ -181,7 +181,7 @@ static TILE_GET_INFO( tx_get_tile_info ) code, color, 0); - tileinfo->group = color; + tileinfo.group = color; } @@ -287,7 +287,7 @@ WRITE16_HANDLER( polepos_view16_w ) polepos_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_view16_memory[offset]); if (offset < 0x400) - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( polepos_view_r ) @@ -301,7 +301,7 @@ WRITE8_HANDLER( polepos_view_w ) polepos_state *state = space->machine().driver_data(); state->m_view16_memory[offset] = (state->m_view16_memory[offset] & 0xff00) | data; if (offset < 0x400) - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( polepos_view16_hscroll_w ) @@ -309,7 +309,7 @@ WRITE16_HANDLER( polepos_view16_hscroll_w ) polepos_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scroll); + state->m_bg_tilemap->set_scrollx(0,state->m_scroll); } WRITE8_HANDLER( polepos_chacl_w ) @@ -318,7 +318,7 @@ WRITE8_HANDLER( polepos_chacl_w ) if (state->m_chacl != (data & 1)) { state->m_chacl = data & 1; - tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); + state->m_tx_tilemap->mark_all_dirty(); } } @@ -339,7 +339,7 @@ WRITE16_HANDLER( polepos_alpha16_w ) { polepos_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_alpha16_memory[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( polepos_alpha_r ) @@ -352,7 +352,7 @@ WRITE8_HANDLER( polepos_alpha_w ) { polepos_state *state = space->machine().driver_data(); state->m_alpha16_memory[offset] = (state->m_alpha16_memory[offset] & 0xff00) | data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } @@ -525,9 +525,9 @@ SCREEN_UPDATE_IND16( polepos ) polepos_state *state = screen.machine().driver_data(); rectangle clip = cliprect; clip.max_y = 127; - tilemap_draw(bitmap,clip,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, clip, 0,0); draw_road(screen.machine(), bitmap); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c index 1dfea721dec..8768db8e1e5 100644 --- a/src/mame/video/poolshrk.c +++ b/src/mame/video/poolshrk.c @@ -23,7 +23,7 @@ VIDEO_START( poolshrk ) state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); } @@ -32,7 +32,7 @@ SCREEN_UPDATE_IND16( poolshrk ) poolshrk_state *state = screen.machine().driver_data(); int i; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); bitmap.fill(0, cliprect); @@ -49,6 +49,6 @@ SCREEN_UPDATE_IND16( poolshrk ) /* draw playfield */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c index fe58e8f11b7..83c4f837bfc 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -132,7 +132,7 @@ WRITE8_HANDLER( pooyan_videoram_w ) { pooyan_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -140,7 +140,7 @@ WRITE8_HANDLER( pooyan_colorram_w ) { pooyan_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -196,7 +196,7 @@ SCREEN_UPDATE_IND16( pooyan ) { pooyan_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index 1e0cc544136..714a3c7a30d 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -172,14 +172,14 @@ WRITE8_HANDLER( popeye_videoram_w ) { popeye_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( popeye_colorram_w ) { popeye_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( popeye_bitmap_w ) @@ -252,7 +252,7 @@ VIDEO_START( skyskipr ) state->m_bitmap_type = TYPE_SKYSKIPR; state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_lastflip = 0; @@ -270,7 +270,7 @@ VIDEO_START( popeye ) state->m_bitmap_type = TYPE_POPEYE; state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_lastflip = 0; @@ -376,6 +376,6 @@ SCREEN_UPDATE_IND16( popeye ) popeye_state *state = screen.machine().driver_data(); draw_background(screen.machine(), bitmap, cliprect); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index 20ab53b0f73..03ad074194b 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -59,8 +59,8 @@ WRITE8_HANDLER( popper_ol_videoram_w ) popper_state *state = space->machine().driver_data(); state->m_ol_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_ol_p123_tilemap, offset); - tilemap_mark_tile_dirty(state->m_ol_p0_tilemap, offset); + state->m_ol_p123_tilemap->mark_tile_dirty(offset); + state->m_ol_p0_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( popper_videoram_w ) @@ -68,8 +68,8 @@ WRITE8_HANDLER( popper_videoram_w ) popper_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_p123_tilemap, offset); - tilemap_mark_tile_dirty(state->m_p0_tilemap, offset); + state->m_p123_tilemap->mark_tile_dirty(offset); + state->m_p0_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( popper_ol_attribram_w ) @@ -77,8 +77,8 @@ WRITE8_HANDLER( popper_ol_attribram_w ) popper_state *state = space->machine().driver_data(); state->m_ol_attribram[offset] = data; - tilemap_mark_tile_dirty(state->m_ol_p123_tilemap, offset); - tilemap_mark_tile_dirty(state->m_ol_p0_tilemap, offset); + state->m_ol_p123_tilemap->mark_tile_dirty(offset); + state->m_ol_p0_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( popper_attribram_w ) @@ -86,8 +86,8 @@ WRITE8_HANDLER( popper_attribram_w ) popper_state *state = space->machine().driver_data(); state->m_attribram[offset] = data; - tilemap_mark_tile_dirty(state->m_p123_tilemap, offset); - tilemap_mark_tile_dirty(state->m_p0_tilemap, offset); + state->m_p123_tilemap->mark_tile_dirty(offset); + state->m_p0_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( popper_flipscreen_w ) @@ -95,7 +95,7 @@ WRITE8_HANDLER( popper_flipscreen_w ) popper_state *state = space->machine().driver_data(); state->m_flipscreen = data; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); if (state->m_flipscreen) state->m_tilemap_clip.min_x = state->m_tilemap_clip.max_x - 15; @@ -116,7 +116,7 @@ WRITE8_HANDLER( popper_gfx_bank_w ) if (state->m_gfx_bank != data) { state->m_gfx_bank = data; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -132,7 +132,7 @@ static TILE_GET_INFO( get_popper_p123_tile_info ) tile_number, (attr & 0xf), 0); - tileinfo->group = (attr & 0x80) >> 7; + tileinfo.group = (attr & 0x80) >> 7; } static TILE_GET_INFO( get_popper_p0_tile_info ) @@ -143,7 +143,7 @@ static TILE_GET_INFO( get_popper_p0_tile_info ) tile_number += state->m_gfx_bank << 8; //pen 0 only in front if colour set as well - tileinfo->group = (attr & 0x70) ? ((attr & 0x80) >> 7) : 0; + tileinfo.group = (attr & 0x70) ? ((attr & 0x80) >> 7) : 0; SET_TILE_INFO( 0, @@ -164,7 +164,7 @@ static TILE_GET_INFO( get_popper_ol_p123_tile_info ) tile_number, (attr & 0xf), 0); - tileinfo->group = (attr & 0x80) >> 7; + tileinfo.group = (attr & 0x80) >> 7; } static TILE_GET_INFO( get_popper_ol_p0_tile_info ) @@ -175,7 +175,7 @@ static TILE_GET_INFO( get_popper_ol_p0_tile_info ) tile_number += state->m_gfx_bank << 8; //pen 0 only in front if colour set as well - tileinfo->group = (attr & 0x70) ? ((attr & 0x80) >> 7) : 0; + tileinfo.group = (attr & 0x70) ? ((attr & 0x80) >> 7) : 0; SET_TILE_INFO( 0, @@ -192,14 +192,14 @@ VIDEO_START( popper ) state->m_ol_p123_tilemap = tilemap_create(machine, get_popper_ol_p123_tile_info, tilemap_scan_cols, 8, 8, 2, 32); state->m_ol_p0_tilemap = tilemap_create(machine, get_popper_ol_p0_tile_info, tilemap_scan_cols, 8, 8, 2, 32); - tilemap_set_transmask(state->m_p123_tilemap, 0, 0x0f, 0x01); - tilemap_set_transmask(state->m_p123_tilemap, 1, 0x01, 0x0f); - tilemap_set_transmask(state->m_p0_tilemap, 0, 0x0f, 0x0e); - tilemap_set_transmask(state->m_p0_tilemap, 1, 0x0e, 0x0f); - tilemap_set_transmask(state->m_ol_p123_tilemap, 0, 0x0f, 0x01); - tilemap_set_transmask(state->m_ol_p123_tilemap, 1, 0x01, 0x0f); - tilemap_set_transmask(state->m_ol_p0_tilemap, 0, 0x0f, 0x0e); - tilemap_set_transmask(state->m_ol_p0_tilemap, 1, 0x0e, 0x0f); + state->m_p123_tilemap->set_transmask(0, 0x0f, 0x01); + state->m_p123_tilemap->set_transmask(1, 0x01, 0x0f); + state->m_p0_tilemap->set_transmask(0, 0x0f, 0x0e); + state->m_p0_tilemap->set_transmask(1, 0x0e, 0x0f); + state->m_ol_p123_tilemap->set_transmask(0, 0x0f, 0x01); + state->m_ol_p123_tilemap->set_transmask(1, 0x01, 0x0f); + state->m_ol_p0_tilemap->set_transmask(0, 0x0f, 0x0e); + state->m_ol_p0_tilemap->set_transmask(1, 0x0e, 0x0f); state->m_tilemap_clip = machine.primary_screen->visible_area(); } @@ -258,16 +258,16 @@ SCREEN_UPDATE_IND16( popper ) //-xxx---- colour for pen 0 (from second prom?) //----xxxx colour for pens 1,2,3 - tilemap_draw(bitmap, cliprect, state->m_p123_tilemap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_p0_tilemap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, finalclip, state->m_ol_p123_tilemap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, finalclip, state->m_ol_p0_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_p123_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_p0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_ol_p123_tilemap->draw(bitmap, finalclip, TILEMAP_DRAW_LAYER1, 0); + state->m_ol_p0_tilemap->draw(bitmap, finalclip, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_p123_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_p0_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, finalclip, state->m_ol_p123_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, finalclip, state->m_ol_p0_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_p123_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_p0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_ol_p123_tilemap->draw(bitmap, finalclip, TILEMAP_DRAW_LAYER0, 0); + state->m_ol_p0_tilemap->draw(bitmap, finalclip, TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c index 5775979f772..23a63892674 100644 --- a/src/mame/video/portrait.c +++ b/src/mame/video/portrait.c @@ -12,18 +12,18 @@ WRITE8_HANDLER( portrait_bgvideo_write ) { portrait_state *state = space->machine().driver_data(); - tilemap_mark_tile_dirty(state->m_background,offset/2); + state->m_background->mark_tile_dirty(offset/2); state->m_bgvideoram[offset] = data; } WRITE8_HANDLER( portrait_fgvideo_write ) { portrait_state *state = space->machine().driver_data(); - tilemap_mark_tile_dirty(state->m_foreground,offset/2); + state->m_foreground->mark_tile_dirty(offset/2); state->m_fgvideoram[offset] = data; } -INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, const UINT8 *source ) +INLINE void get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, const UINT8 *source ) { int attr = source[tile_index*2+0]; int tilenum = source[tile_index*2+1]; @@ -72,7 +72,7 @@ VIDEO_START( portrait ) state->m_background = tilemap_create( machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32 ); state->m_foreground = tilemap_create( machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32 ); - tilemap_set_transparent_pen( state->m_foreground, 7 ); + state->m_foreground->set_transparent_pen(7 ); } @@ -198,15 +198,15 @@ SCREEN_UPDATE_IND16( portrait ) cliprect_no_scroll.min_x = cliprect_no_scroll.max_x - 111; cliprect_scroll.max_x = cliprect_scroll.min_x + 319; - tilemap_set_scrolly(state->m_background, 0, 0); - tilemap_set_scrolly(state->m_foreground, 0, 0); - tilemap_draw(bitmap, cliprect_no_scroll, state->m_background, 0, 0); - tilemap_draw(bitmap, cliprect_no_scroll, state->m_foreground, 0, 0); + state->m_background->set_scrolly(0, 0); + state->m_foreground->set_scrolly(0, 0); + state->m_background->draw(bitmap, cliprect_no_scroll, 0, 0); + state->m_foreground->draw(bitmap, cliprect_no_scroll, 0, 0); - tilemap_set_scrolly(state->m_background, 0, state->m_scroll); - tilemap_set_scrolly(state->m_foreground, 0, state->m_scroll); - tilemap_draw(bitmap, cliprect_scroll, state->m_background, 0, 0); - tilemap_draw(bitmap, cliprect_scroll, state->m_foreground, 0, 0); + state->m_background->set_scrolly(0, state->m_scroll); + state->m_foreground->set_scrolly(0, state->m_scroll); + state->m_background->draw(bitmap, cliprect_scroll, 0, 0); + state->m_foreground->draw(bitmap, cliprect_scroll, 0, 0); draw_sprites(screen.machine(), bitmap,cliprect); return 0; diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index 159dcce2268..d3f0022eb4f 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -61,7 +61,7 @@ WRITE16_HANDLER( powerins_tilebank_w ) if (data != state->m_tile_bank) { state->m_tile_bank = data; // Tiles Bank (VRAM 0) - tilemap_mark_all_tiles_dirty(state->m_tilemap_0); + state->m_tilemap_0->mark_all_dirty(); } } } @@ -134,7 +134,7 @@ WRITE16_HANDLER( powerins_vram_0_w ) { powerins_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_0[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_0, offset); + state->m_tilemap_0->mark_tile_dirty(offset); } static TILEMAP_MAPPER( powerins_get_memory_offset_0 ) @@ -176,7 +176,7 @@ WRITE16_HANDLER( powerins_vram_1_w ) { powerins_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_1[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_1, offset); + state->m_tilemap_1->mark_tile_dirty(offset); } @@ -206,12 +206,12 @@ VIDEO_START( powerins ) 8,8, DIM_NX_1, DIM_NY_1 ); - tilemap_set_scroll_rows(state->m_tilemap_0,1); - tilemap_set_scroll_cols(state->m_tilemap_0,1); + state->m_tilemap_0->set_scroll_rows(1); + state->m_tilemap_0->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_1,1); - tilemap_set_scroll_cols(state->m_tilemap_1,1); - tilemap_set_transparent_pen(state->m_tilemap_1,15); + state->m_tilemap_1->set_scroll_rows(1); + state->m_tilemap_1->set_scroll_cols(1); + state->m_tilemap_1->set_transparent_pen(15); } @@ -348,11 +348,11 @@ SCREEN_UPDATE_IND16( powerins ) int scrollx = (state->m_vctrl_0[2/2]&0xff) + (state->m_vctrl_0[0/2]&0xff)*256; int scrolly = (state->m_vctrl_0[6/2]&0xff) + (state->m_vctrl_0[4/2]&0xff)*256; - tilemap_set_scrollx( state->m_tilemap_0, 0, scrollx - 0x20); - tilemap_set_scrolly( state->m_tilemap_0, 0, scrolly ); + state->m_tilemap_0->set_scrollx(0, scrollx - 0x20); + state->m_tilemap_0->set_scrolly(0, scrolly ); - tilemap_set_scrollx( state->m_tilemap_1, 0, -0x20); // fixed offset - tilemap_set_scrolly( state->m_tilemap_1, 0, 0x00); + state->m_tilemap_1->set_scrollx(0, -0x20); // fixed offset + state->m_tilemap_1->set_scrolly(0, 0x00); #ifdef MAME_DEBUG if (screen.machine().input().code_pressed(KEYCODE_Z)) @@ -367,9 +367,9 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) } #endif - if (layers_ctrl&1) tilemap_draw(bitmap,cliprect, state->m_tilemap_0, 0, 0); + if (layers_ctrl&1) state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); else bitmap.fill(0, cliprect); if (layers_ctrl&8) draw_sprites(screen.machine(),bitmap,cliprect); - if (layers_ctrl&2) tilemap_draw(bitmap,cliprect, state->m_tilemap_1, 0, 0); + if (layers_ctrl&2) state->m_tilemap_1->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index 0ca669a57f6..38c90d73068 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -15,7 +15,7 @@ WRITE16_HANDLER( prehisle_bg_videoram16_w ) prehisle_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_videoram16[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( prehisle_fg_videoram16_w ) @@ -23,7 +23,7 @@ WRITE16_HANDLER( prehisle_fg_videoram16_w ) prehisle_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } READ16_HANDLER( prehisle_control16_r ) @@ -50,10 +50,10 @@ WRITE16_HANDLER( prehisle_control16_w ) switch (offset) { - case 0x00: tilemap_set_scrolly(state->m_bg_tilemap, 0, scroll); break; - case 0x08: tilemap_set_scrollx(state->m_bg_tilemap, 0, scroll); break; - case 0x10: tilemap_set_scrolly(state->m_bg2_tilemap, 0, scroll); break; - case 0x18: tilemap_set_scrollx(state->m_bg2_tilemap, 0, scroll); break; + case 0x00: state->m_bg_tilemap->set_scrolly(0, scroll); break; + case 0x08: state->m_bg_tilemap->set_scrollx(0, scroll); break; + case 0x10: state->m_bg2_tilemap->set_scrolly(0, scroll); break; + case 0x18: state->m_bg2_tilemap->set_scrollx(0, scroll); break; case 0x23: state->m_invert_controls = data ? 0x00ff : 0x0000; break; case 0x28: coin_counter_w(space->machine(), 0, data & 1); break; case 0x29: coin_counter_w(space->machine(), 1, data & 1); break; @@ -108,8 +108,8 @@ VIDEO_START( prehisle ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); + state->m_bg_tilemap->set_transparent_pen(15); + state->m_fg_tilemap->set_transparent_pen(15); /* register for saving */ state->save_item(NAME(state->m_invert_controls)); @@ -168,10 +168,10 @@ SCREEN_UPDATE_IND16( prehisle ) { prehisle_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index f2de0755494..e9df3b6fed3 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -101,18 +101,18 @@ WRITE32_HANDLER( psikyo_vram_0_w ) COMBINE_DATA(&state->m_vram_0[offset]); if (ACCESSING_BITS_16_31) { - tilemap_mark_tile_dirty(state->m_tilemap_0_size0, offset * 2); - tilemap_mark_tile_dirty(state->m_tilemap_0_size1, offset * 2); - tilemap_mark_tile_dirty(state->m_tilemap_0_size2, offset * 2); - tilemap_mark_tile_dirty(state->m_tilemap_0_size3, offset * 2); + state->m_tilemap_0_size0->mark_tile_dirty(offset * 2); + state->m_tilemap_0_size1->mark_tile_dirty(offset * 2); + state->m_tilemap_0_size2->mark_tile_dirty(offset * 2); + state->m_tilemap_0_size3->mark_tile_dirty(offset * 2); } if (ACCESSING_BITS_0_15) { - tilemap_mark_tile_dirty(state->m_tilemap_0_size0, offset * 2 + 1); - tilemap_mark_tile_dirty(state->m_tilemap_0_size1, offset * 2 + 1); - tilemap_mark_tile_dirty(state->m_tilemap_0_size2, offset * 2 + 1); - tilemap_mark_tile_dirty(state->m_tilemap_0_size3, offset * 2 + 1); + state->m_tilemap_0_size0->mark_tile_dirty(offset * 2 + 1); + state->m_tilemap_0_size1->mark_tile_dirty(offset * 2 + 1); + state->m_tilemap_0_size2->mark_tile_dirty(offset * 2 + 1); + state->m_tilemap_0_size3->mark_tile_dirty(offset * 2 + 1); } } @@ -123,18 +123,18 @@ WRITE32_HANDLER( psikyo_vram_1_w ) COMBINE_DATA(&state->m_vram_1[offset]); if (ACCESSING_BITS_16_31) { - tilemap_mark_tile_dirty(state->m_tilemap_1_size0, offset * 2); - tilemap_mark_tile_dirty(state->m_tilemap_1_size1, offset * 2); - tilemap_mark_tile_dirty(state->m_tilemap_1_size2, offset * 2); - tilemap_mark_tile_dirty(state->m_tilemap_1_size3, offset * 2); + state->m_tilemap_1_size0->mark_tile_dirty(offset * 2); + state->m_tilemap_1_size1->mark_tile_dirty(offset * 2); + state->m_tilemap_1_size2->mark_tile_dirty(offset * 2); + state->m_tilemap_1_size3->mark_tile_dirty(offset * 2); } if (ACCESSING_BITS_0_15) { - tilemap_mark_tile_dirty(state->m_tilemap_1_size0, offset * 2 + 1); - tilemap_mark_tile_dirty(state->m_tilemap_1_size1, offset * 2 + 1); - tilemap_mark_tile_dirty(state->m_tilemap_1_size2, offset * 2 + 1); - tilemap_mark_tile_dirty(state->m_tilemap_1_size3, offset * 2 + 1); + state->m_tilemap_1_size0->mark_tile_dirty(offset * 2 + 1); + state->m_tilemap_1_size1->mark_tile_dirty(offset * 2 + 1); + state->m_tilemap_1_size2->mark_tile_dirty(offset * 2 + 1); + state->m_tilemap_1_size3->mark_tile_dirty(offset * 2 + 1); } } @@ -145,18 +145,18 @@ void psikyo_switch_banks( running_machine &machine, int tmap, int bank ) if ((tmap == 0) && (bank != state->m_tilemap_0_bank)) { state->m_tilemap_0_bank = bank; - tilemap_mark_all_tiles_dirty(state->m_tilemap_0_size0); - tilemap_mark_all_tiles_dirty(state->m_tilemap_0_size1); - tilemap_mark_all_tiles_dirty(state->m_tilemap_0_size2); - tilemap_mark_all_tiles_dirty(state->m_tilemap_0_size3); + state->m_tilemap_0_size0->mark_all_dirty(); + state->m_tilemap_0_size1->mark_all_dirty(); + state->m_tilemap_0_size2->mark_all_dirty(); + state->m_tilemap_0_size3->mark_all_dirty(); } else if ((tmap == 1) && (bank != state->m_tilemap_1_bank)) { state->m_tilemap_1_bank = bank; - tilemap_mark_all_tiles_dirty(state->m_tilemap_1_size0); - tilemap_mark_all_tiles_dirty(state->m_tilemap_1_size1); - tilemap_mark_all_tiles_dirty(state->m_tilemap_1_size2); - tilemap_mark_all_tiles_dirty(state->m_tilemap_1_size3); + state->m_tilemap_1_size0->mark_all_dirty(); + state->m_tilemap_1_size1->mark_all_dirty(); + state->m_tilemap_1_size2->mark_all_dirty(); + state->m_tilemap_1_size3->mark_all_dirty(); } } @@ -181,29 +181,29 @@ VIDEO_START( psikyo ) state->m_spritebuf1 = auto_alloc_array(machine, UINT32, 0x2000 / 4); state->m_spritebuf2 = auto_alloc_array(machine, UINT32, 0x2000 / 4); - tilemap_set_scroll_rows(state->m_tilemap_0_size0, 0x80 * 16); // line scrolling - tilemap_set_scroll_cols(state->m_tilemap_0_size0, 1); + state->m_tilemap_0_size0->set_scroll_rows(0x80 * 16); // line scrolling + state->m_tilemap_0_size0->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_0_size1, 0x40 * 16); // line scrolling - tilemap_set_scroll_cols(state->m_tilemap_0_size1, 1); + state->m_tilemap_0_size1->set_scroll_rows(0x40 * 16); // line scrolling + state->m_tilemap_0_size1->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_0_size2, 0x20 * 16); // line scrolling - tilemap_set_scroll_cols(state->m_tilemap_0_size2, 1); + state->m_tilemap_0_size2->set_scroll_rows(0x20 * 16); // line scrolling + state->m_tilemap_0_size2->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_0_size3, 0x10 * 16); // line scrolling - tilemap_set_scroll_cols(state->m_tilemap_0_size3, 1); + state->m_tilemap_0_size3->set_scroll_rows(0x10 * 16); // line scrolling + state->m_tilemap_0_size3->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_1_size0, 0x80 * 16); // line scrolling - tilemap_set_scroll_cols(state->m_tilemap_1_size0, 1); + state->m_tilemap_1_size0->set_scroll_rows(0x80 * 16); // line scrolling + state->m_tilemap_1_size0->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_1_size1, 0x40 * 16); // line scrolling - tilemap_set_scroll_cols(state->m_tilemap_1_size1, 1); + state->m_tilemap_1_size1->set_scroll_rows(0x40 * 16); // line scrolling + state->m_tilemap_1_size1->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_1_size2, 0x20 * 16); // line scrolling - tilemap_set_scroll_cols(state->m_tilemap_1_size2, 1); + state->m_tilemap_1_size2->set_scroll_rows(0x20 * 16); // line scrolling + state->m_tilemap_1_size2->set_scroll_cols(1); - tilemap_set_scroll_rows(state->m_tilemap_1_size3, 0x10 * 16); // line scrolling - tilemap_set_scroll_cols(state->m_tilemap_1_size3, 1); + state->m_tilemap_1_size3->set_scroll_rows(0x10 * 16); // line scrolling + state->m_tilemap_1_size3->set_scroll_cols(1); state->save_pointer(NAME(state->m_spritebuf1), 0x2000 / 4); state->save_pointer(NAME(state->m_spritebuf2), 0x2000 / 4); @@ -612,8 +612,8 @@ SCREEN_UPDATE_IND16( psikyo ) else tmptilemap1 = state->m_tilemap_1_size3; - tilemap_set_enable(tmptilemap0, ~layer0_ctrl & 1); - tilemap_set_enable(tmptilemap1, ~layer1_ctrl & 1); + tmptilemap0->enable(~layer0_ctrl & 1); + tmptilemap1->enable(~layer1_ctrl & 1); /* Layers scrolling */ @@ -622,9 +622,9 @@ SCREEN_UPDATE_IND16( psikyo ) layer1_scrolly = state->m_vregs[0x40a / 4]; layer1_scrollx = state->m_vregs[0x40e / 4]; - tilemap_set_scrolly(tmptilemap0, 0, layer0_scrolly); + tmptilemap0->set_scrolly(0, layer0_scrolly); - tilemap_set_scrolly(tmptilemap1, 0, layer1_scrolly); + tmptilemap1->set_scrolly(0, layer1_scrolly); for (i = 0; i < 256; i++) /* 256 screen lines */ { @@ -641,8 +641,8 @@ SCREEN_UPDATE_IND16( psikyo ) x0 = ((UINT16 *)state->m_vregs)[BYTE_XOR_BE(0x000/2 + i)]; } - tilemap_set_scrollx( - tmptilemap0, + + tmptilemap0->set_scrollx( (i + layer0_scrolly) % tilemap_width(tm0size), layer0_scrollx + x0 ); @@ -658,31 +658,31 @@ SCREEN_UPDATE_IND16( psikyo ) x1 = ((UINT16 *)state->m_vregs)[BYTE_XOR_BE(0x200/2 + i)]; } - tilemap_set_scrollx( - tmptilemap1, + + tmptilemap1->set_scrollx( (i + layer1_scrolly) % tilemap_width(tm1size), layer1_scrollx + x1 ); } - tilemap_set_transparent_pen(state->m_tilemap_0_size0, (layer0_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_0_size1, (layer0_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_0_size2, (layer0_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_0_size3, (layer0_ctrl & 8 ? 0 : 15)); + state->m_tilemap_0_size0->set_transparent_pen((layer0_ctrl & 8 ? 0 : 15)); + state->m_tilemap_0_size1->set_transparent_pen((layer0_ctrl & 8 ? 0 : 15)); + state->m_tilemap_0_size2->set_transparent_pen((layer0_ctrl & 8 ? 0 : 15)); + state->m_tilemap_0_size3->set_transparent_pen((layer0_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_1_size0, (layer1_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_1_size1, (layer1_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_1_size2, (layer1_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_1_size3, (layer1_ctrl & 8 ? 0 : 15)); + state->m_tilemap_1_size0->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15)); + state->m_tilemap_1_size1->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15)); + state->m_tilemap_1_size2->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15)); + state->m_tilemap_1_size3->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15)); bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); if (layers_ctrl & 1) - tilemap_draw(bitmap, cliprect, tmptilemap0, layer0_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 1); + tmptilemap0->draw(bitmap, cliprect, layer0_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 1); if (layers_ctrl & 2) - tilemap_draw(bitmap, cliprect, tmptilemap1, layer1_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 2); + tmptilemap1->draw(bitmap, cliprect, layer1_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 2); if (layers_ctrl & 4) draw_sprites(screen.machine(), bitmap, cliprect, (spr_ctrl & 4 ? 0 : 15)); @@ -786,8 +786,8 @@ SCREEN_UPDATE_IND16( psikyo_bootleg ) else tmptilemap1 = state->m_tilemap_1_size3; - tilemap_set_enable(tmptilemap0, ~layer0_ctrl & 1); - tilemap_set_enable(tmptilemap1, ~layer1_ctrl & 1); + tmptilemap0->enable(~layer0_ctrl & 1); + tmptilemap1->enable(~layer1_ctrl & 1); /* Layers scrolling */ @@ -796,9 +796,9 @@ SCREEN_UPDATE_IND16( psikyo_bootleg ) layer1_scrolly = state->m_vregs[0x40a / 4]; layer1_scrollx = state->m_vregs[0x40e / 4]; - tilemap_set_scrolly(tmptilemap0, 0, layer0_scrolly); + tmptilemap0->set_scrolly(0, layer0_scrolly); - tilemap_set_scrolly(tmptilemap1, 0, layer1_scrolly); + tmptilemap1->set_scrolly(0, layer1_scrolly); for (i = 0; i < 256; i++) /* 256 screen lines */ { @@ -815,8 +815,8 @@ SCREEN_UPDATE_IND16( psikyo_bootleg ) x0 = ((UINT16 *)state->m_vregs)[BYTE_XOR_BE(0x000/2 + i)]; } - tilemap_set_scrollx( - tmptilemap0, + + tmptilemap0->set_scrollx( (i + layer0_scrolly) % tilemap_width(tm0size), layer0_scrollx + x0 ); @@ -832,31 +832,31 @@ SCREEN_UPDATE_IND16( psikyo_bootleg ) x1 = ((UINT16 *)state->m_vregs)[BYTE_XOR_BE(0x200/2 + i)]; } - tilemap_set_scrollx( - tmptilemap1, + + tmptilemap1->set_scrollx( (i + layer1_scrolly) % tilemap_width(tm1size), layer1_scrollx + x1 ); } - tilemap_set_transparent_pen(state->m_tilemap_0_size0, (layer0_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_0_size1, (layer0_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_0_size2, (layer0_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_0_size3, (layer0_ctrl & 8 ? 0 : 15)); + state->m_tilemap_0_size0->set_transparent_pen((layer0_ctrl & 8 ? 0 : 15)); + state->m_tilemap_0_size1->set_transparent_pen((layer0_ctrl & 8 ? 0 : 15)); + state->m_tilemap_0_size2->set_transparent_pen((layer0_ctrl & 8 ? 0 : 15)); + state->m_tilemap_0_size3->set_transparent_pen((layer0_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_1_size0, (layer1_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_1_size1, (layer1_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_1_size2, (layer1_ctrl & 8 ? 0 : 15)); - tilemap_set_transparent_pen(state->m_tilemap_1_size3, (layer1_ctrl & 8 ? 0 : 15)); + state->m_tilemap_1_size0->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15)); + state->m_tilemap_1_size1->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15)); + state->m_tilemap_1_size2->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15)); + state->m_tilemap_1_size3->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15)); bitmap.fill(get_black_pen(screen.machine()), cliprect); screen.machine().priority_bitmap.fill(0, cliprect); if (layers_ctrl & 1) - tilemap_draw(bitmap, cliprect, tmptilemap0, layer0_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 1); + tmptilemap0->draw(bitmap, cliprect, layer0_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 1); if (layers_ctrl & 2) - tilemap_draw(bitmap, cliprect, tmptilemap1, layer1_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 2); + tmptilemap1->draw(bitmap, cliprect, layer1_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 2); if (layers_ctrl & 4) draw_sprites_bootleg(screen.machine(), bitmap, cliprect, (spr_ctrl & 4 ? 0 : 15)); diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c index c4d8999a0b9..bf51c422b29 100644 --- a/src/mame/video/psychic5.c +++ b/src/mame/video/psychic5.c @@ -133,19 +133,19 @@ WRITE8_HANDLER( psychic5_paged_ram_w ) if (state->m_ps5_vram_page == 0) { if (offset <= 0xfff) - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } else { if (offset == BG_SCROLLX_LSB || offset == BG_SCROLLX_MSB) { UINT16 bg_scrollx = state->m_ps5_io_ram[BG_SCROLLX_LSB] | (state->m_ps5_io_ram[BG_SCROLLX_MSB] << 8); - tilemap_set_scrollx(state->m_bg_tilemap, 0, bg_scrollx); + state->m_bg_tilemap->set_scrollx(0, bg_scrollx); } else if (offset == BG_SCROLLY_LSB || offset == BG_SCROLLY_MSB) { UINT16 bg_scrolly = state->m_ps5_io_ram[BG_SCROLLY_LSB] | (state->m_ps5_io_ram[BG_SCROLLY_MSB] << 8); - tilemap_set_scrolly(state->m_bg_tilemap, 0, bg_scrolly); + state->m_bg_tilemap->set_scrolly(0, bg_scrolly); } else if (offset == BG_SCREEN_MODE) { @@ -158,7 +158,7 @@ WRITE8_HANDLER( psychic5_paged_ram_w ) else if (offset >= 0xa00 && offset <= 0xbff) /* Text color */ psychic5_change_palette(space->machine(),((offset >> 1) & 0xff)+0x200,offset-0x400); else if (offset >= 0x1000) - tilemap_mark_tile_dirty(state->m_fg_tilemap, (offset-0x1000) >> 1); + state->m_fg_tilemap->mark_tile_dirty((offset-0x1000) >> 1); } } @@ -169,26 +169,26 @@ WRITE8_HANDLER( bombsa_paged_ram_w ) if (state->m_ps5_vram_page == 0) { - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } else { if (offset == BG_SCROLLX_LSB || offset == BG_SCROLLX_MSB) { UINT16 bg_scrollx = state->m_ps5_io_ram[BG_SCROLLX_LSB] | (state->m_ps5_io_ram[BG_SCROLLX_MSB] << 8); - tilemap_set_scrollx(state->m_bg_tilemap, 0, bg_scrollx); + state->m_bg_tilemap->set_scrollx(0, bg_scrollx); } else if (offset == BG_SCROLLY_LSB || offset == BG_SCROLLY_MSB) { UINT16 bg_scrolly = state->m_ps5_io_ram[BG_SCROLLY_LSB] | (state->m_ps5_io_ram[BG_SCROLLY_MSB] << 8); - tilemap_set_scrolly(state->m_bg_tilemap, 0, bg_scrolly); + state->m_bg_tilemap->set_scrolly(0, bg_scrolly); } else if (offset == BG_SCREEN_MODE) { state->m_bg_status = state->m_ps5_io_ram[BG_SCREEN_MODE]; } else if (offset >= 0x0800 && offset <= 0x0fff) - tilemap_mark_tile_dirty(state->m_fg_tilemap, (offset & 0x7ff) >> 1); + state->m_fg_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); else if (offset >= 0x1000 && offset <= 0x15ff) psychic5_change_palette(space->machine(), (offset >> 1) & 0x3ff, offset-0x1000); } @@ -241,7 +241,7 @@ VIDEO_START( psychic5 ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 64, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); state->m_ps5_pagedram[0] = auto_alloc_array(machine, UINT8, 0x2000); state->m_ps5_pagedram[1] = auto_alloc_array(machine, UINT8, 0x2000); @@ -265,7 +265,7 @@ VIDEO_START( bombsa ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 128, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); + state->m_fg_tilemap->set_transparent_pen(15); state->m_ps5_pagedram[0] = auto_alloc_array(machine, UINT8, 0x2000); state->m_ps5_pagedram[1] = auto_alloc_array(machine, UINT8, 0x2000); @@ -419,7 +419,7 @@ static void draw_background(running_machine &machine, bitmap_rgb32 &bitmap, cons clip.set(255 - clip.max_x, 255 - clip.min_x, 255 - clip.max_y, 255 - clip.min_y); } - tilemap_draw(bitmap, clip, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, clip, 0, 0); } SCREEN_UPDATE_RGB32( psychic5 ) @@ -430,7 +430,7 @@ SCREEN_UPDATE_RGB32( psychic5 ) draw_background(screen.machine(), bitmap, cliprect); if (!(state->m_title_screen & 1)) draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -438,10 +438,10 @@ SCREEN_UPDATE_RGB32( bombsa ) { psychic5_state *state = screen.machine().driver_data(); if (state->m_bg_status & 1) /* Backgound enable */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(screen.machine().pens[0x0ff], cliprect); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index 2c19c9a6ea3..426e6e68749 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -135,15 +135,15 @@ VIDEO_START( punchout ) punchout_state *state = machine.driver_data(); state->m_bg_top_tilemap = tilemap_create(machine, top_get_info, tilemap_scan_rows, 8,8, 32,32); state->m_bg_bot_tilemap = tilemap_create(machine, bot_get_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_scroll_rows(state->m_bg_bot_tilemap, 32); + state->m_bg_bot_tilemap->set_scroll_rows(32); state->m_spr1_tilemap = tilemap_create(machine, bs1_get_info, tilemap_scan_rows, 8,8, 16,32); state->m_spr2_tilemap = tilemap_create(machine, bs2_get_info, tilemap_scan_rows, 8,8, 16,32); state->m_fg_tilemap = NULL; - tilemap_set_transparent_pen(state->m_spr1_tilemap, 0x07); - tilemap_set_transparent_pen(state->m_spr2_tilemap, 0x03); + state->m_spr1_tilemap->set_transparent_pen(0x07); + state->m_spr2_tilemap->set_transparent_pen(0x03); } @@ -158,10 +158,10 @@ VIDEO_START( armwrest ) state->m_spr2_tilemap = tilemap_create(machine, bs2_get_info, tilemap_scan_rows, 8,8, 16,32); state->m_fg_tilemap = tilemap_create(machine, armwrest_fg_get_info, tilemap_scan_rows, 8,8, 32,32); - tilemap_set_transparent_pen(state->m_spr1_tilemap, 0x07); - tilemap_set_transparent_pen(state->m_spr1_tilemap_flipx, 0x07); - tilemap_set_transparent_pen(state->m_spr2_tilemap, 0x03); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0x07); + state->m_spr1_tilemap->set_transparent_pen(0x07); + state->m_spr1_tilemap_flipx->set_transparent_pen(0x07); + state->m_spr2_tilemap->set_transparent_pen(0x03); + state->m_fg_tilemap->set_transparent_pen(0x07); } @@ -170,37 +170,37 @@ WRITE8_HANDLER( punchout_bg_top_videoram_w ) { punchout_state *state = space->machine().driver_data(); state->m_bg_top_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_top_tilemap, offset/2); + state->m_bg_top_tilemap->mark_tile_dirty(offset/2); } WRITE8_HANDLER( punchout_bg_bot_videoram_w ) { punchout_state *state = space->machine().driver_data(); state->m_bg_bot_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_bot_tilemap, offset/2); + state->m_bg_bot_tilemap->mark_tile_dirty(offset/2); } WRITE8_HANDLER( armwrest_fg_videoram_w ) { punchout_state *state = space->machine().driver_data(); state->m_armwrest_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset/2); + state->m_fg_tilemap->mark_tile_dirty(offset/2); } WRITE8_HANDLER( punchout_spr1_videoram_w ) { punchout_state *state = space->machine().driver_data(); state->m_spr1_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_spr1_tilemap, offset/4); + state->m_spr1_tilemap->mark_tile_dirty(offset/4); if (state->m_spr1_tilemap_flipx) - tilemap_mark_tile_dirty(state->m_spr1_tilemap_flipx, offset/4); + state->m_spr1_tilemap_flipx->mark_tile_dirty(offset/4); } WRITE8_HANDLER( punchout_spr2_videoram_w ) { punchout_state *state = space->machine().driver_data(); state->m_spr2_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_spr2_tilemap, offset/4); + state->m_spr2_tilemap->mark_tile_dirty(offset/4); } @@ -238,9 +238,9 @@ static void draw_big_sprite(running_machine &machine, bitmap_ind16 &bitmap, cons incxx = -incxx; } - tilemap_set_palette_offset(state->m_spr1_tilemap, 0x100 * palette); + state->m_spr1_tilemap->set_palette_offset(0x100 * palette); - tilemap_draw_roz(bitmap,cliprect,state->m_spr1_tilemap, + state->m_spr1_tilemap->draw_roz(bitmap, cliprect, startx,starty + 0x200*(2) * zoom, incxx,0,0,incyy, /* zoom, no rotation */ 0, /* no wraparound */ @@ -286,9 +286,9 @@ static void armwrest_draw_big_sprite(running_machine &machine, bitmap_ind16 &bit else _tilemap = state->m_spr1_tilemap; - tilemap_set_palette_offset(_tilemap, 0x100 * palette); + _tilemap->set_palette_offset(0x100 * palette); - tilemap_draw_roz(bitmap,cliprect,_tilemap, + _tilemap->draw_roz(bitmap, cliprect, startx,starty + 0x200*(2) * zoom, incxx,0,0,incyy, /* zoom, no rotation */ 0, /* no wraparound */ @@ -321,7 +321,7 @@ static void drawbs2(running_machine &machine, bitmap_ind16 &bitmap, const rectan incxx = 1; // this tilemap doesn't actually zoom, but draw_roz is the only way to draw it without wraparound - tilemap_draw_roz(bitmap,cliprect,state->m_spr2_tilemap, + state->m_spr2_tilemap->draw_roz(bitmap, cliprect, sx, sy, incxx << 16, 0, 0, 1 << 16, 0, 0, 0); } @@ -375,7 +375,7 @@ SCREEN_UPDATE_IND16( punchout_top ) punchout_copy_top_palette(screen.machine(), BIT(*state->m_palettebank,1)); - tilemap_draw(bitmap, cliprect, state->m_bg_top_tilemap, 0, 0); + state->m_bg_top_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_spr1_ctrlram[7] & 1) /* display in top monitor */ draw_big_sprite(screen.machine(), bitmap, cliprect, 0); @@ -392,9 +392,9 @@ SCREEN_UPDATE_IND16( punchout_bottom ) /* copy the character mapped graphics */ for (offs = 0;offs < 32;offs++) - tilemap_set_scrollx(state->m_bg_bot_tilemap, offs, 58 + state->m_bg_bot_videoram[2*offs] + 256 * (state->m_bg_bot_videoram[2*offs + 1] & 0x01)); + state->m_bg_bot_tilemap->set_scrollx(offs, 58 + state->m_bg_bot_videoram[2*offs] + 256 * (state->m_bg_bot_videoram[2*offs + 1] & 0x01)); - tilemap_draw(bitmap, cliprect, state->m_bg_bot_tilemap, 0, 0); + state->m_bg_bot_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_spr1_ctrlram[7] & 2) /* display in bottom monitor */ draw_big_sprite(screen.machine(), bitmap, cliprect, 1); @@ -410,7 +410,7 @@ SCREEN_UPDATE_IND16( armwrest_top ) punchout_copy_top_palette(screen.machine(), BIT(*state->m_palettebank,1)); - tilemap_draw(bitmap, cliprect, state->m_bg_top_tilemap, 0, 0); + state->m_bg_top_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_spr1_ctrlram[7] & 1) /* display in top monitor */ armwrest_draw_big_sprite(screen.machine(), bitmap, cliprect, 0); @@ -424,13 +424,13 @@ SCREEN_UPDATE_IND16( armwrest_bottom ) punchout_copy_bot_palette(screen.machine(), BIT(*state->m_palettebank,0)); - tilemap_draw(bitmap, cliprect, state->m_bg_bot_tilemap, 0, 0); + state->m_bg_bot_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_spr1_ctrlram[7] & 2) /* display in bottom monitor */ armwrest_draw_big_sprite(screen.machine(), bitmap, cliprect, 1); drawbs2(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index c937fb778cf..612a2fea317 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -53,7 +53,7 @@ VIDEO_START( pushman ) state->m_bg_tilemap = tilemap_create(machine, get_back_tile_info, background_scan_rows, 32, 32, 128, 64); state->m_tx_tilemap = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 3); + state->m_tx_tilemap->set_transparent_pen(3); } @@ -74,7 +74,7 @@ WRITE16_HANDLER( pushman_videoram_w ) { pushman_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } @@ -125,11 +125,11 @@ SCREEN_UPDATE_IND16( pushman ) pushman_state *state = screen.machine().driver_data(); /* Setup the tilemaps */ - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_control[0]); - tilemap_set_scrolly(state->m_bg_tilemap, 0, 0xf00 - state->m_control[1]); + state->m_bg_tilemap->set_scrollx(0, state->m_control[0]); + state->m_bg_tilemap->set_scrolly(0, 0xf00 - state->m_control[1]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index f39f2ea9c2c..1e74d2a3109 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -60,7 +60,7 @@ VIDEO_START( quizdna ) state->m_bg_tilemap = tilemap_create( machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32 ); state->m_fg_tilemap = tilemap_create( machine, get_fg_tile_info,tilemap_scan_rows,16,8,32,32 ); - tilemap_set_transparent_pen( state->m_fg_tilemap,0 ); + state->m_fg_tilemap->set_transparent_pen(0 ); } WRITE8_HANDLER( quizdna_bg_ram_w ) @@ -70,7 +70,7 @@ WRITE8_HANDLER( quizdna_bg_ram_w ) state->m_bg_ram[offset] = data; RAM[0x12000+offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, (offset & 0xfff) / 2 ); + state->m_bg_tilemap->mark_tile_dirty((offset & 0xfff) / 2 ); } WRITE8_HANDLER( quizdna_fg_ram_w ) @@ -85,13 +85,13 @@ WRITE8_HANDLER( quizdna_fg_ram_w ) state->m_fg_ram[offs] = data; for (i=0; i<32; i++) - tilemap_mark_tile_dirty(state->m_fg_tilemap, ((offs/2) & 0x1f) + i*0x20 ); + state->m_fg_tilemap->mark_tile_dirty(((offs/2) & 0x1f) + i*0x20 ); } WRITE8_HANDLER( quizdna_bg_yscroll_w ) { quizdna_state *state = space->machine().driver_data(); - tilemap_set_scrolldy( state->m_bg_tilemap, 255-data, 255-data+1 ); + state->m_bg_tilemap->set_scrolldy(255-data, 255-data+1 ); } WRITE8_HANDLER( quizdna_bg_xscroll_w ) @@ -101,7 +101,7 @@ WRITE8_HANDLER( quizdna_bg_xscroll_w ) state->m_bg_xscroll[offset] = data; x = ~(state->m_bg_xscroll[0] + state->m_bg_xscroll[1]*0x100) & 0x1ff; - tilemap_set_scrolldx( state->m_bg_tilemap, x+64, x-64+10 ); + state->m_bg_tilemap->set_scrolldx(x+64, x-64+10 ); } WRITE8_HANDLER( quizdna_screen_ctrl_w ) @@ -118,7 +118,7 @@ WRITE8_HANDLER( quizdna_screen_ctrl_w ) state->m_flipscreen = tmp; flip_screen_set(space->machine(), tmp); - tilemap_set_scrolldx( state->m_fg_tilemap, 64, -64 +16); + state->m_fg_tilemap->set_scrolldx(64, -64 +16); } WRITE8_HANDLER( paletteram_xBGR_RRRR_GGGG_BBBB_w ) @@ -197,9 +197,9 @@ SCREEN_UPDATE_IND16( quizdna ) quizdna_state *state = screen.machine().driver_data(); if (state->m_video_enable) { - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); } else bitmap.fill(get_black_pen(screen.machine()), cliprect); diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c index f248a221f0a..6978832caf2 100644 --- a/src/mame/video/quizpani.c +++ b/src/mame/video/quizpani.c @@ -42,14 +42,14 @@ WRITE16_HANDLER( quizpani_bg_videoram_w ) { quizpani_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( quizpani_txt_videoram_w ) { quizpani_state *state = space->machine().driver_data(); state->m_txt_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_txt_tilemap, offset); + state->m_txt_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( quizpani_tilesbank_w ) @@ -60,13 +60,13 @@ WRITE16_HANDLER( quizpani_tilesbank_w ) if(state->m_txtbank != (data & 0x30)>>4) { state->m_txtbank = (data & 0x30)>>4; - tilemap_mark_all_tiles_dirty(state->m_txt_tilemap); + state->m_txt_tilemap->mark_all_dirty(); } if(state->m_bgbank != (data & 3)) { state->m_bgbank = data & 3; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } } @@ -76,18 +76,18 @@ VIDEO_START( quizpani ) quizpani_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, bg_tile_info, bg_scan,16,16,256,32); state->m_txt_tilemap = tilemap_create(machine, txt_tile_info,bg_scan,16,16,256,32); - tilemap_set_transparent_pen(state->m_txt_tilemap,15); + state->m_txt_tilemap->set_transparent_pen(15); } SCREEN_UPDATE_IND16( quizpani ) { quizpani_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollreg[0] - 64); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrollreg[1] + 16); - tilemap_set_scrollx(state->m_txt_tilemap, 0, state->m_scrollreg[2] - 64); - tilemap_set_scrolly(state->m_txt_tilemap, 0, state->m_scrollreg[3] + 16); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollreg[0] - 64); + state->m_bg_tilemap->set_scrolly(0, state->m_scrollreg[1] + 16); + state->m_txt_tilemap->set_scrollx(0, state->m_scrollreg[2] - 64); + state->m_txt_tilemap->set_scrolly(0, state->m_scrollreg[3] + 16); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_txt_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_txt_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index ecb34d49c31..b0a7085afdd 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -8,14 +8,14 @@ WRITE16_HANDLER( raiden_background_w ) { raiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_back_data[offset]); - tilemap_mark_tile_dirty(state->m_bg_layer, offset); + state->m_bg_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( raiden_foreground_w ) { raiden_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fore_data[offset]); - tilemap_mark_tile_dirty(state->m_fg_layer, offset); + state->m_fg_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( raiden_text_w ) @@ -23,7 +23,7 @@ WRITE16_HANDLER( raiden_text_w ) raiden_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_layer, offset); + state->m_tx_layer->mark_tile_dirty(offset); } static TILE_GET_INFO( get_back_tile_info ) @@ -79,8 +79,8 @@ VIDEO_START( raiden ) state->m_tx_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_cols,8,8,32,32); state->m_alternate=0; - tilemap_set_transparent_pen(state->m_fg_layer,15); - tilemap_set_transparent_pen(state->m_tx_layer,15); + state->m_fg_layer->set_transparent_pen(15); + state->m_tx_layer->set_transparent_pen(15); } VIDEO_START( raidena ) @@ -91,8 +91,8 @@ VIDEO_START( raidena ) state->m_tx_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows,8,8,32,32); state->m_alternate=1; - tilemap_set_transparent_pen(state->m_fg_layer,15); - tilemap_set_transparent_pen(state->m_tx_layer,15); + state->m_fg_layer->set_transparent_pen(15); + state->m_tx_layer->set_transparent_pen(15); } WRITE16_HANDLER( raiden_control_w ) @@ -103,7 +103,7 @@ WRITE16_HANDLER( raiden_control_w ) /* Flipscreen */ if (offset==3 && ACCESSING_BITS_0_7) { state->m_flipscreen=data&0x2; - tilemap_set_flip_all(space->machine(),state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } } @@ -115,7 +115,7 @@ WRITE16_HANDLER( raidena_control_w ) /* Flipscreen */ if (offset==3 && ACCESSING_BITS_0_7) { state->m_flipscreen=data&0x40; - tilemap_set_flip_all(space->machine(),state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } } @@ -158,28 +158,28 @@ SCREEN_UPDATE_IND16( raiden ) raiden_state *state = screen.machine().driver_data(); /* Setup the tilemaps, alternate version has different scroll positions */ if (!state->m_alternate) { - tilemap_set_scrollx( state->m_bg_layer,0, state->m_scroll_ram[0]); - tilemap_set_scrolly( state->m_bg_layer,0, state->m_scroll_ram[1]); - tilemap_set_scrollx( state->m_fg_layer,0, state->m_scroll_ram[2]); - tilemap_set_scrolly( state->m_fg_layer,0, state->m_scroll_ram[3]); + state->m_bg_layer->set_scrollx(0, state->m_scroll_ram[0]); + state->m_bg_layer->set_scrolly(0, state->m_scroll_ram[1]); + state->m_fg_layer->set_scrollx(0, state->m_scroll_ram[2]); + state->m_fg_layer->set_scrolly(0, state->m_scroll_ram[3]); } else { - tilemap_set_scrolly( state->m_bg_layer,0, ((state->m_scroll_ram[0x01]&0x30)<<4)+((state->m_scroll_ram[0x02]&0x7f)<<1)+((state->m_scroll_ram[0x02]&0x80)>>7) ); - tilemap_set_scrollx( state->m_bg_layer,0, ((state->m_scroll_ram[0x09]&0x30)<<4)+((state->m_scroll_ram[0x0a]&0x7f)<<1)+((state->m_scroll_ram[0x0a]&0x80)>>7) ); - tilemap_set_scrolly( state->m_fg_layer,0, ((state->m_scroll_ram[0x11]&0x30)<<4)+((state->m_scroll_ram[0x12]&0x7f)<<1)+((state->m_scroll_ram[0x12]&0x80)>>7) ); - tilemap_set_scrollx( state->m_fg_layer,0, ((state->m_scroll_ram[0x19]&0x30)<<4)+((state->m_scroll_ram[0x1a]&0x7f)<<1)+((state->m_scroll_ram[0x1a]&0x80)>>7) ); + state->m_bg_layer->set_scrolly(0, ((state->m_scroll_ram[0x01]&0x30)<<4)+((state->m_scroll_ram[0x02]&0x7f)<<1)+((state->m_scroll_ram[0x02]&0x80)>>7) ); + state->m_bg_layer->set_scrollx(0, ((state->m_scroll_ram[0x09]&0x30)<<4)+((state->m_scroll_ram[0x0a]&0x7f)<<1)+((state->m_scroll_ram[0x0a]&0x80)>>7) ); + state->m_fg_layer->set_scrolly(0, ((state->m_scroll_ram[0x11]&0x30)<<4)+((state->m_scroll_ram[0x12]&0x7f)<<1)+((state->m_scroll_ram[0x12]&0x80)>>7) ); + state->m_fg_layer->set_scrollx(0, ((state->m_scroll_ram[0x19]&0x30)<<4)+((state->m_scroll_ram[0x1a]&0x7f)<<1)+((state->m_scroll_ram[0x1a]&0x80)>>7) ); } - tilemap_draw(bitmap,cliprect,state->m_bg_layer,0,0); + state->m_bg_layer->draw(bitmap, cliprect, 0,0); /* Draw sprites underneath foreground */ draw_sprites(screen.machine(),bitmap,cliprect,0x40); - tilemap_draw(bitmap,cliprect,state->m_fg_layer,0,0); + state->m_fg_layer->draw(bitmap, cliprect, 0,0); /* Rest of sprites */ draw_sprites(screen.machine(),bitmap,cliprect,0x80); /* Text layer */ - tilemap_draw(bitmap,cliprect,state->m_tx_layer,0,0); + state->m_tx_layer->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index 267d0326246..6d0af18fbfd 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -220,11 +220,11 @@ static TILEMAP_MAPPER( fg_tilemap_scan ) } -INLINE void rallyx_get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int ram_offs) +INLINE void rallyx_get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int ram_offs) { rallyx_state *state = machine.driver_data(); UINT8 attr = state->m_videoram[ram_offs + tile_index + 0x800]; - tileinfo->category = (attr & 0x20) >> 5; + tileinfo.category = (attr & 0x20) >> 5; SET_TILE_INFO( 0, state->m_videoram[ram_offs + tile_index], @@ -243,13 +243,13 @@ static TILE_GET_INFO( rallyx_fg_get_tile_info ) } -INLINE void locomotn_get_tile_info(running_machine &machine,tile_data *tileinfo,int tile_index,int ram_offs) +INLINE void locomotn_get_tile_info(running_machine &machine,tile_data &tileinfo,int tile_index,int ram_offs) { rallyx_state *state = machine.driver_data(); UINT8 attr = state->m_videoram[ram_offs + tile_index + 0x800]; int code = state->m_videoram[ram_offs + tile_index]; code = (code & 0x7f) + 2 * (attr & 0x40) + 2 * (code & 0x80); - tileinfo->category = (attr & 0x20) >> 5; + tileinfo.category = (attr & 0x20) >> 5; SET_TILE_INFO( 0, code, @@ -345,7 +345,7 @@ VIDEO_START( rallyx ) state->m_fg_tilemap = tilemap_create(machine, rallyx_fg_get_tile_info, fg_tilemap_scan, 8, 8, 8, 32); /* the scrolling tilemap is slightly misplaced in Rally X */ - tilemap_set_scrolldx(state->m_bg_tilemap, 3, 3); + state->m_bg_tilemap->set_scrolldx(3, 3); state->m_spriteram_base = 0x14; @@ -377,8 +377,8 @@ VIDEO_START( locomotn ) /* handle reduced visible area in some games */ if (machine.primary_screen->visible_area().max_x == 32 * 8 - 1) { - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 32); - tilemap_set_scrolldx(state->m_fg_tilemap, 0, 32); + state->m_bg_tilemap->set_scrolldx(0, 32); + state->m_fg_tilemap->set_scrolldx(0, 32); } state->m_spriteram_base = 0x14; @@ -398,8 +398,8 @@ VIDEO_START( commsega ) /* handle reduced visible area in some games */ if (machine.primary_screen->visible_area().max_x == 32 * 8 - 1) { - tilemap_set_scrolldx(state->m_bg_tilemap, 0, 32); - tilemap_set_scrolldx(state->m_fg_tilemap, 0, 32); + state->m_bg_tilemap->set_scrolldx(0, 32); + state->m_fg_tilemap->set_scrolldx(0, 32); } /* commsega has more sprites and bullets than the other games */ @@ -422,21 +422,21 @@ WRITE8_HANDLER( rallyx_videoram_w ) state->m_videoram[offset] = data; if (offset & 0x400) - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); else - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( rallyx_scrollx_w ) { rallyx_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); } WRITE8_HANDLER( rallyx_scrolly_w ) { rallyx_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( tactcian_starson_w ) @@ -647,10 +647,10 @@ SCREEN_UPDATE_IND16( rallyx ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, bg_clip, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, fg_clip, state->m_fg_tilemap, 0, 0); - tilemap_draw(bitmap, bg_clip, state->m_bg_tilemap, 1, 1); - tilemap_draw(bitmap, fg_clip, state->m_fg_tilemap, 1, 1); + state->m_bg_tilemap->draw(bitmap, bg_clip, 0, 0); + state->m_fg_tilemap->draw(bitmap, fg_clip, 0, 0); + state->m_bg_tilemap->draw(bitmap, bg_clip, 1, 1); + state->m_fg_tilemap->draw(bitmap, fg_clip, 1, 1); rallyx_draw_bullets(screen.machine(), bitmap, cliprect, TRUE); rallyx_draw_sprites(screen.machine(), bitmap, cliprect, 1); @@ -682,10 +682,10 @@ SCREEN_UPDATE_IND16( jungler ) screen.machine().priority_bitmap.fill(0, cliprect); /* tile priority doesn't seem to be supported in Jungler */ - tilemap_draw(bitmap,bg_clip, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap,fg_clip, state->m_fg_tilemap, 0, 0); - tilemap_draw(bitmap,bg_clip, state->m_bg_tilemap, 1, 0); - tilemap_draw(bitmap,fg_clip, state->m_fg_tilemap, 1, 0); + state->m_bg_tilemap->draw(bitmap, bg_clip, 0, 0); + state->m_fg_tilemap->draw(bitmap, fg_clip, 0, 0); + state->m_bg_tilemap->draw(bitmap, bg_clip, 1, 0); + state->m_fg_tilemap->draw(bitmap, fg_clip, 1, 0); jungler_draw_bullets(screen.machine(), bitmap, cliprect, TRUE); rallyx_draw_sprites(screen.machine(), bitmap, cliprect, 0); @@ -728,10 +728,10 @@ SCREEN_UPDATE_IND16( locomotn ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, bg_clip, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, fg_clip, state->m_fg_tilemap, 0, 0); - tilemap_draw(bitmap, bg_clip, state->m_bg_tilemap, 1, 1); - tilemap_draw(bitmap, fg_clip, state->m_fg_tilemap, 1, 1); + state->m_bg_tilemap->draw(bitmap, bg_clip, 0, 0); + state->m_fg_tilemap->draw(bitmap, fg_clip, 0, 0); + state->m_bg_tilemap->draw(bitmap, bg_clip, 1, 1); + state->m_fg_tilemap->draw(bitmap, fg_clip, 1, 1); locomotn_draw_bullets(screen.machine(), bitmap, cliprect, TRUE); locomotn_draw_sprites(screen.machine(), bitmap, cliprect, 0); diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index 72d8ea00d7d..d9a4e8a4506 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -98,14 +98,14 @@ WRITE16_HANDLER( realbrk_vram_0_w ) { realbrk_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_0[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_0,offset/2); + state->m_tilemap_0->mark_tile_dirty(offset/2); } WRITE16_HANDLER( realbrk_vram_1_w ) { realbrk_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_1[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_1,offset/2); + state->m_tilemap_1->mark_tile_dirty(offset/2); } /*************************************************************************** @@ -137,7 +137,7 @@ WRITE16_HANDLER( realbrk_vram_2_w ) { realbrk_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_2[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_2,offset); + state->m_tilemap_2->mark_tile_dirty(offset); } @@ -160,9 +160,9 @@ VIDEO_START(realbrk) /* Text */ state->m_tilemap_2 = tilemap_create(machine, get_tile_info_2, tilemap_scan_rows, 8, 8, 0x40, 0x20); - tilemap_set_transparent_pen(state->m_tilemap_0,0); - tilemap_set_transparent_pen(state->m_tilemap_1,0); - tilemap_set_transparent_pen(state->m_tilemap_2,0); + state->m_tilemap_0->set_transparent_pen(0); + state->m_tilemap_1->set_transparent_pen(0); + state->m_tilemap_2->set_transparent_pen(0); state->m_tmpbitmap0 = auto_bitmap_ind16_alloc(machine,32,32); state->m_tmpbitmap1 = auto_bitmap_ind16_alloc(machine,32,32); @@ -489,7 +489,7 @@ WRITE16_HANDLER( realbrk_vregs_w ) if (new_data != old_data) { if (offset == 0xa/2) - tilemap_mark_all_tiles_dirty(state->m_tilemap_0); + state->m_tilemap_0->mark_all_dirty(); } } @@ -498,11 +498,11 @@ SCREEN_UPDATE_IND16(realbrk) realbrk_state *state = screen.machine().driver_data(); int layers_ctrl = -1; - tilemap_set_scrolly(state->m_tilemap_0, 0, state->m_vregs[0x0/2]); - tilemap_set_scrollx(state->m_tilemap_0, 0, state->m_vregs[0x2/2]); + state->m_tilemap_0->set_scrolly(0, state->m_vregs[0x0/2]); + state->m_tilemap_0->set_scrollx(0, state->m_vregs[0x2/2]); - tilemap_set_scrolly(state->m_tilemap_1, 0, state->m_vregs[0x4/2]); - tilemap_set_scrollx(state->m_tilemap_1, 0, state->m_vregs[0x6/2]); + state->m_tilemap_1->set_scrolly(0, state->m_vregs[0x4/2]); + state->m_tilemap_1->set_scrollx(0, state->m_vregs[0x6/2]); #ifdef MAME_DEBUG if ( screen.machine().input().code_pressed(KEYCODE_Z) ) @@ -524,12 +524,12 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) ) else bitmap.fill(state->m_vregs[0xc/2] & 0x7fff, cliprect); - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,state->m_tilemap_1,0,0); - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,state->m_tilemap_0,0,0); + if (layers_ctrl & 2) state->m_tilemap_1->draw(bitmap, cliprect, 0,0); + if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, 0,0); if (layers_ctrl & 8) draw_sprites(screen.machine(),bitmap,cliprect); - if (layers_ctrl & 4) tilemap_draw(bitmap,cliprect,state->m_tilemap_2,0,0); + if (layers_ctrl & 4) state->m_tilemap_2->draw(bitmap, cliprect, 0,0); // popmessage("%04x",state->m_vregs[0x8/2]); return 0; @@ -548,32 +548,32 @@ SCREEN_UPDATE_IND16(dai2kaku) bgx1 = state->m_vregs[0x6/2]; // bg0 - tilemap_set_scroll_rows(state->m_tilemap_0,512); - tilemap_set_scroll_cols(state->m_tilemap_0,1); + state->m_tilemap_0->set_scroll_rows(512); + state->m_tilemap_0->set_scroll_cols(1); if( state->m_vregs[8/2] & (0x0100)){ for(offs=0; offs<(512); offs++) { - tilemap_set_scrollx( state->m_tilemap_0, offs, bgx0 - (state->m_vram_1ras[offs]&0x3ff) ); + state->m_tilemap_0->set_scrollx(offs, bgx0 - (state->m_vram_1ras[offs]&0x3ff) ); } } else { for(offs=0; offs<(512); offs++) { - tilemap_set_scrollx( state->m_tilemap_0, offs, bgx0 ); + state->m_tilemap_0->set_scrollx(offs, bgx0 ); } } - tilemap_set_scrolly( state->m_tilemap_0, 0, bgy0 ); + state->m_tilemap_0->set_scrolly(0, bgy0 ); // bg1 - tilemap_set_scroll_rows(state->m_tilemap_1,512); - tilemap_set_scroll_cols(state->m_tilemap_1,1); + state->m_tilemap_1->set_scroll_rows(512); + state->m_tilemap_1->set_scroll_cols(1); if( state->m_vregs[8/2] & (0x0001)){ for(offs=0; offs<(512); offs++) { - tilemap_set_scrollx( state->m_tilemap_1, offs, bgx1 - (state->m_vram_1ras[offs]&0x3ff) ); + state->m_tilemap_1->set_scrollx(offs, bgx1 - (state->m_vram_1ras[offs]&0x3ff) ); } } else { for(offs=0; offs<(512); offs++) { - tilemap_set_scrollx( state->m_tilemap_1, offs, bgx1 ); + state->m_tilemap_1->set_scrollx(offs, bgx1 ); } } - tilemap_set_scrolly( state->m_tilemap_1, 0, bgy1 ); + state->m_tilemap_1->set_scrolly(0, bgy1 ); #ifdef MAME_DEBUG if ( screen.machine().input().code_pressed(KEYCODE_Z) ) @@ -602,9 +602,9 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) ) // bglow if( state->m_vregs[8/2] & (0x8000)){ - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,state->m_tilemap_0,0,0); + if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, 0,0); } else { - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,state->m_tilemap_1,0,0); + if (layers_ctrl & 2) state->m_tilemap_1->draw(bitmap, cliprect, 0,0); } // spr 1 @@ -612,16 +612,16 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) ) // bghigh if( state->m_vregs[8/2] & (0x8000)){ - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,state->m_tilemap_1,0,0); + if (layers_ctrl & 2) state->m_tilemap_1->draw(bitmap, cliprect, 0,0); } else { - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,state->m_tilemap_0,0,0); + if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, 0,0); } // spr 2 if (layers_ctrl & 8) dai2kaku_draw_sprites(screen.machine(),bitmap,cliprect,0); // fix - if (layers_ctrl & 4) tilemap_draw(bitmap,cliprect,state->m_tilemap_2,0,0); + if (layers_ctrl & 4) state->m_tilemap_2->draw(bitmap, cliprect, 0,0); // usrintf_showmessage("%04x",state->m_vregs[0x8/2]); return 0; diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index 3a1e38141a4..476eb692a37 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -104,7 +104,7 @@ WRITE8_HANDLER( redclash_videoram_w ) ladybug_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( redclash_gfxbank_w ) @@ -114,7 +114,7 @@ WRITE8_HANDLER( redclash_gfxbank_w ) if (state->m_gfxbank != (data & 0x01)) { state->m_gfxbank = data & 0x01; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -180,7 +180,7 @@ VIDEO_START( redclash ) ladybug_state *state = machine.driver_data(); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -432,6 +432,6 @@ SCREEN_UPDATE_IND16( redclash ) redclash_draw_stars(screen.machine(), bitmap, cliprect, 0x60, 0, 0x00, 0xff); draw_sprites(screen.machine(), bitmap, cliprect); draw_bullets(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c index 5970c681c46..8be28144960 100644 --- a/src/mame/video/relief.c +++ b/src/mame/video/relief.c @@ -94,7 +94,7 @@ VIDEO_START( relief ) /* initialize the second playfield */ state->m_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); - tilemap_set_transparent_pen(state->m_playfield2_tilemap, 0); + state->m_playfield2_tilemap->set_transparent_pen(0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); @@ -118,8 +118,8 @@ SCREEN_UPDATE_IND16( relief ) /* draw the playfield */ priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 0, 1); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 0, 1); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c index 3fb1a5e66bb..1bdc5f32727 100644 --- a/src/mame/video/renegade.c +++ b/src/mame/video/renegade.c @@ -14,7 +14,7 @@ WRITE8_HANDLER( renegade_videoram_w ) UINT8 *videoram = state->m_videoram; videoram[offset] = data; offset = offset % (64 * 16); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( renegade_videoram2_w ) @@ -22,7 +22,7 @@ WRITE8_HANDLER( renegade_videoram2_w ) renegade_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; offset = offset % (32 * 32); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( renegade_flipscreen_w ) @@ -73,8 +73,8 @@ VIDEO_START( renegade ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tilemap_info, tilemap_scan_rows, 16, 16, 64, 16); state->m_fg_tilemap = tilemap_create(machine, get_fg_tilemap_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldx(state->m_bg_tilemap, 256, 0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_scrolldx(256, 0); state_save_register_global(machine, state->m_scrollx); } @@ -134,9 +134,9 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( renegade ) { renegade_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0 , 0); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx); + state->m_bg_tilemap->draw(bitmap, cliprect, 0 , 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0 , 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0 , 0); return 0; } diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c index 9e39cc13695..66b6066f6a5 100644 --- a/src/mame/video/retofinv.c +++ b/src/mame/video/retofinv.c @@ -86,7 +86,7 @@ static TILE_GET_INFO( fg_get_tile_info ) retofinv_state *state = machine.driver_data(); int color = state->m_fg_videoram[0x400 + tile_index]; - tileinfo->group = color; + tileinfo.group = color; SET_TILE_INFO( 0, @@ -124,14 +124,14 @@ WRITE8_HANDLER( retofinv_bg_videoram_w ) { retofinv_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( retofinv_fg_videoram_w ) { retofinv_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( retofinv_gfx_ctrl_w ) @@ -147,7 +147,7 @@ WRITE8_HANDLER( retofinv_gfx_ctrl_w ) if (state->m_fg_bank != (data & 1)) { state->m_fg_bank = data & 1; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } break; @@ -155,7 +155,7 @@ WRITE8_HANDLER( retofinv_gfx_ctrl_w ) if (state->m_bg_bank != (data & 1)) { state->m_bg_bank = data & 1; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } break; } @@ -228,8 +228,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap) SCREEN_UPDATE_IND16( retofinv ) { retofinv_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c index 9f79662d308..b394e0ea86e 100644 --- a/src/mame/video/rockrage.c +++ b/src/mame/video/rockrage.c @@ -85,7 +85,7 @@ WRITE8_HANDLER( rockrage_vreg_w ) rockrage_state *state = space->machine().driver_data(); if ((data & 0x0c) != (state->m_vreg & 0x0c)) - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); state->m_vreg = data; } diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index a79b7068ebb..9b50b6b5414 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -86,14 +86,14 @@ WRITE8_HANDLER( rocnrope_videoram_w ) { rocnrope_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( rocnrope_colorram_w ) { rocnrope_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( rocnrope_flipscreen_w ) @@ -101,7 +101,7 @@ WRITE8_HANDLER( rocnrope_flipscreen_w ) if (flip_screen_get(space->machine()) != (~data & 0x01)) { flip_screen_set(space->machine(), ~data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -145,7 +145,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( rocnrope ) { rocnrope_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index fa71f7d8754..81fc687c925 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -77,7 +77,7 @@ VIDEO_START( rpunch ) state->m_background[1] = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_cols,8,8,64,64); /* configure the tilemaps */ - tilemap_set_transparent_pen(state->m_background[1],15); + state->m_background[1]->set_transparent_pen(15); if (state->m_bitmapram) memset(state->m_bitmapram, 0xff, state->m_bitmapram_size); @@ -101,7 +101,7 @@ WRITE16_HANDLER( rpunch_videoram_w ) int tmap = offset >> 12; int tile_index = offset & 0xfff; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty(state->m_background[tmap],tile_index); + state->m_background[tmap]->mark_tile_dirty(tile_index); } @@ -115,9 +115,9 @@ WRITE16_HANDLER( rpunch_videoreg_w ) { /* invalidate tilemaps */ if ((oldword ^ state->m_videoflags) & 0x0410) - tilemap_mark_all_tiles_dirty(state->m_background[0]); + state->m_background[0]->mark_all_dirty(); if ((oldword ^ state->m_videoflags) & 0x0820) - tilemap_mark_all_tiles_dirty(state->m_background[1]); + state->m_background[1]->mark_all_dirty(); } } @@ -129,19 +129,19 @@ WRITE16_HANDLER( rpunch_scrollreg_w ) switch (offset) { case 0: - tilemap_set_scrolly(state->m_background[0], 0, data & 0x1ff); + state->m_background[0]->set_scrolly(0, data & 0x1ff); break; case 1: - tilemap_set_scrollx(state->m_background[0], 0, data & 0x1ff); + state->m_background[0]->set_scrollx(0, data & 0x1ff); break; case 2: - tilemap_set_scrolly(state->m_background[1], 0, data & 0x1ff); + state->m_background[1]->set_scrolly(0, data & 0x1ff); break; case 3: - tilemap_set_scrollx(state->m_background[1], 0, data & 0x1ff); + state->m_background[1]->set_scrollx(0, data & 0x1ff); break; } } @@ -280,9 +280,9 @@ SCREEN_UPDATE_IND16( rpunch ) /* this seems like the most plausible explanation */ effbins = (state->m_bins > state->m_gins) ? state->m_gins : state->m_bins; - tilemap_draw(bitmap, cliprect, state->m_background[0], 0,0); + state->m_background[0]->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect, 0, effbins); - tilemap_draw(bitmap, cliprect, state->m_background[1], 0,0); + state->m_background[1]->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect, effbins, state->m_gins); if (state->m_bitmapram) draw_bitmap(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c index f6ac17afb21..de12e91a811 100644 --- a/src/mame/video/runaway.c +++ b/src/mame/video/runaway.c @@ -34,7 +34,7 @@ WRITE8_HANDLER( runaway_video_ram_w ) { runaway_state *state = space->machine().driver_data(); state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -44,7 +44,7 @@ WRITE8_HANDLER( runaway_tile_bank_w ) runaway_state *state = space->machine().driver_data(); if ((data & 1) != state->m_tile_bank) { - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } state->m_tile_bank = data & 1; @@ -94,7 +94,7 @@ SCREEN_UPDATE_IND16( runaway ) runaway_state *state = screen.machine().driver_data(); int i; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); for (i = 0; i < 16; i++) { @@ -129,7 +129,7 @@ SCREEN_UPDATE_IND16( qwak ) runaway_state *state = screen.machine().driver_data(); int i; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); for (i = 0; i < 16; i++) { diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index b3688d410b2..7544ac57da4 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -49,7 +49,7 @@ WRITE16_HANDLER(rng_936_videoram_w) { rungun_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_936_videoram[offset]); - tilemap_mark_tile_dirty(state->m_936_tilemap, offset / 2); + state->m_936_tilemap->mark_tile_dirty(offset / 2); } static TILE_GET_INFO( get_rng_936_tile_info ) @@ -82,7 +82,7 @@ VIDEO_START( rng ) int gfx_index; state->m_936_tilemap = tilemap_create(machine, get_rng_936_tile_info, tilemap_scan_rows, 16, 16, 128, 128); - tilemap_set_transparent_pen(state->m_936_tilemap, 0); + state->m_936_tilemap->set_transparent_pen(0); /* find first empty slot to decode gfx */ for (gfx_index = 0; gfx_index < MAX_GFX_ELEMENTS; gfx_index++) @@ -98,7 +98,7 @@ VIDEO_START( rng ) // create the tilemap state->m_ttl_tilemap = tilemap_create(machine, ttl_get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_ttl_tilemap, 0); + state->m_ttl_tilemap->set_transparent_pen(0); state->m_sprite_colorbase = 0x20; } @@ -114,7 +114,7 @@ SCREEN_UPDATE_IND16(rng) k053247_sprites_draw(state->m_k055673, bitmap, cliprect); - tilemap_mark_all_tiles_dirty(state->m_ttl_tilemap); - tilemap_draw(bitmap, cliprect, state->m_ttl_tilemap, 0, 0); + state->m_ttl_tilemap->mark_all_dirty(); + state->m_ttl_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index 4ab5e4ae760..cc32fd9a455 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -16,7 +16,7 @@ WRITE8_HANDLER( tecfri_videoram_w ) sauro_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( tecfri_colorram_w ) @@ -24,7 +24,7 @@ WRITE8_HANDLER( tecfri_colorram_w ) sauro_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( tecfri_videoram2_w ) @@ -32,7 +32,7 @@ WRITE8_HANDLER( tecfri_videoram2_w ) sauro_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( tecfri_colorram2_w ) @@ -40,14 +40,14 @@ WRITE8_HANDLER( tecfri_colorram2_w ) sauro_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( tecfri_scroll_bg_w ) { sauro_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); } static TILE_GET_INFO( get_tile_info_bg ) @@ -80,7 +80,7 @@ WRITE8_HANDLER( sauro_palette_bank_w ) sauro_state *state = space->machine().driver_data(); state->m_palette_bank = (data & 0x03) << 4; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } WRITE8_HANDLER( sauro_scroll_fg_w ) @@ -89,7 +89,7 @@ WRITE8_HANDLER( sauro_scroll_fg_w ) const int *map = (flip_screen_get(space->machine()) ? scroll2_map_flip : scroll2_map); int scroll = (data & 0xf8) | map[data & 7]; - tilemap_set_scrollx(state->m_fg_tilemap, 0, scroll); + state->m_fg_tilemap->set_scrollx(0, scroll); } VIDEO_START( sauro ) @@ -102,7 +102,7 @@ VIDEO_START( sauro ) state->m_fg_tilemap = tilemap_create(machine, get_tile_info_fg, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); state->m_palette_bank = 0; } @@ -158,8 +158,8 @@ SCREEN_UPDATE_IND16( sauro ) { sauro_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); sauro_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -233,7 +233,7 @@ static void trckydoc_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap SCREEN_UPDATE_IND16( trckydoc ) { sauro_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); trckydoc_draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index 6a251f5af7c..912cce08ee1 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -98,14 +98,14 @@ WRITE8_HANDLER( sbasketb_videoram_w ) { sbasketb_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sbasketb_colorram_w ) { sbasketb_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sbasketb_flipscreen_w ) @@ -113,7 +113,7 @@ WRITE8_HANDLER( sbasketb_flipscreen_w ) if (flip_screen_get(space->machine()) != data) { flip_screen_set(space->machine(), data); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -132,7 +132,7 @@ VIDEO_START( sbasketb ) sbasketb_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -177,9 +177,9 @@ SCREEN_UPDATE_IND16( sbasketb ) int col; for (col = 6; col < 32; col++) - tilemap_set_scrolly(state->m_bg_tilemap, col, *state->m_scroll); + state->m_bg_tilemap->set_scrolly(col, *state->m_scroll); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c index 2a65e5bbf52..51db266f063 100644 --- a/src/mame/video/sbugger.c +++ b/src/mame/video/sbugger.c @@ -19,7 +19,7 @@ WRITE8_HANDLER( sbugger_videoram_w ) sbugger_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset); + state->m_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sbugger_videoram_attr_w ) @@ -27,7 +27,7 @@ WRITE8_HANDLER( sbugger_videoram_attr_w ) sbugger_state *state = space->machine().driver_data(); state->m_videoram_attr[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset); + state->m_tilemap->mark_tile_dirty(offset); } VIDEO_START(sbugger) @@ -39,7 +39,7 @@ VIDEO_START(sbugger) SCREEN_UPDATE_IND16(sbugger) { sbugger_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index 8f978de334c..443795704d8 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -41,7 +41,7 @@ WRITE8_HANDLER( scotrsht_videoram_w ) scotrsht_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( scotrsht_colorram_w ) @@ -49,7 +49,7 @@ WRITE8_HANDLER( scotrsht_colorram_w ) scotrsht_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( scotrsht_charbank_w ) @@ -59,7 +59,7 @@ WRITE8_HANDLER( scotrsht_charbank_w ) if (state->m_charbank != (data & 0x01)) { state->m_charbank = data & 0x01; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* other bits unknown */ @@ -72,7 +72,7 @@ WRITE8_HANDLER( scotrsht_palettebank_w ) if (state->m_palette_bank != ((data & 0x70) >> 4)) { state->m_palette_bank = ((data & 0x70) >> 4); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } coin_counter_w(space->machine(), 0, data & 1); @@ -135,7 +135,7 @@ VIDEO_START( scotrsht ) state->m_bg_tilemap = tilemap_create(machine, scotrsht_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 64); + state->m_bg_tilemap->set_scroll_cols(64); } SCREEN_UPDATE_IND16( scotrsht ) @@ -144,9 +144,9 @@ SCREEN_UPDATE_IND16( scotrsht ) int col; for (col = 0; col < 32; col++) - tilemap_set_scrolly(state->m_bg_tilemap, col, state->m_scroll[col]); + state->m_bg_tilemap->set_scrolly(col, state->m_scroll[col]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index 6c4960336df..9233d8f4bb7 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -19,7 +19,7 @@ WRITE16_HANDLER( sderby_videoram_w ) sderby_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap,offset/2); + state->m_tilemap->mark_tile_dirty(offset/2); } /* MD Layer */ @@ -40,7 +40,7 @@ WRITE16_HANDLER( sderby_md_videoram_w ) sderby_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_md_videoram[offset]); - tilemap_mark_tile_dirty(state->m_md_tilemap,offset/2); + state->m_md_tilemap->mark_tile_dirty(offset/2); } /* FG Layer */ @@ -61,7 +61,7 @@ WRITE16_HANDLER( sderby_fg_videoram_w ) sderby_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset/2); + state->m_fg_tilemap->mark_tile_dirty(offset/2); } @@ -102,20 +102,20 @@ VIDEO_START( sderby ) state->m_tilemap = tilemap_create(machine, get_sderby_tile_info,tilemap_scan_rows, 16, 16,32,32); state->m_md_tilemap = tilemap_create(machine, get_sderby_md_tile_info,tilemap_scan_rows, 16, 16,32,32); - tilemap_set_transparent_pen(state->m_md_tilemap,0); + state->m_md_tilemap->set_transparent_pen(0); state->m_fg_tilemap = tilemap_create(machine, get_sderby_fg_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); } SCREEN_UPDATE_IND16( sderby ) { sderby_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_md_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_md_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -123,10 +123,10 @@ SCREEN_UPDATE_IND16( pmroulet ) { sderby_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_md_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); + state->m_md_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -139,11 +139,11 @@ WRITE16_HANDLER( sderby_scroll_w ) switch (offset) { - case 0: tilemap_set_scrollx(state->m_fg_tilemap,0,data+2);break; - case 1: tilemap_set_scrolly(state->m_fg_tilemap,0,data-8);break; - case 2: tilemap_set_scrollx(state->m_md_tilemap,0,data+4);break; - case 3: tilemap_set_scrolly(state->m_md_tilemap,0,data-8);break; - case 4: tilemap_set_scrollx(state->m_tilemap,0,data+6); break; - case 5: tilemap_set_scrolly(state->m_tilemap,0,data-8); break; + case 0: state->m_fg_tilemap->set_scrollx(0,data+2);break; + case 1: state->m_fg_tilemap->set_scrolly(0,data-8);break; + case 2: state->m_md_tilemap->set_scrollx(0,data+4);break; + case 3: state->m_md_tilemap->set_scrolly(0,data-8);break; + case 4: state->m_tilemap->set_scrollx(0,data+6); break; + case 5: state->m_tilemap->set_scrolly(0,data-8); break; } } diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index dc8cbee61af..7a80a8163b9 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -359,8 +359,8 @@ WRITE8_HANDLER( spaceod_back_port_w ) case 0: if ((state->m_spaceod_bg_control ^ data) & 0xc4) { - tilemap_mark_all_tiles_dirty(state->m_spaceod_bg_htilemap); - tilemap_mark_all_tiles_dirty(state->m_spaceod_bg_vtilemap); + state->m_spaceod_bg_htilemap->mark_all_dirty(); + state->m_spaceod_bg_vtilemap->mark_all_dirty(); } state->m_spaceod_bg_control = data; break; @@ -475,7 +475,7 @@ WRITE8_HANDLER( monsterb_back_port_w ) */ case 4: if ((state->m_bg_char_bank ^ data) & 0x0f) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_bg_char_bank = data & 0x0f; state->m_bg_scrolly = (data << 4) & 0x700; state->m_bg_enable = data & 0x80; @@ -564,7 +564,7 @@ WRITE8_HANDLER( pignewt_back_port_w ) case 4: data = (data & 0x09) | ((data >> 2) & 0x02) | ((data << 2) & 0x04); if ((state->m_bg_char_bank ^ data) & 0x0f) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_bg_char_bank = data & 0x0f; break; @@ -626,7 +626,7 @@ WRITE8_HANDLER( sindbadm_back_port_w ) state->m_bg_scrollx = (data << 6) & 0x300; state->m_bg_scrolly = (data << 4) & 0x700; if ((state->m_bg_char_bank ^ data) & 0x03) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); state->m_bg_char_bank = data & 0x03; break; } @@ -673,7 +673,7 @@ static void draw_videoram(running_machine &machine, bitmap_ind16 &bitmap, const static void draw_background_spaceod(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) { segag80r_state *state = machine.driver_data(); - bitmap_ind16 &pixmap = tilemap_get_pixmap(!(state->m_spaceod_bg_control & 0x02) ? state->m_spaceod_bg_htilemap : state->m_spaceod_bg_vtilemap); + bitmap_ind16 &pixmap = (!(state->m_spaceod_bg_control & 0x02) ? state->m_spaceod_bg_htilemap : state->m_spaceod_bg_vtilemap)->pixmap(); int flipmask = (state->m_spaceod_bg_control & 0x01) ? 0xff : 0x00; int xoffset = (state->m_spaceod_bg_control & 0x02) ? 0x10 : 0x00; int xmask = pixmap.width() - 1; @@ -731,7 +731,7 @@ static void draw_background_spaceod(running_machine &machine, bitmap_ind16 &bitm static void draw_background_page_scroll(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) { segag80r_state *state = machine.driver_data(); - bitmap_ind16 &pixmap = tilemap_get_pixmap(state->m_bg_tilemap); + bitmap_ind16 &pixmap = state->m_bg_tilemap->pixmap(); int flipmask = (state->m_video_control & 0x08) ? 0xff : 0x00; int xmask = pixmap.width() - 1; int ymask = pixmap.height() - 1; @@ -772,7 +772,7 @@ static void draw_background_page_scroll(running_machine &machine, bitmap_ind16 & static void draw_background_full_scroll(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) { segag80r_state *state = machine.driver_data(); - bitmap_ind16 &pixmap = tilemap_get_pixmap(state->m_bg_tilemap); + bitmap_ind16 &pixmap = state->m_bg_tilemap->pixmap(); int flipmask = (state->m_video_control & 0x08) ? 0x3ff : 0x000; int xmask = pixmap.width() - 1; int ymask = pixmap.height() - 1; diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c index abf374c8f38..159c07ba42b 100644 --- a/src/mame/video/segaic16.c +++ b/src/mame/video/segaic16.c @@ -623,9 +623,9 @@ static void segaic16_draw_virtual_tilemap(running_machine &machine, struct tilem if (pageclip.min_x <= pageclip.max_x && pageclip.min_y <= pageclip.max_y) { page = (pages >> 0) & 0xf; - tilemap_set_scrollx(info->tilemaps[page], 0, xscroll); - tilemap_set_scrolly(info->tilemaps[page], 0, yscroll); - tilemap_draw(bitmap, pageclip, info->tilemaps[page], flags, priority); + info->tilemaps[page]->set_scrollx(0, xscroll); + info->tilemaps[page]->set_scrolly(0, yscroll); + info->tilemaps[page]->draw(bitmap, pageclip, flags, priority); } } @@ -639,9 +639,9 @@ static void segaic16_draw_virtual_tilemap(running_machine &machine, struct tilem if (pageclip.min_x <= pageclip.max_x && pageclip.min_y <= pageclip.max_y) { page = (pages >> 4) & 0xf; - tilemap_set_scrollx(info->tilemaps[page], 0, xscroll); - tilemap_set_scrolly(info->tilemaps[page], 0, yscroll); - tilemap_draw(bitmap, pageclip, info->tilemaps[page], flags, priority); + info->tilemaps[page]->set_scrollx(0, xscroll); + info->tilemaps[page]->set_scrolly(0, yscroll); + info->tilemaps[page]->draw(bitmap, pageclip, flags, priority); } } @@ -655,9 +655,9 @@ static void segaic16_draw_virtual_tilemap(running_machine &machine, struct tilem if (pageclip.min_x <= pageclip.max_x && pageclip.min_y <= pageclip.max_y) { page = (pages >> 8) & 0xf; - tilemap_set_scrollx(info->tilemaps[page], 0, xscroll); - tilemap_set_scrolly(info->tilemaps[page], 0, yscroll); - tilemap_draw(bitmap, pageclip, info->tilemaps[page], flags, priority); + info->tilemaps[page]->set_scrollx(0, xscroll); + info->tilemaps[page]->set_scrolly(0, yscroll); + info->tilemaps[page]->draw(bitmap, pageclip, flags, priority); } } @@ -671,9 +671,9 @@ static void segaic16_draw_virtual_tilemap(running_machine &machine, struct tilem if (pageclip.min_x <= pageclip.max_x && pageclip.min_y <= pageclip.max_y) { page = (pages >> 12) & 0xf; - tilemap_set_scrollx(info->tilemaps[page], 0, xscroll); - tilemap_set_scrolly(info->tilemaps[page], 0, yscroll); - tilemap_draw(bitmap, pageclip, info->tilemaps[page], flags, priority); + info->tilemaps[page]->set_scrollx(0, xscroll); + info->tilemaps[page]->set_scrolly(0, yscroll); + info->tilemaps[page]->draw(bitmap, pageclip, flags, priority); } } } @@ -728,7 +728,7 @@ static TILE_GET_INFO( segaic16_tilemap_16a_tile_info ) int color = (data >> 5) & 0x7f; SET_TILE_INFO(0, code, color, 0); - tileinfo->category = (data >> 12) & 1; + tileinfo.category = (data >> 12) & 1; } @@ -740,7 +740,7 @@ static TILE_GET_INFO( segaic16_tilemap_16a_text_info ) int code = data & 0xff; SET_TILE_INFO(0, code, color, 0); - tileinfo->category = (data >> 11) & 1; + tileinfo.category = (data >> 11) & 1; } @@ -942,7 +942,7 @@ static TILE_GET_INFO( segaic16_tilemap_16b_tile_info ) code = info->bank[code / info->banksize] * info->banksize + code % info->banksize; SET_TILE_INFO(0, code, color, 0); - tileinfo->category = (data >> 15) & 1; + tileinfo.category = (data >> 15) & 1; } @@ -955,7 +955,7 @@ static TILE_GET_INFO( segaic16_tilemap_16b_text_info ) int code = data & 0x1ff; SET_TILE_INFO(0, bank * info->banksize + code, color, 0); - tileinfo->category = (data >> 15) & 1; + tileinfo.category = (data >> 15) & 1; } @@ -969,7 +969,7 @@ static TILE_GET_INFO( segaic16_tilemap_16b_alt_tile_info ) code = info->bank[code / info->banksize] * info->banksize + code % info->banksize; SET_TILE_INFO(0, code, color, 0); - tileinfo->category = (data >> 15) & 1; + tileinfo.category = (data >> 15) & 1; } @@ -982,7 +982,7 @@ static TILE_GET_INFO( segaic16_tilemap_16b_alt_text_info ) int code = data & 0xff; SET_TILE_INFO(0, bank * info->banksize + code, color, 0); - tileinfo->category = (data >> 15) & 1; + tileinfo.category = (data >> 15) & 1; } @@ -1192,11 +1192,11 @@ void segaic16_tilemap_init(running_machine &machine, int which, int type, int co info->textmap_info.rambase = info->textram; info->textmap_info.bank = info->bank; info->textmap_info.banksize = info->banksize; - tilemap_set_user_data(info->textmap, &info->textmap_info); - tilemap_set_palette_offset(info->textmap, colorbase); - tilemap_set_transparent_pen(info->textmap, 0); - tilemap_set_scrolldx(info->textmap, -192 + xoffs, -170 + xoffs); - tilemap_set_scrolldy(info->textmap, 0, 38); + info->textmap->set_user_data(&info->textmap_info); + info->textmap->set_palette_offset(colorbase); + info->textmap->set_transparent_pen(0); + info->textmap->set_scrolldx(-192 + xoffs, -170 + xoffs); + info->textmap->set_scrolldy(0, 38); /* create the tilemaps for the tile pages */ for (pagenum = 0; pagenum < info->numpages; pagenum++) @@ -1208,11 +1208,11 @@ void segaic16_tilemap_init(running_machine &machine, int which, int type, int co info->tmap_info[pagenum].rambase = info->tileram + pagenum * 64*32; info->tmap_info[pagenum].bank = info->bank; info->tmap_info[pagenum].banksize = info->banksize; - tilemap_set_user_data(info->tilemaps[pagenum], &info->tmap_info[pagenum]); - tilemap_set_palette_offset(info->tilemaps[pagenum], colorbase); - tilemap_set_transparent_pen(info->tilemaps[pagenum], 0); - tilemap_set_scrolldx(info->tilemaps[pagenum], 0, 22); - tilemap_set_scrolldy(info->tilemaps[pagenum], 0, 38); + info->tilemaps[pagenum]->set_user_data(&info->tmap_info[pagenum]); + info->tilemaps[pagenum]->set_palette_offset(colorbase); + info->tilemaps[pagenum]->set_transparent_pen(0); + info->tilemaps[pagenum]->set_scrolldx(0, 22); + info->tilemaps[pagenum]->set_scrolldy(0, 38); } } @@ -1231,7 +1231,7 @@ void segaic16_tilemap_draw(screen_device &screen, bitmap_ind16 &bitmap, const re /* text layer is a special common case */ if (map == SEGAIC16_TILEMAP_TEXT) - tilemap_draw(bitmap, cliprect, info->textmap, priority, priority_mark); + info->textmap->draw(bitmap, cliprect, priority, priority_mark); /* other layers are handled differently per-system */ else @@ -1271,7 +1271,7 @@ void segaic16_tilemap_set_bank(running_machine &machine, int which, int banknum, screen_device &screen = *machine.primary_screen; screen.update_partial(screen.vpos()); info->bank[banknum] = offset; - tilemap_mark_all_tiles_dirty_all(machine); + machine.tilemap().mark_all_dirty(); } } @@ -1294,9 +1294,9 @@ void segaic16_tilemap_set_flip(running_machine &machine, int which, int flip) screen_device &screen = *machine.primary_screen; screen.update_partial(screen.vpos()); info->flip = flip; - tilemap_set_flip(info->textmap, flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + info->textmap->set_flip(flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); for (pagenum = 0; pagenum < info->numpages; pagenum++) - tilemap_set_flip(info->tilemaps[pagenum], flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + info->tilemaps[pagenum]->set_flip(flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } } @@ -1353,7 +1353,7 @@ void segaic16_tilemap_set_colscroll(running_machine &machine, int which, int ena WRITE16_HANDLER( segaic16_tileram_0_w ) { COMBINE_DATA(&segaic16_tileram_0[offset]); - tilemap_mark_tile_dirty(bg_tilemap[0].tilemaps[offset / (64*32)], offset % (64*32)); + bg_tilemap[0].tilemaps[offset / (64*32)]->mark_tile_dirty(offset % (64*32)); } @@ -1364,7 +1364,7 @@ WRITE16_HANDLER( segaic16_textram_0_w ) space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); COMBINE_DATA(&segaic16_textram_0[offset]); - tilemap_mark_tile_dirty(bg_tilemap[0].textmap, offset); + bg_tilemap[0].textmap->mark_tile_dirty(offset); } diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c index 20f7ba2c79e..8dcef72dd32 100644 --- a/src/mame/video/segaic24.c +++ b/src/mame/video/segaic24.c @@ -44,11 +44,11 @@ const gfx_layout segas24_tile::char_layout = { 8*32 }; -void segas24_tile::tile_info(int offset, tile_data *tileinfo, tilemap_memory_index tile_index) +void segas24_tile::tile_info(int offset, tile_data &tileinfo, tilemap_memory_index tile_index) { UINT16 val = tile_ram[tile_index|offset]; - tileinfo->category = (val & 0x8000) != 0; - tileinfo_set(machine(), tileinfo, char_gfx_index, val & tile_mask, (val >> 7) & 0xff, 0); + tileinfo.category = (val & 0x8000) != 0; + tileinfo.set(machine(), char_gfx_index, val & tile_mask, (val >> 7) & 0xff, 0); } TILE_GET_INFO_DEVICE( segas24_tile::tile_info_0s ) @@ -86,10 +86,10 @@ void segas24_tile::device_start() tile_layer[2] = tilemap_create_device(this, tile_info_1s, tilemap_scan_rows, 8, 8, 64, 64); tile_layer[3] = tilemap_create_device(this, tile_info_1w, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(tile_layer[0], 0); - tilemap_set_transparent_pen(tile_layer[1], 0); - tilemap_set_transparent_pen(tile_layer[2], 0); - tilemap_set_transparent_pen(tile_layer[3], 0); + tile_layer[0]->set_transparent_pen(0); + tile_layer[1]->set_transparent_pen(0); + tile_layer[2]->set_transparent_pen(0); + tile_layer[3]->set_transparent_pen(0); memset(char_ram, 0, 0x80000); memset(tile_ram, 0, 0x10000); @@ -367,8 +367,8 @@ void segas24_tile::draw_common(_BitmapClass &bitmap, const rectangle &cliprect, if(layer & 1) return; - tilemap_set_scrolly(tile_layer[layer], 0, vscr & 0x1ff); - tilemap_set_scrolly(tile_layer[layer|1], 0, vscr & 0x1ff); + tile_layer[layer]->set_scrolly(0, vscr & 0x1ff); + tile_layer[layer|1]->set_scrolly(0, vscr & 0x1ff); if(hscr & 0x8000) { UINT16 *hscrtb = tile_ram + 0x4000 + 0x200*layer; @@ -391,8 +391,8 @@ void segas24_tile::draw_common(_BitmapClass &bitmap, const rectangle &cliprect, hscr = hscrtb[y]; h = hscr & 0x1ff; - tilemap_set_scrollx(tile_layer[l1], 0, -h); - tilemap_draw(bitmap, c, tile_layer[l1], tpri, lpri); + tile_layer[l1]->set_scrollx(0, -h); + tile_layer[l1]->draw(bitmap, c, tpri, lpri); } break; } @@ -407,8 +407,8 @@ void segas24_tile::draw_common(_BitmapClass &bitmap, const rectangle &cliprect, hscr = hscrtb[y]; h = hscr & 0x1ff; - tilemap_set_scrollx(tile_layer[layer], 0, -h); - tilemap_set_scrollx(tile_layer[layer|1], 0, -h); + tile_layer[layer]->set_scrollx(0, -h); + tile_layer[layer|1]->set_scrollx(0, -h); if(c1.max_x >= h) c1.max_x = h-1; @@ -419,16 +419,16 @@ void segas24_tile::draw_common(_BitmapClass &bitmap, const rectangle &cliprect, c1.min_y = c1.max_y = c2.min_y = c2.max_y = y; - tilemap_draw(bitmap, c1, tile_layer[l1], tpri, lpri); - tilemap_draw(bitmap, c2, tile_layer[l1^1], tpri, lpri); + tile_layer[l1]->draw(bitmap, c1, tpri, lpri); + tile_layer[l1^1]->draw(bitmap, c2, tpri, lpri); } break; } } } else { - tilemap_set_scrollx(tile_layer[layer], 0, -(hscr & 0x1ff)); - tilemap_set_scrollx(tile_layer[layer|1], 0, -(hscr & 0x1ff)); + tile_layer[layer]->set_scrollx(0, -(hscr & 0x1ff)); + tile_layer[layer|1]->set_scrollx(0, -(hscr & 0x1ff)); switch((ctrl & 0x6000) >> 13) { case 1: { @@ -443,8 +443,8 @@ void segas24_tile::draw_common(_BitmapClass &bitmap, const rectangle &cliprect, if(!((-vscr) & 0x200)) layer ^= 1; - tilemap_draw(bitmap, c1, tile_layer[layer], tpri, lpri); - tilemap_draw(bitmap, c2, tile_layer[layer^1], tpri, lpri); + tile_layer[layer]->draw(bitmap, c1, tpri, lpri); + tile_layer[layer^1]->draw(bitmap, c2, tpri, lpri); break; } case 2: case 3: { @@ -459,8 +459,8 @@ void segas24_tile::draw_common(_BitmapClass &bitmap, const rectangle &cliprect, if(!((+hscr) & 0x200)) layer ^= 1; - tilemap_draw(bitmap, c1, tile_layer[layer], tpri, lpri); - tilemap_draw(bitmap, c2, tile_layer[layer^1], tpri, lpri); + tile_layer[layer]->draw(bitmap, c1, tpri, lpri); + tile_layer[layer^1]->draw(bitmap, c2, tpri, lpri); break; } } @@ -469,8 +469,8 @@ void segas24_tile::draw_common(_BitmapClass &bitmap, const rectangle &cliprect, } else { int win = layer & 1; - bitmap_ind16 &bm = tilemap_get_pixmap(tile_layer[layer]); - bitmap_ind8 &tm = tilemap_get_flagsmap(tile_layer[layer]); + bitmap_ind16 &bm = tile_layer[layer]->pixmap(); + bitmap_ind8 &tm = tile_layer[layer]->flagsmap(); if(hscr & 0x8000) { int y; @@ -542,7 +542,7 @@ WRITE16_MEMBER(segas24_tile::tile_w) { COMBINE_DATA(tile_ram + offset); if(offset < 0x4000) - tilemap_mark_tile_dirty(tile_layer[offset >> 12], offset & 0xfff); + tile_layer[offset >> 12]->mark_tile_dirty(offset & 0xfff); } WRITE16_MEMBER(segas24_tile::char_w) diff --git a/src/mame/video/segaic24.h b/src/mame/video/segaic24.h index bde01c16ce0..8adecda5b55 100644 --- a/src/mame/video/segaic24.h +++ b/src/mame/video/segaic24.h @@ -48,7 +48,7 @@ private: static const gfx_layout char_layout; - void tile_info(int offset, tile_data *tileinfo, tilemap_memory_index tile_index); + void tile_info(int offset, tile_data &tileinfo, tilemap_memory_index tile_index); static TILE_GET_INFO_DEVICE(tile_info_0s); static TILE_GET_INFO_DEVICE(tile_info_0w); static TILE_GET_INFO_DEVICE(tile_info_1s); diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index ef0d079beab..c8ec287d7ea 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -257,7 +257,7 @@ static void common_start(running_machine &machine, int multi32) entry->page = 0xff; entry->bank = 0; entry->next = state->m_cache_head; - tilemap_set_user_data(entry->tmap, entry); + entry->tmap->set_user_data(entry); state->m_cache_head = entry; } @@ -507,7 +507,7 @@ WRITE16_HANDLER( system32_videoram_w ) /* scan the cache for a matching pages */ for (entry = state->m_cache_head; entry != NULL; entry = entry->next) if (entry->page == page) - tilemap_mark_tile_dirty(entry->tmap, offset); + entry->tmap->mark_tile_dirty(offset); } } @@ -743,7 +743,7 @@ static tilemap_t *find_cache_entry(segas32_state *state, int page, int bank) /* okay, we didn't find one; take over this last entry */ entry->page = page; entry->bank = bank; - tilemap_mark_all_tiles_dirty(entry->tmap); + entry->tmap->mark_all_dirty(); /* move it to the head */ prev->next = entry->next; @@ -996,8 +996,8 @@ static void update_tilemap_zoom(screen_device &screen, struct layer_info *layer, UINT16 *src[2]; /* look up the pages and get their source pixmaps */ - bitmap_ind16 &tm0 = tilemap_get_pixmap(tilemaps[((srcy >> 27) & 2) + 0]); - bitmap_ind16 &tm1 = tilemap_get_pixmap(tilemaps[((srcy >> 27) & 2) + 1]); + bitmap_ind16 &tm0 = tilemaps[((srcy >> 27) & 2) + 0]->pixmap(); + bitmap_ind16 &tm1 = tilemaps[((srcy >> 27) & 2) + 1]->pixmap(); src[0] = &tm0.pix16((srcy >> 20) & 0xff); src[1] = &tm1.pix16((srcy >> 20) & 0xff); @@ -1154,8 +1154,8 @@ static void update_tilemap_rowscroll(screen_device &screen, struct layer_info *l } /* look up the pages and get their source pixmaps */ - bitmap_ind16 &tm0 = tilemap_get_pixmap(tilemaps[((srcy >> 7) & 2) + 0]); - bitmap_ind16 &tm1 = tilemap_get_pixmap(tilemaps[((srcy >> 7) & 2) + 1]); + bitmap_ind16 &tm0 = tilemaps[((srcy >> 7) & 2) + 0]->pixmap(); + bitmap_ind16 &tm1 = tilemaps[((srcy >> 7) & 2) + 1]->pixmap(); src[0] = &tm0.pix16(srcy & 0xff); src[1] = &tm1.pix16(srcy & 0xff); diff --git a/src/mame/video/sei_crtc.c b/src/mame/video/sei_crtc.c index d985625b69e..b4f94928c7b 100644 --- a/src/mame/video/sei_crtc.c +++ b/src/mame/video/sei_crtc.c @@ -136,26 +136,26 @@ UINT16 seibucrtc_sc0bank; WRITE16_HANDLER( seibucrtc_sc0vram_w ) { COMBINE_DATA(&seibucrtc_sc0vram[offset]); - tilemap_mark_tile_dirty(sc0_tilemap,offset); + sc0_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( seibucrtc_sc2vram_w ) { COMBINE_DATA(&seibucrtc_sc2vram[offset]); - tilemap_mark_tile_dirty(sc2_tilemap,offset); + sc2_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( seibucrtc_sc1vram_w ) { COMBINE_DATA(&seibucrtc_sc1vram[offset]); - tilemap_mark_tile_dirty(sc1_tilemap,offset); + sc1_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( seibucrtc_sc3vram_w ) { COMBINE_DATA(&seibucrtc_sc3vram[offset]); - tilemap_mark_tile_dirty(sc3_tilemap_0,offset); - tilemap_mark_tile_dirty(sc3_tilemap_1,offset); + sc3_tilemap_0->mark_tile_dirty(offset); + sc3_tilemap_1->mark_tile_dirty(offset); } WRITE16_HANDLER( seibucrtc_vregs_w ) @@ -167,7 +167,7 @@ WRITE16_HANDLER( seibucrtc_vregs_w ) void seibucrtc_sc0bank_w(UINT16 data) { seibucrtc_sc0bank = data & 1; - tilemap_mark_all_tiles_dirty(sc0_tilemap); + sc0_tilemap->mark_all_dirty(); } @@ -261,10 +261,10 @@ VIDEO_START( seibu_crtc ) sc3_tilemap_0 = tilemap_create(machine, seibucrtc_sc3_tile_info,tilemap_scan_rows, 8, 8,32,32); sc3_tilemap_1 = tilemap_create(machine, seibucrtc_sc3_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(sc2_tilemap,15); - tilemap_set_transparent_pen(sc1_tilemap,15); - tilemap_set_transparent_pen(sc3_tilemap_0,15); - tilemap_set_transparent_pen(sc3_tilemap_1,15); + sc2_tilemap->set_transparent_pen(15); + sc1_tilemap->set_transparent_pen(15); + sc3_tilemap_0->set_transparent_pen(15); + sc3_tilemap_1->set_transparent_pen(15); seibucrtc_sc0bank = 0; } @@ -273,22 +273,22 @@ SCREEN_UPDATE_IND16( seibu_crtc ) { bitmap.fill(screen.machine().pens[0x7ff], cliprect); //black pen - tilemap_set_scrollx( sc0_tilemap,0, (SEIBU_CRTC_SC0_SX + SEIBU_CRTC_FIX_SX+64) & 0x1ff ); - tilemap_set_scrolly( sc0_tilemap,0, (SEIBU_CRTC_SC0_SY + SEIBU_CRTC_FIX_SY+1) & 0x1ff ); - tilemap_set_scrollx( sc2_tilemap,0, (SEIBU_CRTC_SC2_SX + SEIBU_CRTC_FIX_SX+64) & 0x1ff ); - tilemap_set_scrolly( sc2_tilemap,0, (SEIBU_CRTC_SC2_SY + SEIBU_CRTC_FIX_SY+1) & 0x1ff ); - tilemap_set_scrollx( sc1_tilemap,0, (SEIBU_CRTC_SC1_SX + SEIBU_CRTC_FIX_SX+64) & 0x1ff ); - tilemap_set_scrolly( sc1_tilemap,0, (SEIBU_CRTC_SC1_SY + SEIBU_CRTC_FIX_SY+1) & 0x1ff ); - tilemap_set_scrollx( SEIBU_CRTC_SC3_PAGE_SEL ? sc3_tilemap_0 : sc3_tilemap_1,0, (SEIBU_CRTC_FIX_SX+64) & 0x1ff ); - tilemap_set_scrolly( SEIBU_CRTC_SC3_PAGE_SEL ? sc3_tilemap_0 : sc3_tilemap_1,0, (SEIBU_CRTC_FIX_SY+1) & 0x1ff ); + sc0_tilemap->set_scrollx(0, (SEIBU_CRTC_SC0_SX + SEIBU_CRTC_FIX_SX+64) & 0x1ff ); + sc0_tilemap->set_scrolly(0, (SEIBU_CRTC_SC0_SY + SEIBU_CRTC_FIX_SY+1) & 0x1ff ); + sc2_tilemap->set_scrollx(0, (SEIBU_CRTC_SC2_SX + SEIBU_CRTC_FIX_SX+64) & 0x1ff ); + sc2_tilemap->set_scrolly(0, (SEIBU_CRTC_SC2_SY + SEIBU_CRTC_FIX_SY+1) & 0x1ff ); + sc1_tilemap->set_scrollx(0, (SEIBU_CRTC_SC1_SX + SEIBU_CRTC_FIX_SX+64) & 0x1ff ); + sc1_tilemap->set_scrolly(0, (SEIBU_CRTC_SC1_SY + SEIBU_CRTC_FIX_SY+1) & 0x1ff ); + (SEIBU_CRTC_SC3_PAGE_SEL ? sc3_tilemap_0 : sc3_tilemap_1)->set_scrollx(0, (SEIBU_CRTC_FIX_SX+64) & 0x1ff ); + (SEIBU_CRTC_SC3_PAGE_SEL ? sc3_tilemap_0 : sc3_tilemap_1)->set_scrolly(0, (SEIBU_CRTC_FIX_SY+1) & 0x1ff ); - if(SEIBU_CRTC_ENABLE_SC0) { tilemap_draw(bitmap,cliprect,sc0_tilemap,0,0); } + if(SEIBU_CRTC_ENABLE_SC0) { sc0_tilemap->draw(bitmap, cliprect, 0,0); } if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 2); } - if(SEIBU_CRTC_ENABLE_SC2) { tilemap_draw(bitmap,cliprect,sc2_tilemap,0,0); } + if(SEIBU_CRTC_ENABLE_SC2) { sc2_tilemap->draw(bitmap, cliprect, 0,0); } if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 1); } - if(SEIBU_CRTC_ENABLE_SC1) { tilemap_draw(bitmap,cliprect,sc1_tilemap,0,0); } + if(SEIBU_CRTC_ENABLE_SC1) { sc1_tilemap->draw(bitmap, cliprect, 0,0); } if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 0); } - if(SEIBU_CRTC_ENABLE_SC3) { tilemap_draw(bitmap,cliprect,SEIBU_CRTC_SC3_PAGE_SEL ? sc3_tilemap_0 : sc3_tilemap_1,0,0); } + if(SEIBU_CRTC_ENABLE_SC3) { (SEIBU_CRTC_SC3_PAGE_SEL ? sc3_tilemap_0 : sc3_tilemap_1)->draw(bitmap, cliprect, 0,0); } if(SEIBU_CRTC_ENABLE_SPR) { draw_sprites(screen.machine(), bitmap,cliprect, 3); } return 0; diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c index 1b499887c8b..0f1cb31a46c 100644 --- a/src/mame/video/seibuspi.c +++ b/src/mame/video/seibuspi.c @@ -31,19 +31,19 @@ void rf2_set_layer_banks(running_machine &machine, int banks) if (state->m_rf2_layer_bank[0] != BIT(banks,0)) { state->m_rf2_layer_bank[0] = BIT(banks,0); - tilemap_mark_all_tiles_dirty(state->m_back_layer); + state->m_back_layer->mark_all_dirty(); } if (state->m_rf2_layer_bank[1] != BIT(banks,1)) { state->m_rf2_layer_bank[1] = BIT(banks,1); - tilemap_mark_all_tiles_dirty(state->m_mid_layer); + state->m_mid_layer->mark_all_dirty(); } if (state->m_rf2_layer_bank[2] != BIT(banks,2)) { state->m_rf2_layer_bank[2] = BIT(banks,2); - tilemap_mark_all_tiles_dirty(state->m_fore_layer); + state->m_fore_layer->mark_all_dirty(); } } @@ -59,9 +59,9 @@ WRITE32_HANDLER( spi_layer_enable_w ) { seibuspi_state *state = space->machine().driver_data(); COMBINE_DATA( &state->m_layer_enable ); - tilemap_set_enable(state->m_back_layer, (state->m_layer_enable & 0x1) ^ 0x1); - tilemap_set_enable(state->m_mid_layer, ((state->m_layer_enable >> 1) & 0x1) ^ 0x1); - tilemap_set_enable(state->m_fore_layer, ((state->m_layer_enable >> 2) & 0x1) ^ 0x1); + state->m_back_layer->enable((state->m_layer_enable & 0x1) ^ 0x1); + state->m_mid_layer->enable(((state->m_layer_enable >> 1) & 0x1) ^ 0x1); + state->m_fore_layer->enable(((state->m_layer_enable >> 2) & 0x1) ^ 0x1); } WRITE32_HANDLER( tilemap_dma_start_w ) @@ -79,8 +79,8 @@ WRITE32_HANDLER( tilemap_dma_start_w ) UINT32 tile = state->m_spimainram[index]; if (state->m_tilemap_ram[i] != tile) { state->m_tilemap_ram[i] = tile; - tilemap_mark_tile_dirty( state->m_back_layer, (i * 2) ); - tilemap_mark_tile_dirty( state->m_back_layer, (i * 2) + 1 ); + state->m_back_layer->mark_tile_dirty((i * 2) ); + state->m_back_layer->mark_tile_dirty((i * 2) + 1 ); } index++; } @@ -94,8 +94,8 @@ WRITE32_HANDLER( tilemap_dma_start_w ) UINT32 tile = state->m_spimainram[index]; if (state->m_tilemap_ram[i+state->m_fore_layer_offset] != tile) { state->m_tilemap_ram[i+state->m_fore_layer_offset] = tile; - tilemap_mark_tile_dirty( state->m_fore_layer, (i * 2) ); - tilemap_mark_tile_dirty( state->m_fore_layer, (i * 2) + 1 ); + state->m_fore_layer->mark_tile_dirty((i * 2) ); + state->m_fore_layer->mark_tile_dirty((i * 2) + 1 ); } index++; } @@ -109,8 +109,8 @@ WRITE32_HANDLER( tilemap_dma_start_w ) UINT32 tile = state->m_spimainram[index]; if (state->m_tilemap_ram[i+state->m_mid_layer_offset] != tile) { state->m_tilemap_ram[i+state->m_mid_layer_offset] = tile; - tilemap_mark_tile_dirty( state->m_mid_layer, (i * 2) ); - tilemap_mark_tile_dirty( state->m_mid_layer, (i * 2) + 1 ); + state->m_mid_layer->mark_tile_dirty((i * 2) ); + state->m_mid_layer->mark_tile_dirty((i * 2) + 1 ); } index++; } @@ -124,8 +124,8 @@ WRITE32_HANDLER( tilemap_dma_start_w ) UINT32 tile = state->m_spimainram[index]; if (state->m_tilemap_ram[i+state->m_text_layer_offset] != tile) { state->m_tilemap_ram[i+state->m_text_layer_offset] = tile; - tilemap_mark_tile_dirty( state->m_text_layer, (i * 2) ); - tilemap_mark_tile_dirty( state->m_text_layer, (i * 2) + 1 ); + state->m_text_layer->mark_tile_dirty((i * 2) ); + state->m_text_layer->mark_tile_dirty((i * 2) + 1 ); } index++; } @@ -137,8 +137,8 @@ WRITE32_HANDLER( tilemap_dma_start_w ) UINT32 tile = state->m_spimainram[index]; if (state->m_tilemap_ram[i] != tile) { state->m_tilemap_ram[i] = tile; - tilemap_mark_tile_dirty( state->m_back_layer, (i * 2) ); - tilemap_mark_tile_dirty( state->m_back_layer, (i * 2) + 1 ); + state->m_back_layer->mark_tile_dirty((i * 2) ); + state->m_back_layer->mark_tile_dirty((i * 2) + 1 ); } index++; } @@ -148,8 +148,8 @@ WRITE32_HANDLER( tilemap_dma_start_w ) UINT32 tile = state->m_spimainram[index]; if (state->m_tilemap_ram[i+state->m_fore_layer_offset] != tile) { state->m_tilemap_ram[i+state->m_fore_layer_offset] = tile; - tilemap_mark_tile_dirty( state->m_fore_layer, (i * 2) ); - tilemap_mark_tile_dirty( state->m_fore_layer, (i * 2) + 1 ); + state->m_fore_layer->mark_tile_dirty((i * 2) ); + state->m_fore_layer->mark_tile_dirty((i * 2) + 1 ); } index++; } @@ -159,8 +159,8 @@ WRITE32_HANDLER( tilemap_dma_start_w ) UINT32 tile = state->m_spimainram[index]; if (state->m_tilemap_ram[i+state->m_mid_layer_offset] != tile) { state->m_tilemap_ram[i+state->m_mid_layer_offset] = tile; - tilemap_mark_tile_dirty( state->m_mid_layer, (i * 2) ); - tilemap_mark_tile_dirty( state->m_mid_layer, (i * 2) + 1 ); + state->m_mid_layer->mark_tile_dirty((i * 2) ); + state->m_mid_layer->mark_tile_dirty((i * 2) + 1 ); } index++; } @@ -170,8 +170,8 @@ WRITE32_HANDLER( tilemap_dma_start_w ) UINT32 tile = state->m_spimainram[index]; if (state->m_tilemap_ram[i+state->m_text_layer_offset] != tile) { state->m_tilemap_ram[i+state->m_text_layer_offset] = tile; - tilemap_mark_tile_dirty( state->m_text_layer, (i * 2) ); - tilemap_mark_tile_dirty( state->m_text_layer, (i * 2) + 1 ); + state->m_text_layer->mark_tile_dirty((i * 2) ); + state->m_text_layer->mark_tile_dirty((i * 2) + 1 ); } index++; } @@ -481,9 +481,9 @@ VIDEO_START( spi ) state->m_mid_layer = tilemap_create( machine, get_mid_tile_info, tilemap_scan_cols, 16,16,32,32 ); state->m_fore_layer = tilemap_create( machine, get_fore_tile_info, tilemap_scan_cols, 16,16,32,32 ); - tilemap_set_transparent_pen(state->m_text_layer, 31); - tilemap_set_transparent_pen(state->m_mid_layer, 63); - tilemap_set_transparent_pen(state->m_fore_layer, 63); + state->m_text_layer->set_transparent_pen(31); + state->m_mid_layer->set_transparent_pen(63); + state->m_fore_layer->set_transparent_pen(63); state->m_tilemap_ram = auto_alloc_array_clear(machine, UINT32, 0x4000/4); state->m_palette_ram = auto_alloc_array_clear(machine, UINT32, 0x3000/4); @@ -540,11 +540,11 @@ static void set_rowscroll(tilemap_t *layer, int scroll, INT16* rows) int i; int x = state->m_spi_scrollram[scroll] & 0xffff; int y = (state->m_spi_scrollram[scroll] >> 16) & 0xffff; - tilemap_set_scroll_rows(layer, 512); + layer->set_scroll_rows(512); for( i=0; i < 512; i++ ) { - tilemap_set_scrollx(layer, i, x + rows[i]); + layer->set_scrollx(i, x + rows[i]); } - tilemap_set_scrolly(layer, 0, y); + layer->set_scrolly(0, y); } static void set_scroll(tilemap_t *layer, int scroll) @@ -552,8 +552,8 @@ static void set_scroll(tilemap_t *layer, int scroll) seibuspi_state *state = machine.driver_data(); int x = state->m_spi_scrollram[scroll] & 0xffff; int y = (state->m_spi_scrollram[scroll] >> 16) & 0xffff; - tilemap_set_scrollx(layer, 0, x); - tilemap_set_scrolly(layer, 0, y); + layer->set_scrollx(0, x); + layer->set_scrolly(0, y); } #endif @@ -567,8 +567,8 @@ static void combine_tilemap(running_machine &machine, bitmap_rgb32 &bitmap, cons UINT8 *t; UINT32 xscroll_mask, yscroll_mask; - bitmap_ind16 &pen_bitmap = tilemap_get_pixmap(tile); - bitmap_ind8 &flags_bitmap = tilemap_get_flagsmap(tile); + bitmap_ind16 &pen_bitmap = tile->pixmap(); + bitmap_ind8 &flags_bitmap = tile->flagsmap(); xscroll_mask = pen_bitmap.width() - 1; yscroll_mask = pen_bitmap.height() - 1; diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c index 01f66ef37d4..a8b962cefe8 100644 --- a/src/mame/video/seicross.c +++ b/src/mame/video/seicross.c @@ -58,7 +58,7 @@ WRITE8_HANDLER( seicross_videoram_w ) seicross_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( seicross_colorram_w ) @@ -73,8 +73,8 @@ WRITE8_HANDLER( seicross_colorram_w ) state->m_colorram[offset] = data; state->m_colorram[offset + 0x20] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset + 0x20); + state->m_bg_tilemap->mark_tile_dirty(offset); + state->m_bg_tilemap->mark_tile_dirty(offset + 0x20); } static TILE_GET_INFO( get_bg_tile_info ) @@ -94,7 +94,7 @@ VIDEO_START( seicross ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -143,9 +143,9 @@ SCREEN_UPDATE_IND16( seicross ) int col; for (col = 0; col < 32; col++) - tilemap_set_scrolly(state->m_bg_tilemap, col, state->m_row_scroll[col]); + state->m_bg_tilemap->set_scrolly(col, state->m_row_scroll[col]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c index 93d2bc619de..2f6c52509ff 100644 --- a/src/mame/video/senjyo.c +++ b/src/mame/video/senjyo.c @@ -111,11 +111,11 @@ VIDEO_START( senjyo ) state->m_bg3_tilemap = tilemap_create(machine, get_bg3_tile_info, tilemap_scan_rows, 16, 16, 16, 32); /* only 16x32 used by Star Force */ } - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_transparent_pen(state->m_bg1_tilemap, 0); - tilemap_set_transparent_pen(state->m_bg2_tilemap, 0); - tilemap_set_transparent_pen(state->m_bg3_tilemap, 0); - tilemap_set_scroll_cols(state->m_fg_tilemap, 32); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg1_tilemap->set_transparent_pen(0); + state->m_bg2_tilemap->set_transparent_pen(0); + state->m_bg3_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scroll_cols(32); } @@ -131,35 +131,35 @@ WRITE8_HANDLER( senjyo_fgvideoram_w ) senjyo_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( senjyo_fgcolorram_w ) { senjyo_state *state = space->machine().driver_data(); state->m_fgcolorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( senjyo_bg1videoram_w ) { senjyo_state *state = space->machine().driver_data(); state->m_bg1videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg1_tilemap, offset); + state->m_bg1_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( senjyo_bg2videoram_w ) { senjyo_state *state = space->machine().driver_data(); state->m_bg2videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset); + state->m_bg2_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( senjyo_bg3videoram_w ) { senjyo_state *state = space->machine().driver_data(); state->m_bg3videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg3_tilemap, offset); + state->m_bg3_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( senjyo_bgstripes_w ) @@ -303,14 +303,14 @@ SCREEN_UPDATE_IND16( senjyo ) int scrollx,scrolly; for (i = 0;i < 32;i++) - tilemap_set_scrolly(state->m_fg_tilemap, i, state->m_fgscroll[i]); + state->m_fg_tilemap->set_scrolly(i, state->m_fgscroll[i]); scrollx = state->m_scrollx1[0]; scrolly = state->m_scrolly1[0] + 256 * state->m_scrolly1[1]; if (flip) scrollx = -scrollx; - tilemap_set_scrollx(state->m_bg1_tilemap, 0, scrollx); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, scrolly); + state->m_bg1_tilemap->set_scrollx(0, scrollx); + state->m_bg1_tilemap->set_scrolly(0, scrolly); scrollx = state->m_scrollx2[0]; scrolly = state->m_scrolly2[0] + 256 * state->m_scrolly2[1]; @@ -321,26 +321,26 @@ SCREEN_UPDATE_IND16( senjyo ) } if (flip) scrollx = -scrollx; - tilemap_set_scrollx(state->m_bg2_tilemap, 0, scrollx); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, scrolly); + state->m_bg2_tilemap->set_scrollx(0, scrollx); + state->m_bg2_tilemap->set_scrolly(0, scrolly); scrollx = state->m_scrollx3[0]; scrolly = state->m_scrolly3[0] + 256 * state->m_scrolly3[1]; if (flip) scrollx = -scrollx; - tilemap_set_scrollx(state->m_bg3_tilemap, 0, scrollx); - tilemap_set_scrolly(state->m_bg3_tilemap, 0, scrolly); + state->m_bg3_tilemap->set_scrollx(0, scrollx); + state->m_bg3_tilemap->set_scrolly(0, scrolly); } draw_bgbitmap(screen.machine(), bitmap, cliprect); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_bg3_tilemap, 0, 0); + state->m_bg3_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_bg2_tilemap, 0, 0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 2); - tilemap_draw(bitmap, cliprect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect, 3); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_radar(screen.machine(), bitmap, cliprect); #if 0 diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 3f63a374f1b..31e029d637b 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -360,7 +360,7 @@ Offset + 0x4: ***************************************************************************/ -INLINE void twineagl_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int offset ) +INLINE void twineagl_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int offset ) { seta_state *state = machine.driver_data(); UINT16 *vram = state->m_vram_0 + offset; @@ -375,7 +375,7 @@ static TILE_GET_INFO( twineagl_get_tile_info_0 ) { twineagl_tile_info( machine, static TILE_GET_INFO( twineagl_get_tile_info_1 ) { twineagl_tile_info( machine, tileinfo, tile_index, 0x1000 ); } -INLINE void get_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int layer, int offset ) +INLINE void get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int layer, int offset ) { seta_state *state = machine.driver_data(); int gfx = 1 + layer; @@ -408,9 +408,9 @@ WRITE16_HANDLER( seta_vram_0_w ) COMBINE_DATA(&state->m_vram_0[offset]); if (offset & 0x1000) - tilemap_mark_tile_dirty(state->m_tilemap_1, offset & 0x7ff); + state->m_tilemap_1->mark_tile_dirty(offset & 0x7ff); else - tilemap_mark_tile_dirty(state->m_tilemap_0, offset & 0x7ff); + state->m_tilemap_0->mark_tile_dirty(offset & 0x7ff); } WRITE16_HANDLER( seta_vram_2_w ) @@ -419,9 +419,9 @@ WRITE16_HANDLER( seta_vram_2_w ) COMBINE_DATA(&state->m_vram_2[offset]); if (offset & 0x1000) - tilemap_mark_tile_dirty(state->m_tilemap_3, offset & 0x7ff); + state->m_tilemap_3->mark_tile_dirty(offset & 0x7ff); else - tilemap_mark_tile_dirty(state->m_tilemap_2, offset & 0x7ff); + state->m_tilemap_2->mark_tile_dirty(offset & 0x7ff); } WRITE16_HANDLER( twineagl_tilebank_w ) @@ -433,7 +433,7 @@ WRITE16_HANDLER( twineagl_tilebank_w ) if (state->m_twineagl_tilebank[offset] != data) { state->m_twineagl_tilebank[offset] = data; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } } @@ -468,10 +468,10 @@ VIDEO_START( seta_2_layers ) state->m_tilemaps_flip = 0; state->m_color_mode_shift = 3; - tilemap_set_transparent_pen(state->m_tilemap_0, 0); - tilemap_set_transparent_pen(state->m_tilemap_1, 0); - tilemap_set_transparent_pen(state->m_tilemap_2, 0); - tilemap_set_transparent_pen(state->m_tilemap_3, 0); + state->m_tilemap_0->set_transparent_pen(0); + state->m_tilemap_1->set_transparent_pen(0); + state->m_tilemap_2->set_transparent_pen(0); + state->m_tilemap_3->set_transparent_pen(0); } @@ -494,8 +494,8 @@ VIDEO_START( seta_1_layer ) state->m_color_mode_shift = 4; - tilemap_set_transparent_pen(state->m_tilemap_0, 0); - tilemap_set_transparent_pen(state->m_tilemap_1, 0); + state->m_tilemap_0->set_transparent_pen(0); + state->m_tilemap_1->set_transparent_pen(0); } VIDEO_START( twineagl_1_layer ) @@ -514,8 +514,8 @@ VIDEO_START( twineagl_1_layer ) state->m_tilemap_1 = tilemap_create( machine, twineagl_get_tile_info_1, tilemap_scan_rows, 16,16, 64,32 ); - tilemap_set_transparent_pen(state->m_tilemap_0, 0); - tilemap_set_transparent_pen(state->m_tilemap_1, 0); + state->m_tilemap_0->set_transparent_pen(0); + state->m_tilemap_1->set_transparent_pen(0); } int setac_gfxbank_callback( running_machine &machine, UINT16 code, UINT8 color ) @@ -774,7 +774,7 @@ static void draw_tilemap_palette_effect(running_machine &machine, bitmap_ind16 & { int y; const gfx_element *gfx_tilemap = machine.gfx[gfxnum]; - const bitmap_ind16 &src_bitmap = tilemap_get_pixmap(tilemap); + const bitmap_ind16 &src_bitmap = tilemap->pixmap(); int width_mask, height_mask; int opaque_mask = gfx_tilemap->color_granularity - 1; int pixel_effect_mask = gfx_tilemap->color_base + (gfx_tilemap->total_colors - 1) * gfx_tilemap->color_granularity; @@ -856,8 +856,8 @@ void seta_layers_update(screen_device &screen, bitmap_ind16 &bitmap, const recta if(state->m_current_tilemap_mode[0] != (state->m_vctrl_0[ 4/2 ] & 0x10)) { state->m_current_tilemap_mode[0] = state->m_vctrl_0[ 4/2 ] & 0x10; - tilemap_mark_all_tiles_dirty(state->m_tilemap_0); - tilemap_mark_all_tiles_dirty(state->m_tilemap_1); + state->m_tilemap_0->mark_all_dirty(); + state->m_tilemap_1->mark_all_dirty(); } if(state->m_tilemap_2 != NULL && state->m_tilemap_3 != NULL) @@ -865,22 +865,22 @@ void seta_layers_update(screen_device &screen, bitmap_ind16 &bitmap, const recta if(state->m_current_tilemap_mode[1] != (state->m_vctrl_2[ 4/2 ] & 0x10)) { state->m_current_tilemap_mode[1] = state->m_vctrl_2[ 4/2 ] & 0x10; - tilemap_mark_all_tiles_dirty(state->m_tilemap_2); - tilemap_mark_all_tiles_dirty(state->m_tilemap_3); + state->m_tilemap_2->mark_all_dirty(); + state->m_tilemap_3->mark_all_dirty(); } } flip ^= state->m_tilemaps_flip; - tilemap_set_flip_all(screen.machine(), flip ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0 ); + screen.machine().tilemap().set_flip_all(flip ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0 ); x_0 = state->m_vctrl_0[ 0/2 ]; y_0 = state->m_vctrl_0[ 2/2 ]; enab_0 = state->m_vctrl_0[ 4/2 ]; /* Only one tilemap per layer is enabled! */ - tilemap_set_enable(state->m_tilemap_0, (!(enab_0 & 0x0008)) /*&& (enab_0 & 0x0001)*/ ); - tilemap_set_enable(state->m_tilemap_1, ( (enab_0 & 0x0008)) /*&& (enab_0 & 0x0001)*/ ); + state->m_tilemap_0->enable((!(enab_0 & 0x0008)) /*&& (enab_0 & 0x0001)*/ ); + state->m_tilemap_1->enable(( (enab_0 & 0x0008)) /*&& (enab_0 & 0x0001)*/ ); /* the hardware wants different scroll values when flipped */ @@ -898,10 +898,10 @@ void seta_layers_update(screen_device &screen, bitmap_ind16 &bitmap, const recta y_0 = y_0 - vis_dimy; } - tilemap_set_scrollx(state->m_tilemap_0, 0, x_0); - tilemap_set_scrollx(state->m_tilemap_1, 0, x_0); - tilemap_set_scrolly(state->m_tilemap_0, 0, y_0); - tilemap_set_scrolly(state->m_tilemap_1, 0, y_0); + state->m_tilemap_0->set_scrollx(0, x_0); + state->m_tilemap_1->set_scrollx(0, x_0); + state->m_tilemap_0->set_scrolly(0, y_0); + state->m_tilemap_1->set_scrolly(0, y_0); if (state->m_tilemap_2) { @@ -909,8 +909,8 @@ void seta_layers_update(screen_device &screen, bitmap_ind16 &bitmap, const recta y_1 = state->m_vctrl_2[ 2/2 ]; enab_1 = state->m_vctrl_2[ 4/2 ]; - tilemap_set_enable(state->m_tilemap_2, (!(enab_1 & 0x0008)) /*&& (enab_1 & 0x0001)*/ ); - tilemap_set_enable(state->m_tilemap_3, ( (enab_1 & 0x0008)) /*&& (enab_1 & 0x0001)*/ ); + state->m_tilemap_2->enable((!(enab_1 & 0x0008)) /*&& (enab_1 & 0x0001)*/ ); + state->m_tilemap_3->enable(( (enab_1 & 0x0008)) /*&& (enab_1 & 0x0001)*/ ); x_1 += 0x10 - state->m_global_offsets->tilemap_offs[flip ? 1 : 0]; y_1 -= (256 - vis_dimy)/2; @@ -920,10 +920,10 @@ void seta_layers_update(screen_device &screen, bitmap_ind16 &bitmap, const recta y_1 = y_1 - vis_dimy; } - tilemap_set_scrollx(state->m_tilemap_2, 0, x_1); - tilemap_set_scrollx(state->m_tilemap_3, 0, x_1); - tilemap_set_scrolly(state->m_tilemap_2, 0, y_1); - tilemap_set_scrolly(state->m_tilemap_3, 0, y_1); + state->m_tilemap_2->set_scrollx(0, x_1); + state->m_tilemap_3->set_scrollx(0, x_1); + state->m_tilemap_2->set_scrolly(0, y_1); + state->m_tilemap_3->set_scrolly(0, y_1); order = state->m_vregs[ 2/2 ]; } @@ -950,8 +950,8 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) { if (state->m_tilemap_2) { - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_tilemap_2, TILEMAP_DRAW_OPAQUE, 0); - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_tilemap_3, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 2) state->m_tilemap_2->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 2) state->m_tilemap_3->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); } if (order & 2) // layer-sprite priority? @@ -963,8 +963,8 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) popmessage("Missing palette effect. Contact MAMETesters."); } - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 0); - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 0); + if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); + if (layers_ctrl & 1) state->m_tilemap_1->draw(bitmap, cliprect, 0, 0); } else { @@ -973,16 +973,16 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) popmessage("Missing palette effect. Contact MAMETesters."); } - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 0); - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 0); + if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); + if (layers_ctrl & 1) state->m_tilemap_1->draw(bitmap, cliprect, 0, 0); if (layers_ctrl & 8) screen.machine().device("spritegen")->seta001_draw_sprites(screen.machine(),bitmap,cliprect,sprite_bank_size, sprite_setac); } } else { - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_tilemap_0, TILEMAP_DRAW_OPAQUE, 0); - if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->m_tilemap_1, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + if (layers_ctrl & 1) state->m_tilemap_1->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); if (order & 2) // layer-sprite priority? { @@ -990,7 +990,7 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) if((order & 4) && state->m_paletteram2 != NULL) { - if(tilemap_get_enable(state->m_tilemap_2)) + if(state->m_tilemap_2->enabled()) { draw_tilemap_palette_effect(screen.machine(), bitmap, cliprect, state->m_tilemap_2, x_1, y_1, 2 + ((state->m_vctrl_2[ 4/2 ] & 0x10) >> state->m_color_mode_shift), flip); } @@ -1008,8 +1008,8 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) if (state->m_tilemap_2) { - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_tilemap_2, 0, 0); - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_tilemap_3, 0, 0); + if (layers_ctrl & 2) state->m_tilemap_2->draw(bitmap, cliprect, 0, 0); + if (layers_ctrl & 2) state->m_tilemap_3->draw(bitmap, cliprect, 0, 0); } } } @@ -1017,7 +1017,7 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) { if((order & 4) && state->m_paletteram2 != NULL) { - if(tilemap_get_enable(state->m_tilemap_2)) + if(state->m_tilemap_2->enabled()) { draw_tilemap_palette_effect(screen.machine(), bitmap, cliprect, state->m_tilemap_2, x_1, y_1, 2 + ((state->m_vctrl_2[ 4/2 ] & 0x10) >> state->m_color_mode_shift), flip); } @@ -1035,8 +1035,8 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) if (state->m_tilemap_2) { - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_tilemap_2, 0, 0); - if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->m_tilemap_3, 0, 0); + if (layers_ctrl & 2) state->m_tilemap_2->draw(bitmap, cliprect, 0, 0); + if (layers_ctrl & 2) state->m_tilemap_3->draw(bitmap, cliprect, 0, 0); } } diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index 64b1f4cbab2..d6af20ed115 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -60,8 +60,8 @@ VIDEO_START( sf ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 16, 16, 2048, 16); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_transparent_pen(state->m_tx_tilemap, 3); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(3); } @@ -76,21 +76,21 @@ WRITE16_HANDLER( sf_videoram_w ) { sf_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( sf_bg_scroll_w ) { sf_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgscroll); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bgscroll); + state->m_bg_tilemap->set_scrollx(0, state->m_bgscroll); } WRITE16_HANDLER( sf_fg_scroll_w ) { sf_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fgscroll); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_fgscroll); + state->m_fg_tilemap->set_scrollx(0, state->m_fgscroll); } WRITE16_HANDLER( sf_gfxctrl_w ) @@ -109,9 +109,9 @@ WRITE16_HANDLER( sf_gfxctrl_w ) { state->m_sf_active = data & 0xff; flip_screen_set(space->machine(), data & 0x04); - tilemap_set_enable(state->m_tx_tilemap, data & 0x08); - tilemap_set_enable(state->m_bg_tilemap, data & 0x20); - tilemap_set_enable(state->m_fg_tilemap, data & 0x40); + state->m_tx_tilemap->enable(data & 0x08); + state->m_bg_tilemap->enable(data & 0x20); + state->m_fg_tilemap->enable(data & 0x40); } } @@ -223,15 +223,15 @@ SCREEN_UPDATE_IND16( sf ) sf_state *state = screen.machine().driver_data(); if (state->m_sf_active & 0x20) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); else bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_sf_active & 0x80) draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index 3c5c2b19d70..7ccde454a0c 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -19,7 +19,7 @@ WRITE16_HANDLER( shadfrce_fgvideoram_w ) shadfrce_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fgtilemap,offset/2); + state->m_fgtilemap->mark_tile_dirty(offset/2); } static TILE_GET_INFO( get_shadfrce_bg0tile_info ) @@ -42,7 +42,7 @@ WRITE16_HANDLER( shadfrce_bg0videoram_w ) shadfrce_state *state = space->machine().driver_data(); state->m_bg0videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg0tilemap,offset/2); + state->m_bg0tilemap->mark_tile_dirty(offset/2); } static TILE_GET_INFO( get_shadfrce_bg1tile_info ) @@ -61,7 +61,7 @@ WRITE16_HANDLER( shadfrce_bg1videoram_w ) shadfrce_state *state = space->machine().driver_data(); state->m_bg1videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg1tilemap,offset); + state->m_bg1tilemap->mark_tile_dirty(offset); } @@ -72,10 +72,10 @@ VIDEO_START( shadfrce ) shadfrce_state *state = machine.driver_data(); state->m_fgtilemap = tilemap_create(machine, get_shadfrce_fgtile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_fgtilemap,0); + state->m_fgtilemap->set_transparent_pen(0); state->m_bg0tilemap = tilemap_create(machine, get_shadfrce_bg0tile_info,tilemap_scan_rows, 16, 16,32,32); - tilemap_set_transparent_pen(state->m_bg0tilemap,0); + state->m_bg0tilemap->set_transparent_pen(0); state->m_bg1tilemap = tilemap_create(machine, get_shadfrce_bg1tile_info,tilemap_scan_rows, 16, 16,32,32); @@ -86,28 +86,28 @@ WRITE16_HANDLER ( shadfrce_bg0scrollx_w ) { shadfrce_state *state = space->machine().driver_data(); - tilemap_set_scrollx( state->m_bg0tilemap, 0, data & 0x1ff ); + state->m_bg0tilemap->set_scrollx(0, data & 0x1ff ); } WRITE16_HANDLER ( shadfrce_bg0scrolly_w ) { shadfrce_state *state = space->machine().driver_data(); - tilemap_set_scrolly( state->m_bg0tilemap, 0, data & 0x1ff ); + state->m_bg0tilemap->set_scrolly(0, data & 0x1ff ); } WRITE16_HANDLER ( shadfrce_bg1scrollx_w ) { shadfrce_state *state = space->machine().driver_data(); - tilemap_set_scrollx( state->m_bg1tilemap, 0, data & 0x1ff ); + state->m_bg1tilemap->set_scrollx(0, data & 0x1ff ); } WRITE16_HANDLER ( shadfrce_bg1scrolly_w ) { shadfrce_state *state = space->machine().driver_data(); - tilemap_set_scrolly( state->m_bg1tilemap, 0, data & 0x1ff ); + state->m_bg1tilemap->set_scrolly(0, data & 0x1ff ); } @@ -169,10 +169,10 @@ SCREEN_UPDATE_IND16( shadfrce ) if (state->m_video_enable) { - tilemap_draw(bitmap,cliprect,state->m_bg1tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_bg0tilemap,0,1); + state->m_bg1tilemap->draw(bitmap, cliprect, 0,0); + state->m_bg0tilemap->draw(bitmap, cliprect, 0,1); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_fgtilemap, 0,0); + state->m_fgtilemap->draw(bitmap, cliprect, 0,0); } else { diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index 409f59f7d22..f05b919511f 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -42,7 +42,7 @@ static TILE_GET_INFO( get_bg_tile_info ){ (attributes&0x80)?TILE_FLIPX:0); } - tileinfo->category = + tileinfo.category = (machine.region( "proms" )->base()[0x800+color*4]==2)?1:0; } @@ -57,7 +57,7 @@ WRITE8_HANDLER( shangkid_videoram_w ) shangkid_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty( state->m_background, offset&0x7ff ); + state->m_background->mark_tile_dirty(offset&0x7ff ); } static void draw_sprite(running_machine &machine, const UINT8 *source, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -189,13 +189,13 @@ SCREEN_UPDATE_IND16( shangkid ) { shangkid_state *state = screen.machine().driver_data(); int flipscreen = state->m_videoreg[1]&0x80; - tilemap_set_flip( state->m_background, flipscreen?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); - tilemap_set_scrollx( state->m_background,0,state->m_videoreg[0]-40 ); - tilemap_set_scrolly( state->m_background,0,state->m_videoreg[2]+0x10 ); + state->m_background->set_flip(flipscreen?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); + state->m_background->set_scrollx(0,state->m_videoreg[0]-40 ); + state->m_background->set_scrolly(0,state->m_videoreg[2]+0x10 ); - tilemap_draw( bitmap,cliprect,state->m_background,0,0 ); + state->m_background->draw(bitmap, cliprect, 0,0 ); shangkid_draw_sprites(screen.machine(), bitmap,cliprect ); - tilemap_draw( bitmap,cliprect,state->m_background,1,0 ); /* high priority tiles */ + state->m_background->draw(bitmap, cliprect, 1,0 ); /* high priority tiles */ return 0; } diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index 4a47eb91aab..798c5a724a4 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -93,7 +93,7 @@ WRITE8_HANDLER( shaolins_videoram_w ) shaolins_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( shaolins_colorram_w ) @@ -101,7 +101,7 @@ WRITE8_HANDLER( shaolins_colorram_w ) shaolins_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( shaolins_palettebank_w ) @@ -111,7 +111,7 @@ WRITE8_HANDLER( shaolins_palettebank_w ) if (state->m_palettebank != (data & 0x07)) { state->m_palettebank = data & 0x07; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -121,7 +121,7 @@ WRITE8_HANDLER( shaolins_scroll_w ) int col; for (col = 4; col < 32; col++) - tilemap_set_scrolly(state->m_bg_tilemap, col, data + 1); + state->m_bg_tilemap->set_scrolly(col, data + 1); } WRITE8_HANDLER( shaolins_nmi_w ) @@ -133,7 +133,7 @@ WRITE8_HANDLER( shaolins_nmi_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -155,7 +155,7 @@ VIDEO_START( shaolins ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_cols(32); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -196,7 +196,7 @@ SCREEN_UPDATE_IND16( shaolins ) { shaolins_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index c8536057778..b7f363081f6 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -6,7 +6,7 @@ WRITE8_HANDLER( sichuan2_videoram_w ) shisen_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( sichuan2_bankswitch_w ) @@ -28,7 +28,7 @@ WRITE8_HANDLER( sichuan2_bankswitch_w ) if (state->m_gfxbank != bank) { state->m_gfxbank = bank; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* bits 6-7 unknown */ @@ -72,6 +72,6 @@ SCREEN_UPDATE_IND16( sichuan2 ) flip_screen_set(screen.machine(), ~input_port_read(screen.machine(), "DSW2") & 1); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index b98db514319..bab7a7f7e9f 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -71,7 +71,7 @@ WRITE8_HANDLER( shootout_videoram_w ) shootout_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty( state->m_background, offset&0x3ff ); + state->m_background->mark_tile_dirty(offset&0x3ff ); } WRITE8_HANDLER( shootout_textram_w ) @@ -79,7 +79,7 @@ WRITE8_HANDLER( shootout_textram_w ) shootout_state *state = space->machine().driver_data(); state->m_textram[offset] = data; - tilemap_mark_tile_dirty( state->m_foreground, offset&0x3ff ); + state->m_foreground->mark_tile_dirty(offset&0x3ff ); } VIDEO_START( shootout ) @@ -88,7 +88,7 @@ VIDEO_START( shootout ) state->m_background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_foreground = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen( state->m_foreground, 0 ); + state->m_foreground->set_transparent_pen(0 ); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int bank_bits ) @@ -177,8 +177,8 @@ SCREEN_UPDATE_IND16( shootout ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect,state->m_background,0,0); - tilemap_draw(bitmap,cliprect,state->m_foreground,0,1); + state->m_background->draw(bitmap, cliprect, 0,0); + state->m_foreground->draw(bitmap, cliprect, 0,1); draw_sprites(screen.machine(), bitmap,cliprect,3/*bank bits */); return 0; } @@ -189,8 +189,8 @@ SCREEN_UPDATE_IND16( shootouj ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect,state->m_background,0,0); - tilemap_draw(bitmap,cliprect,state->m_foreground,0,1); + state->m_background->draw(bitmap, cliprect, 0,0); + state->m_foreground->draw(bitmap, cliprect, 0,1); draw_sprites(screen.machine(), bitmap,cliprect,2/*bank bits*/); return 0; } diff --git a/src/mame/video/shuuz.c b/src/mame/video/shuuz.c index 83a972449b5..695f3556971 100644 --- a/src/mame/video/shuuz.c +++ b/src/mame/video/shuuz.c @@ -97,7 +97,7 @@ SCREEN_UPDATE_IND16( shuuz ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index ab8cea31c54..0d6a0a04533 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -14,7 +14,7 @@ WRITE8_HANDLER( sidearms_videoram_w ) sidearms_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sidearms_colorram_w ) @@ -22,7 +22,7 @@ WRITE8_HANDLER( sidearms_colorram_w ) sidearms_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sidearms_c804_w ) @@ -67,7 +67,7 @@ WRITE8_HANDLER( sidearms_c804_w ) { state->m_flipon = data & 0x80; flip_screen_set(space->machine(), state->m_flipon); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -156,7 +156,7 @@ VIDEO_START( sidearms ) state->m_bg_tilemap = tilemap_create(machine, get_sidearms_bg_tile_info, sidearms_tilemap_scan, 32, 32, 128, 128); - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); + state->m_bg_tilemap->set_transparent_pen(15); } else { @@ -166,7 +166,7 @@ VIDEO_START( sidearms ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_fg_tilemap, 3); + state->m_fg_tilemap->set_transparent_pen(3); state->m_hflop_74a_n = 1; state->m_latch_374 = state->m_vcount_191 = state->m_hcount_191 = 0; @@ -352,17 +352,17 @@ SCREEN_UPDATE_IND16( sidearms ) sidearms_draw_starfield(screen.machine(), bitmap); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx[0] + (state->m_bg_scrollx[1] << 8 & 0xf00)); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly[0] + (state->m_bg_scrolly[1] << 8 & 0xf00)); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx[0] + (state->m_bg_scrollx[1] << 8 & 0xf00)); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly[0] + (state->m_bg_scrolly[1] << 8 & 0xf00)); if (state->m_bgon) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_objon) draw_sprites(screen.machine(), bitmap, cliprect); if (state->m_charon) - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 625cca12280..93fb49216dc 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -50,7 +50,7 @@ static TILE_GET_INFO( get_tile_info ) state->m_videoram[tile_index] + ((attr & 0x07) << 8), ((attr & 0x10) >> 3) | ((attr & 0x20) >> 5), TILE_FLIPX); - tileinfo->group = (attr & 0x80) >> 7; + tileinfo.group = (attr & 0x80) >> 7; } @@ -66,10 +66,10 @@ VIDEO_START( sidepckt ) sidepckt_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transmask(state->m_bg_tilemap,0,0xff,0x00); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap,1,0x01,0xfe); /* split type 1 has pen 0 transparent in front half */ + state->m_bg_tilemap->set_transmask(0,0xff,0x00); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1,0x01,0xfe); /* split type 1 has pen 0 transparent in front half */ - tilemap_set_flip_all(machine,TILEMAP_FLIPX); + machine.tilemap().set_flip_all(TILEMAP_FLIPX); } @@ -84,20 +84,20 @@ WRITE8_HANDLER( sidepckt_videoram_w ) { sidepckt_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sidepckt_colorram_w ) { sidepckt_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sidepckt_flipscreen_w ) { int flipscreen = data; - tilemap_set_flip_all(space->machine(),flipscreen ? TILEMAP_FLIPY : TILEMAP_FLIPX); + space->machine().tilemap().set_flip_all(flipscreen ? TILEMAP_FLIPY : TILEMAP_FLIPX); } @@ -144,8 +144,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re SCREEN_UPDATE_IND16( sidepckt ) { sidepckt_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_LAYER1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_LAYER0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0); return 0; } diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index 7abbd832a47..2ff3b3d5341 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -78,7 +78,7 @@ WRITE32_HANDLER( silkroad_fgram_w ) silkroad_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vidram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_fg2_tile_info ) @@ -102,7 +102,7 @@ WRITE32_HANDLER( silkroad_fgram2_w ) silkroad_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vidram2[offset]); - tilemap_mark_tile_dirty(state->m_fg2_tilemap,offset); + state->m_fg2_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_fg3_tile_info ) @@ -126,7 +126,7 @@ WRITE32_HANDLER( silkroad_fgram3_w ) silkroad_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vidram3[offset]); - tilemap_mark_tile_dirty(state->m_fg3_tilemap,offset); + state->m_fg3_tilemap->mark_tile_dirty(offset); } VIDEO_START(silkroad) @@ -136,9 +136,9 @@ VIDEO_START(silkroad) state->m_fg2_tilemap = tilemap_create(machine, get_fg2_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_fg3_tilemap = tilemap_create(machine, get_fg3_tile_info, tilemap_scan_rows, 16, 16, 64, 64); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg2_tilemap, 0); - tilemap_set_transparent_pen(state->m_fg3_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_fg2_tilemap->set_transparent_pen(0); + state->m_fg3_tilemap->set_transparent_pen(0); } SCREEN_UPDATE_IND16(silkroad) @@ -147,18 +147,18 @@ SCREEN_UPDATE_IND16(silkroad) screen.machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0x7c0, cliprect); - tilemap_set_scrollx( state->m_fg_tilemap, 0, ((state->m_regs[0] & 0xffff0000) >> 16) ); - tilemap_set_scrolly( state->m_fg_tilemap, 0, (state->m_regs[0] & 0x0000ffff) >> 0 ); + state->m_fg_tilemap->set_scrollx(0, ((state->m_regs[0] & 0xffff0000) >> 16) ); + state->m_fg_tilemap->set_scrolly(0, (state->m_regs[0] & 0x0000ffff) >> 0 ); - tilemap_set_scrolly( state->m_fg3_tilemap, 0, (state->m_regs[1] & 0xffff0000) >> 16 ); - tilemap_set_scrollx( state->m_fg3_tilemap, 0, (state->m_regs[2] & 0xffff0000) >> 16 ); + state->m_fg3_tilemap->set_scrolly(0, (state->m_regs[1] & 0xffff0000) >> 16 ); + state->m_fg3_tilemap->set_scrollx(0, (state->m_regs[2] & 0xffff0000) >> 16 ); - tilemap_set_scrolly( state->m_fg2_tilemap, 0, ((state->m_regs[5] & 0xffff0000) >> 16)); - tilemap_set_scrollx( state->m_fg2_tilemap, 0, (state->m_regs[2] & 0x0000ffff) >> 0 ); + state->m_fg2_tilemap->set_scrolly(0, ((state->m_regs[5] & 0xffff0000) >> 16)); + state->m_fg2_tilemap->set_scrollx(0, (state->m_regs[2] & 0x0000ffff) >> 0 ); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap, 0,0); - tilemap_draw(bitmap,cliprect,state->m_fg2_tilemap,0,1); - tilemap_draw(bitmap,cliprect,state->m_fg3_tilemap,0,2); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg2_tilemap->draw(bitmap, cliprect, 0,1); + state->m_fg3_tilemap->draw(bitmap, cliprect, 0,2); draw_sprites(screen.machine(),bitmap,cliprect); if (0) diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c index 3a99b1faf96..10a4fdf86aa 100644 --- a/src/mame/video/skullxbo.c +++ b/src/mame/video/skullxbo.c @@ -93,7 +93,7 @@ VIDEO_START( skullxbo ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); } @@ -118,7 +118,7 @@ WRITE16_HANDLER( skullxbo_xscroll_w ) space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); /* adjust the actual scrolls */ - tilemap_set_scrollx(state->m_playfield_tilemap, 0, 2 * (newscroll >> 7)); + state->m_playfield_tilemap->set_scrollx(0, 2 * (newscroll >> 7)); atarimo_set_xscroll(0, 2 * (newscroll >> 7)); /* update the data */ @@ -147,7 +147,7 @@ WRITE16_HANDLER( skullxbo_yscroll_w ) effscroll = (newscroll >> 7) - scanline; /* adjust the actual scrolls */ - tilemap_set_scrolly(state->m_playfield_tilemap, 0, effscroll); + state->m_playfield_tilemap->set_scrolly(0, effscroll); atarimo_set_yscroll(0, effscroll & 0x1ff); /* update the data */ @@ -204,7 +204,7 @@ void skullxbo_scanline_update(running_machine &machine, int scanline) if (scanline == 0) { int newscroll = (*state->m_yscroll >> 7) & 0x1ff; - tilemap_set_scrolly(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrolly(0, newscroll); atarimo_set_yscroll(0, newscroll); } @@ -225,7 +225,7 @@ void skullxbo_scanline_update(running_machine &machine, int scanline) machine.primary_screen->update_partial(scanline - 1); /* update the new scroll */ - tilemap_set_scrolly(state->m_playfield_tilemap, 0, newscroll); + state->m_playfield_tilemap->set_scrolly(0, newscroll); atarimo_set_yscroll(0, newscroll); /* make sure we change this value so that writes to the scroll register */ @@ -251,7 +251,7 @@ SCREEN_UPDATE_IND16( skullxbo ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -315,6 +315,6 @@ SCREEN_UPDATE_IND16( skullxbo ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c index 25701b762f9..af5c9124a94 100644 --- a/src/mame/video/skydiver.c +++ b/src/mame/video/skydiver.c @@ -67,7 +67,7 @@ WRITE8_HANDLER( skydiver_videoram_w ) { skydiver_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -209,7 +209,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( skydiver ) { skydiver_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c index dfb21d8207d..2821c9b702c 100644 --- a/src/mame/video/skykid.c +++ b/src/mame/video/skykid.c @@ -75,7 +75,7 @@ static TILE_GET_INFO( tx_get_tile_info ) skykid_state *state = machine.driver_data(); int code = state->m_textram[tile_index]; int attr = state->m_textram[tile_index + 0x400]; - tileinfo->category = code >> 4 & 0xf; + tileinfo.category = code >> 4 & 0xf; /* the hardware has two character sets, one normal and one flipped. When screen is flipped, character flip is done by selecting the 2nd character set. @@ -116,7 +116,7 @@ VIDEO_START( skykid ) state->m_tx_tilemap = tilemap_create(machine, tx_get_tile_info,tx_tilemap_scan, 8,8,36,28); state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows, 8,8,64,32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); + state->m_tx_tilemap->set_transparent_pen(0); state_save_register_global(machine, state->m_priority); state_save_register_global(machine, state->m_scroll_x); @@ -141,7 +141,7 @@ WRITE8_HANDLER( skykid_videoram_w ) { skykid_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } READ8_HANDLER( skykid_textram_r ) @@ -154,7 +154,7 @@ WRITE8_HANDLER( skykid_textram_w ) { skykid_state *state = space->machine().driver_data(); state->m_textram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset & 0x3ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( skykid_scroll_x_w ) @@ -243,16 +243,16 @@ SCREEN_UPDATE_IND16( skykid ) skykid_state *state = screen.machine().driver_data(); if (flip_screen_get(screen.machine())) { - tilemap_set_scrollx(state->m_bg_tilemap, 0, 189 - (state->m_scroll_x ^ 1)); - tilemap_set_scrolly(state->m_bg_tilemap, 0, 7 - state->m_scroll_y); + state->m_bg_tilemap->set_scrollx(0, 189 - (state->m_scroll_x ^ 1)); + state->m_bg_tilemap->set_scrolly(0, 7 - state->m_scroll_y); } else { - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_x + 35); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll_y + 25); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_x + 35); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll_y + 25); } - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_OPAQUE,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); if (state->m_priority & 0x04) { @@ -260,18 +260,18 @@ SCREEN_UPDATE_IND16( skykid ) int cat, pri = state->m_priority >> 4; // draw low priority tiles - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, pri, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, pri, 0); draw_sprites(screen.machine(), bitmap, cliprect); // draw the other tiles for (cat = 0; cat < 0xf; cat++) - if (cat != pri) tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, cat, 0); + if (cat != pri) state->m_tx_tilemap->draw(bitmap, cliprect, cat, 0); } else { draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, TILEMAP_DRAW_ALL_CATEGORIES, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_ALL_CATEGORIES, 0); } return 0; diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index ffcbbeb3419..ece21d346f2 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -72,7 +72,7 @@ VIDEO_START( perfrman ) slapfght_state *state = machine.driver_data(); state->m_pf1_tilemap = tilemap_create(machine, get_pf_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_pf1_tilemap,0); + state->m_pf1_tilemap->set_transparent_pen(0); } VIDEO_START( slapfight ) @@ -81,7 +81,7 @@ VIDEO_START( slapfight ) state->m_pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_rows,8,8,64,32); state->m_fix_tilemap = tilemap_create(machine, get_fix_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_fix_tilemap,0); + state->m_fix_tilemap->set_transparent_pen(0); } @@ -95,28 +95,28 @@ WRITE8_HANDLER( slapfight_videoram_w ) { slapfght_state *state = space->machine().driver_data(); state->m_slapfight_videoram[offset]=data; - tilemap_mark_tile_dirty(state->m_pf1_tilemap,offset); + state->m_pf1_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( slapfight_colorram_w ) { slapfght_state *state = space->machine().driver_data(); state->m_slapfight_colorram[offset]=data; - tilemap_mark_tile_dirty(state->m_pf1_tilemap,offset); + state->m_pf1_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( slapfight_fixram_w ) { slapfght_state *state = space->machine().driver_data(); state->m_slapfight_fixvideoram[offset]=data; - tilemap_mark_tile_dirty(state->m_fix_tilemap,offset); + state->m_fix_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( slapfight_fixcol_w ) { slapfght_state *state = space->machine().driver_data(); state->m_slapfight_fixcolorram[offset]=data; - tilemap_mark_tile_dirty(state->m_fix_tilemap,offset); + state->m_fix_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( slapfight_flipscreen_w ) @@ -190,18 +190,18 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( perfrman ) { slapfght_state *state = screen.machine().driver_data(); - tilemap_set_flip( state->m_pf1_tilemap, state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - tilemap_set_scrolly( state->m_pf1_tilemap ,0 , 0 ); + state->m_pf1_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + state->m_pf1_tilemap ->set_scrolly(0 , 0 ); if (state->m_flipscreen) { - tilemap_set_scrollx( state->m_pf1_tilemap ,0 , 264 ); + state->m_pf1_tilemap ->set_scrollx(0 , 264 ); } else { - tilemap_set_scrollx( state->m_pf1_tilemap ,0 , -16 ); + state->m_pf1_tilemap ->set_scrollx(0 , -16 ); } - tilemap_draw(bitmap,cliprect,state->m_pf1_tilemap,TILEMAP_DRAW_OPAQUE,0); + state->m_pf1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_pf1_tilemap,0,0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect,0x80); slapfght_log_vram(screen.machine()); @@ -215,21 +215,21 @@ SCREEN_UPDATE_IND16( slapfight ) UINT8 *buffered_spriteram = screen.machine().generic.buffered_spriteram.u8; int offs; - tilemap_set_flip_all(screen.machine(),state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (state->m_flipscreen) { - tilemap_set_scrollx( state->m_fix_tilemap,0,296); - tilemap_set_scrollx( state->m_pf1_tilemap,0,(*state->m_slapfight_scrollx_lo + 256 * *state->m_slapfight_scrollx_hi)+296 ); - tilemap_set_scrolly( state->m_pf1_tilemap,0, (*state->m_slapfight_scrolly)+15 ); - tilemap_set_scrolly( state->m_fix_tilemap,0, -1 ); /* Glitch in Tiger Heli otherwise */ + state->m_fix_tilemap->set_scrollx(0,296); + state->m_pf1_tilemap->set_scrollx(0,(*state->m_slapfight_scrollx_lo + 256 * *state->m_slapfight_scrollx_hi)+296 ); + state->m_pf1_tilemap->set_scrolly(0, (*state->m_slapfight_scrolly)+15 ); + state->m_fix_tilemap->set_scrolly(0, -1 ); /* Glitch in Tiger Heli otherwise */ } else { - tilemap_set_scrollx( state->m_fix_tilemap,0,0); - tilemap_set_scrollx( state->m_pf1_tilemap,0,(*state->m_slapfight_scrollx_lo + 256 * *state->m_slapfight_scrollx_hi) ); - tilemap_set_scrolly( state->m_pf1_tilemap,0, (*state->m_slapfight_scrolly)-1 ); - tilemap_set_scrolly( state->m_fix_tilemap,0, -1 ); /* Glitch in Tiger Heli otherwise */ + state->m_fix_tilemap->set_scrollx(0,0); + state->m_pf1_tilemap->set_scrollx(0,(*state->m_slapfight_scrollx_lo + 256 * *state->m_slapfight_scrollx_hi) ); + state->m_pf1_tilemap->set_scrolly(0, (*state->m_slapfight_scrolly)-1 ); + state->m_fix_tilemap->set_scrolly(0, -1 ); /* Glitch in Tiger Heli otherwise */ } - tilemap_draw(bitmap,cliprect,state->m_pf1_tilemap,0,0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0,0); /* Draw the sprites */ for (offs = 0;offs < screen.machine().generic.spriteram_size;offs += 4) @@ -248,7 +248,7 @@ SCREEN_UPDATE_IND16( slapfight ) (buffered_spriteram[offs+1] + ((buffered_spriteram[offs+2] & 0x01) << 8)) - 13,buffered_spriteram[offs+3],0); } - tilemap_draw(bitmap,cliprect,state->m_fix_tilemap,0,0); + state->m_fix_tilemap->draw(bitmap, cliprect, 0,0); slapfght_log_vram(screen.machine()); return 0; diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c index 5e594d5d082..139cef0743f 100644 --- a/src/mame/video/snk.c +++ b/src/mame/video/snk.c @@ -183,7 +183,7 @@ static TILE_GET_INFO( gwar_get_bg_tile_info ) // (still call SET_TILE_INFO, otherwise problems might occur on boot when // the tile data hasn't been initialised) if (code >= machine.gfx[1]->total_elements) - tileinfo->pen_data = state->m_empty_tile; + tileinfo.pen_data = state->m_empty_tile; } @@ -238,15 +238,15 @@ VIDEO_START( marvins ) state->m_fg_tilemap = tilemap_create(machine, marvins_get_fg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); state->m_bg_tilemap = tilemap_create(machine, marvins_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); - tilemap_set_scrolldy(state->m_tx_tilemap, 8, 8); + state->m_tx_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_scrolldy(8, 8); - tilemap_set_transparent_pen(state->m_fg_tilemap, 15); - tilemap_set_scrolldx(state->m_fg_tilemap, 15, 31); - tilemap_set_scrolldy(state->m_fg_tilemap, 8, -32); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_fg_tilemap->set_scrolldx(15, 31); + state->m_fg_tilemap->set_scrolldy(8, -32); - tilemap_set_scrolldx(state->m_bg_tilemap, 15, 31); - tilemap_set_scrolldy(state->m_bg_tilemap, 8, -32); + state->m_bg_tilemap->set_scrolldx(15, 31); + state->m_bg_tilemap->set_scrolldy(8, -32); state->m_tx_tile_offset = 0; } @@ -260,11 +260,11 @@ VIDEO_START( jcross ) state->m_tx_tilemap = tilemap_create(machine, marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); state->m_bg_tilemap = tilemap_create(machine, aso_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); - tilemap_set_scrolldy(state->m_tx_tilemap, 8, 8); + state->m_tx_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_scrolldy(8, 8); - tilemap_set_scrolldx(state->m_bg_tilemap, 15, 24); - tilemap_set_scrolldy(state->m_bg_tilemap, 8, -32); + state->m_bg_tilemap->set_scrolldx(15, 24); + state->m_bg_tilemap->set_scrolldy(8, -32); state->m_num_sprites = 25; state->m_yscroll_mask = 0x1ff; @@ -281,11 +281,11 @@ VIDEO_START( sgladiat ) state->m_tx_tilemap = tilemap_create(machine, marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); state->m_bg_tilemap = tilemap_create(machine, aso_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); - tilemap_set_scrolldy(state->m_tx_tilemap, 8, 8); + state->m_tx_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_scrolldy(8, 8); - tilemap_set_scrolldx(state->m_bg_tilemap, 15, 24); - tilemap_set_scrolldy(state->m_bg_tilemap, 8, -32); + state->m_bg_tilemap->set_scrolldx(15, 24); + state->m_bg_tilemap->set_scrolldy(8, -32); state->m_num_sprites = 25; state->m_yscroll_mask = 0x0ff; @@ -299,7 +299,7 @@ VIDEO_START( hal21 ) VIDEO_START_CALL(jcross); - tilemap_set_scrolldy(state->m_bg_tilemap, 8, -32+256); + state->m_bg_tilemap->set_scrolldy(8, -32+256); state->m_num_sprites = 50; state->m_yscroll_mask = 0x1ff; @@ -311,7 +311,7 @@ VIDEO_START( aso ) VIDEO_START_CALL(jcross); - tilemap_set_scrolldx(state->m_bg_tilemap, 15+256, 24+256); + state->m_bg_tilemap->set_scrolldx(15+256, 24+256); state->m_num_sprites = 50; state->m_yscroll_mask = 0x1ff; @@ -327,11 +327,11 @@ VIDEO_START( tnk3 ) state->m_tx_tilemap = tilemap_create(machine, marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); state->m_bg_tilemap = tilemap_create(machine, tnk3_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); - tilemap_set_scrolldy(state->m_tx_tilemap, 8, 8); + state->m_tx_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_scrolldy(8, 8); - tilemap_set_scrolldx(state->m_bg_tilemap, 15, 24); - tilemap_set_scrolldy(state->m_bg_tilemap, 8, -32); + state->m_bg_tilemap->set_scrolldx(15, 24); + state->m_bg_tilemap->set_scrolldy(8, -32); state->m_num_sprites = 50; state->m_yscroll_mask = 0x1ff; @@ -347,11 +347,11 @@ VIDEO_START( ikari ) state->m_tx_tilemap = tilemap_create(machine, ikari_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); state->m_bg_tilemap = tilemap_create(machine, ikari_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); - tilemap_set_scrolldy(state->m_tx_tilemap, 8, 8); + state->m_tx_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_scrolldy(8, 8); - tilemap_set_scrolldx(state->m_bg_tilemap, 15, 24); - tilemap_set_scrolldy(state->m_bg_tilemap, 8, -32); + state->m_bg_tilemap->set_scrolldx(15, 24); + state->m_bg_tilemap->set_scrolldy(8, -32); state->m_tx_tile_offset = 0; } @@ -370,10 +370,10 @@ VIDEO_START( gwar ) state->m_tx_tilemap = tilemap_create(machine, gwar_get_tx_tile_info, tilemap_scan_cols, 8, 8, 50, 32); state->m_bg_tilemap = tilemap_create(machine, gwar_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_tx_tilemap, 15); + state->m_tx_tilemap->set_transparent_pen(15); - tilemap_set_scrolldx(state->m_bg_tilemap, 16, 143); - tilemap_set_scrolldy(state->m_bg_tilemap, 0, -32); + state->m_bg_tilemap->set_scrolldx(16, 143); + state->m_bg_tilemap->set_scrolldy(0, -32); state->m_tx_tile_offset = 0; @@ -401,7 +401,7 @@ WRITE8_HANDLER( snk_tx_videoram_w ) snk_state *state = space->machine().driver_data(); state->m_tx_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( marvins_fg_videoram_w ) @@ -409,7 +409,7 @@ WRITE8_HANDLER( marvins_fg_videoram_w ) snk_state *state = space->machine().driver_data(); state->m_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( marvins_bg_videoram_w ) @@ -417,7 +417,7 @@ WRITE8_HANDLER( marvins_bg_videoram_w ) snk_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( snk_bg_videoram_w ) @@ -425,7 +425,7 @@ WRITE8_HANDLER( snk_bg_videoram_w ) snk_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset >> 1); + state->m_bg_tilemap->mark_tile_dirty(offset >> 1); } @@ -497,8 +497,8 @@ WRITE8_HANDLER( marvins_palette_bank_w ) { snk_state *state = space->machine().driver_data(); - tilemap_set_palette_offset(state->m_bg_tilemap, data & 0x70); - tilemap_set_palette_offset(state->m_fg_tilemap, (data & 0x07) << 4); + state->m_bg_tilemap->set_palette_offset(data & 0x70); + state->m_fg_tilemap->set_palette_offset((data & 0x07) << 4); } WRITE8_HANDLER( marvins_flipscreen_w ) @@ -514,7 +514,7 @@ WRITE8_HANDLER( sgladiat_flipscreen_w ) flip_screen_set(space->machine(), data & 0x80); - tilemap_set_palette_offset(state->m_bg_tilemap, ((data & 0xf) ^ 8) << 4); + state->m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4); // other bits unknown } @@ -525,11 +525,11 @@ WRITE8_HANDLER( hal21_flipscreen_w ) flip_screen_set(space->machine(), data & 0x80); - tilemap_set_palette_offset(state->m_bg_tilemap, ((data & 0xf) ^ 8) << 4); + state->m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4); if (state->m_bg_tile_offset != ((data & 0x20) << 3)) { state->m_bg_tile_offset = (data & 0x20) << 3; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } // other bits unknown @@ -607,7 +607,7 @@ WRITE8_HANDLER( tnk3_videoattrs_w ) if (state->m_tx_tile_offset != ((data & 0x40) << 2)) { state->m_tx_tile_offset = (data & 0x40) << 2; - tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); + state->m_tx_tilemap->mark_all_dirty(); } state->m_bg_scrolly = (state->m_bg_scrolly & 0xff) | ((data & 0x10) << 4); @@ -620,11 +620,11 @@ WRITE8_HANDLER( aso_bg_bank_w ) { snk_state *state = space->machine().driver_data(); - tilemap_set_palette_offset(state->m_bg_tilemap, ((data & 0xf) ^ 8) << 4); + state->m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4); if (state->m_bg_tile_offset != ((data & 0x30) << 4)) { state->m_bg_tile_offset = (data & 0x30) << 4; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -661,11 +661,11 @@ if (data != 0x20 && // normal data != 0xaa) // victroad spurious during boot popmessage("attrs %02x contact MAMEDEV", data); - tilemap_set_palette_offset(state->m_tx_tilemap, (data & 0x01) << 4); + state->m_tx_tilemap->set_palette_offset((data & 0x01) << 4); if (state->m_tx_tile_offset != ((data & 0x10) << 4)) { state->m_tx_tile_offset = (data & 0x10) << 4; - tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); + state->m_tx_tilemap->mark_all_dirty(); } } @@ -673,15 +673,15 @@ WRITE8_HANDLER( gwar_tx_bank_w ) { snk_state *state = space->machine().driver_data(); - tilemap_set_palette_offset(state->m_tx_tilemap, (data & 0xf) << 4); + state->m_tx_tilemap->set_palette_offset((data & 0xf) << 4); if (state->m_tx_tile_offset != ((data & 0x30) << 4)) { state->m_tx_tile_offset = (data & 0x30) << 4; - tilemap_mark_all_tiles_dirty(state->m_tx_tilemap); + state->m_tx_tilemap->mark_all_dirty(); } if (state->m_is_psychos) - tilemap_set_palette_offset(state->m_bg_tilemap, (data & 0x80)); + state->m_bg_tilemap->set_palette_offset((data & 0x80)); } WRITE8_HANDLER( gwar_videoattrs_w ) @@ -994,16 +994,16 @@ SCREEN_UPDATE_IND16( marvins ) { snk_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_fg_scrollx); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_fg_scrolly); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); + state->m_fg_tilemap->set_scrollx(0, state->m_fg_scrollx); + state->m_fg_tilemap->set_scrolly(0, state->m_fg_scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); marvins_draw_sprites(screen.machine(), bitmap, cliprect, state->m_sp16_scrollx, state->m_sp16_scrolly, 0, state->m_sprite_split_point>>2); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); marvins_draw_sprites(screen.machine(), bitmap, cliprect, state->m_sp16_scrollx, state->m_sp16_scrolly, state->m_sprite_split_point>>2, 25); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -1013,12 +1013,12 @@ SCREEN_UPDATE_IND16( tnk3 ) { snk_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); tnk3_draw_sprites(screen.machine(), bitmap, cliprect, state->m_sp16_scrollx, state->m_sp16_scrolly); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -1028,16 +1028,16 @@ SCREEN_UPDATE_IND16( ikari ) { snk_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); ikari_draw_sprites(screen.machine(), bitmap, cliprect, 0, state->m_sp16_scrollx, state->m_sp16_scrolly, state->m_spriteram + 0x800, 2 ); ikari_draw_sprites(screen.machine(), bitmap, cliprect, 0, state->m_sp32_scrollx, state->m_sp32_scrolly, state->m_spriteram, 3 ); ikari_draw_sprites(screen.machine(), bitmap, cliprect, 25, state->m_sp16_scrollx, state->m_sp16_scrolly, state->m_spriteram + 0x800, 2 ); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -1046,16 +1046,16 @@ SCREEN_UPDATE_IND16( gwar ) { snk_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); tdfever_draw_sprites(screen.machine(), bitmap, cliprect, state->m_sp16_scrollx, state->m_sp16_scrolly, state->m_spriteram + 0x800, 2, 0, 0, state->m_sprite_split_point ); tdfever_draw_sprites(screen.machine(), bitmap, cliprect, state->m_sp32_scrollx, state->m_sp32_scrolly, state->m_spriteram, 3, 0, 0, 32 ); tdfever_draw_sprites(screen.machine(), bitmap, cliprect, state->m_sp16_scrollx, state->m_sp16_scrolly, state->m_spriteram + 0x800, 2, 0, state->m_sprite_split_point, 64 ); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -1065,14 +1065,14 @@ SCREEN_UPDATE_IND16( tdfever ) { snk_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bg_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bg_scrolly); + state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); tdfever_draw_sprites(screen.machine(), bitmap, cliprect, state->m_sp32_scrollx, state->m_sp32_scrolly, state->m_spriteram, 2, 1, 0, 32 ); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c index 27eccdff6ef..478a0c5ec9a 100644 --- a/src/mame/video/snk6502.c +++ b/src/mame/video/snk6502.c @@ -79,7 +79,7 @@ WRITE8_HANDLER( snk6502_videoram_w ) snk6502_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( snk6502_videoram2_w ) @@ -87,7 +87,7 @@ WRITE8_HANDLER( snk6502_videoram2_w ) snk6502_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( snk6502_colorram_w ) @@ -95,8 +95,8 @@ WRITE8_HANDLER( snk6502_colorram_w ) snk6502_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( snk6502_charram_w ) @@ -135,7 +135,7 @@ WRITE8_HANDLER( snk6502_flipscreen_w ) if (state->m_charbank != bank) { state->m_charbank = bank; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* bit 7 flips screen */ @@ -143,7 +143,7 @@ WRITE8_HANDLER( snk6502_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x80)) { flip_screen_set(space->machine(), data & 0x80); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -151,14 +151,14 @@ WRITE8_HANDLER( snk6502_scrollx_w ) { snk6502_state *state = space->machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrollx(0, data); } WRITE8_HANDLER( snk6502_scrolly_w ) { snk6502_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } @@ -187,7 +187,7 @@ VIDEO_START( snk6502 ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); gfx_element_set_source(machine.gfx[0], state->m_charram); } @@ -198,8 +198,8 @@ VIDEO_START( pballoon ) VIDEO_START_CALL( snk6502 ); - tilemap_set_scrolldy(state->m_bg_tilemap, -24, 0); - tilemap_set_scrolldy(state->m_fg_tilemap, -24, 0); + state->m_bg_tilemap->set_scrolldy(-24, 0); + state->m_fg_tilemap->set_scrolldy(-24, 0); } @@ -207,8 +207,8 @@ SCREEN_UPDATE_IND16( snk6502 ) { snk6502_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -274,7 +274,7 @@ WRITE8_HANDLER( satansat_b002_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* bit 1 enables interrupts */ @@ -325,7 +325,7 @@ VIDEO_START( satansat ) state->m_bg_tilemap = tilemap_create(machine, satansat_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, satansat_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); gfx_element_set_source(machine.gfx[0], state->m_charram); } diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index a5ad0ac3832..6871d5f767e 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -54,10 +54,10 @@ static void common_video_start(running_machine &machine) { snk68_state *state = machine.driver_data(); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_fg_tilemap, 0, machine.primary_screen->width() - 256); - tilemap_set_scrolldy(state->m_fg_tilemap, 0, machine.primary_screen->height() - 256); + state->m_fg_tilemap->set_scrolldx(0, machine.primary_screen->width() - 256); + state->m_fg_tilemap->set_scrolldy(0, machine.primary_screen->height() - 256); } VIDEO_START( pow ) @@ -133,7 +133,7 @@ WRITE16_HANDLER( pow_fg_videoram_w ) data |= 0xff00; COMBINE_DATA(&state->m_pow_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset >> 1); + state->m_fg_tilemap->mark_tile_dirty(offset >> 1); } WRITE16_HANDLER( searchar_fg_videoram_w ) @@ -142,7 +142,7 @@ WRITE16_HANDLER( searchar_fg_videoram_w ) // RAM is full 16-bit, though only half of it is used by the hardware COMBINE_DATA(&state->m_pow_fg_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset >> 1); + state->m_fg_tilemap->mark_tile_dirty(offset >> 1); } WRITE16_HANDLER( pow_flipscreen16_w ) @@ -151,14 +151,14 @@ WRITE16_HANDLER( pow_flipscreen16_w ) { snk68_state *state = space->machine().driver_data(); state->m_flipscreen = data & 0x08; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); state->m_sprite_flip_axis = data & 0x04; // for streetsm? though might not be present on this board if (state->m_fg_tile_offset != ((data & 0x70) << 4)) { state->m_fg_tile_offset = (data & 0x70) << 4; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } } } @@ -170,7 +170,7 @@ WRITE16_HANDLER( searchar_flipscreen16_w ) snk68_state *state = space->machine().driver_data(); state->m_flipscreen = data & 0x08; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); state->m_sprite_flip_axis = data & 0x04; } @@ -299,6 +299,6 @@ SCREEN_UPDATE_IND16( pow ) draw_sprites(screen.machine(), bitmap, cliprect, 3); draw_sprites(screen.machine(), bitmap, cliprect, 1); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/snookr10.c b/src/mame/video/snookr10.c index 451e52d6db0..b4b8bbd7d0c 100644 --- a/src/mame/video/snookr10.c +++ b/src/mame/video/snookr10.c @@ -46,14 +46,14 @@ WRITE8_HANDLER( snookr10_videoram_w ) { snookr10_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( snookr10_colorram_w ) { snookr10_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -190,6 +190,6 @@ VIDEO_START( apple10 ) SCREEN_UPDATE_IND16( snookr10 ) { snookr10_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index 39f62016d44..3ae8603701e 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -6,7 +6,7 @@ WRITE8_HANDLER( solomon_videoram_w ) solomon_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( solomon_colorram_w ) @@ -14,7 +14,7 @@ WRITE8_HANDLER( solomon_colorram_w ) solomon_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( solomon_videoram2_w ) @@ -22,7 +22,7 @@ WRITE8_HANDLER( solomon_videoram2_w ) solomon_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( solomon_colorram2_w ) @@ -30,7 +30,7 @@ WRITE8_HANDLER( solomon_colorram2_w ) solomon_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( solomon_flipscreen_w ) @@ -38,7 +38,7 @@ WRITE8_HANDLER( solomon_flipscreen_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -73,7 +73,7 @@ VIDEO_START( solomon ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -110,8 +110,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( solomon ) { solomon_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index 53f6e4eda92..1b60106c4b3 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -98,14 +98,14 @@ WRITE8_HANDLER( sonson_videoram_w ) { sonson_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sonson_colorram_w ) { sonson_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( sonson_scrollx_w ) @@ -114,7 +114,7 @@ WRITE8_HANDLER( sonson_scrollx_w ) int row; for (row = 5; row < 32; row++) - tilemap_set_scrollx(state->m_bg_tilemap, row, data); + state->m_bg_tilemap->set_scrollx(row, data); } WRITE8_HANDLER( sonson_flipscreen_w ) @@ -137,7 +137,7 @@ VIDEO_START( sonson ) sonson_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); } static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -178,7 +178,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const SCREEN_UPDATE_IND16( sonson ) { sonson_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index 6b991703c6f..3b4d1bfe407 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -126,7 +126,7 @@ WRITE8_HANDLER( spdodgeb_ctrl_w ) if (state->m_tile_palbank != ((data & 0x30) >> 4)) { state->m_tile_palbank = ((data & 0x30) >> 4); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } state->m_sprite_palbank = (data & 0xc0) >> 6; } @@ -135,7 +135,7 @@ WRITE8_HANDLER( spdodgeb_videoram_w ) { spdodgeb_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } @@ -211,8 +211,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( spdodgeb ) { spdodgeb_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_lastscroll+5); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->set_scrollx(0,state->m_lastscroll+5); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); return 0; } diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c index 958c4a318f7..f5c4b9f65d4 100644 --- a/src/mame/video/speedbal.c +++ b/src/mame/video/speedbal.c @@ -17,7 +17,7 @@ static TILE_GET_INFO( get_tile_info_bg ) int color = state->m_background_videoram[tile_index*2+1] & 0x0f; SET_TILE_INFO(1, code, color, 0); - tileinfo->group = (color == 8); + tileinfo.group = (color == 8); } static TILE_GET_INFO( get_tile_info_fg ) @@ -27,7 +27,7 @@ static TILE_GET_INFO( get_tile_info_fg ) int color = state->m_foreground_videoram[tile_index*2+1] & 0x0f; SET_TILE_INFO(0, code, color, 0); - tileinfo->group = (color == 9); + tileinfo.group = (color == 9); } /************************************* @@ -42,11 +42,11 @@ VIDEO_START( speedbal ) state->m_bg_tilemap = tilemap_create(machine, get_tile_info_bg, tilemap_scan_cols_flip_x, 16, 16, 16, 16); state->m_fg_tilemap = tilemap_create(machine, get_tile_info_fg, tilemap_scan_cols_flip_x, 8, 8, 32, 32); - tilemap_set_transmask(state->m_bg_tilemap,0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap,1,0x00f7,0x0000); /* split type 1 has pen 0-2, 4-7 transparent in front half */ + state->m_bg_tilemap->set_transmask(0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1,0x00f7,0x0000); /* split type 1 has pen 0-2, 4-7 transparent in front half */ - tilemap_set_transmask(state->m_fg_tilemap,0,0xffff,0x0001); /* split type 0 is totally transparent in front half and has pen 0 transparent in back half */ - tilemap_set_transmask(state->m_fg_tilemap,1,0x0001,0x0001); /* split type 1 has pen 0 transparent in front and back half */ + state->m_fg_tilemap->set_transmask(0,0xffff,0x0001); /* split type 0 is totally transparent in front half and has pen 0 transparent in back half */ + state->m_fg_tilemap->set_transmask(1,0x0001,0x0001); /* split type 1 has pen 0 transparent in front and back half */ } @@ -61,7 +61,7 @@ WRITE8_HANDLER( speedbal_foreground_videoram_w ) { speedbal_state *state = space->machine().driver_data(); state->m_foreground_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset>>1); + state->m_fg_tilemap->mark_tile_dirty(offset>>1); } /************************************* @@ -74,7 +74,7 @@ WRITE8_HANDLER( speedbal_background_videoram_w ) { speedbal_state *state = space->machine().driver_data(); state->m_background_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset>>1); + state->m_bg_tilemap->mark_tile_dirty(offset>>1); } @@ -130,10 +130,10 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( speedbal ) { speedbal_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c index 8a40d8747ef..fbea2d487b4 100644 --- a/src/mame/video/speedspn.c +++ b/src/mame/video/speedspn.c @@ -26,7 +26,7 @@ WRITE8_HANDLER( speedspn_vidram_w ) state->m_vidram[offset + state->m_bank_vidram] = data; if (state->m_bank_vidram == 0) - tilemap_mark_tile_dirty(state->m_tilemap,offset/2); + state->m_tilemap->mark_tile_dirty(offset/2); } WRITE8_HANDLER( speedspn_attram_w ) @@ -34,7 +34,7 @@ WRITE8_HANDLER( speedspn_attram_w ) speedspn_state *state = space->machine().driver_data(); state->m_attram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset^0x400); + state->m_tilemap->mark_tile_dirty(offset^0x400); } READ8_HANDLER( speedspn_vidram_r ) @@ -110,8 +110,8 @@ SCREEN_UPDATE_IND16(speedspn) fclose(f); } #endif - tilemap_set_scrollx(state->m_tilemap,0, 0x100); // verify - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->set_scrollx(0, 0x100); // verify + state->m_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); return 0; } diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c index b1634ef830d..ecc9c914f79 100644 --- a/src/mame/video/splash.c +++ b/src/mame/video/splash.c @@ -77,7 +77,7 @@ WRITE16_HANDLER( splash_vram_w ) splash_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap[offset >> 11],((offset << 1) & 0x0fff) >> 1); + state->m_bg_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 1); } static void draw_bitmap(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -175,10 +175,10 @@ VIDEO_START( splash ) state->m_bg_tilemap[0] = tilemap_create(machine, get_tile_info_splash_tilemap0, tilemap_scan_rows, 8, 8, 64, 32); state->m_bg_tilemap[1] = tilemap_create(machine, get_tile_info_splash_tilemap1, tilemap_scan_rows, 16, 16, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap[0], 0); - tilemap_set_transparent_pen(state->m_bg_tilemap[1], 0); + state->m_bg_tilemap[0]->set_transparent_pen(0); + state->m_bg_tilemap[1]->set_transparent_pen(0); - tilemap_set_scrollx(state->m_bg_tilemap[0], 0, 4); + state->m_bg_tilemap[0]->set_scrollx(0, 4); } /*************************************************************************** @@ -263,14 +263,14 @@ SCREEN_UPDATE_IND16( splash ) splash_state *state = screen.machine().driver_data(); /* set scroll registers */ - tilemap_set_scrolly(state->m_bg_tilemap[0], 0, state->m_vregs[0]); - tilemap_set_scrolly(state->m_bg_tilemap[1], 0, state->m_vregs[1]); + state->m_bg_tilemap[0]->set_scrolly(0, state->m_vregs[0]); + state->m_bg_tilemap[1]->set_scrolly(0, state->m_vregs[1]); draw_bitmap(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[1], 0, 0); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, 0, 0); splash_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[0], 0, 0); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, 0, 0); return 0; } @@ -279,14 +279,14 @@ SCREEN_UPDATE_IND16( funystrp ) splash_state *state = screen.machine().driver_data(); /* set scroll registers */ - tilemap_set_scrolly(state->m_bg_tilemap[0], 0, state->m_vregs[0]); - tilemap_set_scrolly(state->m_bg_tilemap[1], 0, state->m_vregs[1]); + state->m_bg_tilemap[0]->set_scrolly(0, state->m_vregs[0]); + state->m_bg_tilemap[1]->set_scrolly(0, state->m_vregs[1]); draw_bitmap(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[1], 0, 0); + state->m_bg_tilemap[1]->draw(bitmap, cliprect, 0, 0); /*Sprite chip is similar but not the same*/ funystrp_draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap[0], 0, 0); + state->m_bg_tilemap[0]->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c index c821cefcf73..8cf0369c929 100644 --- a/src/mame/video/sprcros2.c +++ b/src/mame/video/sprcros2.c @@ -64,7 +64,7 @@ WRITE8_HANDLER( sprcros2_fgvideoram_w ) sprcros2_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fgtilemap, offset&0x3ff); + state->m_fgtilemap->mark_tile_dirty(offset&0x3ff); } WRITE8_HANDLER( sprcros2_bgvideoram_w ) @@ -72,7 +72,7 @@ WRITE8_HANDLER( sprcros2_bgvideoram_w ) sprcros2_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bgtilemap, offset&0x3ff); + state->m_bgtilemap->mark_tile_dirty(offset&0x3ff); } WRITE8_HANDLER( sprcros2_bgscrollx_w ) @@ -80,16 +80,16 @@ WRITE8_HANDLER( sprcros2_bgscrollx_w ) sprcros2_state *state = space->machine().driver_data(); if(state->m_port7&0x02) - tilemap_set_scrollx(state->m_bgtilemap, 0, 0x100-data); + state->m_bgtilemap->set_scrollx(0, 0x100-data); else - tilemap_set_scrollx(state->m_bgtilemap, 0, data); + state->m_bgtilemap->set_scrollx(0, data); } WRITE8_HANDLER( sprcros2_bgscrolly_w ) { sprcros2_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bgtilemap, 0, data); + state->m_bgtilemap->set_scrolly(0, data); } static TILE_GET_INFO( get_sprcros2_bgtile_info ) @@ -120,7 +120,7 @@ static TILE_GET_INFO( get_sprcros2_fgtile_info ) UINT8 attr = state->m_fgvideoram[tile_index + 0x400]; int color = (attr&0xfc)>>2; - tileinfo->group = color; + tileinfo.group = color; //attr //76543210 @@ -198,8 +198,8 @@ SCREEN_UPDATE_IND16( sprcros2 ) { sprcros2_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bgtilemap, 0, 0); + state->m_bgtilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fgtilemap, 0, 0); + state->m_fgtilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c index 0be93d81701..17f8b8b2d68 100644 --- a/src/mame/video/sprint2.c +++ b/src/mame/video/sprint2.c @@ -80,7 +80,7 @@ WRITE8_HANDLER( sprint2_video_ram_w ) { sprint2_state *state = space->machine().driver_data(); state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -127,7 +127,7 @@ SCREEN_UPDATE_IND16( sprint2 ) UINT8 *video_ram = state->m_video_ram; int i; - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ @@ -176,7 +176,7 @@ SCREEN_VBLANK( sprint2 ) /* check for sprite-tilemap collisions */ - tilemap_draw(state->m_helper, rect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(state->m_helper, rect, 0, 0); drawgfx_transpen(state->m_helper, rect, screen.machine().gfx[1], get_sprite_code(video_ram, i), diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c index 61e0c523916..2216528a374 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -63,7 +63,7 @@ SCREEN_UPDATE_IND16( sprint4 ) UINT8 *videoram = state->m_videoram; int i; - tilemap_draw(bitmap, cliprect, state->m_playfield, 0, 0); + state->m_playfield->draw(bitmap, cliprect, 0, 0); for (i = 0; i < 4; i++) { @@ -121,7 +121,7 @@ SCREEN_VBLANK( sprint4 ) rect &= screen.machine().primary_screen->visible_area(); - tilemap_draw(state->m_helper, rect, state->m_playfield, 0, 0); + state->m_playfield->draw(state->m_helper, rect, 0, 0); if (i & 1) bank = 32; @@ -154,5 +154,5 @@ WRITE8_HANDLER( sprint4_video_ram_w ) sprint4_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_playfield, offset); + state->m_playfield->mark_tile_dirty(offset); } diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c index 6674008a6e5..2c31a3c90da 100644 --- a/src/mame/video/sprint8.c +++ b/src/mame/video/sprint8.c @@ -109,8 +109,8 @@ WRITE8_HANDLER( sprint8_video_ram_w ) { sprint8_state *state = space->machine().driver_data(); state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap1, offset); - tilemap_mark_tile_dirty(state->m_tilemap2, offset); + state->m_tilemap1->mark_tile_dirty(offset); + state->m_tilemap2->mark_tile_dirty(offset); } @@ -123,8 +123,8 @@ VIDEO_START( sprint8 ) state->m_tilemap1 = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 16, 8, 32, 32); state->m_tilemap2 = tilemap_create(machine, get_tile_info2, tilemap_scan_rows, 16, 8, 32, 32); - tilemap_set_scrolly(state->m_tilemap1, 0, +24); - tilemap_set_scrolly(state->m_tilemap2, 0, +24); + state->m_tilemap1->set_scrolly(0, +24); + state->m_tilemap2->set_scrolly(0, +24); } @@ -162,7 +162,7 @@ SCREEN_UPDATE_IND16( sprint8 ) { sprint8_state *state = screen.machine().driver_data(); set_pens(state, screen.machine().colortable); - tilemap_draw(bitmap, cliprect, state->m_tilemap1, 0, 0); + state->m_tilemap1->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } @@ -178,7 +178,7 @@ SCREEN_VBLANK( sprint8 ) int y; const rectangle &visarea = screen.machine().primary_screen->visible_area(); - tilemap_draw(state->m_helper2, visarea, state->m_tilemap2, 0, 0); + state->m_tilemap2->draw(state->m_helper2, visarea, 0, 0); state->m_helper1.fill(0x20, visarea); diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index 86cf9305dcb..ac14eed191b 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_bg_tile_info ) state->m_backgroundram[2*tile_index + 1] + ((attr & 0x07) << 8), (attr & 0xe0) >> 5, ((attr & 0x08) ? TILE_FLIPY : 0)); - tileinfo->group = (attr & 0x10) >> 4; + tileinfo.group = (attr & 0x10) >> 4; } @@ -53,10 +53,10 @@ VIDEO_START( srumbler ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,8,8,64,32); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols, 16,16,64,64); - tilemap_set_transparent_pen(state->m_fg_tilemap,3); + state->m_fg_tilemap->set_transparent_pen(3); - tilemap_set_transmask(state->m_bg_tilemap,0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap,1,0x07ff,0xf800); /* split type 1 has pens 0-10 transparent in front half */ + state->m_bg_tilemap->set_transmask(0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1,0x07ff,0xf800); /* split type 1 has pens 0-10 transparent in front half */ } @@ -71,14 +71,14 @@ WRITE8_HANDLER( srumbler_foreground_w ) { srumbler_state *state = space->machine().driver_data(); state->m_foregroundram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset/2); + state->m_fg_tilemap->mark_tile_dirty(offset/2); } WRITE8_HANDLER( srumbler_background_w ) { srumbler_state *state = space->machine().driver_data(); state->m_backgroundram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset/2); + state->m_bg_tilemap->mark_tile_dirty(offset/2); } @@ -101,8 +101,8 @@ WRITE8_HANDLER( srumbler_scroll_w ) state->m_scroll[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scroll[0] | (state->m_scroll[1] << 8)); - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scroll[2] | (state->m_scroll[3] << 8)); + state->m_bg_tilemap->set_scrollx(0,state->m_scroll[0] | (state->m_scroll[1] << 8)); + state->m_bg_tilemap->set_scrolly(0,state->m_scroll[2] | (state->m_scroll[3] << 8)); } @@ -163,10 +163,10 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( srumbler ) { srumbler_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_LAYER1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_LAYER0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index ba8c256f2be..51881b8686c 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -39,7 +39,7 @@ SCREEN_UPDATE_RGB32( sshangha ) if (screen.machine().generic.spriteram2.u16) screen.machine().device("spritegen2")->draw_sprites(bitmap, cliprect, screen.machine().generic.spriteram2.u16, 0x800, true); - tilemap_set_flip_all(screen.machine(),flip_screen_x_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(flip_screen_x_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); bitmap.fill(get_black_pen(screen.machine()), cliprect); diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index 92f2e2b7336..5262ddead8c 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -105,7 +105,7 @@ WRITE16_HANDLER( sslam_tx_tileram_w ) sslam_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tx_tileram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } /* Middle Layer */ @@ -124,7 +124,7 @@ WRITE16_HANDLER( sslam_md_tileram_w ) sslam_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_md_tileram[offset]); - tilemap_mark_tile_dirty(state->m_md_tilemap,offset); + state->m_md_tilemap->mark_tile_dirty(offset); } /* Background Layer */ @@ -143,7 +143,7 @@ WRITE16_HANDLER( sslam_bg_tileram_w ) sslam_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_tileram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_powerbls_bg_tile_info ) @@ -163,7 +163,7 @@ WRITE16_HANDLER( powerbls_bg_tileram_w ) sslam_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg_tileram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset>>1); + state->m_bg_tilemap->mark_tile_dirty(offset>>1); } VIDEO_START(sslam) @@ -174,8 +174,8 @@ VIDEO_START(sslam) state->m_md_tilemap = tilemap_create(machine, get_sslam_md_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->m_tx_tilemap = tilemap_create(machine, get_sslam_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_md_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_md_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); state->m_sprites_x_offset = 0; state->save_item(NAME(state->m_sprites_x_offset)); @@ -201,14 +201,14 @@ SCREEN_UPDATE_IND16(sslam) return 0; } - tilemap_set_scrollx(state->m_tx_tilemap,0, state->m_regs[0]+1); /* +0 looks better, but the real board has the left most pixel at the left edge shifted off screen */ - tilemap_set_scrolly(state->m_tx_tilemap,0, (state->m_regs[1] & 0xff)+8); - tilemap_set_scrollx(state->m_md_tilemap,0, state->m_regs[2]+2); - tilemap_set_scrolly(state->m_md_tilemap,0, state->m_regs[3]+8); - tilemap_set_scrollx(state->m_bg_tilemap,0, state->m_regs[4]+4); - tilemap_set_scrolly(state->m_bg_tilemap,0, state->m_regs[5]+8); + state->m_tx_tilemap->set_scrollx(0, state->m_regs[0]+1); /* +0 looks better, but the real board has the left most pixel at the left edge shifted off screen */ + state->m_tx_tilemap->set_scrolly(0, (state->m_regs[1] & 0xff)+8); + state->m_md_tilemap->set_scrollx(0, state->m_regs[2]+2); + state->m_md_tilemap->set_scrolly(0, state->m_regs[3]+8); + state->m_bg_tilemap->set_scrollx(0, state->m_regs[4]+4); + state->m_bg_tilemap->set_scrolly(0, state->m_regs[5]+8); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); /* remove wraparound from the tilemap (used on title screen) */ if (state->m_regs[2]+2 > 0x8c8) @@ -219,15 +219,15 @@ SCREEN_UPDATE_IND16(sslam) md_clip.min_y = cliprect.min_y; md_clip.max_y = cliprect.max_y; - tilemap_draw(bitmap,md_clip,state->m_md_tilemap,0,0); + state->m_md_tilemap->draw(bitmap, md_clip, 0,0); } else { - tilemap_draw(bitmap,cliprect,state->m_md_tilemap,0,0); + state->m_md_tilemap->draw(bitmap, cliprect, 0,0); } draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -241,10 +241,10 @@ SCREEN_UPDATE_IND16(powerbls) return 0; } - tilemap_set_scrollx(state->m_bg_tilemap,0, state->m_regs[0]+21); - tilemap_set_scrolly(state->m_bg_tilemap,0, state->m_regs[1]-240); + state->m_bg_tilemap->set_scrollx(0, state->m_regs[0]+21); + state->m_bg_tilemap->set_scrolly(0, state->m_regs[1]-240); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); return 0; } diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index 8870ddcf064..6dbbff59ce6 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -45,7 +45,7 @@ WRITE8_HANDLER( ssozumo_videoram_w ) ssozumo_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ssozumo_colorram_w ) @@ -53,7 +53,7 @@ WRITE8_HANDLER( ssozumo_colorram_w ) ssozumo_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ssozumo_videoram2_w ) @@ -61,7 +61,7 @@ WRITE8_HANDLER( ssozumo_videoram2_w ) ssozumo_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ssozumo_colorram2_w ) @@ -69,7 +69,7 @@ WRITE8_HANDLER( ssozumo_colorram2_w ) ssozumo_state *state = space->machine().driver_data(); state->m_colorram2[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( ssozumo_paletteram_w ) @@ -110,7 +110,7 @@ WRITE8_HANDLER( ssozumo_scroll_w ) { ssozumo_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( ssozumo_flipscreen_w ) @@ -147,7 +147,7 @@ VIDEO_START( ssozumo ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_x, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -188,8 +188,8 @@ SCREEN_UPDATE_IND16( ssozumo ) { ssozumo_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c index af2931734e5..e11ad1b820a 100644 --- a/src/mame/video/ssrj.c +++ b/src/mame/video/ssrj.c @@ -8,7 +8,7 @@ WRITE8_HANDLER(ssrj_vram1_w) ssrj_state *state = space->machine().driver_data(); state->m_vram1[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap1, offset>>1); + state->m_tilemap1->mark_tile_dirty(offset>>1); } static TILE_GET_INFO( get_tile_info1 ) @@ -30,7 +30,7 @@ WRITE8_HANDLER(ssrj_vram2_w) ssrj_state *state = space->machine().driver_data(); state->m_vram2[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap2, offset>>1); + state->m_tilemap2->mark_tile_dirty(offset>>1); } static TILE_GET_INFO( get_tile_info2 ) @@ -52,7 +52,7 @@ WRITE8_HANDLER(ssrj_vram4_w) ssrj_state *state = space->machine().driver_data(); state->m_vram4[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap4, offset>>1); + state->m_tilemap4->mark_tile_dirty(offset>>1); } static TILE_GET_INFO( get_tile_info4 ) @@ -229,8 +229,8 @@ VIDEO_START( ssrj ) state->m_tilemap1 = tilemap_create(machine, get_tile_info1, tilemap_scan_cols, 8, 8, 32, 32); state->m_tilemap2 = tilemap_create(machine, get_tile_info2, tilemap_scan_cols, 8, 8, 32, 32); state->m_tilemap4 = tilemap_create(machine, get_tile_info4, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_tilemap2, 0); - tilemap_set_transparent_pen(state->m_tilemap4, 0); + state->m_tilemap2->set_transparent_pen(0); + state->m_tilemap4->set_transparent_pen(0); state->m_buffer_spriteram = auto_alloc_array(machine, UINT8, 0x0800); } @@ -284,13 +284,13 @@ SCREEN_UPDATE_IND16( ssrj ) { ssrj_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_tilemap1, 0, 0xff-state->m_scrollram[2] ); - tilemap_set_scrolly(state->m_tilemap1, 0, state->m_scrollram[0] ); - tilemap_draw(bitmap, cliprect, state->m_tilemap1, 0, 0); + state->m_tilemap1->set_scrollx(0, 0xff-state->m_scrollram[2] ); + state->m_tilemap1->set_scrolly(0, state->m_scrollram[0] ); + state->m_tilemap1->draw(bitmap, cliprect, 0, 0); draw_objects(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_tilemap2, 0, 0); + state->m_tilemap2->draw(bitmap, cliprect, 0, 0); - if (state->m_scrollram[0x101] == 0xb) tilemap_draw(bitmap, cliprect, state->m_tilemap4, 0, 0);/* hack to display 4th tilemap */ + if (state->m_scrollram[0x101] == 0xb) state->m_tilemap4->draw(bitmap, cliprect, 0, 0);/* hack to display 4th tilemap */ return 0; } diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 70ade6f4649..69e7fb8e16c 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -221,7 +221,7 @@ WRITE16_HANDLER( gdfs_tmapram_w ) ssv_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_gdfs_tmapram[offset]); - tilemap_mark_tile_dirty(state->m_gdfs_tmap, offset); + state->m_gdfs_tmap->mark_tile_dirty(offset); } VIDEO_START( gdfs ) @@ -238,7 +238,7 @@ VIDEO_START( gdfs ) state->m_gdfs_tmap = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x100,0x100 ); - tilemap_set_transparent_pen(state->m_gdfs_tmap, 0); + state->m_gdfs_tmap->set_transparent_pen(0); } /*************************************************************************** @@ -1172,9 +1172,9 @@ SCREEN_UPDATE_IND16( gdfs ) for (pri = 0; pri <= 0xf; pri++) gdfs_draw_zooming_sprites(screen.machine(), bitmap, cliprect, pri); - tilemap_set_scrollx(state->m_gdfs_tmap, 0, state->m_gdfs_tmapscroll[0x0c/2]); - tilemap_set_scrolly(state->m_gdfs_tmap, 0, state->m_gdfs_tmapscroll[0x10/2]); - tilemap_draw(bitmap,cliprect, state->m_gdfs_tmap, 0, 0); + state->m_gdfs_tmap->set_scrollx(0, state->m_gdfs_tmapscroll[0x0c/2]); + state->m_gdfs_tmap->set_scrolly(0, state->m_gdfs_tmapscroll[0x10/2]); + state->m_gdfs_tmap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index 0bcd0cd7c1b..cacb8eec643 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -22,12 +22,12 @@ SCREEN_UPDATE_IND16( stadhero ) { stadhero_state *state = screen.machine().driver_data(); -// tilemap_set_flip_all(screen.machine(),state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); +// screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); screen.machine().device("tilegen1")->set_bppmultmask(0x8, 0x7); screen.machine().device("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); screen.machine().device("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram, 0x00, 0x00, 0x0f); - tilemap_draw(bitmap,cliprect,state->m_pf1_tilemap,0,0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -37,7 +37,7 @@ WRITE16_HANDLER( stadhero_pf1_data_w ) { stadhero_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf1_data[offset]); - tilemap_mark_tile_dirty(state->m_pf1_tilemap,offset); + state->m_pf1_tilemap->mark_tile_dirty(offset); } @@ -61,7 +61,7 @@ VIDEO_START( stadhero ) { stadhero_state *state = machine.driver_data(); state->m_pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_rows, 8, 8,32,32); - tilemap_set_transparent_pen(state->m_pf1_tilemap,0); + state->m_pf1_tilemap->set_transparent_pen(0); } /******************************************************************************/ diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index c561a5420bb..3826f34ee25 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -63,9 +63,9 @@ VIDEO_START( starshp1 ) state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 8, 32, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); - tilemap_set_scrollx(state->m_bg_tilemap, 0, -8); + state->m_bg_tilemap->set_scrollx(0, -8); state->m_LSFR = auto_alloc_array(machine, UINT16, 0x10000); @@ -142,7 +142,7 @@ WRITE8_HANDLER( starshp1_playfield_w ) { offset ^= 0x1f; state->m_playfield_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } } @@ -377,7 +377,7 @@ SCREEN_UPDATE_IND16( starshp1 ) if (state->m_circle_kill == 0 && state->m_circle_mod == 0) draw_circle(screen.machine(), bitmap); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_phasor != 0) draw_phasor(state, bitmap); diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c index b8df16a8276..ffd4d2fdbfa 100644 --- a/src/mame/video/stfight.c +++ b/src/mame/video/stfight.c @@ -138,7 +138,7 @@ static TILE_GET_INFO( get_tx_tile_info ) UINT8 attr = state->m_text_attr_ram[tile_index]; int color = attr & 0x0f; - tileinfo->group = color; + tileinfo.group = color; SET_TILE_INFO( 0, @@ -161,7 +161,7 @@ VIDEO_START( stfight ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,fg_scan,16,16,128,256); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8,8,32,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0x0f); + state->m_fg_tilemap->set_transparent_pen(0x0f); colortable_configure_tilemap_groups(machine.colortable, state->m_tx_tilemap, machine.gfx[0], 0xcf); } @@ -177,14 +177,14 @@ WRITE8_HANDLER( stfight_text_char_w ) { stfight_state *state = space->machine().driver_data(); state->m_text_char_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( stfight_text_attr_w ) { stfight_state *state = space->machine().driver_data(); state->m_text_attr_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( stfight_sprite_bank_w ) @@ -207,32 +207,32 @@ WRITE8_HANDLER( stfight_vh_latch_w ) case 0x00: case 0x01: scroll = (state->m_vh_latch_ram[1] << 8) | state->m_vh_latch_ram[0]; - tilemap_set_scrollx(state->m_fg_tilemap,0,scroll); + state->m_fg_tilemap->set_scrollx(0,scroll); break; case 0x02: case 0x03: scroll = (state->m_vh_latch_ram[3] << 8) | state->m_vh_latch_ram[2]; - tilemap_set_scrolly(state->m_fg_tilemap,0,scroll); + state->m_fg_tilemap->set_scrolly(0,scroll); break; case 0x04: case 0x05: scroll = (state->m_vh_latch_ram[5] << 8) | state->m_vh_latch_ram[4]; - tilemap_set_scrollx(state->m_bg_tilemap,0,scroll); + state->m_bg_tilemap->set_scrollx(0,scroll); break; case 0x06: case 0x08: scroll = (state->m_vh_latch_ram[8] << 8) | state->m_vh_latch_ram[6]; - tilemap_set_scrolly(state->m_bg_tilemap,0,scroll); + state->m_bg_tilemap->set_scrolly(0,scroll); break; case 0x07: - tilemap_set_enable(state->m_tx_tilemap,data & 0x80); + state->m_tx_tilemap->enable(data & 0x80); /* 0x40 = sprites */ - tilemap_set_enable(state->m_bg_tilemap,data & 0x20); - tilemap_set_enable(state->m_fg_tilemap,data & 0x10); + state->m_bg_tilemap->enable(data & 0x20); + state->m_fg_tilemap->enable(data & 0x10); flip_screen_set(space->machine(), data & 0x01); break; } @@ -300,13 +300,13 @@ SCREEN_UPDATE_IND16( stfight ) screen.machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0, cliprect); /* in case state->m_bg_tilemap is disabled */ - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,1); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,1); /* Draw sprites (may be obscured by foreground layer) */ if (state->m_vh_latch_ram[0x07] & 0x40) draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index 34021e4fb5b..7c60bfc3c4a 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -21,7 +21,7 @@ WRITE16_HANDLER( stlforce_bg_videoram_w ) stlforce_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } /* middle layer, low */ @@ -45,7 +45,7 @@ WRITE16_HANDLER( stlforce_mlow_videoram_w ) stlforce_state *state = space->machine().driver_data(); state->m_mlow_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_mlow_tilemap,offset); + state->m_mlow_tilemap->mark_tile_dirty(offset); } /* middle layer, high */ @@ -69,7 +69,7 @@ WRITE16_HANDLER( stlforce_mhigh_videoram_w ) stlforce_state *state = space->machine().driver_data(); state->m_mhigh_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_mhigh_tilemap,offset); + state->m_mhigh_tilemap->mark_tile_dirty(offset); } /* text layer, appears to be the top layer */ @@ -94,7 +94,7 @@ WRITE16_HANDLER( stlforce_tx_videoram_w ) stlforce_state *state = space->machine().driver_data(); state->m_tx_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } /* sprites - quite a bit still needs doing .. */ @@ -139,48 +139,48 @@ SCREEN_UPDATE_IND16( stlforce ) if (state->m_vidattrram[6] & 1) { for(i=0;i<256;i++) - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_bg_scrollram[i]+9); //+9 for twinbrat + state->m_bg_tilemap->set_scrollx(i, state->m_bg_scrollram[i]+9); //+9 for twinbrat } else { for(i=0;i<256;i++) - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_bg_scrollram[0]+9); //+9 for twinbrat + state->m_bg_tilemap->set_scrollx(i, state->m_bg_scrollram[0]+9); //+9 for twinbrat } if (state->m_vidattrram[6] & 4) { for(i=0;i<256;i++) - tilemap_set_scrollx(state->m_mlow_tilemap, i, state->m_mlow_scrollram[i]+8); + state->m_mlow_tilemap->set_scrollx(i, state->m_mlow_scrollram[i]+8); } else { for(i=0;i<256;i++) - tilemap_set_scrollx(state->m_mlow_tilemap, i, state->m_mlow_scrollram[0]+8); + state->m_mlow_tilemap->set_scrollx(i, state->m_mlow_scrollram[0]+8); } if (state->m_vidattrram[6] & 0x10) { for(i=0;i<256;i++) - tilemap_set_scrollx(state->m_mhigh_tilemap, i, state->m_mhigh_scrollram[i]+8); + state->m_mhigh_tilemap->set_scrollx(i, state->m_mhigh_scrollram[i]+8); } else { for(i=0;i<256;i++) - tilemap_set_scrollx(state->m_mhigh_tilemap, i, state->m_mhigh_scrollram[0]+8); + state->m_mhigh_tilemap->set_scrollx(i, state->m_mhigh_scrollram[0]+8); } - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_vidattrram[1]); - tilemap_set_scrolly(state->m_mlow_tilemap, 0, state->m_vidattrram[2]); - tilemap_set_scrolly(state->m_mhigh_tilemap, 0, state->m_vidattrram[3]); + state->m_bg_tilemap->set_scrolly(0, state->m_vidattrram[1]); + state->m_mlow_tilemap->set_scrolly(0, state->m_vidattrram[2]); + state->m_mhigh_tilemap->set_scrolly(0, state->m_vidattrram[3]); - tilemap_set_scrollx(state->m_tx_tilemap, 0, state->m_vidattrram[0]+8); - tilemap_set_scrolly(state->m_tx_tilemap, 0,state->m_vidattrram[4]); + state->m_tx_tilemap->set_scrollx(0, state->m_vidattrram[0]+8); + state->m_tx_tilemap->set_scrolly(0,state->m_vidattrram[4]); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_mlow_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_mhigh_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_mlow_tilemap->draw(bitmap, cliprect, 0,0); + state->m_mhigh_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -193,11 +193,11 @@ VIDEO_START( stlforce ) state->m_mhigh_tilemap = tilemap_create(machine, get_stlforce_mhigh_tile_info,tilemap_scan_cols, 16,16,64,16); state->m_tx_tilemap = tilemap_create(machine, get_stlforce_tx_tile_info, tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_mlow_tilemap,0); - tilemap_set_transparent_pen(state->m_mhigh_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_mlow_tilemap->set_transparent_pen(0); + state->m_mhigh_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_bg_tilemap, 256); - tilemap_set_scroll_rows(state->m_mlow_tilemap, 256); - tilemap_set_scroll_rows(state->m_mhigh_tilemap, 256); + state->m_bg_tilemap->set_scroll_rows(256); + state->m_mlow_tilemap->set_scroll_rows(256); + state->m_mhigh_tilemap->set_scroll_rows(256); } diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index 07250b81b69..793c79363db 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -46,7 +46,7 @@ WRITE8_HANDLER( strnskil_videoram_w ) strnskil_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( strnskil_scrl_ctrl_w ) @@ -57,7 +57,7 @@ WRITE8_HANDLER( strnskil_scrl_ctrl_w ) if (flip_screen_get(space->machine()) != (data & 0x08)) { flip_screen_set(space->machine(), data & 0x08); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -78,7 +78,7 @@ VIDEO_START( strnskil ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -136,16 +136,16 @@ SCREEN_UPDATE_IND16( strnskil ) switch (usr1[state->m_scrl_ctrl * 32 + row]) { case 2: - tilemap_set_scrollx(state->m_bg_tilemap, row, -~state->m_xscroll[1]); + state->m_bg_tilemap->set_scrollx(row, -~state->m_xscroll[1]); break; case 4: - tilemap_set_scrollx(state->m_bg_tilemap, row, -~state->m_xscroll[0]); + state->m_bg_tilemap->set_scrollx(row, -~state->m_xscroll[0]); break; } } } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index 1136d530664..440de5f8fd6 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -123,7 +123,7 @@ WRITE8_HANDLER( suna8_spriteram_w ) state->m_spriteram[offset] = data; #if TILEMAPS - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset/2); + state->m_bg_tilemap->mark_tile_dirty(offset/2); #endif } @@ -134,7 +134,7 @@ WRITE8_HANDLER( suna8_banked_spriteram_w ) offset += state->m_spritebank * 0x2000; state->m_spriteram[offset] = data; #if TILEMAPS - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset/2); + state->m_bg_tilemap->mark_tile_dirty(offset/2); #endif } @@ -186,7 +186,7 @@ static void suna8_vh_start_common(running_machine &machine, int dim) 8, 8, 0x20*((state->m_text_dim > 0)?4:8), 0x20); - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); + state->m_bg_tilemap->set_transparent_pen(15); #endif } @@ -424,21 +424,21 @@ SCREEN_UPDATE_IND16( suna8 ) suna8_state *state = screen.machine().driver_data(); int max_tiles = screen.machine().region("gfx1")->bytes() / (0x400 * 0x20); - if (screen.machine().input().code_pressed_once(KEYCODE_Q)) { state->m_page--; tilemap_mark_all_tiles_dirty_all(screen.machine()); } - if (screen.machine().input().code_pressed_once(KEYCODE_W)) { state->m_page++; tilemap_mark_all_tiles_dirty_all(screen.machine()); } - if (screen.machine().input().code_pressed_once(KEYCODE_E)) { state->m_tiles--; tilemap_mark_all_tiles_dirty_all(screen.machine()); } - if (screen.machine().input().code_pressed_once(KEYCODE_R)) { state->m_tiles++; tilemap_mark_all_tiles_dirty_all(screen.machine()); } - if (screen.machine().input().code_pressed_once(KEYCODE_A)) { state->m_trombank--; tilemap_mark_all_tiles_dirty_all(screen.machine()); } - if (screen.machine().input().code_pressed_once(KEYCODE_S)) { state->m_trombank++; tilemap_mark_all_tiles_dirty_all(screen.machine()); } + if (screen.machine().input().code_pressed_once(KEYCODE_Q)) { state->m_page--; screen.machine().tilemap().mark_all_dirty(); } + if (screen.machine().input().code_pressed_once(KEYCODE_W)) { state->m_page++; screen.machine().tilemap().mark_all_dirty(); } + if (screen.machine().input().code_pressed_once(KEYCODE_E)) { state->m_tiles--; screen.machine().tilemap().mark_all_dirty(); } + if (screen.machine().input().code_pressed_once(KEYCODE_R)) { state->m_tiles++; screen.machine().tilemap().mark_all_dirty(); } + if (screen.machine().input().code_pressed_once(KEYCODE_A)) { state->m_trombank--; screen.machine().tilemap().mark_all_dirty(); } + if (screen.machine().input().code_pressed_once(KEYCODE_S)) { state->m_trombank++; screen.machine().tilemap().mark_all_dirty(); } state->m_rombank &= 0xf; state->m_page &= (state->m_text_dim > 0)?3:7; state->m_tiles %= max_tiles; if (state->m_tiles < 0) state->m_tiles += max_tiles; - tilemap_set_scrollx(state->m_bg_tilemap, 0, 0x100 * state->m_page); - tilemap_set_scrolly(state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, 0x100 * state->m_page); + state->m_bg_tilemap->set_scrolly(0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); #if 1 popmessage("%02X %02X %02X %02X - p%2X g%02X r%02X", state->m_rombank, state->m_palettebank, state->m_spritebank, state->m_unknown, diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index c465f00614f..2fa0795ac39 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -38,7 +38,7 @@ static TILE_GET_INFO( sqix_get_bg_tile_info ) if (bank) code += 1024 * state->m_gfxbank; SET_TILE_INFO(bank, code, color, 0); - tileinfo->group = (attr & 0x08) >> 3; + tileinfo.group = (attr & 0x08) >> 3; } @@ -62,8 +62,8 @@ VIDEO_START( superqix ) state->m_fg_bitmap[1] = auto_bitmap_ind16_alloc(machine, 256, 256); state->m_bg_tilemap = tilemap_create(machine, sqix_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transmask(state->m_bg_tilemap,0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap,1,0x0001,0xfffe); /* split type 1 has pen 0 transparent in front half */ + state->m_bg_tilemap->set_transmask(0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1,0x0001,0xfffe); /* split type 1 has pen 0 transparent in front half */ state->save_item(NAME(state->m_gfxbank)); state->save_item(NAME(state->m_show_bitmap)); @@ -83,7 +83,7 @@ WRITE8_HANDLER( superqix_videoram_w ) { superqix_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( superqix_bitmapram_w ) @@ -144,7 +144,7 @@ WRITE8_HANDLER( superqix_0410_w ) if (state->m_gfxbank != (data & 0x03)) { state->m_gfxbank = data & 0x03; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 2 selects which of the two bitmaps to display (for 2 players game) */ @@ -228,7 +228,7 @@ static void superqix_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap SCREEN_UPDATE_IND16( pbillian ) { superqix_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); pbillian_draw_sprites(screen.machine(), bitmap,cliprect); return 0; @@ -237,9 +237,9 @@ SCREEN_UPDATE_IND16( pbillian ) SCREEN_UPDATE_IND16( superqix ) { superqix_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); copybitmap_trans(bitmap,*state->m_fg_bitmap[state->m_show_bitmap],flip_screen_get(screen.machine()),flip_screen_get(screen.machine()),0,0,cliprect,0); superqix_draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c index e7ca4a34b09..9a292c9cd81 100644 --- a/src/mame/video/suprloco.c +++ b/src/mame/video/suprloco.c @@ -83,7 +83,7 @@ static TILE_GET_INFO( get_tile_info ) state->m_videoram[2*tile_index] | ((attr & 0x03) << 8), (attr & 0x1c) >> 2, 0); - tileinfo->category = (attr & 0x20) >> 5; + tileinfo.category = (attr & 0x20) >> 5; } @@ -99,7 +99,7 @@ VIDEO_START( suprloco ) suprloco_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_scroll_rows(state->m_bg_tilemap,32); + state->m_bg_tilemap->set_scroll_rows(32); } @@ -114,7 +114,7 @@ WRITE8_HANDLER( suprloco_videoram_w ) { suprloco_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset/2); + state->m_bg_tilemap->mark_tile_dirty(offset/2); } WRITE8_HANDLER( suprloco_scrollram_w ) @@ -123,7 +123,7 @@ WRITE8_HANDLER( suprloco_scrollram_w ) int adj = flip_screen_get(space->machine()) ? -8 : 8; state->m_scrollram[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap,offset, data - adj); + state->m_bg_tilemap->set_scrollx(offset, data - adj); } WRITE8_HANDLER( suprloco_control_w ) @@ -267,8 +267,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( suprloco ) { suprloco_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,1,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1,0); return 0; } diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index 2aca0448672..0075a74b7ad 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -9,8 +9,8 @@ static void suprnova_draw_roz(bitmap_ind16 &bitmap, bitmap_ind8& bitmapflags, const rectangle &cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, int columnscroll, UINT32* scrollram) { //bitmap_ind16 *destbitmap = bitmap; - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(tmap); - bitmap_ind8 &srcbitmapflags = tilemap_get_flagsmap(tmap); + bitmap_ind16 &srcbitmap = tmap->pixmap(); + bitmap_ind8 &srcbitmapflags = tmap->flagsmap(); const int xmask = srcbitmap.width()-1; const int ymask = srcbitmap.height()-1; const int widthshifted = srcbitmap.width() << 16; @@ -291,7 +291,7 @@ static TILE_GET_INFO( get_tilemap_A_tile_info ) code, 0x40+colr, flags); - tileinfo->category = pri; + tileinfo.category = pri; //if (pri) popmessage("pri A!! %02x\n", pri); } @@ -300,7 +300,7 @@ WRITE32_HANDLER ( skns_tilemapA_w ) { skns_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tilemapA_ram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_A,offset); + state->m_tilemap_A->mark_tile_dirty(offset); } static TILE_GET_INFO( get_tilemap_B_tile_info ) @@ -320,7 +320,7 @@ static TILE_GET_INFO( get_tilemap_B_tile_info ) code, 0x40+colr, flags); - tileinfo->category = pri; + tileinfo.category = pri; //if (pri) popmessage("pri B!! %02x\n", pri); // 02 on cyvern } @@ -329,7 +329,7 @@ WRITE32_HANDLER ( skns_tilemapB_w ) { skns_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_tilemapB_ram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_B,offset); + state->m_tilemap_B->mark_tile_dirty(offset); } WRITE32_HANDLER ( skns_v3_regs_w ) @@ -346,8 +346,8 @@ WRITE32_HANDLER ( skns_v3_regs_w ) state->m_depthA = (state->m_v3_regs[0x0c/4] & 0x0001) << 1; state->m_depthB = (state->m_v3_regs[0x0c/4] & 0x0100) >> 7; - if (old_depthA != state->m_depthA) tilemap_mark_all_tiles_dirty (state->m_tilemap_A); - if (old_depthB != state->m_depthB) tilemap_mark_all_tiles_dirty (state->m_tilemap_B); + if (old_depthA != state->m_depthA) state->m_tilemap_A->mark_all_dirty(); + if (old_depthB != state->m_depthB) state->m_tilemap_B->mark_all_dirty(); } } @@ -360,10 +360,10 @@ VIDEO_START(skns) state->m_spritegen = machine.device("spritegen"); state->m_tilemap_A = tilemap_create(machine, get_tilemap_A_tile_info,tilemap_scan_rows,16,16,64, 64); - tilemap_set_transparent_pen(state->m_tilemap_A,0); + state->m_tilemap_A->set_transparent_pen(0); state->m_tilemap_B = tilemap_create(machine, get_tilemap_B_tile_info,tilemap_scan_rows,16,16,64, 64); - tilemap_set_transparent_pen(state->m_tilemap_B,0); + state->m_tilemap_B->set_transparent_pen(0); state->m_sprite_bitmap.allocate(1024,1024); diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c index 5d74406c39c..6801397cbb7 100644 --- a/src/mame/video/suprridr.c +++ b/src/mame/video/suprridr.c @@ -44,7 +44,7 @@ VIDEO_START( suprridr ) state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 32,32); state->m_bg_tilemap_noscroll = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 32,32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -95,7 +95,7 @@ WRITE8_HANDLER( suprridr_flipx_w ) { suprridr_state *state = space->machine().driver_data(); state->m_flipx = data & 1; - tilemap_set_flip_all(space->machine(), (state->m_flipx ? TILEMAP_FLIPX : 0) | (state->m_flipy ? TILEMAP_FLIPY : 0)); + space->machine().tilemap().set_flip_all((state->m_flipx ? TILEMAP_FLIPX : 0) | (state->m_flipy ? TILEMAP_FLIPY : 0)); } @@ -103,28 +103,28 @@ WRITE8_HANDLER( suprridr_flipy_w ) { suprridr_state *state = space->machine().driver_data(); state->m_flipy = data & 1; - tilemap_set_flip_all(space->machine(), (state->m_flipx ? TILEMAP_FLIPX : 0) | (state->m_flipy ? TILEMAP_FLIPY : 0)); + space->machine().tilemap().set_flip_all((state->m_flipx ? TILEMAP_FLIPX : 0) | (state->m_flipy ? TILEMAP_FLIPY : 0)); } WRITE8_HANDLER( suprridr_fgdisable_w ) { suprridr_state *state = space->machine().driver_data(); - tilemap_set_enable(state->m_fg_tilemap, ~data & 1); + state->m_fg_tilemap->enable(~data & 1); } WRITE8_HANDLER( suprridr_fgscrolly_w ) { suprridr_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_fg_tilemap, 0, data); + state->m_fg_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( suprridr_bgscrolly_w ) { suprridr_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } @@ -146,8 +146,8 @@ WRITE8_HANDLER( suprridr_bgram_w ) { suprridr_state *state = space->machine().driver_data(); state->m_bgram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); - tilemap_mark_tile_dirty(state->m_bg_tilemap_noscroll, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); + state->m_bg_tilemap_noscroll->mark_tile_dirty(offset); } @@ -155,7 +155,7 @@ WRITE8_HANDLER( suprridr_fgram_w ) { suprridr_state *state = space->machine().driver_data(); state->m_fgram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -178,23 +178,23 @@ SCREEN_UPDATE_IND16( suprridr ) subclip = visarea;; subclip.max_x = subclip.min_x + (state->m_flipx ? 1*8 : 4*8) - 1; subclip &= cliprect; - tilemap_draw(bitmap, subclip, state->m_bg_tilemap_noscroll, 0, 0); + state->m_bg_tilemap_noscroll->draw(bitmap, subclip, 0, 0); /* render right 1 column with no scroll */ subclip = visarea;; subclip.min_x = subclip.max_x - (state->m_flipx ? 4*8 : 1*8) + 1; subclip &= cliprect; - tilemap_draw(bitmap, subclip, state->m_bg_tilemap_noscroll, 0, 0); + state->m_bg_tilemap_noscroll->draw(bitmap, subclip, 0, 0); /* render the middle columns normally */ subclip = visarea;; subclip.min_x += state->m_flipx ? 1*8 : 4*8; subclip.max_x -= state->m_flipx ? 4*8 : 1*8; subclip &= cliprect; - tilemap_draw(bitmap, subclip, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, subclip, 0, 0); /* render the top layer */ - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the sprites */ for (i = 0; i < 48; i++) diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c index 48d0916bdc4..965469c1dea 100644 --- a/src/mame/video/suprslam.c +++ b/src/mame/video/suprslam.c @@ -102,7 +102,7 @@ WRITE16_HANDLER( suprslam_screen_videoram_w ) suprslam_state *state = space->machine().driver_data(); state->m_screen_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_screen_tilemap, offset); + state->m_screen_tilemap->mark_tile_dirty(offset); } @@ -125,7 +125,7 @@ WRITE16_HANDLER( suprslam_bg_videoram_w ) suprslam_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -149,19 +149,19 @@ VIDEO_START( suprslam ) state->m_bg_tilemap = tilemap_create(machine, get_suprslam_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_screen_tilemap = tilemap_create(machine, get_suprslam_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_screen_tilemap, 15); + state->m_screen_tilemap->set_transparent_pen(15); } SCREEN_UPDATE_IND16( suprslam ) { suprslam_state *state = screen.machine().driver_data(); - tilemap_set_scrollx( state->m_screen_tilemap,0, state->m_screen_vregs[0x04/2] ); + state->m_screen_tilemap->set_scrollx(0, state->m_screen_vregs[0x04/2] ); bitmap.fill(get_black_pen(screen.machine()), cliprect); k053936_zoom_draw(state->m_k053936, bitmap, cliprect, state->m_bg_tilemap, 0, 0, 1); if(!(state->m_spr_ctrl[0] & 8)) draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_screen_tilemap, 0, 0); + state->m_screen_tilemap->draw(bitmap, cliprect, 0, 0); if(state->m_spr_ctrl[0] & 8) draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -178,7 +178,7 @@ WRITE16_HANDLER (suprslam_bank_w) state->m_bg_bank = (data & 0x0f00) << 4; if (state->m_screen_bank != old_screen_bank) - tilemap_mark_all_tiles_dirty(state->m_screen_tilemap); + state->m_screen_tilemap->mark_all_dirty(); if (state->m_bg_bank != old_bg_bank) - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c index 8d96e6f9925..b8b784ab71a 100644 --- a/src/mame/video/system1.c +++ b/src/mame/video/system1.c @@ -131,8 +131,8 @@ static void video_start_common(running_machine &machine, int pagecount) for (pagenum = 0; pagenum < pagecount; pagenum++) { state->m_tilemap_page[pagenum] = tilemap_create(machine, tile_get_info, tilemap_scan_rows, 8,8, 32,32); - tilemap_set_transparent_pen(state->m_tilemap_page[pagenum], 0); - tilemap_set_user_data(state->m_tilemap_page[pagenum], state->m_videoram + 0x800 * pagenum); + state->m_tilemap_page[pagenum]->set_transparent_pen(0); + state->m_tilemap_page[pagenum]->set_user_data(state->m_videoram + 0x800 * pagenum); } /* allocate a temporary bitmap for sprite rendering */ @@ -277,7 +277,7 @@ WRITE8_HANDLER( system1_videoram_w ) offset |= 0x1000 * ((state->m_videoram_bank >> 1) % (state->m_tilemap_pages / 2)); videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_page[offset / 0x800], (offset % 0x800) / 2); + state->m_tilemap_page[offset / 0x800]->mark_tile_dirty((offset % 0x800) / 2); /* force a partial update if the page is changing */ if (state->m_tilemap_pages > 2 && offset >= 0x740 && offset < 0x748 && offset % 2 == 0) @@ -577,10 +577,10 @@ SCREEN_UPDATE_IND16( system1 ) int y; /* all 4 background pages are the same, fixed to page 0 */ - bgpixmaps[0] = bgpixmaps[1] = bgpixmaps[2] = bgpixmaps[3] = &tilemap_get_pixmap(state->m_tilemap_page[0]); + bgpixmaps[0] = bgpixmaps[1] = bgpixmaps[2] = bgpixmaps[3] = &state->m_tilemap_page[0]->pixmap(); /* foreground is fixed to page 1 */ - bitmap_ind16 &fgpixmap = tilemap_get_pixmap(state->m_tilemap_page[1]); + bitmap_ind16 &fgpixmap = state->m_tilemap_page[1]->pixmap(); /* get fixed scroll offsets */ xscroll = (INT16)((videoram[0xffc] | (videoram[0xffd] << 8)) + 28); @@ -614,13 +614,13 @@ SCREEN_UPDATE_IND16( system2 ) int y; /* 4 independent background pages */ - bgpixmaps[0] = &tilemap_get_pixmap(state->m_tilemap_page[videoram[0x740] & 7]); - bgpixmaps[1] = &tilemap_get_pixmap(state->m_tilemap_page[videoram[0x742] & 7]); - bgpixmaps[2] = &tilemap_get_pixmap(state->m_tilemap_page[videoram[0x744] & 7]); - bgpixmaps[3] = &tilemap_get_pixmap(state->m_tilemap_page[videoram[0x746] & 7]); + bgpixmaps[0] = &state->m_tilemap_page[videoram[0x740] & 7]->pixmap(); + bgpixmaps[1] = &state->m_tilemap_page[videoram[0x742] & 7]->pixmap(); + bgpixmaps[2] = &state->m_tilemap_page[videoram[0x744] & 7]->pixmap(); + bgpixmaps[3] = &state->m_tilemap_page[videoram[0x746] & 7]->pixmap(); /* foreground is fixed to page 0 */ - bitmap_ind16 &fgpixmap = tilemap_get_pixmap(state->m_tilemap_page[0]); + bitmap_ind16 &fgpixmap = state->m_tilemap_page[0]->pixmap(); /* get scroll offsets */ if (!flip_screen_get(screen.machine())) @@ -657,13 +657,13 @@ SCREEN_UPDATE_IND16( system2_rowscroll ) int y; /* 4 independent background pages */ - bgpixmaps[0] = &tilemap_get_pixmap(state->m_tilemap_page[videoram[0x740] & 7]); - bgpixmaps[1] = &tilemap_get_pixmap(state->m_tilemap_page[videoram[0x742] & 7]); - bgpixmaps[2] = &tilemap_get_pixmap(state->m_tilemap_page[videoram[0x744] & 7]); - bgpixmaps[3] = &tilemap_get_pixmap(state->m_tilemap_page[videoram[0x746] & 7]); + bgpixmaps[0] = &state->m_tilemap_page[videoram[0x740] & 7]->pixmap(); + bgpixmaps[1] = &state->m_tilemap_page[videoram[0x742] & 7]->pixmap(); + bgpixmaps[2] = &state->m_tilemap_page[videoram[0x744] & 7]->pixmap(); + bgpixmaps[3] = &state->m_tilemap_page[videoram[0x746] & 7]->pixmap(); /* foreground is fixed to page 0 */ - bitmap_ind16 &fgpixmap = tilemap_get_pixmap(state->m_tilemap_page[0]); + bitmap_ind16 &fgpixmap = state->m_tilemap_page[0]->pixmap(); /* get scroll offsets */ if (!flip_screen_get(screen.machine())) diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index 2e92a7671ae..07f12e22f6b 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -176,18 +176,18 @@ static void update_page( running_machine &machine ) { all_dirty = 1; state->m_old_tile_bank0 = state->m_tile_bank0; - tilemap_mark_all_tiles_dirty(state->m_text_layer); + state->m_text_layer->mark_all_dirty(); } if (all_dirty) { - tilemap_mark_all_tiles_dirty(state->m_background); - tilemap_mark_all_tiles_dirty(state->m_foreground); + state->m_background->mark_all_dirty(); + state->m_foreground->mark_all_dirty(); if (state->m_system18) { - tilemap_mark_all_tiles_dirty(state->m_background2); - tilemap_mark_all_tiles_dirty(state->m_foreground2); + state->m_background2->mark_all_dirty(); + state->m_foreground2->mark_all_dirty(); } } else { @@ -199,7 +199,7 @@ static void update_page( running_machine &machine ) state->m_old_bg_page[i] = state->m_bg_page[i]; for (offset = page0; offset < page0 + 64 * 32; offset++) { - tilemap_mark_tile_dirty(state->m_background, offset); + state->m_background->mark_tile_dirty(offset); } } @@ -208,7 +208,7 @@ static void update_page( running_machine &machine ) state->m_old_fg_page[i] = state->m_fg_page[i]; for (offset = page0; offset < page0 + 64 * 32; offset++) { - tilemap_mark_tile_dirty(state->m_foreground, offset); + state->m_foreground->mark_tile_dirty(offset); } } @@ -219,7 +219,7 @@ static void update_page( running_machine &machine ) state->m_old_bg2_page[i] = state->m_bg2_page[i]; for (offset = page0; offset < page0 + 64 * 32; offset++) { - tilemap_mark_tile_dirty(state->m_background2, offset); + state->m_background2->mark_tile_dirty(offset); } } @@ -228,7 +228,7 @@ static void update_page( running_machine &machine ) state->m_old_fg2_page[i] = state->m_fg2_page[i]; for (offset = page0; offset < page0 + 64 * 32; offset++) { - tilemap_mark_tile_dirty(state->m_foreground2, offset); + state->m_foreground2->mark_tile_dirty(offset); } } } @@ -304,27 +304,27 @@ WRITE16_HANDLER( sys16_tileram_w ) int page = offset / (64 * 32); offset = offset % (64 * 32); - if (state->m_bg_page[0] == page) tilemap_mark_tile_dirty(state->m_background, offset + 64 * 32 * 0); - if (state->m_bg_page[1] == page) tilemap_mark_tile_dirty(state->m_background, offset + 64 * 32 * 1); - if (state->m_bg_page[2] == page) tilemap_mark_tile_dirty(state->m_background, offset + 64 * 32 * 2); - if (state->m_bg_page[3] == page) tilemap_mark_tile_dirty(state->m_background, offset + 64 * 32 * 3); + if (state->m_bg_page[0] == page) state->m_background->mark_tile_dirty(offset + 64 * 32 * 0); + if (state->m_bg_page[1] == page) state->m_background->mark_tile_dirty(offset + 64 * 32 * 1); + if (state->m_bg_page[2] == page) state->m_background->mark_tile_dirty(offset + 64 * 32 * 2); + if (state->m_bg_page[3] == page) state->m_background->mark_tile_dirty(offset + 64 * 32 * 3); - if (state->m_fg_page[0] == page) tilemap_mark_tile_dirty(state->m_foreground, offset + 64 * 32 * 0); - if (state->m_fg_page[1] == page) tilemap_mark_tile_dirty(state->m_foreground, offset + 64 * 32 * 1); - if (state->m_fg_page[2] == page) tilemap_mark_tile_dirty(state->m_foreground, offset + 64 * 32 * 2); - if (state->m_fg_page[3] == page) tilemap_mark_tile_dirty(state->m_foreground, offset + 64 * 32 * 3); + if (state->m_fg_page[0] == page) state->m_foreground->mark_tile_dirty(offset + 64 * 32 * 0); + if (state->m_fg_page[1] == page) state->m_foreground->mark_tile_dirty(offset + 64 * 32 * 1); + if (state->m_fg_page[2] == page) state->m_foreground->mark_tile_dirty(offset + 64 * 32 * 2); + if (state->m_fg_page[3] == page) state->m_foreground->mark_tile_dirty(offset + 64 * 32 * 3); if (state->m_system18) { - if (state->m_bg2_page[0] == page) tilemap_mark_tile_dirty(state->m_background2, offset + 64 * 32 * 0); - if (state->m_bg2_page[1] == page) tilemap_mark_tile_dirty(state->m_background2, offset + 64 * 32 * 1); - if (state->m_bg2_page[2] == page) tilemap_mark_tile_dirty(state->m_background2, offset + 64 * 32 * 2); - if (state->m_bg2_page[3] == page) tilemap_mark_tile_dirty(state->m_background2, offset + 64 * 32 * 3); + if (state->m_bg2_page[0] == page) state->m_background2->mark_tile_dirty(offset + 64 * 32 * 0); + if (state->m_bg2_page[1] == page) state->m_background2->mark_tile_dirty(offset + 64 * 32 * 1); + if (state->m_bg2_page[2] == page) state->m_background2->mark_tile_dirty(offset + 64 * 32 * 2); + if (state->m_bg2_page[3] == page) state->m_background2->mark_tile_dirty(offset + 64 * 32 * 3); - if (state->m_fg2_page[0] == page) tilemap_mark_tile_dirty(state->m_foreground2, offset + 64 * 32 * 0); - if (state->m_fg2_page[1] == page) tilemap_mark_tile_dirty(state->m_foreground2, offset + 64 * 32 * 1); - if (state->m_fg2_page[2] == page) tilemap_mark_tile_dirty(state->m_foreground2, offset + 64 * 32 * 2); - if (state->m_fg2_page[3] == page) tilemap_mark_tile_dirty(state->m_foreground2, offset + 64 * 32 * 3); + if (state->m_fg2_page[0] == page) state->m_foreground2->mark_tile_dirty(offset + 64 * 32 * 0); + if (state->m_fg2_page[1] == page) state->m_foreground2->mark_tile_dirty(offset + 64 * 32 * 1); + if (state->m_fg2_page[2] == page) state->m_foreground2->mark_tile_dirty(offset + 64 * 32 * 2); + if (state->m_fg2_page[3] == page) state->m_foreground2->mark_tile_dirty(offset + 64 * 32 * 3); } } } @@ -356,9 +356,9 @@ static TILE_GET_INFO( get_text_tile_info ) } if (pri >= state->m_textlayer_lo_min && pri <= state->m_textlayer_lo_max) - tileinfo->category = 1; + tileinfo.category = 1; if (pri >= state->m_textlayer_hi_min && pri <= state->m_textlayer_hi_max) - tileinfo->category = 0; + tileinfo.category = 0; } WRITE16_HANDLER( sys16_textram_w ) @@ -366,7 +366,7 @@ WRITE16_HANDLER( sys16_textram_w ) segas1x_bootleg_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_textram[offset]); - tilemap_mark_tile_dirty(state->m_text_layer, offset); + state->m_text_layer->mark_tile_dirty(offset); } /***************************************************************************/ @@ -407,9 +407,9 @@ VIDEO_START( system16 ) 40,28 ); { - if (state->m_bg1_trans) tilemap_set_transparent_pen(state->m_background, 0); - tilemap_set_transparent_pen(state->m_foreground, 0); - tilemap_set_transparent_pen(state->m_text_layer, 0); + if (state->m_bg1_trans) state->m_background->set_transparent_pen(0); + state->m_foreground->set_transparent_pen(0); + state->m_text_layer->set_transparent_pen(0); state->m_tile_bank0 = 0; state->m_tile_bank1 = 1; @@ -456,18 +456,18 @@ VIDEO_START( system18old ) 8,8, 64*2,32*2 ); - tilemap_set_transparent_pen(state->m_foreground2, 0); + state->m_foreground2->set_transparent_pen(0); if (state->m_splittab_fg_x) { - tilemap_set_scroll_rows(state->m_foreground , 64); - tilemap_set_scroll_rows(state->m_foreground2 , 64); + state->m_foreground ->set_scroll_rows(64); + state->m_foreground2 ->set_scroll_rows(64); } if (state->m_splittab_bg_x) { - tilemap_set_scroll_rows(state->m_background , 64); - tilemap_set_scroll_rows(state->m_background2 , 64); + state->m_background ->set_scroll_rows(64); + state->m_background2 ->set_scroll_rows(64); } state->m_textlayer_lo_min = 0; @@ -602,9 +602,9 @@ VIDEO_START( s16a_bootleg ) state->m_bg_tilemaps[0] = tilemap_create(machine, get_s16a_bootleg_tile_info0, tilemap_scan_rows, 8,8, 64,32 ); state->m_bg_tilemaps[1] = tilemap_create(machine, get_s16a_bootleg_tile_info1, tilemap_scan_rows, 8,8, 64,32 ); - tilemap_set_transparent_pen(state->m_text_tilemap, 0); - tilemap_set_transparent_pen(state->m_bg_tilemaps[0], 0); - tilemap_set_transparent_pen(state->m_bg_tilemaps[1], 0); + state->m_text_tilemap->set_transparent_pen(0); + state->m_bg_tilemaps[0]->set_transparent_pen(0); + state->m_bg_tilemaps[1]->set_transparent_pen(0); segaic16_palette_init(0x800); @@ -644,40 +644,40 @@ SCREEN_UPDATE_IND16( s16a_bootleg ) bitmap.fill(get_black_pen(screen.machine()), cliprect); // I can't bring myself to care about dirty tile marking on something which runs at a bazillion % speed anyway, clean code is better - tilemap_mark_all_tiles_dirty(state->m_bg_tilemaps[0]); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemaps[1]); - tilemap_mark_all_tiles_dirty(state->m_text_tilemap); + state->m_bg_tilemaps[0]->mark_all_dirty(); + state->m_bg_tilemaps[1]->mark_all_dirty(); + state->m_text_tilemap->mark_all_dirty(); - tilemap_set_scrollx(state->m_text_tilemap, 0, offset_txtx); - tilemap_set_scrolly(state->m_text_tilemap, 0, offset_txty); + state->m_text_tilemap->set_scrollx(0, offset_txtx); + state->m_text_tilemap->set_scrolly(0, offset_txty); if ((state->m_tilemapselect & 0xff) == 0x12) { - tilemap_set_scrollx(state->m_bg_tilemaps[1], 0, state->m_bg_scrollx + offset_bg1x); - tilemap_set_scrolly(state->m_bg_tilemaps[1], 0, state->m_bg_scrolly + offset_bg1y + state->m_back_yscroll); - tilemap_set_scrollx(state->m_bg_tilemaps[0], 0, state->m_fg_scrollx + offset_bg0x); - tilemap_set_scrolly(state->m_bg_tilemaps[0], 0, state->m_fg_scrolly + offset_bg0y + state->m_fore_yscroll); + state->m_bg_tilemaps[1]->set_scrollx(0, state->m_bg_scrollx + offset_bg1x); + state->m_bg_tilemaps[1]->set_scrolly(0, state->m_bg_scrolly + offset_bg1y + state->m_back_yscroll); + state->m_bg_tilemaps[0]->set_scrollx(0, state->m_fg_scrollx + offset_bg0x); + state->m_bg_tilemaps[0]->set_scrolly(0, state->m_fg_scrolly + offset_bg0y + state->m_fore_yscroll); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemaps[0], TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemaps[1], 0, 0); + state->m_bg_tilemaps[0]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemaps[1]->draw(bitmap, cliprect, 0, 0); - tilemap_set_scrolly(state->m_text_tilemap, 0, state->m_text_yscroll); + state->m_text_tilemap->set_scrolly(0, state->m_text_yscroll); - tilemap_draw(bitmap, cliprect, state->m_text_tilemap, 0, 0); + state->m_text_tilemap->draw(bitmap, cliprect, 0, 0); } else if ((state->m_tilemapselect & 0xff) == 0x21) { - tilemap_set_scrollx(state->m_bg_tilemaps[0], 0, state->m_bg_scrollx + 187 ); - tilemap_set_scrolly(state->m_bg_tilemaps[0], 0, state->m_bg_scrolly + state->m_back_yscroll ); - tilemap_set_scrollx(state->m_bg_tilemaps[1], 0, state->m_fg_scrollx + 187 ); - tilemap_set_scrolly(state->m_bg_tilemaps[1], 0, state->m_fg_scrolly + 1 + state->m_fore_yscroll ); + state->m_bg_tilemaps[0]->set_scrollx(0, state->m_bg_scrollx + 187 ); + state->m_bg_tilemaps[0]->set_scrolly(0, state->m_bg_scrolly + state->m_back_yscroll ); + state->m_bg_tilemaps[1]->set_scrollx(0, state->m_fg_scrollx + 187 ); + state->m_bg_tilemaps[1]->set_scrolly(0, state->m_fg_scrolly + 1 + state->m_fore_yscroll ); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemaps[1], TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemaps[0], 0, 0); + state->m_bg_tilemaps[1]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemaps[0]->draw(bitmap, cliprect, 0, 0); - tilemap_set_scrolly(state->m_text_tilemap, 0, state->m_text_yscroll); + state->m_text_tilemap->set_scrolly(0, state->m_text_yscroll); - tilemap_draw(bitmap, cliprect, state->m_text_tilemap, 0, 0); + state->m_text_tilemap->draw(bitmap, cliprect, 0, 0); } /* draw the sprites */ @@ -702,23 +702,23 @@ SCREEN_UPDATE_IND16( s16a_bootleg_passht4b ) bitmap.fill(get_black_pen(screen.machine()), cliprect); // I can't bring myself to care about dirty tile marking on something which runs at a bazillion % speed anyway, clean code is better - tilemap_mark_all_tiles_dirty(state->m_bg_tilemaps[0]); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemaps[1]); - tilemap_mark_all_tiles_dirty(state->m_text_tilemap); + state->m_bg_tilemaps[0]->mark_all_dirty(); + state->m_bg_tilemaps[1]->mark_all_dirty(); + state->m_text_tilemap->mark_all_dirty(); - tilemap_set_scrollx(state->m_text_tilemap, 0, offset_txtx); - tilemap_set_scrolly(state->m_text_tilemap, 0, offset_txty); + state->m_text_tilemap->set_scrollx(0, offset_txtx); + state->m_text_tilemap->set_scrolly(0, offset_txty); if ((state->m_tilemapselect & 0xff) == 0x12) { - tilemap_set_scrollx(state->m_bg_tilemaps[1], 0, (state->m_bg_scrollx ^ 0x7) + offset_bg1x); - tilemap_set_scrolly(state->m_bg_tilemaps[1], 0, state->m_bg_scrolly + offset_bg1y); - tilemap_set_scrollx(state->m_bg_tilemaps[0], 0, (state->m_fg_scrollx ^ 0x7) + offset_bg0x); - tilemap_set_scrolly(state->m_bg_tilemaps[0], 0, state->m_fg_scrolly + offset_bg0y); + state->m_bg_tilemaps[1]->set_scrollx(0, (state->m_bg_scrollx ^ 0x7) + offset_bg1x); + state->m_bg_tilemaps[1]->set_scrolly(0, state->m_bg_scrolly + offset_bg1y); + state->m_bg_tilemaps[0]->set_scrollx(0, (state->m_fg_scrollx ^ 0x7) + offset_bg0x); + state->m_bg_tilemaps[0]->set_scrolly(0, state->m_fg_scrolly + offset_bg0y); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemaps[0], TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemaps[1], 0, 0); - tilemap_draw(bitmap, cliprect, state->m_text_tilemap, 0, 0); + state->m_bg_tilemaps[0]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_bg_tilemaps[1]->draw(bitmap, cliprect, 0, 0); + state->m_text_tilemap->draw(bitmap, cliprect, 0, 0); } /* draw the sprites */ @@ -744,29 +744,29 @@ SCREEN_UPDATE_IND16( system16 ) screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_set_scrollx(state->m_background, 0, -320 - state->m_bg_scrollx); - tilemap_set_scrolly(state->m_background, 0, -256 + state->m_bg_scrolly + state->m_back_yscroll); - tilemap_set_scrollx(state->m_foreground, 0, -320 - state->m_fg_scrollx); - tilemap_set_scrolly(state->m_foreground, 0, -256 + state->m_fg_scrolly + state->m_fore_yscroll); + state->m_background->set_scrollx(0, -320 - state->m_bg_scrollx); + state->m_background->set_scrolly(0, -256 + state->m_bg_scrolly + state->m_back_yscroll); + state->m_foreground->set_scrollx(0, -320 - state->m_fg_scrollx); + state->m_foreground->set_scrolly(0, -256 + state->m_fg_scrolly + state->m_fore_yscroll); - tilemap_set_scrollx(state->m_text_layer, 0, 0); - tilemap_set_scrolly(state->m_text_layer, 0, 0 + state->m_text_yscroll); + state->m_text_layer->set_scrollx(0, 0); + state->m_text_layer->set_scrolly(0, 0 + state->m_text_yscroll); /* Background */ - tilemap_draw(bitmap, cliprect, state->m_background, TILEMAP_DRAW_OPAQUE, 0x00); + state->m_background->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0x00); /* Foreground */ - tilemap_draw(bitmap, cliprect, state->m_foreground, 0, 0x03); - tilemap_draw(bitmap, cliprect, state->m_foreground, 1, 0x07); + state->m_foreground->draw(bitmap, cliprect, 0, 0x03); + state->m_foreground->draw(bitmap, cliprect, 1, 0x07); /* Text Layer */ if (state->m_textlayer_lo_max != 0) { - tilemap_draw(bitmap, cliprect, state->m_text_layer, 1, 7);// needed for Body Slam + state->m_text_layer->draw(bitmap, cliprect, 1, 7);// needed for Body Slam } - tilemap_draw(bitmap, cliprect, state->m_text_layer, 0, 0xf); + state->m_text_layer->draw(bitmap, cliprect, 0, 0xf); //draw_sprites(screen.machine(), bitmap, cliprect,0); @@ -792,17 +792,17 @@ SCREEN_UPDATE_IND16( system18old ) bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_background, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_background, TILEMAP_DRAW_OPAQUE | 1, 0); //?? - tilemap_draw(bitmap, cliprect, state->m_background, TILEMAP_DRAW_OPAQUE | 2, 0); //?? - tilemap_draw(bitmap, cliprect, state->m_background, 1, 0x1); - tilemap_draw(bitmap, cliprect, state->m_background, 2, 0x3); + state->m_background->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_background->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 1, 0); //?? + state->m_background->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 2, 0); //?? + state->m_background->draw(bitmap, cliprect, 1, 0x1); + state->m_background->draw(bitmap, cliprect, 2, 0x3); - tilemap_draw(bitmap, cliprect, state->m_foreground, 0, 0x3); - tilemap_draw(bitmap, cliprect, state->m_foreground, 1, 0x7); + state->m_foreground->draw(bitmap, cliprect, 0, 0x3); + state->m_foreground->draw(bitmap, cliprect, 1, 0x7); - tilemap_draw(bitmap, cliprect, state->m_text_layer, 1, 0x7); - tilemap_draw(bitmap, cliprect, state->m_text_layer, 0, 0xf); + state->m_text_layer->draw(bitmap, cliprect, 1, 0x7); + state->m_text_layer->draw(bitmap, cliprect, 0, 0xf); /* draw the sprites */ segaic16_sprites_draw(screen, bitmap, cliprect, 0); diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index 1459293267f..ea6506f78a4 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -46,14 +46,14 @@ WRITE8_HANDLER( tagteam_videoram_w ) { tagteam_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( tagteam_colorram_w ) { tagteam_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( tagteam_mirrorvideoram_r ) @@ -123,7 +123,7 @@ WRITE8_HANDLER( tagteam_flipscreen_w ) if (flip_screen_get(space->machine()) != (data &0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } // d6/7: coin counters @@ -195,7 +195,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( tagteam ) { tagteam_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index 6bb575a78e1..984423cda00 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -46,7 +46,7 @@ static void tail2nos_postload(running_machine &machine) tail2nos_state *state = machine.driver_data(); int i; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); for (i = 0; i < 0x20000; i += 64) { @@ -60,7 +60,7 @@ VIDEO_START( tail2nos ) state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_bg_tilemap, 15); + state->m_bg_tilemap->set_transparent_pen(15); state->m_zoomdata = (UINT16 *)machine.region("gfx3")->base(); @@ -81,7 +81,7 @@ WRITE16_HANDLER( tail2nos_bgvideoram_w ) tail2nos_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgvideoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ16_HANDLER( tail2nos_zoomdata_r ) @@ -119,7 +119,7 @@ WRITE16_HANDLER( tail2nos_gfxbank_w ) if (state->m_charbank != bank) { state->m_charbank = bank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 5 seems to select palette bank (used on startup) */ @@ -131,7 +131,7 @@ WRITE16_HANDLER( tail2nos_gfxbank_w ) if (state->m_charpalette != bank) { state->m_charpalette = bank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bit 4 seems to be video enable */ @@ -185,7 +185,7 @@ SCREEN_UPDATE_IND16( tail2nos ) { k051316_zoom_draw(state->m_k051316, bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); } else bitmap.fill(0, cliprect); diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index 4dd686c18b6..33a292b6eff 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -402,7 +402,7 @@ static void print_debug_info(running_machine &machine, bitmap_rgb32 &bitmap) /******************************************************************************/ -INLINE void get_tile_info(running_machine &machine, tile_data *tileinfo, int tile_index, UINT16 *gfx_base) +INLINE void get_tile_info(running_machine &machine, tile_data &tileinfo, int tile_index, UINT16 *gfx_base) { UINT32 tile=(gfx_base[tile_index*2+0]<<16)|(gfx_base[tile_index*2+1]&0xffff); UINT8 abtype=(tile>>(16+9)) & 1; @@ -416,8 +416,8 @@ INLINE void get_tile_info(running_machine &machine, tile_data *tileinfo, int til tile&0xffff, (tile>>16) & 0x1ff & (~extra_planes), TILE_FLIPYX( tile >> 30 )); - tileinfo->category = abtype&1; /* alpha blending type */ - tileinfo->pen_mask = (extra_planes << 4) | 0x0f; + tileinfo.category = abtype&1; /* alpha blending type */ + tileinfo.pen_mask = (extra_planes << 4) | 0x0f; } static TILE_GET_INFO( get_tile_info1 ) @@ -601,10 +601,10 @@ VIDEO_START( f3 ) state->m_twidth_mask=0x7f; state->m_twidth_mask_bit=7; - tilemap_set_transparent_pen(state->m_pf1_tilemap,0); - tilemap_set_transparent_pen(state->m_pf2_tilemap,0); - tilemap_set_transparent_pen(state->m_pf3_tilemap,0); - tilemap_set_transparent_pen(state->m_pf4_tilemap,0); + state->m_pf1_tilemap->set_transparent_pen(0); + state->m_pf2_tilemap->set_transparent_pen(0); + state->m_pf3_tilemap->set_transparent_pen(0); + state->m_pf4_tilemap->set_transparent_pen(0); } else { @@ -630,14 +630,14 @@ VIDEO_START( f3 ) state->m_twidth_mask=0x3f; state->m_twidth_mask_bit=6; - tilemap_set_transparent_pen(state->m_pf1_tilemap,0); - tilemap_set_transparent_pen(state->m_pf2_tilemap,0); - tilemap_set_transparent_pen(state->m_pf3_tilemap,0); - tilemap_set_transparent_pen(state->m_pf4_tilemap,0); - tilemap_set_transparent_pen(state->m_pf5_tilemap,0); - tilemap_set_transparent_pen(state->m_pf6_tilemap,0); - tilemap_set_transparent_pen(state->m_pf7_tilemap,0); - tilemap_set_transparent_pen(state->m_pf8_tilemap,0); + state->m_pf1_tilemap->set_transparent_pen(0); + state->m_pf2_tilemap->set_transparent_pen(0); + state->m_pf3_tilemap->set_transparent_pen(0); + state->m_pf4_tilemap->set_transparent_pen(0); + state->m_pf5_tilemap->set_transparent_pen(0); + state->m_pf6_tilemap->set_transparent_pen(0); + state->m_pf7_tilemap->set_transparent_pen(0); + state->m_pf8_tilemap->set_transparent_pen(0); } state->m_spriteram16_buffered = auto_alloc_array(machine, UINT16, 0x10000/2); @@ -653,8 +653,8 @@ VIDEO_START( f3 ) state->m_tile_opaque_pf[i] = auto_alloc_array(machine, UINT8, machine.gfx[1]->total_elements); - tilemap_set_transparent_pen(state->m_vram_layer,0); - tilemap_set_transparent_pen(state->m_pixel_layer,0); + state->m_vram_layer->set_transparent_pen(0); + state->m_pixel_layer->set_transparent_pen(0); /* Palettes have 4 bpp indexes despite up to 6 bpp data. The unused */ /* top bits in the gfx data are cleared later. */ @@ -747,19 +747,19 @@ WRITE16_HANDLER( f3_pf_data_w ) COMBINE_DATA(&state->m_f3_pf_data[offset]); if (state->m_f3_game_config->extend) { - if (offset<0x1000) tilemap_mark_tile_dirty(state->m_pf1_tilemap,(offset & 0xfff) >> 1); - else if (offset<0x2000) tilemap_mark_tile_dirty(state->m_pf2_tilemap,(offset & 0xfff) >> 1); - else if (offset<0x3000) tilemap_mark_tile_dirty(state->m_pf3_tilemap,(offset & 0xfff) >> 1); - else if (offset<0x4000) tilemap_mark_tile_dirty(state->m_pf4_tilemap,(offset & 0xfff) >> 1); + if (offset<0x1000) state->m_pf1_tilemap->mark_tile_dirty((offset & 0xfff) >> 1); + else if (offset<0x2000) state->m_pf2_tilemap->mark_tile_dirty((offset & 0xfff) >> 1); + else if (offset<0x3000) state->m_pf3_tilemap->mark_tile_dirty((offset & 0xfff) >> 1); + else if (offset<0x4000) state->m_pf4_tilemap->mark_tile_dirty((offset & 0xfff) >> 1); } else { - if (offset<0x0800) tilemap_mark_tile_dirty(state->m_pf1_tilemap,(offset & 0x7ff) >> 1); - else if (offset<0x1000) tilemap_mark_tile_dirty(state->m_pf2_tilemap,(offset & 0x7ff) >> 1); - else if (offset<0x1800) tilemap_mark_tile_dirty(state->m_pf3_tilemap,(offset & 0x7ff) >> 1); - else if (offset<0x2000) tilemap_mark_tile_dirty(state->m_pf4_tilemap,(offset & 0x7ff) >> 1); - else if (offset<0x2800) tilemap_mark_tile_dirty(state->m_pf5_tilemap,(offset & 0x7ff) >> 1); - else if (offset<0x3000) tilemap_mark_tile_dirty(state->m_pf6_tilemap,(offset & 0x7ff) >> 1); - else if (offset<0x3800) tilemap_mark_tile_dirty(state->m_pf7_tilemap,(offset & 0x7ff) >> 1); - else if (offset<0x4000) tilemap_mark_tile_dirty(state->m_pf8_tilemap,(offset & 0x7ff) >> 1); + if (offset<0x0800) state->m_pf1_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); + else if (offset<0x1000) state->m_pf2_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); + else if (offset<0x1800) state->m_pf3_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); + else if (offset<0x2000) state->m_pf4_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); + else if (offset<0x2800) state->m_pf5_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); + else if (offset<0x3000) state->m_pf6_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); + else if (offset<0x3800) state->m_pf7_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); + else if (offset<0x4000) state->m_pf8_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1); } } @@ -799,16 +799,16 @@ WRITE16_HANDLER( f3_videoram_w ) int tile,col_off; COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_vram_layer,offset); - //tilemap_mark_tile_dirty(state->m_vram_layer,offset+1); + state->m_vram_layer->mark_tile_dirty(offset); + //state->m_vram_layer->mark_tile_dirty(offset+1); if (offset>0x7ff) offset-=0x800; tile=offset; col_off=((tile&0x3f)*32)+((tile&0xfc0)>>6); - tilemap_mark_tile_dirty(state->m_pixel_layer,col_off); - //tilemap_mark_tile_dirty(state->m_pixel_layer,col_off+32); + state->m_pixel_layer->mark_tile_dirty(col_off); + //state->m_pixel_layer->mark_tile_dirty(col_off+32); } @@ -2009,8 +2009,8 @@ static void get_line_ram_info(running_machine &machine, tilemap_t *tmap, int sx, } /* set pixmap pointer */ - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(tmap); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap(tmap); + bitmap_ind16 &srcbitmap = tmap->pixmap(); + bitmap_ind8 &flagsbitmap = tmap->flagsmap(); if(line_t->alpha_mode[y]!=0) { @@ -2124,10 +2124,10 @@ static void get_vram_info(running_machine &machine, tilemap_t *vram_tilemap, til sx&=0x1ff; /* set pixmap pointer */ - bitmap_ind16 &srcbitmap_pixel = tilemap_get_pixmap(pixel_tilemap); - bitmap_ind8 &flagsbitmap_pixel = tilemap_get_flagsmap(pixel_tilemap); - bitmap_ind16 &srcbitmap_vram = tilemap_get_pixmap(vram_tilemap); - bitmap_ind8 &flagsbitmap_vram = tilemap_get_flagsmap(vram_tilemap); + bitmap_ind16 &srcbitmap_pixel = pixel_tilemap->pixmap(); + bitmap_ind8 &flagsbitmap_pixel = pixel_tilemap->flagsmap(); + bitmap_ind16 &srcbitmap_vram = vram_tilemap->pixmap(); + bitmap_ind8 &flagsbitmap_vram = vram_tilemap->flagsmap(); y=y_start; while(y!=y_end) @@ -3178,7 +3178,7 @@ SCREEN_UPDATE_RGB32( f3 ) UINT32 sy_fix[5],sx_fix[5]; state->m_f3_skip_this_frame=0; - tilemap_set_flip_all(screen.machine(),state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* Setup scroll */ sy_fix[0]=((state->m_f3_control_0[4]&0xffff)<< 9) + (1<<16); diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index 20c024fea5d..61d35c9d8c6 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -69,15 +69,15 @@ VIDEO_START( taitol ) state->m_bg19_tilemap = tilemap_create(machine, get_bg19_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->m_ch1a_tilemap = tilemap_create(machine, get_ch1a_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_bg18_tilemap, 0); - tilemap_set_transparent_pen(state->m_ch1a_tilemap, 0); + state->m_bg18_tilemap->set_transparent_pen(0); + state->m_ch1a_tilemap->set_transparent_pen(0); for (i = 0; i < 256; i++) palette_set_color(machine, i, MAKE_RGB(0, 0, 0)); - tilemap_set_scrolldx(state->m_ch1a_tilemap, -8, -8); - tilemap_set_scrolldx(state->m_bg18_tilemap, 28, -11); - tilemap_set_scrolldx(state->m_bg19_tilemap, 38, -21); + state->m_ch1a_tilemap->set_scrolldx(-8, -8); + state->m_bg18_tilemap->set_scrolldx(28, -11); + state->m_bg19_tilemap->set_scrolldx(38, -21); } @@ -96,8 +96,8 @@ WRITE8_HANDLER( horshoes_bankg_w ) { state->m_horshoes_gfxbank = data; - tilemap_mark_all_tiles_dirty(state->m_bg18_tilemap); - tilemap_mark_all_tiles_dirty(state->m_bg19_tilemap); + state->m_bg18_tilemap->mark_all_dirty(); + state->m_bg19_tilemap->mark_all_dirty(); } } @@ -110,8 +110,8 @@ WRITE8_HANDLER( taitol_bankc_w ) state->m_bankc[offset] = data; // logerror("Bankc %d, %02x (%04x)\n", offset, data, cpu_get_pc(&space->device())); - tilemap_mark_all_tiles_dirty(state->m_bg18_tilemap); - tilemap_mark_all_tiles_dirty(state->m_bg19_tilemap); + state->m_bg18_tilemap->mark_all_dirty(); + state->m_bg19_tilemap->mark_all_dirty(); } } @@ -139,7 +139,7 @@ WRITE8_HANDLER( taitol_control_w ) /* bit 4 flip screen */ state->m_flipscreen = data & 0x10; - tilemap_set_flip_all(space->machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* bit 5 display enable - handled in vh_screenrefresh() */ } @@ -195,19 +195,19 @@ void taitol_chardef1f_m( running_machine &machine, int offset ) void taitol_bg18_m( running_machine &machine, int offset ) { taitol_state *state = machine.driver_data(); - tilemap_mark_tile_dirty(state->m_bg18_tilemap, offset / 2); + state->m_bg18_tilemap->mark_tile_dirty(offset / 2); } void taitol_bg19_m( running_machine &machine, int offset ) { taitol_state *state = machine.driver_data(); - tilemap_mark_tile_dirty(state->m_bg19_tilemap, offset / 2); + state->m_bg19_tilemap->mark_tile_dirty(offset / 2); } void taitol_char1a_m( running_machine &machine, int offset ) { taitol_state *state = machine.driver_data(); - tilemap_mark_tile_dirty(state->m_ch1a_tilemap, offset / 2); + state->m_ch1a_tilemap->mark_tile_dirty(offset / 2); } void taitol_obj1b_m( running_machine &machine, int offset ) @@ -294,31 +294,31 @@ SCREEN_UPDATE_IND16( taitol ) dx = ((dx & 0xfffc) | ((dx - 3) & 0x0003)) ^ 0xf; dy = state->m_rambanks[0xb3f6]; - tilemap_set_scrollx(state->m_bg18_tilemap, 0, -dx); - tilemap_set_scrolly(state->m_bg18_tilemap, 0, -dy); + state->m_bg18_tilemap->set_scrollx(0, -dx); + state->m_bg18_tilemap->set_scrolly(0, -dy); dx = state->m_rambanks[0xb3fc] | (state->m_rambanks[0xb3fd] << 8); if (state->m_flipscreen) dx = ((dx & 0xfffc) | ((dx - 3) & 0x0003)) ^ 0xf; dy = state->m_rambanks[0xb3fe]; - tilemap_set_scrollx(state->m_bg19_tilemap, 0, -dx); - tilemap_set_scrolly(state->m_bg19_tilemap, 0, -dy); + state->m_bg19_tilemap->set_scrollx(0, -dx); + state->m_bg19_tilemap->set_scrolly(0, -dy); if (state->m_cur_ctrl & 0x20) /* display enable */ { screen.machine().priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg19_tilemap, 0, 0); + state->m_bg19_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_cur_ctrl & 0x08) /* sprites always over BG1 */ - tilemap_draw(bitmap, cliprect, state->m_bg18_tilemap, 0, 0); + state->m_bg18_tilemap->draw(bitmap, cliprect, 0, 0); else /* split priority */ - tilemap_draw(bitmap, cliprect, state->m_bg18_tilemap,0,1); + state->m_bg18_tilemap->draw(bitmap, cliprect, 0,1); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_ch1a_tilemap, 0, 0); + state->m_ch1a_tilemap->draw(bitmap, cliprect, 0, 0); } else bitmap.fill(screen.machine().pens[0], cliprect); diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index 2e93491158f..784d61bec87 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -586,7 +586,7 @@ INLINE const pc080sn_interface *pc080sn_get_interface( device_t *device ) DEVICE HANDLERS *****************************************************************************/ -INLINE void common_get_pc080sn_bg_tile_info( device_t *device, tile_data *tileinfo, int tile_index, UINT16 *ram, int gfxnum ) +INLINE void common_get_pc080sn_bg_tile_info( device_t *device, tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum ) { pc080sn_state *pc080sn = pc080sn_get_safe_token(device); UINT16 code, attr; @@ -609,7 +609,7 @@ INLINE void common_get_pc080sn_bg_tile_info( device_t *device, tile_data *tilein TILE_FLIPYX((attr & 0xc000) >> 14)); } -INLINE void common_get_pc080sn_fg_tile_info( device_t *device, tile_data *tileinfo, int tile_index, UINT16 *ram, int gfxnum ) +INLINE void common_get_pc080sn_fg_tile_info( device_t *device, tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum ) { pc080sn_state *pc080sn = pc080sn_get_safe_token(device); UINT16 code,attr; @@ -660,16 +660,16 @@ WRITE16_DEVICE_HANDLER( pc080sn_word_w ) if (!pc080sn->dblwidth) { if (offset < 0x2000) - tilemap_mark_tile_dirty(pc080sn->tilemap[0], offset / 2); + pc080sn->tilemap[0]->mark_tile_dirty(offset / 2); else if (offset >= 0x4000 && offset < 0x6000) - tilemap_mark_tile_dirty(pc080sn->tilemap[1], (offset & 0x1fff) / 2); + pc080sn->tilemap[1]->mark_tile_dirty((offset & 0x1fff) / 2); } else { if (offset < 0x4000) - tilemap_mark_tile_dirty(pc080sn->tilemap[0], (offset & 0x1fff)); + pc080sn->tilemap[0]->mark_tile_dirty((offset & 0x1fff)); else if (offset >= 0x4000 && offset < 0x8000) - tilemap_mark_tile_dirty(pc080sn->tilemap[1], (offset & 0x1fff)); + pc080sn->tilemap[1]->mark_tile_dirty((offset & 0x1fff)); } } @@ -730,8 +730,8 @@ WRITE16_DEVICE_HANDLER( pc080sn_ctrl_word_w ) { int flip = (data & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; - tilemap_set_flip(pc080sn->tilemap[0], flip); - tilemap_set_flip(pc080sn->tilemap[1], flip); + pc080sn->tilemap[0]->set_flip(flip); + pc080sn->tilemap[1]->set_flip(flip); break; } } @@ -748,8 +748,8 @@ void pc080sn_set_scroll( device_t *device, int tilemap_num, int scrollx, int scr { pc080sn_state *pc080sn = pc080sn_get_safe_token(device); - tilemap_set_scrollx(pc080sn->tilemap[tilemap_num], 0, scrollx); - tilemap_set_scrolly(pc080sn->tilemap[tilemap_num], 0, scrolly); + pc080sn->tilemap[tilemap_num]->set_scrollx(0, scrollx); + pc080sn->tilemap[tilemap_num]->set_scrolly(0, scrolly); } /* This routine is needed as an override by Jumping */ @@ -757,7 +757,7 @@ void pc080sn_set_scroll( device_t *device, int tilemap_num, int scrollx, int scr void pc080sn_set_trans_pen( device_t *device, int tilemap_num, int pen ) { pc080sn_state *pc080sn = pc080sn_get_safe_token(device); - tilemap_set_transparent_pen(pc080sn->tilemap[tilemap_num], pen); + pc080sn->tilemap[tilemap_num]->set_transparent_pen(pen); } @@ -766,21 +766,21 @@ void pc080sn_tilemap_update( device_t *device ) pc080sn_state *pc080sn = pc080sn_get_safe_token(device); int j; - tilemap_set_scrolly(pc080sn->tilemap[0], 0, pc080sn->bgscrolly[0]); - tilemap_set_scrolly(pc080sn->tilemap[1], 0, pc080sn->bgscrolly[1]); + pc080sn->tilemap[0]->set_scrolly(0, pc080sn->bgscrolly[0]); + pc080sn->tilemap[1]->set_scrolly(0, pc080sn->bgscrolly[1]); if (!pc080sn->dblwidth) { for (j = 0; j < 256; j++) - tilemap_set_scrollx(pc080sn->tilemap[0], (j + pc080sn->bgscrolly[0]) & 0x1ff, pc080sn->bgscrollx[0] - pc080sn->bgscroll_ram[0][j]); + pc080sn->tilemap[0]->set_scrollx((j + pc080sn->bgscrolly[0]) & 0x1ff, pc080sn->bgscrollx[0] - pc080sn->bgscroll_ram[0][j]); for (j = 0; j < 256; j++) - tilemap_set_scrollx(pc080sn->tilemap[1], (j + pc080sn->bgscrolly[1]) & 0x1ff, pc080sn->bgscrollx[1] - pc080sn->bgscroll_ram[1][j]); + pc080sn->tilemap[1]->set_scrollx((j + pc080sn->bgscrolly[1]) & 0x1ff, pc080sn->bgscrollx[1] - pc080sn->bgscroll_ram[1][j]); } else { - tilemap_set_scrollx(pc080sn->tilemap[0], 0, pc080sn->bgscrollx[0]); - tilemap_set_scrollx(pc080sn->tilemap[1], 0, pc080sn->bgscrollx[1]); + pc080sn->tilemap[0]->set_scrollx(0, pc080sn->bgscrollx[0]); + pc080sn->tilemap[1]->set_scrollx(0, pc080sn->bgscrollx[1]); } } @@ -842,8 +842,8 @@ static void topspeed_custom_draw( device_t *device, bitmap_ind16 &bitmap, const UINT8 *tsrc; UINT16 scanline[1024]; /* won't be called by a wide-screen game, but just in case... */ - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(pc080sn->tilemap[layer]); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap(pc080sn->tilemap[layer]); + bitmap_ind16 &srcbitmap = pc080sn->tilemap[layer]->pixmap(); + bitmap_ind8 &flagsbitmap = pc080sn->tilemap[layer]->flagsmap(); UINT16 a, color; int sx, x_index; @@ -931,7 +931,7 @@ static void topspeed_custom_draw( device_t *device, bitmap_ind16 &bitmap, const void pc080sn_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int flags, UINT32 priority ) { pc080sn_state *pc080sn = pc080sn_get_safe_token(device); - tilemap_draw(bitmap, cliprect, pc080sn->tilemap[layer], flags, priority); + pc080sn->tilemap[layer]->draw(bitmap, cliprect, flags, priority); } void pc080sn_tilemap_draw_offset( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int flags, UINT32 priority, int xoffs, int yoffs ) @@ -942,11 +942,11 @@ void pc080sn_tilemap_draw_offset( device_t *device, bitmap_ind16 &bitmap, const int basedy = pc080sn->yoffs; int basedyflip = -pc080sn->yoffs; - tilemap_set_scrolldx(pc080sn->tilemap[layer], basedx + xoffs, basedxflip + xoffs); - tilemap_set_scrolldy(pc080sn->tilemap[layer], basedy + yoffs, basedyflip + yoffs); - tilemap_draw(bitmap, cliprect, pc080sn->tilemap[layer], flags, priority); - tilemap_set_scrolldx(pc080sn->tilemap[layer], basedx, basedxflip); - tilemap_set_scrolldy(pc080sn->tilemap[layer], basedy, basedyflip); + pc080sn->tilemap[layer]->set_scrolldx(basedx + xoffs, basedxflip + xoffs); + pc080sn->tilemap[layer]->set_scrolldy(basedy + yoffs, basedyflip + yoffs); + pc080sn->tilemap[layer]->draw(bitmap, cliprect, flags, priority); + pc080sn->tilemap[layer]->set_scrolldx(basedx, basedxflip); + pc080sn->tilemap[layer]->set_scrolldy(basedy, basedyflip); } void pc080sn_tilemap_draw_special( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int flags, UINT32 priority, UINT16 *ram ) @@ -965,8 +965,8 @@ static void pc080sn_restore_scroll(pc080sn_state *pc080sn) pc080sn->bgscrolly[1] = -pc080sn->ctrl[3]; flip = (pc080sn->ctrl[4] & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; - tilemap_set_flip(pc080sn->tilemap[0], flip); - tilemap_set_flip(pc080sn->tilemap[1], flip); + pc080sn->tilemap[0]->set_flip(flip); + pc080sn->tilemap[1]->set_flip(flip); } /***************************************************************************** @@ -997,18 +997,18 @@ static DEVICE_START( pc080sn ) pc080sn->tilemap[1] = tilemap_create_device(device, pc080sn_get_fg_tile_info, tilemap_scan_rows, 8, 8, 128, 64); } - tilemap_set_transparent_pen(pc080sn->tilemap[0], 0); - tilemap_set_transparent_pen(pc080sn->tilemap[1], 0); + pc080sn->tilemap[0]->set_transparent_pen(0); + pc080sn->tilemap[1]->set_transparent_pen(0); - tilemap_set_scrolldx(pc080sn->tilemap[0], -16 + pc080sn->xoffs, -16 - pc080sn->xoffs); - tilemap_set_scrolldy(pc080sn->tilemap[0], pc080sn->yoffs, -pc080sn->yoffs); - tilemap_set_scrolldx(pc080sn->tilemap[1], -16 + pc080sn->xoffs, -16 - pc080sn->xoffs); - tilemap_set_scrolldy(pc080sn->tilemap[1], pc080sn->yoffs, -pc080sn->yoffs); + pc080sn->tilemap[0]->set_scrolldx(-16 + pc080sn->xoffs, -16 - pc080sn->xoffs); + pc080sn->tilemap[0]->set_scrolldy(pc080sn->yoffs, -pc080sn->yoffs); + pc080sn->tilemap[1]->set_scrolldx(-16 + pc080sn->xoffs, -16 - pc080sn->xoffs); + pc080sn->tilemap[1]->set_scrolldy(pc080sn->yoffs, -pc080sn->yoffs); if (!pc080sn->dblwidth) { - tilemap_set_scroll_rows(pc080sn->tilemap[0], 512); - tilemap_set_scroll_rows(pc080sn->tilemap[1], 512); + pc080sn->tilemap[0]->set_scroll_rows(512); + pc080sn->tilemap[1]->set_scroll_rows(512); } pc080sn->ram = auto_alloc_array_clear(device->machine(), UINT16, PC080SN_RAM_SIZE / 2); @@ -1312,7 +1312,7 @@ static TILE_GET_INFO_DEVICE( tc0080vco_get_bg0_tile_info ) color = tc0080vco->bg0_ram_1[tile_index] & 0x001f; tile = tc0080vco->bg0_ram_0[tile_index] & 0x7fff; - tileinfo->category = 0; + tileinfo.category = 0; SET_TILE_INFO_DEVICE( tc0080vco->bg_gfx, @@ -1329,7 +1329,7 @@ static TILE_GET_INFO_DEVICE( tc0080vco_get_bg1_tile_info ) color = tc0080vco->bg1_ram_1[tile_index] & 0x001f; tile = tc0080vco->bg1_ram_0[tile_index] & 0x7fff; - tileinfo->category = 0; + tileinfo.category = 0; SET_TILE_INFO_DEVICE( tc0080vco->bg_gfx, @@ -1349,7 +1349,7 @@ static TILE_GET_INFO_DEVICE( tc0080vco_get_tx_tile_info ) tile = (tc0080vco->tx_ram_0[tile_index >> 1] & 0x00ff); else tile = (tc0080vco->tx_ram_0[tile_index >> 1] & 0xff00) >> 8; - tileinfo->category = 0; + tileinfo.category = 0; } else { @@ -1357,7 +1357,7 @@ static TILE_GET_INFO_DEVICE( tc0080vco_get_tx_tile_info ) tile = (tc0080vco->tx_ram_0[tile_index >> 1] & 0xff00) >> 8; else tile = (tc0080vco->tx_ram_0[tile_index >> 1] & 0x00ff); - tileinfo->category = 0; + tileinfo.category = 0; } SET_TILE_INFO_DEVICE( @@ -1392,9 +1392,9 @@ static WRITE16_DEVICE_HANDLER( tc0080vco_scrollram_w ) case 0x00: /* screen invert control */ tc0080vco->flipscreen = tc0080vco->scroll_ram[0] & 0x0c00; - tilemap_set_flip(tc0080vco->tilemap[0], tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_flip(tc0080vco->tilemap[1], tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_flip(tc0080vco->tilemap[2], tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tc0080vco->tilemap[0]->set_flip(tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tc0080vco->tilemap[1]->set_flip(tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tc0080vco->tilemap[2]->set_flip(tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); tc0080vco->bg0_scrollx = tc0080vco->scroll_ram[1] & 0x03ff; tc0080vco->bg1_scrollx = tc0080vco->scroll_ram[2] & 0x03ff; @@ -1450,8 +1450,8 @@ WRITE16_DEVICE_HANDLER( tc0080vco_word_w ) } else if (offset < 0x2000 / 2) /* fg0 (text layer) */ { - tilemap_mark_tile_dirty(tc0080vco->tilemap[2], (offset & 0x07ff) * 2); - tilemap_mark_tile_dirty(tc0080vco->tilemap[2], (offset & 0x07ff) * 2 + 1); + tc0080vco->tilemap[2]->mark_tile_dirty((offset & 0x07ff) * 2); + tc0080vco->tilemap[2]->mark_tile_dirty((offset & 0x07ff) * 2 + 1); #if 0 if (!tc0080vco->has_tx) { @@ -1463,10 +1463,10 @@ WRITE16_DEVICE_HANDLER( tc0080vco_word_w ) else if (offset < 0xc000 / 2) /* chain ram */ {} else if (offset < 0xe000 / 2) /* bg0 (0) */ - tilemap_mark_tile_dirty(tc0080vco->tilemap[0], (offset & 0xfff)); + tc0080vco->tilemap[0]->mark_tile_dirty((offset & 0xfff)); else if (offset < 0x10000 / 2) /* bg1 (0) */ - tilemap_mark_tile_dirty(tc0080vco->tilemap[1],(offset & 0xfff)); + tc0080vco->tilemap[1]->mark_tile_dirty((offset & 0xfff)); else if (offset < 0x11000 / 2) { @@ -1489,10 +1489,10 @@ WRITE16_DEVICE_HANDLER( tc0080vco_word_w ) else if (offset < 0x1c000 / 2) /* chain ram */ {} else if (offset < 0x1e000 / 2) /* bg0 (1) */ - tilemap_mark_tile_dirty(tc0080vco->tilemap[0], (offset & 0xfff)); + tc0080vco->tilemap[0]->mark_tile_dirty((offset & 0xfff)); else if (offset < 0x20000 / 2) /* bg1 (1) */ - tilemap_mark_tile_dirty(tc0080vco->tilemap[1], (offset & 0xfff)); + tc0080vco->tilemap[1]->mark_tile_dirty((offset & 0xfff)); else if (offset < 0x20400 / 2) /* bg0 rowscroll */ {} @@ -1510,19 +1510,19 @@ void tc0080vco_tilemap_update( device_t *device ) if (!tc0080vco->flipscreen) { for (j = 0; j < 0x400; j++) - tilemap_set_scrollx(tc0080vco->tilemap[0], (j + 0) & 0x3ff, -tc0080vco->bg0_scrollx - tc0080vco->bgscroll_ram[j & 0x1ff]); + tc0080vco->tilemap[0]->set_scrollx((j + 0) & 0x3ff, -tc0080vco->bg0_scrollx - tc0080vco->bgscroll_ram[j & 0x1ff]); } else { for (j = 0; j < 0x400; j++) - tilemap_set_scrollx(tc0080vco->tilemap[0], (j + 0) & 0x3ff, -tc0080vco->bg0_scrollx + tc0080vco->bgscroll_ram[j & 0x1ff]); + tc0080vco->tilemap[0]->set_scrollx((j + 0) & 0x3ff, -tc0080vco->bg0_scrollx + tc0080vco->bgscroll_ram[j & 0x1ff]); } - tilemap_set_scrolly(tc0080vco->tilemap[0], 0, tc0080vco->bg0_scrolly); - tilemap_set_scrollx(tc0080vco->tilemap[1], 0, -tc0080vco->bg1_scrollx); - tilemap_set_scrolly(tc0080vco->tilemap[1], 0, tc0080vco->bg1_scrolly); - tilemap_set_scrollx(tc0080vco->tilemap[2], 0, 0); /* no scroll (maybe) */ - tilemap_set_scrolly(tc0080vco->tilemap[2], 0, 0); + tc0080vco->tilemap[0]->set_scrolly(0, tc0080vco->bg0_scrolly); + tc0080vco->tilemap[1]->set_scrollx(0, -tc0080vco->bg1_scrollx); + tc0080vco->tilemap[1]->set_scrolly(0, tc0080vco->bg1_scrolly); + tc0080vco->tilemap[2]->set_scrollx(0, 0); /* no scroll (maybe) */ + tc0080vco->tilemap[2]->set_scrolly(0, 0); } @@ -1539,15 +1539,15 @@ static void tc0080vco_bg0_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, if (zx == 0x3f && zy == 0x7f) /* normal size */ { - tilemap_draw(bitmap, cliprect, tc0080vco->tilemap[0], flags, priority); + tc0080vco->tilemap[0]->draw(bitmap, cliprect, flags, priority); } else /* zoom + rowscroll = custom draw routine */ { UINT16 *dst16, *src16; UINT8 *tsrc; UINT16 scanline[512]; - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(tc0080vco->tilemap[0]); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap(tc0080vco->tilemap[0]); + bitmap_ind16 &srcbitmap = tc0080vco->tilemap[0]->pixmap(); + bitmap_ind8 &flagsbitmap = tc0080vco->tilemap[0]->flagsmap(); int sx, zoomx, zoomy; int dx, ex, dy, ey; @@ -1697,7 +1697,7 @@ static void tc0080vco_bg1_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, if (zoomx == 0x3f && zoomy == 0x7f) /* normal size */ { - tilemap_draw(bitmap, cliprect, tc0080vco->tilemap[layer], flags, priority); + tc0080vco->tilemap[layer]->draw(bitmap, cliprect, flags, priority); } else /* zoomed */ { @@ -1705,7 +1705,7 @@ static void tc0080vco_bg1_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, int sx,sy; /* shouldn't we set no_clip before doing this (see TC0480SCP) ? */ - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(tc0080vco->tilemap[layer]); + bitmap_ind16 &srcbitmap = tc0080vco->tilemap[layer]->pixmap(); if (zoomx < 63) { @@ -1791,7 +1791,7 @@ void tc0080vco_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const recta case 2: if (disable & 0x04) return; - tilemap_draw(bitmap, cliprect, tc0080vco->tilemap[2], flags, priority); + tc0080vco->tilemap[2]->draw(bitmap, cliprect, flags, priority); break; } } @@ -1833,9 +1833,9 @@ static void tc0080vco_postload(tc0080vco_state *tc0080vco) { tc0080vco->flipscreen = tc0080vco->scroll_ram[0] & 0x0c00; - tilemap_set_flip(tc0080vco->tilemap[0], tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_flip(tc0080vco->tilemap[1], tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_flip(tc0080vco->tilemap[2], tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tc0080vco->tilemap[0]->set_flip(tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tc0080vco->tilemap[1]->set_flip(tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tc0080vco->tilemap[2]->set_flip(tc0080vco->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); tc0080vco->bg0_scrollx = tc0080vco->scroll_ram[1] & 0x03ff; tc0080vco->bg1_scrollx = tc0080vco->scroll_ram[2] & 0x03ff; @@ -1864,24 +1864,24 @@ static DEVICE_START( tc0080vco ) tc0080vco->tilemap[0] = tilemap_create_device(device, tc0080vco_get_bg0_tile_info, tilemap_scan_rows, 16, 16, 64, 64); tc0080vco->tilemap[1] = tilemap_create_device(device, tc0080vco_get_bg1_tile_info, tilemap_scan_rows, 16, 16, 64, 64); - tilemap_set_transparent_pen(tc0080vco->tilemap[0], 0); - tilemap_set_transparent_pen(tc0080vco->tilemap[1], 0); + tc0080vco->tilemap[0]->set_transparent_pen(0); + tc0080vco->tilemap[1]->set_transparent_pen(0); - tilemap_set_scrolldx(tc0080vco->tilemap[0], tc0080vco->bg_xoffs, 512); - tilemap_set_scrolldx(tc0080vco->tilemap[1], tc0080vco->bg_xoffs, 512); - tilemap_set_scrolldy(tc0080vco->tilemap[0], tc0080vco->bg_yoffs, tc0080vco->bg_flip_yoffs); - tilemap_set_scrolldy(tc0080vco->tilemap[1], tc0080vco->bg_yoffs, tc0080vco->bg_flip_yoffs); + tc0080vco->tilemap[0]->set_scrolldx(tc0080vco->bg_xoffs, 512); + tc0080vco->tilemap[1]->set_scrolldx(tc0080vco->bg_xoffs, 512); + tc0080vco->tilemap[0]->set_scrolldy(tc0080vco->bg_yoffs, tc0080vco->bg_flip_yoffs); + tc0080vco->tilemap[1]->set_scrolldy(tc0080vco->bg_yoffs, tc0080vco->bg_flip_yoffs); /* bg0 tilemap scrollable per pixel row */ - tilemap_set_scroll_rows(tc0080vco->tilemap[0], 512); + tc0080vco->tilemap[0]->set_scroll_rows(512); /* Perform extra initialisations for text layer */ tc0080vco->tilemap[2] = tilemap_create_device(device, tc0080vco_get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_scrolldx(tc0080vco->tilemap[2], 0, 0); - tilemap_set_scrolldy(tc0080vco->tilemap[2], 48, -448); + tc0080vco->tilemap[2]->set_scrolldx(0, 0); + tc0080vco->tilemap[2]->set_scrolldy(48, -448); - tilemap_set_transparent_pen(tc0080vco->tilemap[2], 0); + tc0080vco->tilemap[2]->set_transparent_pen(0); tc0080vco->ram = auto_alloc_array_clear(device->machine(), UINT16, TC0080VCO_RAM_SIZE / 2); @@ -1969,7 +1969,7 @@ INLINE const tc0100scn_interface *tc0100scn_get_interface( device_t *device ) DEVICE HANDLERS *****************************************************************************/ -INLINE void common_get_bg0_tile_info( device_t *device, tile_data *tileinfo, int tile_index, UINT16 *ram, int gfxnum, int colbank, int dblwidth ) +INLINE void common_get_bg0_tile_info( device_t *device, tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum, int colbank, int dblwidth ) { tc0100scn_state *tc0100scn = tc0100scn_get_safe_token(device); int code, attr; @@ -1993,7 +1993,7 @@ INLINE void common_get_bg0_tile_info( device_t *device, tile_data *tileinfo, int TILE_FLIPYX((attr & 0xc000) >> 14)); } -INLINE void common_get_bg1_tile_info( device_t *device, tile_data *tileinfo, int tile_index, UINT16 *ram, int gfxnum, int colbank, int dblwidth ) +INLINE void common_get_bg1_tile_info( device_t *device, tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum, int colbank, int dblwidth ) { tc0100scn_state *tc0100scn = tc0100scn_get_safe_token(device); int code, attr; @@ -2017,7 +2017,7 @@ INLINE void common_get_bg1_tile_info( device_t *device, tile_data *tileinfo, int TILE_FLIPYX((attr & 0xc000) >> 14)); } -INLINE void common_get_tx_tile_info( device_t *device, tile_data *tileinfo, int tile_index, UINT16 *ram, int gfxnum, int colbank, int dblwidth ) +INLINE void common_get_tx_tile_info( device_t *device, tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum, int colbank, int dblwidth ) { tc0100scn_state *tc0100scn = tc0100scn_get_safe_token(device); int attr = ram[tile_index]; @@ -2113,9 +2113,9 @@ static void tc0100scn_dirty_tilemaps( device_t *device ) { tc0100scn_state *tc0100scn = tc0100scn_get_safe_token(device); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[0][tc0100scn->dblwidth]); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[1][tc0100scn->dblwidth]); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[2][tc0100scn->dblwidth]); + tc0100scn->tilemap[0][tc0100scn->dblwidth]->mark_all_dirty(); + tc0100scn->tilemap[1][tc0100scn->dblwidth]->mark_all_dirty(); + tc0100scn->tilemap[2][tc0100scn->dblwidth]->mark_all_dirty(); } static void tc0100scn_restore_scroll( tc0100scn_state *tc0100scn ) @@ -2124,21 +2124,21 @@ static void tc0100scn_restore_scroll( tc0100scn_state *tc0100scn ) tc0100scn->bgscrollx = -tc0100scn->ctrl[0]; tc0100scn->fgscrollx = -tc0100scn->ctrl[1]; - tilemap_set_scrollx(tc0100scn->tilemap[2][0], 0, -tc0100scn->ctrl[2]); - tilemap_set_scrollx(tc0100scn->tilemap[2][1], 0, -tc0100scn->ctrl[2]); + tc0100scn->tilemap[2][0]->set_scrollx(0, -tc0100scn->ctrl[2]); + tc0100scn->tilemap[2][1]->set_scrollx(0, -tc0100scn->ctrl[2]); tc0100scn->bgscrolly = -tc0100scn->ctrl[3]; tc0100scn->fgscrolly = -tc0100scn->ctrl[4]; - tilemap_set_scrolly(tc0100scn->tilemap[2][0], 0, -tc0100scn->ctrl[5]); - tilemap_set_scrolly(tc0100scn->tilemap[2][1], 0, -tc0100scn->ctrl[5]); + tc0100scn->tilemap[2][0]->set_scrolly(0, -tc0100scn->ctrl[5]); + tc0100scn->tilemap[2][1]->set_scrolly(0, -tc0100scn->ctrl[5]); flip = (tc0100scn->ctrl[7] & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; - tilemap_set_flip(tc0100scn->tilemap[0][0], flip); - tilemap_set_flip(tc0100scn->tilemap[1][0], flip); - tilemap_set_flip(tc0100scn->tilemap[2][0], flip); - tilemap_set_flip(tc0100scn->tilemap[0][1], flip); - tilemap_set_flip(tc0100scn->tilemap[1][1], flip); - tilemap_set_flip(tc0100scn->tilemap[2][1], flip); + tc0100scn->tilemap[0][0]->set_flip(flip); + tc0100scn->tilemap[1][0]->set_flip(flip); + tc0100scn->tilemap[2][0]->set_flip(flip); + tc0100scn->tilemap[0][1]->set_flip(flip); + tc0100scn->tilemap[1][1]->set_flip(flip); + tc0100scn->tilemap[2][1]->set_flip(flip); } @@ -2147,12 +2147,12 @@ static void tc0100scn_postload(tc0100scn_state *tc0100scn) tc0100scn_set_layer_ptrs(tc0100scn); tc0100scn_restore_scroll(tc0100scn); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[0][0]); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[1][0]); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[2][0]); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[0][1]); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[1][1]); - tilemap_mark_all_tiles_dirty(tc0100scn->tilemap[2][1]); + tc0100scn->tilemap[0][0]->mark_all_dirty(); + tc0100scn->tilemap[1][0]->mark_all_dirty(); + tc0100scn->tilemap[2][0]->mark_all_dirty(); + tc0100scn->tilemap[0][1]->mark_all_dirty(); + tc0100scn->tilemap[1][1]->mark_all_dirty(); + tc0100scn->tilemap[2][1]->mark_all_dirty(); } READ16_DEVICE_HANDLER( tc0100scn_word_r ) @@ -2169,24 +2169,24 @@ WRITE16_DEVICE_HANDLER( tc0100scn_word_w ) if (!tc0100scn->dblwidth) { if (offset < 0x2000) - tilemap_mark_tile_dirty(tc0100scn->tilemap[0][0], offset / 2); + tc0100scn->tilemap[0][0]->mark_tile_dirty(offset / 2); else if (offset < 0x3000) - tilemap_mark_tile_dirty(tc0100scn->tilemap[2][0], (offset & 0x0fff)); + tc0100scn->tilemap[2][0]->mark_tile_dirty((offset & 0x0fff)); else if (offset < 0x3800) gfx_element_mark_dirty(device->machine().gfx[tc0100scn->tx_gfx], (offset - 0x3000) / 8); else if (offset >= 0x4000 && offset < 0x6000) - tilemap_mark_tile_dirty(tc0100scn->tilemap[1][0], (offset & 0x1fff) / 2); + tc0100scn->tilemap[1][0]->mark_tile_dirty((offset & 0x1fff) / 2); } else /* Double-width tilemaps have a different memory map */ { if (offset < 0x4000) - tilemap_mark_tile_dirty(tc0100scn->tilemap[0][1], offset / 2); + tc0100scn->tilemap[0][1]->mark_tile_dirty(offset / 2); else if (offset >= 0x4000 && offset < 0x8000) - tilemap_mark_tile_dirty(tc0100scn->tilemap[1][1], (offset & 0x3fff) / 2); + tc0100scn->tilemap[1][1]->mark_tile_dirty((offset & 0x3fff) / 2); else if (offset >= 0x8800 && offset < 0x9000) gfx_element_mark_dirty(device->machine().gfx[tc0100scn->tx_gfx], (offset - 0x8800) / 8); else if (offset >= 0x9000) - tilemap_mark_tile_dirty(tc0100scn->tilemap[2][1], (offset & 0x0fff)); + tc0100scn->tilemap[2][1]->mark_tile_dirty((offset & 0x0fff)); } } @@ -2215,8 +2215,8 @@ WRITE16_DEVICE_HANDLER( tc0100scn_ctrl_word_w ) break; case 0x02: - tilemap_set_scrollx(tc0100scn->tilemap[2][0], 0, -data); - tilemap_set_scrollx(tc0100scn->tilemap[2][1], 0, -data); + tc0100scn->tilemap[2][0]->set_scrollx(0, -data); + tc0100scn->tilemap[2][1]->set_scrollx(0, -data); break; case 0x03: @@ -2228,8 +2228,8 @@ WRITE16_DEVICE_HANDLER( tc0100scn_ctrl_word_w ) break; case 0x05: - tilemap_set_scrolly(tc0100scn->tilemap[2][0], 0, -data); - tilemap_set_scrolly(tc0100scn->tilemap[2][1], 0, -data); + tc0100scn->tilemap[2][0]->set_scrolly(0, -data); + tc0100scn->tilemap[2][1]->set_scrolly(0, -data); break; case 0x06: @@ -2256,12 +2256,12 @@ WRITE16_DEVICE_HANDLER( tc0100scn_ctrl_word_w ) { int flip = (data & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; - tilemap_set_flip(tc0100scn->tilemap[0][0], flip); - tilemap_set_flip(tc0100scn->tilemap[1][0], flip); - tilemap_set_flip(tc0100scn->tilemap[2][0], flip); - tilemap_set_flip(tc0100scn->tilemap[0][1], flip); - tilemap_set_flip(tc0100scn->tilemap[1][1], flip); - tilemap_set_flip(tc0100scn->tilemap[2][1], flip); + tc0100scn->tilemap[0][0]->set_flip(flip); + tc0100scn->tilemap[1][0]->set_flip(flip); + tc0100scn->tilemap[2][0]->set_flip(flip); + tc0100scn->tilemap[0][1]->set_flip(flip); + tc0100scn->tilemap[1][1]->set_flip(flip); + tc0100scn->tilemap[2][1]->set_flip(flip); break; } @@ -2317,23 +2317,23 @@ void tc0100scn_tilemap_update( device_t *device ) tc0100scn_state *tc0100scn = tc0100scn_get_safe_token(device); int j; - tilemap_set_scrolly(tc0100scn->tilemap[0][tc0100scn->dblwidth], 0, tc0100scn->bgscrolly); - tilemap_set_scrolly(tc0100scn->tilemap[1][tc0100scn->dblwidth], 0, tc0100scn->fgscrolly); + tc0100scn->tilemap[0][tc0100scn->dblwidth]->set_scrolly(0, tc0100scn->bgscrolly); + tc0100scn->tilemap[1][tc0100scn->dblwidth]->set_scrolly(0, tc0100scn->fgscrolly); for (j = 0; j < 256; j++) - tilemap_set_scrollx(tc0100scn->tilemap[0][tc0100scn->dblwidth], (j + tc0100scn->bgscrolly) & 0x1ff, tc0100scn->bgscrollx - tc0100scn->bgscroll_ram[j]); + tc0100scn->tilemap[0][tc0100scn->dblwidth]->set_scrollx((j + tc0100scn->bgscrolly) & 0x1ff, tc0100scn->bgscrollx - tc0100scn->bgscroll_ram[j]); for (j = 0; j < 256; j++) - tilemap_set_scrollx(tc0100scn->tilemap[1][tc0100scn->dblwidth], (j + tc0100scn->fgscrolly) & 0x1ff, tc0100scn->fgscrollx - tc0100scn->fgscroll_ram[j]); + tc0100scn->tilemap[1][tc0100scn->dblwidth]->set_scrollx((j + tc0100scn->fgscrolly) & 0x1ff, tc0100scn->fgscrollx - tc0100scn->fgscroll_ram[j]); } static void tc0100scn_tilemap_draw_fg( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, tilemap_t* tmap, int flags, UINT32 priority ) { tc0100scn_state *tc0100scn = tc0100scn_get_safe_token(device); - const bitmap_ind16 &src_bitmap = tilemap_get_pixmap(tmap); + const bitmap_ind16 &src_bitmap = tmap->pixmap(); int width_mask, height_mask, x, y, p; int column_offset, src_x = 0, src_y = 0; - int scrollx_delta = - tilemap_get_scrolldx(tmap); - int scrolly_delta = - tilemap_get_scrolldy(tmap); + int scrollx_delta = - tmap->scrolldx(); + int scrolly_delta = - tmap->scrolldy(); width_mask = src_bitmap.width() - 1; height_mask = src_bitmap.height() - 1; @@ -2389,7 +2389,7 @@ if (disable != 0 && disable != 3 && disable != 7) case 0: if (disable & 0x01) return 1; - tilemap_draw(bitmap, clip, tc0100scn->tilemap[0][tc0100scn->dblwidth], flags, priority); + tc0100scn->tilemap[0][tc0100scn->dblwidth]->draw(bitmap, clip, flags, priority); break; case 1: if (disable & 0x02) @@ -2399,7 +2399,7 @@ if (disable != 0 && disable != 3 && disable != 7) case 2: if (disable & 0x04) return 1; - tilemap_draw(bitmap, clip, tc0100scn->tilemap[2][tc0100scn->dblwidth], flags, priority); + tc0100scn->tilemap[2][tc0100scn->dblwidth]->draw(bitmap, clip, flags, priority); break; } return 0; @@ -2444,13 +2444,13 @@ static DEVICE_START( tc0100scn ) tc0100scn->tilemap[1][1] = tilemap_create_device(device, tc0100scn_get_fg_tile_info, tilemap_scan_rows, 8, 8, 128, 64); tc0100scn->tilemap[2][1] = tilemap_create_device(device, tc0100scn_get_tx_tile_info, tilemap_scan_rows, 8, 8, 128, 32); - tilemap_set_transparent_pen(tc0100scn->tilemap[0][0], 0); - tilemap_set_transparent_pen(tc0100scn->tilemap[1][0], 0); - tilemap_set_transparent_pen(tc0100scn->tilemap[2][0], 0); + tc0100scn->tilemap[0][0]->set_transparent_pen(0); + tc0100scn->tilemap[1][0]->set_transparent_pen(0); + tc0100scn->tilemap[2][0]->set_transparent_pen(0); - tilemap_set_transparent_pen(tc0100scn->tilemap[0][1], 0); - tilemap_set_transparent_pen(tc0100scn->tilemap[1][1], 0); - tilemap_set_transparent_pen(tc0100scn->tilemap[2][1], 0); + tc0100scn->tilemap[0][1]->set_transparent_pen(0); + tc0100scn->tilemap[1][1]->set_transparent_pen(0); + tc0100scn->tilemap[2][1]->set_transparent_pen(0); /* Standard width tilemaps. I'm setting the optional chip #2 7 bits higher and 2 pixels to the left than chip #1 because @@ -2459,12 +2459,12 @@ static DEVICE_START( tc0100scn ) xd = (intf->multiscrn_hack == 0) ? (-intf->x_offset) : (-intf->x_offset - 2); yd = (intf->multiscrn_hack == 0) ? (8 - intf->y_offset) : (1 - intf->y_offset); - tilemap_set_scrolldx(tc0100scn->tilemap[0][0], xd - 16, -intf->flip_xoffs - xd - 16); - tilemap_set_scrolldy(tc0100scn->tilemap[0][0], yd, -intf->flip_yoffs - yd); - tilemap_set_scrolldx(tc0100scn->tilemap[1][0], xd - 16, -intf->flip_xoffs - xd - 16); - tilemap_set_scrolldy(tc0100scn->tilemap[1][0], yd, -intf->flip_yoffs - yd); - tilemap_set_scrolldx(tc0100scn->tilemap[2][0], xd - 16, -intf->flip_text_xoffs - xd - 16 - 7); - tilemap_set_scrolldy(tc0100scn->tilemap[2][0], yd, -intf->flip_text_yoffs - yd); + tc0100scn->tilemap[0][0]->set_scrolldx(xd - 16, -intf->flip_xoffs - xd - 16); + tc0100scn->tilemap[0][0]->set_scrolldy(yd, -intf->flip_yoffs - yd); + tc0100scn->tilemap[1][0]->set_scrolldx(xd - 16, -intf->flip_xoffs - xd - 16); + tc0100scn->tilemap[1][0]->set_scrolldy(yd, -intf->flip_yoffs - yd); + tc0100scn->tilemap[2][0]->set_scrolldx(xd - 16, -intf->flip_text_xoffs - xd - 16 - 7); + tc0100scn->tilemap[2][0]->set_scrolldy(yd, -intf->flip_text_yoffs - yd); /* Double width tilemaps. We must correct offsets for extra chips, as MAME sees offsets from LHS of whole @@ -2474,17 +2474,17 @@ static DEVICE_START( tc0100scn ) xd = -intf->x_offset - intf->multiscrn_xoffs; yd = 8 - intf->y_offset; - tilemap_set_scrolldx(tc0100scn->tilemap[0][1], xd - 16, -intf->flip_xoffs - xd - 16); - tilemap_set_scrolldy(tc0100scn->tilemap[0][1], yd, -intf->flip_yoffs - yd); - tilemap_set_scrolldx(tc0100scn->tilemap[1][1], xd - 16, -intf->flip_xoffs - xd - 16); - tilemap_set_scrolldy(tc0100scn->tilemap[1][1], yd, -intf->flip_yoffs - yd); - tilemap_set_scrolldx(tc0100scn->tilemap[2][1], xd - 16, -intf->flip_text_xoffs - xd - 16 - 7); - tilemap_set_scrolldy(tc0100scn->tilemap[2][1], yd, -intf->flip_text_yoffs - yd); + tc0100scn->tilemap[0][1]->set_scrolldx(xd - 16, -intf->flip_xoffs - xd - 16); + tc0100scn->tilemap[0][1]->set_scrolldy(yd, -intf->flip_yoffs - yd); + tc0100scn->tilemap[1][1]->set_scrolldx(xd - 16, -intf->flip_xoffs - xd - 16); + tc0100scn->tilemap[1][1]->set_scrolldy(yd, -intf->flip_yoffs - yd); + tc0100scn->tilemap[2][1]->set_scrolldx(xd - 16, -intf->flip_text_xoffs - xd - 16 - 7); + tc0100scn->tilemap[2][1]->set_scrolldy(yd, -intf->flip_text_yoffs - yd); - tilemap_set_scroll_rows(tc0100scn->tilemap[0][0], 512); - tilemap_set_scroll_rows(tc0100scn->tilemap[1][0], 512); - tilemap_set_scroll_rows(tc0100scn->tilemap[0][1], 512); - tilemap_set_scroll_rows(tc0100scn->tilemap[1][1], 512); + tc0100scn->tilemap[0][0]->set_scroll_rows(512); + tc0100scn->tilemap[1][0]->set_scroll_rows(512); + tc0100scn->tilemap[0][1]->set_scroll_rows(512); + tc0100scn->tilemap[1][1]->set_scroll_rows(512); tc0100scn->bg_tilemask = 0xffff; /* Mjnquest has 0x7fff tilemask */ @@ -2594,7 +2594,7 @@ WRITE16_DEVICE_HANDLER( tc0280grd_word_w ) { tc0280grd_state *tc0280grd = tc0280grd_get_safe_token(device); COMBINE_DATA(&tc0280grd->ram[offset]); - tilemap_mark_tile_dirty(tc0280grd->tilemap, offset); + tc0280grd->tilemap->mark_tile_dirty(offset); } WRITE16_DEVICE_HANDLER( tc0280grd_ctrl_word_w ) @@ -2624,7 +2624,7 @@ void tc0280grd_tilemap_update( device_t *device, int base_color ) if (tc0280grd->base_color != base_color) { tc0280grd->base_color = base_color; - tilemap_mark_all_tiles_dirty(tc0280grd->tilemap); + tc0280grd->tilemap->mark_all_dirty(); } } @@ -2662,7 +2662,7 @@ static void zoom_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle & startx -= xoffset * incxx + yoffset * incyx; starty -= xoffset * incxy + yoffset * incyy; - tilemap_draw_roz(bitmap, cliprect, tc0280grd->tilemap, startx << 4, starty << 4, + tc0280grd->tilemap->draw_roz(bitmap, cliprect, startx << 4, starty << 4, incxx << 4, incxy << 4, incyx << 4, incyy << 4, 1, /* copy with wraparound */ 0, priority); @@ -2690,7 +2690,7 @@ static DEVICE_START( tc0280grd ) tc0280grd->gfxnum = intf->gfxnum; tc0280grd->tilemap = tilemap_create_device(device, tc0280grd_get_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(tc0280grd->tilemap, 0); + tc0280grd->tilemap->set_transparent_pen(0); tc0280grd->ram = auto_alloc_array(device->machine(), UINT16, TC0280GRD_RAM_SIZE / 2); @@ -2836,7 +2836,7 @@ INLINE const tc0480scp_interface *tc0480scp_get_interface( device_t *device ) *****************************************************************************/ -INLINE void common_get_tc0480bg_tile_info( device_t *device, tile_data *tileinfo, int tile_index, UINT16 *ram, int gfxnum ) +INLINE void common_get_tc0480bg_tile_info( device_t *device, tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum ) { tc0480scp_state *tc0480scp = tc0480scp_get_safe_token(device); int code = ram[2 * tile_index + 1] & 0x7fff; @@ -2848,7 +2848,7 @@ INLINE void common_get_tc0480bg_tile_info( device_t *device, tile_data *tileinfo TILE_FLIPYX((attr & 0xc000) >> 14)); } -INLINE void common_get_tc0480tx_tile_info( device_t *device, tile_data *tileinfo, int tile_index, UINT16 *ram, int gfxnum ) +INLINE void common_get_tc0480tx_tile_info( device_t *device, tile_data &tileinfo, int tile_index, UINT16 *ram, int gfxnum ) { tc0480scp_state *tc0480scp = tc0480scp_get_safe_token(device); int attr = ram[tile_index]; @@ -2903,11 +2903,11 @@ static const gfx_layout tc0480scp_charlayout = static void tc0480scp_dirty_tilemaps( tc0480scp_state *tc0480scp ) { - tilemap_mark_all_tiles_dirty(tc0480scp->tilemap[0][tc0480scp->dblwidth]); - tilemap_mark_all_tiles_dirty(tc0480scp->tilemap[1][tc0480scp->dblwidth]); - tilemap_mark_all_tiles_dirty(tc0480scp->tilemap[2][tc0480scp->dblwidth]); - tilemap_mark_all_tiles_dirty(tc0480scp->tilemap[3][tc0480scp->dblwidth]); - tilemap_mark_all_tiles_dirty(tc0480scp->tilemap[4][tc0480scp->dblwidth]); + tc0480scp->tilemap[0][tc0480scp->dblwidth]->mark_all_dirty(); + tc0480scp->tilemap[1][tc0480scp->dblwidth]->mark_all_dirty(); + tc0480scp->tilemap[2][tc0480scp->dblwidth]->mark_all_dirty(); + tc0480scp->tilemap[3][tc0480scp->dblwidth]->mark_all_dirty(); + tc0480scp->tilemap[4][tc0480scp->dblwidth]->mark_all_dirty(); } @@ -2965,14 +2965,14 @@ WRITE16_DEVICE_HANDLER( tc0480scp_word_w ) { if (offset < 0x2000) { - tilemap_mark_tile_dirty(tc0480scp->tilemap[(offset / 0x800)][tc0480scp->dblwidth], ((offset % 0x800) / 2)); + tc0480scp->tilemap[(offset / 0x800)][tc0480scp->dblwidth]->mark_tile_dirty(((offset % 0x800) / 2)); } else if (offset < 0x6000) { /* do nothing */ } else if (offset < 0x7000) { - tilemap_mark_tile_dirty(tc0480scp->tilemap[4][tc0480scp->dblwidth], (offset - 0x6000)); + tc0480scp->tilemap[4][tc0480scp->dblwidth]->mark_tile_dirty((offset - 0x6000)); } else if (offset <= 0x7fff) { @@ -2983,14 +2983,14 @@ WRITE16_DEVICE_HANDLER( tc0480scp_word_w ) { if (offset < 0x4000) { - tilemap_mark_tile_dirty(tc0480scp->tilemap[(offset / 0x1000)][tc0480scp->dblwidth], ((offset % 0x1000) / 2)); + tc0480scp->tilemap[(offset / 0x1000)][tc0480scp->dblwidth]->mark_tile_dirty(((offset % 0x1000) / 2)); } else if (offset < 0x6000) { /* do nothing */ } else if (offset < 0x7000) { - tilemap_mark_tile_dirty(tc0480scp->tilemap[4][tc0480scp->dblwidth], (offset - 0x6000)); + tc0480scp->tilemap[4][tc0480scp->dblwidth]->mark_tile_dirty((offset - 0x6000)); } else if (offset <= 0x7fff) { @@ -3071,8 +3071,8 @@ WRITE16_DEVICE_HANDLER( tc0480scp_ctrl_word_w ) if (!flip) data -= tc0480scp->text_xoffs; if (flip) data += tc0480scp->text_xoffs; - tilemap_set_scrollx(tc0480scp->tilemap[4][0], 0, -data); - tilemap_set_scrollx(tc0480scp->tilemap[4][1], 0, -data); + tc0480scp->tilemap[4][0]->set_scrollx(0, -data); + tc0480scp->tilemap[4][1]->set_scrollx(0, -data); break; case 0x0d: /* fg (text) y */ @@ -3081,8 +3081,8 @@ WRITE16_DEVICE_HANDLER( tc0480scp_ctrl_word_w ) if (!flip) data -= tc0480scp->text_yoffs; if (flip) data += tc0480scp->text_yoffs; - tilemap_set_scrolly(tc0480scp->tilemap[4][0], 0, -data); - tilemap_set_scrolly(tc0480scp->tilemap[4][1], 0, -data); + tc0480scp->tilemap[4][0]->set_scrolly(0, -data); + tc0480scp->tilemap[4][1]->set_scrolly(0, -data); break; /* offset 0x0e unused */ @@ -3093,17 +3093,17 @@ WRITE16_DEVICE_HANDLER( tc0480scp_ctrl_word_w ) flip = (data & 0x40) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; tc0480scp->pri_reg = data; - tilemap_set_flip(tc0480scp->tilemap[0][0],flip); - tilemap_set_flip(tc0480scp->tilemap[1][0],flip); - tilemap_set_flip(tc0480scp->tilemap[2][0],flip); - tilemap_set_flip(tc0480scp->tilemap[3][0],flip); - tilemap_set_flip(tc0480scp->tilemap[4][0],flip); + tc0480scp->tilemap[0][0]->set_flip(flip); + tc0480scp->tilemap[1][0]->set_flip(flip); + tc0480scp->tilemap[2][0]->set_flip(flip); + tc0480scp->tilemap[3][0]->set_flip(flip); + tc0480scp->tilemap[4][0]->set_flip(flip); - tilemap_set_flip(tc0480scp->tilemap[0][1],flip); - tilemap_set_flip(tc0480scp->tilemap[1][1],flip); - tilemap_set_flip(tc0480scp->tilemap[2][1],flip); - tilemap_set_flip(tc0480scp->tilemap[3][1],flip); - tilemap_set_flip(tc0480scp->tilemap[4][1],flip); + tc0480scp->tilemap[0][1]->set_flip(flip); + tc0480scp->tilemap[1][1]->set_flip(flip); + tc0480scp->tilemap[2][1]->set_flip(flip); + tc0480scp->tilemap[3][1]->set_flip(flip); + tc0480scp->tilemap[4][1]->set_flip(flip); tc0480scp->dblwidth = (tc0480scp->pri_reg & 0x80) >> 7; @@ -3177,12 +3177,12 @@ void tc0480scp_tilemap_update( device_t *device ) for (layer = 0; layer < 4; layer++) { - tilemap_set_scrolly(tc0480scp->tilemap[layer][tc0480scp->dblwidth], 0, tc0480scp->bgscrolly[layer]); + tc0480scp->tilemap[layer][tc0480scp->dblwidth]->set_scrolly(0, tc0480scp->bgscrolly[layer]); zoom = 0x10000 + 0x7f - tc0480scp->ctrl[0x08 + layer]; if (zoom != 0x10000) /* can't use scroll rows when zooming */ { - tilemap_set_scrollx(tc0480scp->tilemap[layer][tc0480scp->dblwidth], 0, tc0480scp->bgscrollx[layer]); + tc0480scp->tilemap[layer][tc0480scp->dblwidth]->set_scrollx(0, tc0480scp->bgscrollx[layer]); } else { @@ -3191,9 +3191,9 @@ void tc0480scp_tilemap_update( device_t *device ) i = tc0480scp->bgscroll_ram[layer][j]; if (!flip) - tilemap_set_scrollx(tc0480scp->tilemap[layer][tc0480scp->dblwidth], j & 0x1ff, tc0480scp->bgscrollx[layer] - i); + tc0480scp->tilemap[layer][tc0480scp->dblwidth]->set_scrollx(j & 0x1ff, tc0480scp->bgscrollx[layer] - i); else - tilemap_set_scrollx(tc0480scp->tilemap[layer][tc0480scp->dblwidth], j & 0x1ff, tc0480scp->bgscrollx[layer] + i); + tc0480scp->tilemap[layer][tc0480scp->dblwidth]->set_scrollx(j & 0x1ff, tc0480scp->bgscrollx[layer] + i); } } } @@ -3249,7 +3249,7 @@ static void tc0480scp_bg01_draw( device_t *device, bitmap_ind16 &bitmap, const r if ((zoomx == 0x10000) && (zoomy == 0x10000)) /* no zoom, simple */ { /* Prevent bad things */ - tilemap_draw(bitmap, cliprect, tc0480scp->tilemap[layer][tc0480scp->dblwidth], flags, priority); + tc0480scp->tilemap[layer][tc0480scp->dblwidth]->draw(bitmap, cliprect, flags, priority); } else /* zoom */ { @@ -3257,8 +3257,8 @@ static void tc0480scp_bg01_draw( device_t *device, bitmap_ind16 &bitmap, const r UINT8 *tsrc; UINT16 scanline[512]; UINT32 sx; - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(tc0480scp->tilemap[layer][tc0480scp->dblwidth]); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap(tc0480scp->tilemap[layer][tc0480scp->dblwidth]); + bitmap_ind16 &srcbitmap = tc0480scp->tilemap[layer][tc0480scp->dblwidth]->pixmap(); + bitmap_ind8 &flagsbitmap = tc0480scp->tilemap[layer][tc0480scp->dblwidth]->flagsmap(); int flip = tc0480scp->pri_reg & 0x40; int i, y, y_index, src_y_index, row_index; int x_index, x_step; @@ -3388,8 +3388,8 @@ flipscreen. static void tc0480scp_bg23_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int flags, UINT32 priority ) { tc0480scp_state *tc0480scp = tc0480scp_get_safe_token(device); - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(tc0480scp->tilemap[layer][tc0480scp->dblwidth]); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap(tc0480scp->tilemap[layer][tc0480scp->dblwidth]); + bitmap_ind16 &srcbitmap = tc0480scp->tilemap[layer][tc0480scp->dblwidth]->pixmap(); + bitmap_ind8 &flagsbitmap = tc0480scp->tilemap[layer][tc0480scp->dblwidth]->flagsmap(); UINT16 *dst16, *src16; UINT8 *tsrc; @@ -3527,7 +3527,7 @@ void tc0480scp_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const recta tc0480scp_bg23_draw(device, bitmap, cliprect, 3, flags, priority); break; case 4: - tilemap_draw(bitmap, cliprect, tc0480scp->tilemap[4][tc0480scp->dblwidth], flags, priority); + tc0480scp->tilemap[4][tc0480scp->dblwidth]->draw(bitmap, cliprect, flags, priority); break; } } @@ -3566,17 +3566,17 @@ static void tc0480scp_postload(tc0480scp_state *tc0480scp) tc0480scp_set_layer_ptrs(tc0480scp); - tilemap_set_flip(tc0480scp->tilemap[0][0], flip); - tilemap_set_flip(tc0480scp->tilemap[1][0], flip); - tilemap_set_flip(tc0480scp->tilemap[2][0], flip); - tilemap_set_flip(tc0480scp->tilemap[3][0], flip); - tilemap_set_flip(tc0480scp->tilemap[4][0], flip); + tc0480scp->tilemap[0][0]->set_flip(flip); + tc0480scp->tilemap[1][0]->set_flip(flip); + tc0480scp->tilemap[2][0]->set_flip(flip); + tc0480scp->tilemap[3][0]->set_flip(flip); + tc0480scp->tilemap[4][0]->set_flip(flip); - tilemap_set_flip(tc0480scp->tilemap[0][1], flip); - tilemap_set_flip(tc0480scp->tilemap[1][1], flip); - tilemap_set_flip(tc0480scp->tilemap[2][1], flip); - tilemap_set_flip(tc0480scp->tilemap[3][1], flip); - tilemap_set_flip(tc0480scp->tilemap[4][1], flip); + tc0480scp->tilemap[0][1]->set_flip(flip); + tc0480scp->tilemap[1][1]->set_flip(flip); + tc0480scp->tilemap[2][1]->set_flip(flip); + tc0480scp->tilemap[3][1]->set_flip(flip); + tc0480scp->tilemap[4][1]->set_flip(flip); reg = tc0480scp->ctrl[0]; if (!flip) reg = -reg; @@ -3613,14 +3613,14 @@ static void tc0480scp_postload(tc0480scp_state *tc0480scp) reg = tc0480scp->ctrl[0x0c]; if (!flip) reg -= tc0480scp->text_xoffs; if (flip) reg += tc0480scp->text_xoffs; - tilemap_set_scrollx(tc0480scp->tilemap[4][0], 0, -reg); - tilemap_set_scrollx(tc0480scp->tilemap[4][1], 0, -reg); + tc0480scp->tilemap[4][0]->set_scrollx(0, -reg); + tc0480scp->tilemap[4][1]->set_scrollx(0, -reg); reg = tc0480scp->ctrl[0x0d]; if (!flip) reg -= tc0480scp->text_yoffs; if (flip) reg += tc0480scp->text_yoffs; - tilemap_set_scrolly(tc0480scp->tilemap[4][0], 0, -reg); - tilemap_set_scrolly(tc0480scp->tilemap[4][1], 0, -reg); + tc0480scp->tilemap[4][0]->set_scrolly(0, -reg); + tc0480scp->tilemap[4][1]->set_scrolly(0, -reg); } /***************************************************************************** @@ -3661,11 +3661,11 @@ static DEVICE_START( tc0480scp ) for (i = 0; i < 2; i++) { - tilemap_set_transparent_pen(tc0480scp->tilemap[0][i], 0); - tilemap_set_transparent_pen(tc0480scp->tilemap[1][i], 0); - tilemap_set_transparent_pen(tc0480scp->tilemap[2][i], 0); - tilemap_set_transparent_pen(tc0480scp->tilemap[3][i], 0); - tilemap_set_transparent_pen(tc0480scp->tilemap[4][i], 0); + tc0480scp->tilemap[0][i]->set_transparent_pen(0); + tc0480scp->tilemap[1][i]->set_transparent_pen(0); + tc0480scp->tilemap[2][i]->set_transparent_pen(0); + tc0480scp->tilemap[3][i]->set_transparent_pen(0); + tc0480scp->tilemap[4][i]->set_transparent_pen(0); } xd = -tc0480scp->x_offs; @@ -3680,36 +3680,36 @@ static DEVICE_START( tc0480scp ) next valid pair:- the numbers diverge from xd, 319-xd */ /* Single width offsets */ - tilemap_set_scrolldx(tc0480scp->tilemap[0][0], xd, 320 - xd + tc0480scp->flip_xoffs); - tilemap_set_scrolldy(tc0480scp->tilemap[0][0], yd, 256 - yd + tc0480scp->flip_yoffs); - tilemap_set_scrolldx(tc0480scp->tilemap[1][0], xd, 320 - xd + tc0480scp->flip_xoffs); - tilemap_set_scrolldy(tc0480scp->tilemap[1][0], yd, 256 - yd + tc0480scp->flip_yoffs); - tilemap_set_scrolldx(tc0480scp->tilemap[2][0], xd, 320 - xd + tc0480scp->flip_xoffs); - tilemap_set_scrolldy(tc0480scp->tilemap[2][0], yd, 256 - yd + tc0480scp->flip_yoffs); - tilemap_set_scrolldx(tc0480scp->tilemap[3][0], xd, 320 - xd + tc0480scp->flip_xoffs); - tilemap_set_scrolldy(tc0480scp->tilemap[3][0], yd, 256 - yd + tc0480scp->flip_yoffs); - tilemap_set_scrolldx(tc0480scp->tilemap[4][0], xd - 3, 316 - xd); /* text layer */ - tilemap_set_scrolldy(tc0480scp->tilemap[4][0], yd, 256 - yd); /* text layer */ + tc0480scp->tilemap[0][0]->set_scrolldx(xd, 320 - xd + tc0480scp->flip_xoffs); + tc0480scp->tilemap[0][0]->set_scrolldy(yd, 256 - yd + tc0480scp->flip_yoffs); + tc0480scp->tilemap[1][0]->set_scrolldx(xd, 320 - xd + tc0480scp->flip_xoffs); + tc0480scp->tilemap[1][0]->set_scrolldy(yd, 256 - yd + tc0480scp->flip_yoffs); + tc0480scp->tilemap[2][0]->set_scrolldx(xd, 320 - xd + tc0480scp->flip_xoffs); + tc0480scp->tilemap[2][0]->set_scrolldy(yd, 256 - yd + tc0480scp->flip_yoffs); + tc0480scp->tilemap[3][0]->set_scrolldx(xd, 320 - xd + tc0480scp->flip_xoffs); + tc0480scp->tilemap[3][0]->set_scrolldy(yd, 256 - yd + tc0480scp->flip_yoffs); + tc0480scp->tilemap[4][0]->set_scrolldx(xd - 3, 316 - xd); /* text layer */ + tc0480scp->tilemap[4][0]->set_scrolldy(yd, 256 - yd); /* text layer */ /* Double width offsets */ - tilemap_set_scrolldx(tc0480scp->tilemap[0][1], xd, 320 - xd + tc0480scp->flip_xoffs); - tilemap_set_scrolldy(tc0480scp->tilemap[0][1], yd, 256 - yd + tc0480scp->flip_yoffs); - tilemap_set_scrolldx(tc0480scp->tilemap[1][1], xd, 320 - xd + tc0480scp->flip_xoffs); - tilemap_set_scrolldy(tc0480scp->tilemap[1][1], yd, 256 - yd + tc0480scp->flip_yoffs); - tilemap_set_scrolldx(tc0480scp->tilemap[2][1], xd, 320 - xd + tc0480scp->flip_xoffs); - tilemap_set_scrolldy(tc0480scp->tilemap[2][1], yd, 256 - yd + tc0480scp->flip_yoffs); - tilemap_set_scrolldx(tc0480scp->tilemap[3][1], xd, 320 - xd + tc0480scp->flip_xoffs); - tilemap_set_scrolldy(tc0480scp->tilemap[3][1], yd, 256 - yd + tc0480scp->flip_yoffs); - tilemap_set_scrolldx(tc0480scp->tilemap[4][1], xd - 3, 317 - xd); /* text layer */ - tilemap_set_scrolldy(tc0480scp->tilemap[4][1], yd, 256 - yd); /* text layer */ + tc0480scp->tilemap[0][1]->set_scrolldx(xd, 320 - xd + tc0480scp->flip_xoffs); + tc0480scp->tilemap[0][1]->set_scrolldy(yd, 256 - yd + tc0480scp->flip_yoffs); + tc0480scp->tilemap[1][1]->set_scrolldx(xd, 320 - xd + tc0480scp->flip_xoffs); + tc0480scp->tilemap[1][1]->set_scrolldy(yd, 256 - yd + tc0480scp->flip_yoffs); + tc0480scp->tilemap[2][1]->set_scrolldx(xd, 320 - xd + tc0480scp->flip_xoffs); + tc0480scp->tilemap[2][1]->set_scrolldy(yd, 256 - yd + tc0480scp->flip_yoffs); + tc0480scp->tilemap[3][1]->set_scrolldx(xd, 320 - xd + tc0480scp->flip_xoffs); + tc0480scp->tilemap[3][1]->set_scrolldy(yd, 256 - yd + tc0480scp->flip_yoffs); + tc0480scp->tilemap[4][1]->set_scrolldx(xd - 3, 317 - xd); /* text layer */ + tc0480scp->tilemap[4][1]->set_scrolldy(yd, 256 - yd); /* text layer */ for (i = 0; i < 2; i++) { /* Both sets of bg tilemaps scrollable per pixel row */ - tilemap_set_scroll_rows(tc0480scp->tilemap[0][i], 512); - tilemap_set_scroll_rows(tc0480scp->tilemap[1][i], 512); - tilemap_set_scroll_rows(tc0480scp->tilemap[2][i], 512); - tilemap_set_scroll_rows(tc0480scp->tilemap[3][i], 512); + tc0480scp->tilemap[0][i]->set_scroll_rows(512); + tc0480scp->tilemap[1][i]->set_scroll_rows(512); + tc0480scp->tilemap[2][i]->set_scroll_rows(512); + tc0480scp->tilemap[3][i]->set_scroll_rows(512); } tc0480scp->ram = auto_alloc_array_clear(device->machine(), UINT16, TC0480SCP_RAM_SIZE / 2); @@ -4893,7 +4893,7 @@ static void tc0180vcu_video_control( device_t *device, UINT8 data ) if (tc0180vcu->video_control & 0x80) tc0180vcu->framebuffer_page = (~tc0180vcu->video_control & 0x40) >> 6; - tilemap_set_flip_all(device->machine(), (tc0180vcu->video_control & 0x10) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0 ); + device->machine().tilemap().set_flip_all((tc0180vcu->video_control & 0x10) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0 ); } READ16_DEVICE_HANDLER( tc0180vcu_ctrl_r ) @@ -4916,21 +4916,21 @@ WRITE16_DEVICE_HANDLER( tc0180vcu_ctrl_w ) switch(offset) { case 0: - tilemap_mark_all_tiles_dirty(tc0180vcu->tilemap[1]); + tc0180vcu->tilemap[1]->mark_all_dirty(); tc0180vcu->fg_rambank[0] = (((tc0180vcu->ctrl[offset] >> 8) & 0x0f) << 12); tc0180vcu->fg_rambank[1] = (((tc0180vcu->ctrl[offset] >> 12) & 0x0f) << 12); break; case 1: - tilemap_mark_all_tiles_dirty(tc0180vcu->tilemap[0]); + tc0180vcu->tilemap[0]->mark_all_dirty(); tc0180vcu->bg_rambank[0] = (((tc0180vcu->ctrl[offset] >> 8) & 0x0f) << 12); tc0180vcu->bg_rambank[1] = (((tc0180vcu->ctrl[offset] >> 12) & 0x0f) << 12); break; case 4: case 5: - tilemap_mark_all_tiles_dirty(tc0180vcu->tilemap[2]); + tc0180vcu->tilemap[2]->mark_all_dirty(); break; case 6: - tilemap_mark_all_tiles_dirty(tc0180vcu->tilemap[2]); + tc0180vcu->tilemap[2]->mark_all_dirty(); tc0180vcu->tx_rambank = (((tc0180vcu->ctrl[offset] >> 8) & 0x0f) << 11); break; case 7: @@ -5005,13 +5005,13 @@ WRITE16_DEVICE_HANDLER( tc0180vcu_word_w ) COMBINE_DATA(&tc0180vcu->ram[offset]); if ((offset & 0x7000) == tc0180vcu->fg_rambank[0] || (offset & 0x7000) == tc0180vcu->fg_rambank[1]) - tilemap_mark_tile_dirty(tc0180vcu->tilemap[1], offset & 0x0fff); + tc0180vcu->tilemap[1]->mark_tile_dirty(offset & 0x0fff); if ((offset & 0x7000) == tc0180vcu->bg_rambank[0] || (offset & 0x7000) == tc0180vcu->bg_rambank[1]) - tilemap_mark_tile_dirty(tc0180vcu->tilemap[0], offset & 0x0fff); + tc0180vcu->tilemap[0]->mark_tile_dirty(offset & 0x0fff); if ((offset & 0x7800) == tc0180vcu->tx_rambank) - tilemap_mark_tile_dirty(tc0180vcu->tilemap[2], offset & 0x7ff); + tc0180vcu->tilemap[2]->mark_tile_dirty(offset & 0x7ff); } void tc0180vcu_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int tmap_num, int plane ) @@ -5021,7 +5021,7 @@ void tc0180vcu_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const recta assert(tmap_num < 3); if (tmap_num == 2) - tilemap_draw(bitmap, cliprect, tc0180vcu->tilemap[2], 0, 0); /* not much to do for tx_tilemap */ + tc0180vcu->tilemap[2]->draw(bitmap, cliprect, 0, 0); /* not much to do for tx_tilemap */ else { /*plane = 0 fg tilemap*/ @@ -5056,9 +5056,9 @@ void tc0180vcu_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const recta if (my_clip.min_y <= my_clip.max_y) { - tilemap_set_scrollx(tc0180vcu->tilemap[tmap_num], 0, -scrollx); - tilemap_set_scrolly(tc0180vcu->tilemap[tmap_num], 0, -scrolly); - tilemap_draw(bitmap, my_clip, tc0180vcu->tilemap[tmap_num], 0, 0); + tc0180vcu->tilemap[tmap_num]->set_scrollx(0, -scrollx); + tc0180vcu->tilemap[tmap_num]->set_scrolly(0, -scrolly); + tc0180vcu->tilemap[tmap_num]->draw(bitmap, my_clip, 0, 0); } } } @@ -5081,12 +5081,12 @@ static DEVICE_START( tc0180vcu ) tc0180vcu->tilemap[1] = tilemap_create_device(device, get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); tc0180vcu->tilemap[2] = tilemap_create_device(device, get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(tc0180vcu->tilemap[1], 0); - tilemap_set_transparent_pen(tc0180vcu->tilemap[2], 0); + tc0180vcu->tilemap[1]->set_transparent_pen(0); + tc0180vcu->tilemap[2]->set_transparent_pen(0); - tilemap_set_scrolldx(tc0180vcu->tilemap[0], 0, 24 * 8); - tilemap_set_scrolldx(tc0180vcu->tilemap[1], 0, 24 * 8); - tilemap_set_scrolldx(tc0180vcu->tilemap[2], 0, 24 * 8); + tc0180vcu->tilemap[0]->set_scrolldx(0, 24 * 8); + tc0180vcu->tilemap[1]->set_scrolldx(0, 24 * 8); + tc0180vcu->tilemap[2]->set_scrolldx(0, 24 * 8); tc0180vcu->ram = auto_alloc_array_clear(device->machine(), UINT16, TC0180VCU_RAM_SIZE / 2); tc0180vcu->scrollram = auto_alloc_array_clear(device->machine(), UINT16, TC0180VCU_SCROLLRAM_SIZE / 2); diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index dc228e2fe5c..5b3fbc4b497 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -58,7 +58,7 @@ WRITE32_HANDLER(taitojc_tile_w) taitojc_state *state = space->machine().driver_data(); COMBINE_DATA(state->m_tile_ram + offset); - tilemap_mark_tile_dirty(state->m_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); } WRITE32_HANDLER(taitojc_char_w) @@ -274,7 +274,7 @@ VIDEO_START( taitojc ) state->m_tilemap = tilemap_create(machine, taitojc_tile_info, tilemap_scan_rows, 16, 16, 64, 64); - tilemap_set_transparent_pen(state->m_tilemap, 0); + state->m_tilemap->set_transparent_pen(0); state->m_char_ram = auto_alloc_array_clear(machine, UINT32, 0x4000/4); state->m_tile_ram = auto_alloc_array_clear(machine, UINT32, 0x4000/4); @@ -352,7 +352,7 @@ SCREEN_UPDATE_IND16( taitojc ) draw_object_bank(screen.machine(), bitmap, cliprect, 1, 1); draw_object_bank(screen.machine(), bitmap, cliprect, 2, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); #if 0 if (debug_tex_pal > 0) diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c index b3b1c6cba36..156f2a0c245 100644 --- a/src/mame/video/tank8.c +++ b/src/mame/video/tank8.c @@ -65,7 +65,7 @@ WRITE8_HANDLER( tank8_video_ram_w ) { tank8_state *state = space->machine().driver_data(); state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); } @@ -112,7 +112,7 @@ VIDEO_START( tank8 ) /* VBLANK starts on scanline #256 and ends on scanline #24 */ - tilemap_set_scrolly(state->m_tilemap, 0, 2 * 24); + state->m_tilemap->set_scrolly(0, 2 * 24); } @@ -181,7 +181,7 @@ SCREEN_UPDATE_IND16( tank8 ) { tank8_state *state = screen.machine().driver_data(); set_pens(state, screen.machine().colortable); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); draw_bullets(screen.machine(), bitmap, cliprect); @@ -199,7 +199,7 @@ SCREEN_VBLANK( tank8 ) int y; const rectangle &visarea = screen.machine().primary_screen->visible_area(); - tilemap_draw(state->m_helper1, visarea, state->m_tilemap, 0, 0); + state->m_tilemap->draw(state->m_helper1, visarea, 0, 0); state->m_helper2.fill(8, visarea); state->m_helper3.fill(8, visarea); diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c index a4ae11ed48f..3ea99938a08 100644 --- a/src/mame/video/tankbatt.c +++ b/src/mame/video/tankbatt.c @@ -63,7 +63,7 @@ WRITE8_HANDLER( tankbatt_videoram_w ) tankbatt_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -104,7 +104,7 @@ static void draw_bullets(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( tankbatt ) { tankbatt_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_bullets(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 9d801f50488..0bcaad4767e 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -49,7 +49,7 @@ static TILE_GET_INFO( get_bg_tile_info ) #endif /* priority bg/sprites (1 = this bg tile on top of sprites) */ - tileinfo->category = (attr & 0x08) >> 3; + tileinfo.category = (attr & 0x08) >> 3; SET_TILE_INFO( 1, code, @@ -86,7 +86,7 @@ VIDEO_START( tankbust ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_txt_tilemap, 0); + state->m_txt_tilemap->set_transparent_pen(0); } @@ -100,7 +100,7 @@ WRITE8_HANDLER( tankbust_background_videoram_w ) { tankbust_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( tankbust_background_videoram_r ) { @@ -112,7 +112,7 @@ WRITE8_HANDLER( tankbust_background_colorram_w ) { tankbust_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( tankbust_background_colorram_r ) { @@ -124,7 +124,7 @@ WRITE8_HANDLER( tankbust_txtram_w ) { tankbust_state *state = space->machine().driver_data(); state->m_txtram[offset] = data; - tilemap_mark_tile_dirty(state->m_txt_tilemap, offset); + state->m_txt_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( tankbust_txtram_r ) { @@ -145,7 +145,7 @@ WRITE8_HANDLER( tankbust_xscroll_w ) x = state->m_xscroll[0] + 256 * (state->m_xscroll[1]&1); if (x>=0x100) x-=0x200; - tilemap_set_scrollx(state->m_bg_tilemap, 0, x ); + state->m_bg_tilemap->set_scrollx(0, x ); } //popmessage("x=%02x %02x", state->m_xscroll[0], state->m_xscroll[1]); } @@ -161,7 +161,7 @@ WRITE8_HANDLER( tankbust_yscroll_w ) state->m_yscroll[offset] = data; y = state->m_yscroll[0]; if (y>=0x80) y-=0x100; - tilemap_set_scrolly(state->m_bg_tilemap, 0, y ); + state->m_bg_tilemap->set_scrolly(0, y ); } //popmessage("y=%02x %02x", state->m_yscroll[0], state->m_yscroll[1]); } @@ -244,15 +244,15 @@ SCREEN_UPDATE_IND16( tankbust ) if ( (tile_attrib&8) || (tile_attrib&0x80) ) { - tilemap_mark_tile_dirty(state->m_bg_tilemap, i); + state->m_bg_tilemap->mark_tile_dirty(i); } } #endif - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); - tilemap_draw(bitmap, cliprect, state->m_txt_tilemap, 0,0); + state->m_txt_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c index f92a47bc956..68fb1279f9e 100644 --- a/src/mame/video/taotaido.c +++ b/src/mame/video/taotaido.c @@ -150,7 +150,7 @@ WRITE16_HANDLER( taotaido_tileregs_w ) state->m_video_bank_select[(offset-4)*2] = data >> 8; if(ACCESSING_BITS_0_7) state->m_video_bank_select[(offset-4)*2+1] = data &0xff; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); break; } } @@ -159,7 +159,7 @@ WRITE16_HANDLER( taotaido_bgvideoram_w ) { taotaido_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( taotaido_bg_tile_info ) @@ -200,8 +200,8 @@ VIDEO_START(taotaido) SCREEN_UPDATE_IND16(taotaido) { taotaido_state *state = screen.machine().driver_data(); -// tilemap_set_scrollx(state->m_bg_tilemap,0,(state->m_scrollram[0x380/2]>>4)); // the values put here end up being wrong every other frame -// tilemap_set_scrolly(state->m_bg_tilemap,0,(state->m_scrollram[0x382/2]>>4)); // the values put here end up being wrong every other frame +// state->m_bg_tilemap->set_scrollx(0,(state->m_scrollram[0x380/2]>>4)); // the values put here end up being wrong every other frame +// state->m_bg_tilemap->set_scrolly(0,(state->m_scrollram[0x382/2]>>4)); // the values put here end up being wrong every other frame /* not amazingly efficient however it should be functional for row select and linescroll */ int line; @@ -214,10 +214,10 @@ SCREEN_UPDATE_IND16(taotaido) { clip.min_y = clip.max_y = line; - tilemap_set_scrollx(state->m_bg_tilemap,0,((state->m_scrollram[(0x00+4*line)/2])>>4)+30); - tilemap_set_scrolly(state->m_bg_tilemap,0,((state->m_scrollram[(0x02+4*line)/2])>>4)-line); + state->m_bg_tilemap->set_scrollx(0,((state->m_scrollram[(0x00+4*line)/2])>>4)+30); + state->m_bg_tilemap->set_scrolly(0,((state->m_scrollram[(0x02+4*line)/2])>>4)-line); - tilemap_draw(bitmap,clip,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, clip, 0,0); } draw_sprites(screen.machine(), bitmap,cliprect); diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c index 60ce00faf33..27902fc8f06 100644 --- a/src/mame/video/targeth.c +++ b/src/mame/video/targeth.c @@ -62,7 +62,7 @@ WRITE16_HANDLER( targeth_vram_w ) { targeth_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_pant[(offset & 0x1fff) >> 12], ((offset << 1) & 0x1fff) >> 2); + state->m_pant[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2); } @@ -78,7 +78,7 @@ VIDEO_START( targeth ) state->m_pant[0] = tilemap_create(machine, get_tile_info_targeth_screen0,tilemap_scan_rows,16,16,64,32); state->m_pant[1] = tilemap_create(machine, get_tile_info_targeth_screen1,tilemap_scan_rows,16,16,64,32); - tilemap_set_transparent_pen(state->m_pant[0],0); + state->m_pant[0]->set_transparent_pen(0); } @@ -137,13 +137,13 @@ SCREEN_UPDATE_IND16( targeth ) { targeth_state *state = screen.machine().driver_data(); /* set scroll registers */ - tilemap_set_scrolly(state->m_pant[0], 0, state->m_vregs[0]); - tilemap_set_scrollx(state->m_pant[0], 0, state->m_vregs[1] + 0x04); - tilemap_set_scrolly(state->m_pant[1], 0, state->m_vregs[2]); - tilemap_set_scrollx(state->m_pant[1], 0, state->m_vregs[3]); + state->m_pant[0]->set_scrolly(0, state->m_vregs[0]); + state->m_pant[0]->set_scrollx(0, state->m_vregs[1] + 0x04); + state->m_pant[1]->set_scrolly(0, state->m_vregs[2]); + state->m_pant[1]->set_scrollx(0, state->m_vregs[3]); - tilemap_draw(bitmap,cliprect,state->m_pant[1],0,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],0,0); + state->m_pant[1]->draw(bitmap, cliprect, 0,0); + state->m_pant[0]->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); return 0; diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index 6ce03577e5e..9350d70f164 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -119,7 +119,7 @@ WRITE16_HANDLER( roundup5_text_w ) tatsumi_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty( state->m_tx_layer,offset); + state->m_tx_layer->mark_tile_dirty(offset); } READ16_HANDLER( cyclwarr_videoram0_r ) @@ -140,8 +140,8 @@ WRITE16_HANDLER( cyclwarr_videoram0_w ) COMBINE_DATA(&state->m_cyclwarr_videoram0[offset]); if (offset>=0x400) { - tilemap_mark_tile_dirty( state->m_layer0, offset-0x400); - tilemap_mark_tile_dirty( state->m_layer1, offset-0x400); + state->m_layer0->mark_tile_dirty(offset-0x400); + state->m_layer1->mark_tile_dirty(offset-0x400); } } @@ -151,8 +151,8 @@ WRITE16_HANDLER( cyclwarr_videoram1_w ) COMBINE_DATA(&state->m_cyclwarr_videoram1[offset]); if (offset>=0x400) { - tilemap_mark_tile_dirty( state->m_layer2, offset-0x400); - tilemap_mark_tile_dirty( state->m_layer3, offset-0x400); + state->m_layer2->mark_tile_dirty(offset-0x400); + state->m_layer3->mark_tile_dirty(offset-0x400); } } @@ -208,7 +208,7 @@ VIDEO_START( apache3 ) state->m_temp_bitmap.allocate(512, 512); state->m_apache3_road_x_ram = auto_alloc_array(machine, UINT8, 512); - tilemap_set_transparent_pen(state->m_tx_layer,0); + state->m_tx_layer->set_transparent_pen(0); } VIDEO_START( roundup5 ) @@ -218,7 +218,7 @@ VIDEO_START( roundup5 ) state->m_shadow_pen_array = auto_alloc_array_clear(machine, UINT8, 8192); state->m_roundup5_vram = auto_alloc_array(machine, UINT16, (0x48000 * 4)/2); - tilemap_set_transparent_pen(state->m_tx_layer,0); + state->m_tx_layer->set_transparent_pen(0); gfx_element_set_source(machine.gfx[1], (UINT8 *)state->m_roundup5_vram); } @@ -985,7 +985,7 @@ static void draw_bg(running_machine &machine, bitmap_rgb32 &dst, tilemap_t *src, from sets of 8 bit palettes! */ const UINT8* tile_cluts = machine.region("gfx4")->base(); - const bitmap_ind16 &src_bitmap = tilemap_get_pixmap(src); + const bitmap_ind16 &src_bitmap = src->pixmap(); int src_y_mask=ysize-1; int src_x_mask=xsize-1; int tile_y_mask=(ysize/8)-1; @@ -1085,13 +1085,13 @@ SCREEN_UPDATE_RGB32( apache3 ) tatsumi_state *state = screen.machine().driver_data(); update_cluts(screen.machine(), 1024, 0, 2048); - tilemap_set_scrollx(state->m_tx_layer,0,24); + state->m_tx_layer->set_scrollx(0,24); bitmap.fill(screen.machine().pens[0], cliprect); draw_sky(screen.machine(), bitmap, cliprect, 256, state->m_apache3_rotate_ctrl[1]); // draw_ground(screen.machine(), bitmap, cliprect); draw_sprites(screen.machine(), bitmap,cliprect,0, (state->m_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0); - tilemap_draw(bitmap,cliprect,state->m_tx_layer,0,0); + state->m_tx_layer->draw(bitmap, cliprect, 0,0); return 0; } @@ -1103,8 +1103,8 @@ SCREEN_UPDATE_RGB32( roundup5 ) update_cluts(screen.machine(), 1024, 512, 4096); - tilemap_set_scrollx(state->m_tx_layer,0,24); - tilemap_set_scrolly(state->m_tx_layer,0,0); //(((state->m_roundupt_crt_reg[0xe]<<8)|state->m_roundupt_crt_reg[0xf])>>5) + 96); + state->m_tx_layer->set_scrollx(0,24); + state->m_tx_layer->set_scrolly(0,0); //(((state->m_roundupt_crt_reg[0xe]<<8)|state->m_roundupt_crt_reg[0xf])>>5) + 96); bitmap.fill(screen.machine().pens[384], cliprect); // todo screen.machine().priority_bitmap.fill(0, cliprect); @@ -1112,7 +1112,7 @@ SCREEN_UPDATE_RGB32( roundup5 ) draw_sprites(screen.machine(), screen.machine().priority_bitmap,cliprect,1,(state->m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only draw_road(screen.machine(), bitmap,cliprect,screen.machine().priority_bitmap); draw_sprites(screen.machine(), bitmap,cliprect,0,(state->m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass - tilemap_draw(bitmap,cliprect,state->m_tx_layer,0,0); + state->m_tx_layer->draw(bitmap, cliprect, 0,0); return 0; } @@ -1122,10 +1122,10 @@ SCREEN_UPDATE_RGB32( cyclwarr ) state->m_bigfight_bank=state->m_bigfight_a40000[0]; if (state->m_bigfight_bank!=state->m_bigfight_last_bank) { - tilemap_mark_all_tiles_dirty(state->m_layer0); - tilemap_mark_all_tiles_dirty(state->m_layer1); - tilemap_mark_all_tiles_dirty(state->m_layer2); - tilemap_mark_all_tiles_dirty(state->m_layer3); + state->m_layer0->mark_all_dirty(); + state->m_layer1->mark_all_dirty(); + state->m_layer2->mark_all_dirty(); + state->m_layer3->mark_all_dirty(); state->m_bigfight_last_bank=state->m_bigfight_bank; } @@ -1147,10 +1147,10 @@ SCREEN_UPDATE_RGB32( bigfight ) state->m_bigfight_bank=state->m_bigfight_a40000[0]; if (state->m_bigfight_bank!=state->m_bigfight_last_bank) { - tilemap_mark_all_tiles_dirty(state->m_layer0); - tilemap_mark_all_tiles_dirty(state->m_layer1); - tilemap_mark_all_tiles_dirty(state->m_layer2); - tilemap_mark_all_tiles_dirty(state->m_layer3); + state->m_layer0->mark_all_dirty(); + state->m_layer1->mark_all_dirty(); + state->m_layer2->mark_all_dirty(); + state->m_layer3->mark_all_dirty(); state->m_bigfight_last_bank=state->m_bigfight_bank; } diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index a58ea3e8213..b7294cdaa63 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -24,7 +24,7 @@ WRITE8_HANDLER( tbowl_txvideoram_w ) { tbowl_state *state = space->machine().driver_data(); state->m_txvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset & 0x7ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); } /* Bottom BG Layer (bg) Tilemap */ @@ -45,7 +45,7 @@ WRITE8_HANDLER( tbowl_bg2videoram_w ) { tbowl_state *state = space->machine().driver_data(); state->m_bg2videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg2_tilemap,offset & 0xfff); + state->m_bg2_tilemap->mark_tile_dirty(offset & 0xfff); } WRITE8_HANDLER (tbowl_bgxscroll_lo) @@ -91,7 +91,7 @@ WRITE8_HANDLER( tbowl_bgvideoram_w ) { tbowl_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0xfff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0xfff); } WRITE8_HANDLER (tbowl_bg2xscroll_lo) @@ -208,9 +208,9 @@ VIDEO_START( tbowl ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16, 16,128,32); state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows, 16, 16,128,32); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_transparent_pen(state->m_bg2_tilemap,0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_bg2_tilemap->set_transparent_pen(0); } @@ -218,18 +218,18 @@ SCREEN_UPDATE_IND16( tbowl_left ) { tbowl_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_xscroll ); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_yscroll ); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bg2xscroll ); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2yscroll ); - tilemap_set_scrollx(state->m_tx_tilemap, 0, 0 ); - tilemap_set_scrolly(state->m_tx_tilemap, 0, 0 ); + state->m_bg_tilemap->set_scrollx(0, state->m_xscroll ); + state->m_bg_tilemap->set_scrolly(0, state->m_yscroll ); + state->m_bg2_tilemap->set_scrollx(0, state->m_bg2xscroll ); + state->m_bg2_tilemap->set_scrolly(0, state->m_bg2yscroll ); + state->m_tx_tilemap->set_scrollx(0, 0 ); + state->m_tx_tilemap->set_scrolly(0, 0 ); bitmap.fill(0x100, cliprect); /* is there a register controling the colour? looks odd when screen is blank */ - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect, 0); - tilemap_draw(bitmap,cliprect,state->m_bg2_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } @@ -238,18 +238,18 @@ SCREEN_UPDATE_IND16( tbowl_right ) { tbowl_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_xscroll+32*8 ); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_yscroll ); - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bg2xscroll+32*8 ); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2yscroll ); - tilemap_set_scrollx(state->m_tx_tilemap, 0, 32*8 ); - tilemap_set_scrolly(state->m_tx_tilemap, 0, 0 ); + state->m_bg_tilemap->set_scrollx(0, state->m_xscroll+32*8 ); + state->m_bg_tilemap->set_scrolly(0, state->m_yscroll ); + state->m_bg2_tilemap->set_scrollx(0, state->m_bg2xscroll+32*8 ); + state->m_bg2_tilemap->set_scrolly(0, state->m_bg2yscroll ); + state->m_tx_tilemap->set_scrollx(0, 32*8 ); + state->m_tx_tilemap->set_scrolly(0, 0 ); bitmap.fill(0x100, cliprect); /* is there a register controling the colour? looks odd when screen is blank */ - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect, 32*8); - tilemap_draw(bitmap,cliprect,state->m_bg2_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index 65e8ad4baa8..ad46557de11 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -110,7 +110,7 @@ static TILE_GET_INFO( get_tx_tile_info ) int code = state->m_tile_ram[offset]; int color = state->m_tile_attr[offset]; - tileinfo->group = color; + tileinfo.group = color; SET_TILE_INFO(0, code, color, 0); } @@ -138,7 +138,7 @@ static void tile_mark_dirty(tceptor_state *state, int offset) } if (x >= 0) - tilemap_mark_tile_dirty(state->m_tx_tilemap, x * 28 + y); + state->m_tx_tilemap->mark_tile_dirty(x * 28 + y); } @@ -192,9 +192,9 @@ WRITE8_HANDLER( tceptor_bg_ram_w ) offset /= 2; if (offset < 0x800) - tilemap_mark_tile_dirty(state->m_bg1_tilemap, offset); + state->m_bg1_tilemap->mark_tile_dirty(offset); else - tilemap_mark_tile_dirty(state->m_bg2_tilemap, offset - 0x800); + state->m_bg2_tilemap->mark_tile_dirty(offset - 0x800); } WRITE8_HANDLER( tceptor_bg_scroll_w ) @@ -402,8 +402,8 @@ VIDEO_START( tceptor ) state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 34, 28); - tilemap_set_scrollx(state->m_tx_tilemap, 0, -2*8); - tilemap_set_scrolly(state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->set_scrollx(0, -2*8); + state->m_tx_tilemap->set_scrolly(0, 0); colortable_configure_tilemap_groups(machine.colortable, state->m_tx_tilemap, machine.gfx[0], 7); state->m_bg1_tilemap = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -530,16 +530,16 @@ SCREEN_UPDATE_IND16( tceptor_2d ) // left background rect = cliprect; rect.max_x = bg_center; - tilemap_set_scrollx(state->m_bg1_tilemap, 0, state->m_bg1_scroll_x + 12); - tilemap_set_scrolly(state->m_bg1_tilemap, 0, state->m_bg1_scroll_y + 20); //32? - tilemap_draw(bitmap, rect, state->m_bg1_tilemap, 0, 0); + state->m_bg1_tilemap->set_scrollx(0, state->m_bg1_scroll_x + 12); + state->m_bg1_tilemap->set_scrolly(0, state->m_bg1_scroll_y + 20); //32? + state->m_bg1_tilemap->draw(bitmap, rect, 0, 0); // right background rect.min_x = bg_center; rect.max_x = cliprect.max_x; - tilemap_set_scrollx(state->m_bg2_tilemap, 0, state->m_bg2_scroll_x + 20); - tilemap_set_scrolly(state->m_bg2_tilemap, 0, state->m_bg2_scroll_y + 20); // 32? - tilemap_draw(bitmap, rect, state->m_bg2_tilemap, 0, 0); + state->m_bg2_tilemap->set_scrollx(0, state->m_bg2_scroll_x + 20); + state->m_bg2_tilemap->set_scrolly(0, state->m_bg2_scroll_y + 20); // 32? + state->m_bg2_tilemap->draw(bitmap, rect, 0, 0); for (pri = 0; pri < 8; pri++) { @@ -548,7 +548,7 @@ SCREEN_UPDATE_IND16( tceptor_2d ) draw_sprites(screen.machine(), bitmap, cliprect, pri); } - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c index f623a75b714..321a73c6e34 100644 --- a/src/mame/video/tecmo.c +++ b/src/mame/video/tecmo.c @@ -99,12 +99,12 @@ VIDEO_START( tecmo ) } state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); - tilemap_set_scrolldx(state->m_bg_tilemap,-48,256+48); - tilemap_set_scrolldx(state->m_fg_tilemap,-48,256+48); + state->m_bg_tilemap->set_scrolldx(-48,256+48); + state->m_fg_tilemap->set_scrolldx(-48,256+48); } @@ -119,21 +119,21 @@ WRITE8_HANDLER( tecmo_txvideoram_w ) { tecmo_state *state = space->machine().driver_data(); state->m_txvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset & 0x3ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( tecmo_fgvideoram_w ) { tecmo_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x1ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x1ff); } WRITE8_HANDLER( tecmo_bgvideoram_w ) { tecmo_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x1ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x1ff); } WRITE8_HANDLER( tecmo_fgscroll_w ) @@ -142,8 +142,8 @@ WRITE8_HANDLER( tecmo_fgscroll_w ) state->m_fgscroll[offset] = data; - tilemap_set_scrollx(state->m_fg_tilemap, 0, state->m_fgscroll[0] + 256 * state->m_fgscroll[1]); - tilemap_set_scrolly(state->m_fg_tilemap, 0, state->m_fgscroll[2]); + state->m_fg_tilemap->set_scrollx(0, state->m_fgscroll[0] + 256 * state->m_fgscroll[1]); + state->m_fg_tilemap->set_scrolly(0, state->m_fgscroll[2]); } WRITE8_HANDLER( tecmo_bgscroll_w ) @@ -152,8 +152,8 @@ WRITE8_HANDLER( tecmo_bgscroll_w ) state->m_bgscroll[offset] = data; - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_bgscroll[0] + 256 * state->m_bgscroll[1]); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_bgscroll[2]); + state->m_bg_tilemap->set_scrollx(0, state->m_bgscroll[0] + 256 * state->m_bgscroll[1]); + state->m_bg_tilemap->set_scrolly(0, state->m_bgscroll[2]); } WRITE8_HANDLER( tecmo_flipscreen_w ) @@ -253,9 +253,9 @@ SCREEN_UPDATE_IND16( tecmo ) tecmo_state *state = screen.machine().driver_data(); screen.machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0x100, cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,1); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,2); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,4); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,1); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,2); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,4); draw_sprites(screen.machine(), bitmap,cliprect); return 0; diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c index fdca6a8ca0e..1d82908dd80 100644 --- a/src/mame/video/tecmo16.c +++ b/src/mame/video/tecmo16.c @@ -21,12 +21,12 @@ static TILE_GET_INFO( fg_get_tile_info ) int color = state->m_colorram[tile_index] & 0x0f; /* bit 4 controls blending */ - tileinfo->category = (state->m_colorram[tile_index] & 0x10) >> 4; + tileinfo.category = (state->m_colorram[tile_index] & 0x10) >> 4; SET_TILE_INFO( 1, tile, - color | (tileinfo->category ? 0x70 : 0x00), + color | (tileinfo.category ? 0x70 : 0x00), 0); } @@ -71,11 +71,11 @@ VIDEO_START( fstarfrc ) state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,16,16,32,32); state->m_tx_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); - tilemap_set_scrolly(state->m_tx_tilemap,0,-16); + state->m_tx_tilemap->set_scrolly(0,-16); state->m_flipscreen = 0; state->m_game_is_riot = 0; } @@ -95,9 +95,9 @@ VIDEO_START( ginkun ) state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,16,16,64,32); state->m_tx_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); state->m_flipscreen = 0; state->m_game_is_riot = 0; } @@ -117,10 +117,10 @@ VIDEO_START( riot ) state->m_bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,16,16,64,32); state->m_tx_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); - tilemap_set_scrolldy(state->m_tx_tilemap,-16,-16); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_scrolldy(-16,-16); state->m_flipscreen = 0; state->m_game_is_riot = 1; } @@ -131,28 +131,28 @@ WRITE16_HANDLER( tecmo16_videoram_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( tecmo16_colorram_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_colorram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( tecmo16_videoram2_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram2[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( tecmo16_colorram2_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_colorram2[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -160,7 +160,7 @@ WRITE16_HANDLER( tecmo16_charram_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_charram[offset]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( tecmo16_flipscreen_w ) @@ -176,42 +176,42 @@ WRITE16_HANDLER( tecmo16_scroll_x_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll_x_w); - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scroll_x_w); + state->m_fg_tilemap->set_scrollx(0,state->m_scroll_x_w); } WRITE16_HANDLER( tecmo16_scroll_y_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll_y_w); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scroll_y_w); + state->m_fg_tilemap->set_scrolly(0,state->m_scroll_y_w); } WRITE16_HANDLER( tecmo16_scroll2_x_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll2_x_w); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scroll2_x_w); + state->m_bg_tilemap->set_scrollx(0,state->m_scroll2_x_w); } WRITE16_HANDLER( tecmo16_scroll2_y_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll2_y_w); - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scroll2_y_w); + state->m_bg_tilemap->set_scrolly(0,state->m_scroll2_y_w); } WRITE16_HANDLER( tecmo16_scroll_char_x_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll_char_x_w); - tilemap_set_scrollx(state->m_tx_tilemap,0,state->m_scroll_char_x_w); + state->m_tx_tilemap->set_scrollx(0,state->m_scroll_char_x_w); } WRITE16_HANDLER( tecmo16_scroll_char_y_w ) { tecmo16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_scroll_char_y_w); - tilemap_set_scrolly(state->m_tx_tilemap,0,state->m_scroll_char_y_w-16); + state->m_tx_tilemap->set_scrolly(0,state->m_scroll_char_y_w-16); } /******************************************************************************/ @@ -494,12 +494,12 @@ SCREEN_UPDATE_RGB32( tecmo16 ) state->m_sprite_bitmap.fill(0, cliprect); /* draw tilemaps into a 16-bit bitmap */ - tilemap_draw(state->m_tile_bitmap_bg, cliprect,state->m_bg_tilemap, 0, 1); - tilemap_draw(state->m_tile_bitmap_fg, cliprect,state->m_fg_tilemap, 0, 2); + state->m_bg_tilemap->draw(state->m_tile_bitmap_bg, cliprect, 0, 1); + state->m_fg_tilemap->draw(state->m_tile_bitmap_fg, cliprect, 0, 2); /* draw the blended tiles at a lower priority so sprites covered by them will still be drawn */ - tilemap_draw(state->m_tile_bitmap_fg, cliprect,state->m_fg_tilemap, 1, 0); - tilemap_draw(state->m_tile_bitmap_fg, cliprect,state->m_tx_tilemap, 0, 4); + state->m_fg_tilemap->draw(state->m_tile_bitmap_fg, cliprect, 1, 0); + state->m_tx_tilemap->draw(state->m_tile_bitmap_fg, cliprect, 0, 4); /* draw sprites into a 16-bit bitmap */ draw_sprites(screen.machine(), state->m_tile_bitmap_bg, state->m_tile_bitmap_fg, state->m_sprite_bitmap, cliprect); diff --git a/src/mame/video/tecmosys.c b/src/mame/video/tecmosys.c index ca8e142beb9..d5fa3c588a4 100644 --- a/src/mame/video/tecmosys.c +++ b/src/mame/video/tecmosys.c @@ -57,28 +57,28 @@ WRITE16_HANDLER( bg0_tilemap_w ) { tecmosys_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg0tilemap_ram[offset]); - tilemap_mark_tile_dirty(state->m_bg0tilemap,offset/2); + state->m_bg0tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( bg1_tilemap_w ) { tecmosys_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg1tilemap_ram[offset]); - tilemap_mark_tile_dirty(state->m_bg1tilemap,offset/2); + state->m_bg1tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( bg2_tilemap_w ) { tecmosys_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg2tilemap_ram[offset]); - tilemap_mark_tile_dirty(state->m_bg2tilemap,offset/2); + state->m_bg2tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( fg_tilemap_w ) { tecmosys_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fgtilemap_ram[offset]); - tilemap_mark_tile_dirty(state->m_txt_tilemap,offset/2); + state->m_txt_tilemap->mark_tile_dirty(offset/2); } @@ -304,31 +304,31 @@ SCREEN_UPDATE_RGB32(tecmosys) bitmap.fill(screen.machine().pens[0x4000], cliprect); - tilemap_set_scrolly( state->m_bg0tilemap, 0, state->m_c80000regs[1]+16); - tilemap_set_scrollx( state->m_bg0tilemap, 0, state->m_c80000regs[0]+104); + state->m_bg0tilemap->set_scrolly(0, state->m_c80000regs[1]+16); + state->m_bg0tilemap->set_scrollx(0, state->m_c80000regs[0]+104); - tilemap_set_scrolly( state->m_bg1tilemap, 0, state->m_a80000regs[1]+17); - tilemap_set_scrollx( state->m_bg1tilemap, 0, state->m_a80000regs[0]+106); + state->m_bg1tilemap->set_scrolly(0, state->m_a80000regs[1]+17); + state->m_bg1tilemap->set_scrollx(0, state->m_a80000regs[0]+106); - tilemap_set_scrolly( state->m_bg2tilemap, 0, state->m_b00000regs[1]+17); - tilemap_set_scrollx( state->m_bg2tilemap, 0, state->m_b00000regs[0]+106); + state->m_bg2tilemap->set_scrolly(0, state->m_b00000regs[1]+17); + state->m_bg2tilemap->set_scrollx(0, state->m_b00000regs[0]+106); state->m_tmp_tilemap_composebitmap.fill(0, cliprect); state->m_tmp_tilemap_renderbitmap.fill(0, cliprect); - tilemap_draw(state->m_tmp_tilemap_renderbitmap,cliprect,state->m_bg0tilemap,0,0); + state->m_bg0tilemap->draw(state->m_tmp_tilemap_renderbitmap, cliprect, 0,0); tecmosys_tilemap_copy_to_compose(state, 0x0000); state->m_tmp_tilemap_renderbitmap.fill(0, cliprect); - tilemap_draw(state->m_tmp_tilemap_renderbitmap,cliprect,state->m_bg1tilemap,0,0); + state->m_bg1tilemap->draw(state->m_tmp_tilemap_renderbitmap, cliprect, 0,0); tecmosys_tilemap_copy_to_compose(state, 0x4000); state->m_tmp_tilemap_renderbitmap.fill(0, cliprect); - tilemap_draw(state->m_tmp_tilemap_renderbitmap,cliprect,state->m_bg2tilemap,0,0); + state->m_bg2tilemap->draw(state->m_tmp_tilemap_renderbitmap, cliprect, 0,0); tecmosys_tilemap_copy_to_compose(state, 0x8000); state->m_tmp_tilemap_renderbitmap.fill(0, cliprect); - tilemap_draw(state->m_tmp_tilemap_renderbitmap,cliprect,state->m_txt_tilemap,0,0); + state->m_txt_tilemap->draw(state->m_tmp_tilemap_renderbitmap, cliprect, 0,0); tecmosys_tilemap_copy_to_compose(state, 0xc000); @@ -354,14 +354,14 @@ VIDEO_START(tecmosys) state->m_txt_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32*2,32*2); - tilemap_set_transparent_pen(state->m_txt_tilemap,0); + state->m_txt_tilemap->set_transparent_pen(0); state->m_bg0tilemap = tilemap_create(machine, get_bg0tile_info,tilemap_scan_rows,16,16,32,32); - tilemap_set_transparent_pen(state->m_bg0tilemap,0); + state->m_bg0tilemap->set_transparent_pen(0); state->m_bg1tilemap = tilemap_create(machine, get_bg1tile_info,tilemap_scan_rows,16,16,32,32); - tilemap_set_transparent_pen(state->m_bg1tilemap,0); + state->m_bg1tilemap->set_transparent_pen(0); state->m_bg2tilemap = tilemap_create(machine, get_bg2tile_info,tilemap_scan_rows,16,16,32,32); - tilemap_set_transparent_pen(state->m_bg2tilemap,0); + state->m_bg2tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c index b69d58b1197..aaf2b07955b 100644 --- a/src/mame/video/tehkanwc.c +++ b/src/mame/video/tehkanwc.c @@ -19,21 +19,21 @@ WRITE8_HANDLER( tehkanwc_videoram_w ) { tehkanwc_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( tehkanwc_colorram_w ) { tehkanwc_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( tehkanwc_videoram2_w ) { tehkanwc_state *state = space->machine().driver_data(); state->m_videoram2[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( tehkanwc_scroll_x_w ) @@ -45,7 +45,7 @@ WRITE8_HANDLER( tehkanwc_scroll_x_w ) WRITE8_HANDLER( tehkanwc_scroll_y_w ) { tehkanwc_state *state = space->machine().driver_data(); - tilemap_set_scrolly(state->m_bg_tilemap, 0, data); + state->m_bg_tilemap->set_scrolly(0, data); } WRITE8_HANDLER( tehkanwc_flipscreen_x_w ) @@ -89,7 +89,7 @@ static TILE_GET_INFO( get_fg_tile_info ) int color = attr & 0x0f; int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0); - tileinfo->category = (attr & 0x20) ? 0 : 1; + tileinfo.category = (attr & 0x20) ? 0 : 1; SET_TILE_INFO(0, code, color, flags); } @@ -103,7 +103,7 @@ VIDEO_START( tehkanwc ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } /* @@ -167,11 +167,11 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( tehkanwc ) { tehkanwc_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_x[0] + 256 * state->m_scroll_x[1]); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_x[0] + 256 * state->m_scroll_x[1]); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 1, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 1, 0); gridiron_draw_led(screen.machine(), bitmap, cliprect, state->m_led0, 0); gridiron_draw_led(screen.machine(), bitmap, cliprect, state->m_led1, 1); return 0; diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c index 646b3d062d6..4ead2d9eb57 100644 --- a/src/mame/video/terracre.c +++ b/src/mame/video/terracre.c @@ -155,7 +155,7 @@ WRITE16_HANDLER( amazon_background_w ) { terracre_state *state = space->machine().driver_data(); COMBINE_DATA( &state->m_amazon_videoram[offset] ); - tilemap_mark_tile_dirty( state->m_background, offset ); + state->m_background->mark_tile_dirty(offset ); } WRITE16_HANDLER( amazon_foreground_w ) @@ -163,7 +163,7 @@ WRITE16_HANDLER( amazon_foreground_w ) terracre_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA( &videoram[offset] ); - tilemap_mark_tile_dirty( state->m_foreground, offset ); + state->m_foreground->mark_tile_dirty(offset ); } WRITE16_HANDLER( amazon_flipscreen_w ) @@ -180,14 +180,14 @@ WRITE16_HANDLER( amazon_scrolly_w ) { terracre_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_yscroll); - tilemap_set_scrolly(state->m_background,0,state->m_yscroll); + state->m_background->set_scrolly(0,state->m_yscroll); } WRITE16_HANDLER( amazon_scrollx_w ) { terracre_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_xscroll); - tilemap_set_scrollx(state->m_background,0,state->m_xscroll); + state->m_background->set_scrollx(0,state->m_xscroll); } VIDEO_START( amazon ) @@ -195,7 +195,7 @@ VIDEO_START( amazon ) terracre_state *state = machine.driver_data(); state->m_background = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,64,32); state->m_foreground = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,8,8,64,32); - tilemap_set_transparent_pen(state->m_foreground,0xf); + state->m_foreground->set_transparent_pen(0xf); /* register for saving */ state_save_register_global(machine, state->m_xscroll); @@ -208,9 +208,9 @@ SCREEN_UPDATE_IND16( amazon ) if( state->m_xscroll&0x2000 ) bitmap.fill(get_black_pen(screen.machine()), cliprect ); else - tilemap_draw( bitmap,cliprect, state->m_background, 0, 0 ); + state->m_background->draw(bitmap, cliprect, 0, 0 ); draw_sprites(screen.machine(), bitmap,cliprect ); - tilemap_draw( bitmap,cliprect, state->m_foreground, 0, 0 ); + state->m_foreground->draw(bitmap, cliprect, 0, 0 ); return 0; } diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index 7c73c84327c..7f4efd4a29e 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -144,7 +144,7 @@ WRITE16_HANDLER( tetrisp2_vram_bg_w ) { tetrisp2_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_bg[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_bg,offset/2); + state->m_tilemap_bg->mark_tile_dirty(offset/2); } @@ -168,7 +168,7 @@ WRITE16_HANDLER( tetrisp2_vram_fg_w ) { tetrisp2_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_fg[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_fg,offset/2); + state->m_tilemap_fg->mark_tile_dirty(offset/2); } @@ -188,7 +188,7 @@ WRITE16_HANDLER( tetrisp2_vram_rot_w ) { tetrisp2_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_rot[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_rot,offset/2); + state->m_tilemap_rot->mark_tile_dirty(offset/2); } static TILE_GET_INFO( get_tile_info_rocknms_sub_bg ) @@ -207,7 +207,7 @@ WRITE16_HANDLER( rocknms_sub_vram_bg_w ) { tetrisp2_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_rocknms_sub_vram_bg[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_sub_bg,offset/2); + state->m_tilemap_sub_bg->mark_tile_dirty(offset/2); } @@ -227,7 +227,7 @@ WRITE16_HANDLER( rocknms_sub_vram_fg_w ) { tetrisp2_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_rocknms_sub_vram_fg[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_sub_fg,offset/2); + state->m_tilemap_sub_fg->mark_tile_dirty(offset/2); } @@ -247,7 +247,7 @@ WRITE16_HANDLER( rocknms_sub_vram_rot_w ) { tetrisp2_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_rocknms_sub_vram_rot[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_sub_rot,offset/2); + state->m_tilemap_sub_rot->mark_tile_dirty(offset/2); } @@ -269,9 +269,9 @@ VIDEO_START( tetrisp2 ) 16,16,NX_0*2,NY_0*2); - tilemap_set_transparent_pen(state->m_tilemap_bg,0); - tilemap_set_transparent_pen(state->m_tilemap_fg,0); - tilemap_set_transparent_pen(state->m_tilemap_rot,0); + state->m_tilemap_bg->set_transparent_pen(0); + state->m_tilemap_fg->set_transparent_pen(0); + state->m_tilemap_rot->set_transparent_pen(0); // should be smaller and mirrored like m32 I guess state->m_priority = auto_alloc_array(machine, UINT8, 0x40000); @@ -282,7 +282,7 @@ VIDEO_START( nndmseal ) { tetrisp2_state *state = machine.driver_data(); VIDEO_START_CALL( tetrisp2 ); - tilemap_set_scrolldx(state->m_tilemap_bg, -4,-4); + state->m_tilemap_bg->set_scrolldx(-4,-4); } VIDEO_START( rockntread ) @@ -302,9 +302,9 @@ VIDEO_START( rockntread ) 16, 16, 128, 128); - tilemap_set_transparent_pen(state->m_tilemap_bg, 0); - tilemap_set_transparent_pen(state->m_tilemap_fg, 0); - tilemap_set_transparent_pen(state->m_tilemap_rot, 0); + state->m_tilemap_bg->set_transparent_pen(0); + state->m_tilemap_fg->set_transparent_pen(0); + state->m_tilemap_rot->set_transparent_pen(0); // should be smaller and mirrored like m32 I guess state->m_priority = auto_alloc_array(machine, UINT8, 0x40000); @@ -329,9 +329,9 @@ VIDEO_START( rocknms ) 16, 16, 128, 128); - tilemap_set_transparent_pen(state->m_tilemap_sub_bg, 0); - tilemap_set_transparent_pen(state->m_tilemap_sub_fg, 0); - tilemap_set_transparent_pen(state->m_tilemap_sub_rot, 0); + state->m_tilemap_sub_bg->set_transparent_pen(0); + state->m_tilemap_sub_fg->set_transparent_pen(0); + state->m_tilemap_sub_rot->set_transparent_pen(0); ms32_rearrange_sprites(machine, "gfx5"); } @@ -479,7 +479,7 @@ SCREEN_UPDATE_IND16( tetrisp2 ) if (flipscreen != state->m_flipscreen_old) { state->m_flipscreen_old = flipscreen; - tilemap_set_flip_all(screen.machine(), flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + screen.machine().tilemap().set_flip_all(flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } /* Flip Screen */ @@ -494,14 +494,14 @@ SCREEN_UPDATE_IND16( tetrisp2 ) rot_ofsy = 0x400; } - tilemap_set_scrollx(state->m_tilemap_bg, 0, (((state->m_scroll_bg[ 0 ] + 0x0014) + state->m_scroll_bg[ 2 ] ) & 0xffff)); - tilemap_set_scrolly(state->m_tilemap_bg, 0, (((state->m_scroll_bg[ 3 ] + 0x0000) + state->m_scroll_bg[ 5 ] ) & 0xffff)); + state->m_tilemap_bg->set_scrollx(0, (((state->m_scroll_bg[ 0 ] + 0x0014) + state->m_scroll_bg[ 2 ] ) & 0xffff)); + state->m_tilemap_bg->set_scrolly(0, (((state->m_scroll_bg[ 3 ] + 0x0000) + state->m_scroll_bg[ 5 ] ) & 0xffff)); - tilemap_set_scrollx(state->m_tilemap_fg, 0, state->m_scroll_fg[ 2 ]); - tilemap_set_scrolly(state->m_tilemap_fg, 0, state->m_scroll_fg[ 5 ]); + state->m_tilemap_fg->set_scrollx(0, state->m_scroll_fg[ 2 ]); + state->m_tilemap_fg->set_scrolly(0, state->m_scroll_fg[ 5 ]); - tilemap_set_scrollx(state->m_tilemap_rot, 0, (state->m_rotregs[ 0 ] - rot_ofsx)); - tilemap_set_scrolly(state->m_tilemap_rot, 0, (state->m_rotregs[ 2 ] - rot_ofsy)); + state->m_tilemap_rot->set_scrollx(0, (state->m_rotregs[ 0 ] - rot_ofsx)); + state->m_tilemap_rot->set_scrolly(0, (state->m_rotregs[ 2 ] - rot_ofsy)); asc_pri = scr_pri = rot_pri = 0; @@ -521,25 +521,25 @@ SCREEN_UPDATE_IND16( tetrisp2 ) rot_pri++; if (rot_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); if (rot_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); if (rot_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); tetrisp2_draw_sprites(screen.machine(), bitmap, screen.machine().priority_bitmap, cliprect, state->m_priority, screen.machine().generic.spriteram.u16, screen.machine().generic.spriteram_size, 0, (state->m_systemregs[0x00] & 0x02)); return 0; @@ -564,7 +564,7 @@ SCREEN_UPDATE_IND16( rockntread ) if (flipscreen != state->m_flipscreen_old) { state->m_flipscreen_old = flipscreen; - tilemap_set_flip_all(screen.machine(), flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + screen.machine().tilemap().set_flip_all(flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } /* Flip Screen */ @@ -579,14 +579,14 @@ SCREEN_UPDATE_IND16( rockntread ) rot_ofsy = 0x400; } - tilemap_set_scrollx(state->m_tilemap_bg, 0, (((state->m_scroll_bg[ 0 ] + 0x0014) + state->m_scroll_bg[ 2 ] ) & 0xffff)); - tilemap_set_scrolly(state->m_tilemap_bg, 0, (((state->m_scroll_bg[ 3 ] + 0x0000) + state->m_scroll_bg[ 5 ] ) & 0xffff)); + state->m_tilemap_bg->set_scrollx(0, (((state->m_scroll_bg[ 0 ] + 0x0014) + state->m_scroll_bg[ 2 ] ) & 0xffff)); + state->m_tilemap_bg->set_scrolly(0, (((state->m_scroll_bg[ 3 ] + 0x0000) + state->m_scroll_bg[ 5 ] ) & 0xffff)); - tilemap_set_scrollx(state->m_tilemap_fg, 0, state->m_scroll_fg[ 2 ]); - tilemap_set_scrolly(state->m_tilemap_fg, 0, state->m_scroll_fg[ 5 ]); + state->m_tilemap_fg->set_scrollx(0, state->m_scroll_fg[ 2 ]); + state->m_tilemap_fg->set_scrolly(0, state->m_scroll_fg[ 5 ]); - tilemap_set_scrollx(state->m_tilemap_rot, 0, (state->m_rotregs[ 0 ] - rot_ofsx)); - tilemap_set_scrolly(state->m_tilemap_rot, 0, (state->m_rotregs[ 2 ] - rot_ofsy)); + state->m_tilemap_rot->set_scrollx(0, (state->m_rotregs[ 0 ] - rot_ofsx)); + state->m_tilemap_rot->set_scrolly(0, (state->m_rotregs[ 2 ] - rot_ofsy)); asc_pri = scr_pri = rot_pri = 0; @@ -606,25 +606,25 @@ SCREEN_UPDATE_IND16( rockntread ) rot_pri++; if (rot_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); if (rot_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); if (rot_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); tetrisp2_draw_sprites(screen.machine(), bitmap, screen.machine().priority_bitmap,cliprect, state->m_priority, screen.machine().generic.spriteram.u16, screen.machine().generic.spriteram_size, 0, (state->m_systemregs[0x00] & 0x02)); return 0; @@ -640,12 +640,12 @@ SCREEN_UPDATE_RGB32( rocknms_left ) int scr_pri; int rot_pri; - tilemap_set_scrollx(state->m_tilemap_sub_bg, 0, state->m_rocknms_sub_scroll_bg[ 2 ] + 0x000); - tilemap_set_scrolly(state->m_tilemap_sub_bg, 0, state->m_rocknms_sub_scroll_bg[ 5 ] + 0x000); - tilemap_set_scrollx(state->m_tilemap_sub_fg, 0, state->m_rocknms_sub_scroll_fg[ 2 ] + 0x000); - tilemap_set_scrolly(state->m_tilemap_sub_fg, 0, state->m_rocknms_sub_scroll_fg[ 5 ] + 0x000); - tilemap_set_scrollx(state->m_tilemap_sub_rot, 0, state->m_rocknms_sub_rotregs[ 0 ] + 0x400); - tilemap_set_scrolly(state->m_tilemap_sub_rot, 0, state->m_rocknms_sub_rotregs[ 2 ] + 0x400); + state->m_tilemap_sub_bg->set_scrollx(0, state->m_rocknms_sub_scroll_bg[ 2 ] + 0x000); + state->m_tilemap_sub_bg->set_scrolly(0, state->m_rocknms_sub_scroll_bg[ 5 ] + 0x000); + state->m_tilemap_sub_fg->set_scrollx(0, state->m_rocknms_sub_scroll_fg[ 2 ] + 0x000); + state->m_tilemap_sub_fg->set_scrolly(0, state->m_rocknms_sub_scroll_fg[ 5 ] + 0x000); + state->m_tilemap_sub_rot->set_scrollx(0, state->m_rocknms_sub_rotregs[ 0 ] + 0x400); + state->m_tilemap_sub_rot->set_scrolly(0, state->m_rocknms_sub_rotregs[ 2 ] + 0x400); bitmap.fill(screen.machine().pens[0x0000], cliprect); screen.machine().priority_bitmap.fill(0, cliprect); @@ -668,25 +668,25 @@ SCREEN_UPDATE_RGB32( rocknms_left ) rot_pri++; if (rot_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_rot, 0, 1 << 1); + state->m_tilemap_sub_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_bg, 0, 1 << 0); + state->m_tilemap_sub_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_fg, 0, 1 << 2); + state->m_tilemap_sub_fg->draw(bitmap, cliprect, 0, 1 << 2); if (rot_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_rot, 0, 1 << 1); + state->m_tilemap_sub_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_bg, 0, 1 << 0); + state->m_tilemap_sub_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_fg, 0, 1 << 2); + state->m_tilemap_sub_fg->draw(bitmap, cliprect, 0, 1 << 2); if (rot_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_rot, 0, 1 << 1); + state->m_tilemap_sub_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_bg, 0, 1 << 0); + state->m_tilemap_sub_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_sub_fg, 0, 1 << 2); + state->m_tilemap_sub_fg->draw(bitmap, cliprect, 0, 1 << 2); tetrisp2_draw_sprites(screen.machine(), bitmap, screen.machine().priority_bitmap,cliprect, state->m_priority, screen.machine().generic.spriteram2.u16, screen.machine().generic.spriteram2_size, 4, (state->m_systemregs[0x00] & 0x02)); @@ -700,12 +700,12 @@ SCREEN_UPDATE_RGB32( rocknms_right ) int scr_pri; int rot_pri; - tilemap_set_scrollx(state->m_tilemap_bg, 0, state->m_scroll_bg[ 2 ] + 0x000); - tilemap_set_scrolly(state->m_tilemap_bg, 0, state->m_scroll_bg[ 5 ] + 0x000); - tilemap_set_scrollx(state->m_tilemap_fg, 0, state->m_scroll_fg[ 2 ] + 0x000); - tilemap_set_scrolly(state->m_tilemap_fg, 0, state->m_scroll_fg[ 5 ] + 0x000); - tilemap_set_scrollx(state->m_tilemap_rot, 0, state->m_rotregs[ 0 ] + 0x400); - tilemap_set_scrolly(state->m_tilemap_rot, 0, state->m_rotregs[ 2 ] + 0x400); + state->m_tilemap_bg->set_scrollx(0, state->m_scroll_bg[ 2 ] + 0x000); + state->m_tilemap_bg->set_scrolly(0, state->m_scroll_bg[ 5 ] + 0x000); + state->m_tilemap_fg->set_scrollx(0, state->m_scroll_fg[ 2 ] + 0x000); + state->m_tilemap_fg->set_scrolly(0, state->m_scroll_fg[ 5 ] + 0x000); + state->m_tilemap_rot->set_scrollx(0, state->m_rotregs[ 0 ] + 0x400); + state->m_tilemap_rot->set_scrolly(0, state->m_rotregs[ 2 ] + 0x400); /* Black background color */ bitmap.fill(screen.machine().pens[0x0000], cliprect); @@ -729,25 +729,25 @@ SCREEN_UPDATE_RGB32( rocknms_right ) rot_pri++; if (rot_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 0) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); if (rot_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 1) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); if (rot_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_rot, 0, 1 << 1); + state->m_tilemap_rot->draw(bitmap, cliprect, 0, 1 << 1); else if (scr_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_bg, 0, 1 << 0); + state->m_tilemap_bg->draw(bitmap, cliprect, 0, 1 << 0); else if (asc_pri == 2) - tilemap_draw(bitmap,cliprect, state->m_tilemap_fg, 0, 1 << 2); + state->m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2); tetrisp2_draw_sprites(screen.machine(), bitmap, screen.machine().priority_bitmap,cliprect, state->m_priority, screen.machine().generic.spriteram.u16, screen.machine().generic.spriteram_size, 0, (state->m_systemregs[0x00] & 0x02)); diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c index 8ed47279be0..da228454532 100644 --- a/src/mame/video/thedeep.c +++ b/src/mame/video/thedeep.c @@ -71,14 +71,14 @@ WRITE8_HANDLER( thedeep_vram_0_w ) { thedeep_state *state = space->machine().driver_data(); state->m_vram_0[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_0, offset / 2); + state->m_tilemap_0->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( thedeep_vram_1_w ) { thedeep_state *state = space->machine().driver_data(); state->m_vram_1[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_1, offset / 2); + state->m_tilemap_1->mark_tile_dirty(offset / 2); } @@ -107,10 +107,10 @@ VIDEO_START( thedeep ) state->m_tilemap_0 = tilemap_create(machine, get_tile_info_0,tilemap_scan_rows_back,16,16,0x20,0x20); state->m_tilemap_1 = tilemap_create(machine, get_tile_info_1,tilemap_scan_rows,8,8,0x20,0x20); - tilemap_set_transparent_pen( state->m_tilemap_0, 0 ); - tilemap_set_transparent_pen( state->m_tilemap_1, 0 ); + state->m_tilemap_0->set_transparent_pen(0 ); + state->m_tilemap_1->set_transparent_pen(0 ); - tilemap_set_scroll_cols(state->m_tilemap_0, 0x20); // column scroll for the background + state->m_tilemap_0->set_scroll_cols(0x20); // column scroll for the background } /*************************************************************************** @@ -216,18 +216,18 @@ SCREEN_UPDATE_IND16( thedeep ) int scrolly = state->m_scroll[2] + (state->m_scroll[3]<<8); int x; - tilemap_set_scrollx(state->m_tilemap_0, 0, scrollx); + state->m_tilemap_0->set_scrollx(0, scrollx); for (x = 0; x < 0x20; x++) { int y = state->m_scroll2[x*2+0] + (state->m_scroll2[x*2+1]<<8); - tilemap_set_scrolly(state->m_tilemap_0, x, y + scrolly); + state->m_tilemap_0->set_scrolly(x, y + scrolly); } bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_draw(bitmap,cliprect,state->m_tilemap_0,0,0); + state->m_tilemap_0->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_tilemap_1,0,0); + state->m_tilemap_1->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index 75230eaedbc..9efd11aecfc 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -98,9 +98,9 @@ static TILE_GET_INFO( solid_get_tile_info ) thepit_state *state = machine.driver_data(); UINT8 back_color = (state->m_colorram[tile_index] & 0x70) >> 4; int priority = (back_color != 0) && ((state->m_colorram[tile_index] & 0x80) == 0); - tileinfo->pen_data = state->m_dummy_tile; - tileinfo->palette_base = back_color + 32; - tileinfo->category = priority; + tileinfo.pen_data = state->m_dummy_tile; + tileinfo.palette_base = back_color + 32; + tileinfo.category = priority; } @@ -126,10 +126,10 @@ VIDEO_START( thepit ) state->m_solid_tilemap = tilemap_create(machine, solid_get_tile_info,tilemap_scan_rows,8,8,32,32); state->m_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_tilemap, 0); + state->m_tilemap->set_transparent_pen(0); - tilemap_set_scroll_cols(state->m_solid_tilemap, 32); - tilemap_set_scroll_cols(state->m_tilemap, 32); + state->m_solid_tilemap->set_scroll_cols(32); + state->m_tilemap->set_scroll_cols(32); state->m_dummy_tile = auto_alloc_array_clear(machine, UINT8, 8*8); @@ -148,7 +148,7 @@ WRITE8_HANDLER( thepit_videoram_w ) { thepit_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); } @@ -156,8 +156,8 @@ WRITE8_HANDLER( thepit_colorram_w ) { thepit_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap, offset); - tilemap_mark_tile_dirty(state->m_solid_tilemap, offset); + state->m_tilemap->mark_tile_dirty(offset); + state->m_solid_tilemap->mark_tile_dirty(offset); } @@ -172,8 +172,8 @@ WRITE8_HANDLER( thepit_flip_screen_x_w ) if (state->m_flip_screen_y) flip |= TILEMAP_FLIPY ; - tilemap_set_flip(state->m_tilemap, flip); - tilemap_set_flip(state->m_solid_tilemap, flip); + state->m_tilemap->set_flip(flip); + state->m_solid_tilemap->set_flip(flip); } @@ -189,8 +189,8 @@ WRITE8_HANDLER( thepit_flip_screen_y_w ) if (state->m_flip_screen_y) flip |= TILEMAP_FLIPY ; - tilemap_set_flip(state->m_tilemap, flip); - tilemap_set_flip(state->m_solid_tilemap, flip); + state->m_tilemap->set_flip(flip); + state->m_solid_tilemap->set_flip(flip); } @@ -202,7 +202,7 @@ WRITE8_HANDLER( intrepid_graphics_bank_w ) { state->m_graphics_bank = data & 0x01; - tilemap_mark_all_tiles_dirty(state->m_tilemap); + state->m_tilemap->mark_all_dirty(); } } @@ -293,22 +293,22 @@ SCREEN_UPDATE_IND16( thepit ) int xshift = state->m_flip_screen_x ? 128 : 0; int yshift = state->m_flip_screen_y ? -8 : 0; - tilemap_set_scrollx(state->m_tilemap, offs, xshift); - tilemap_set_scrollx(state->m_solid_tilemap, offs, xshift); + state->m_tilemap->set_scrollx(offs, xshift); + state->m_solid_tilemap->set_scrollx(offs, xshift); - tilemap_set_scrolly(state->m_tilemap, offs, yshift + state->m_attributesram[offs << 1]); - tilemap_set_scrolly(state->m_solid_tilemap, offs, yshift + state->m_attributesram[offs << 1]); + state->m_tilemap->set_scrolly(offs, yshift + state->m_attributesram[offs << 1]); + state->m_solid_tilemap->set_scrolly(offs, yshift + state->m_attributesram[offs << 1]); } /* low priority tiles */ - tilemap_draw(bitmap, cliprect, state->m_solid_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_solid_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); /* low priority sprites */ draw_sprites(screen.machine(), bitmap, cliprect, 0); /* high priority tiles */ - tilemap_draw(bitmap, cliprect, state->m_solid_tilemap, 1, 1); + state->m_solid_tilemap->draw(bitmap, cliprect, 1, 1); /* high priority sprites */ draw_sprites(screen.machine(), bitmap, cliprect, 1); diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c index 71fc1328afb..9d7d8856e0c 100644 --- a/src/mame/video/thoop2.c +++ b/src/mame/video/thoop2.c @@ -43,7 +43,7 @@ static TILE_GET_INFO( get_tile_info_thoop2_screen0 ) int data2 = state->m_videoram[(tile_index << 1) + 1]; int code = ((data & 0xfffc) >> 2) | ((data & 0x0003) << 14); - tileinfo->category = (data2 >> 6) & 0x03; + tileinfo.category = (data2 >> 6) & 0x03; SET_TILE_INFO(1, code, data2 & 0x3f, TILE_FLIPYX((data2 >> 14) & 0x03)); } @@ -56,7 +56,7 @@ static TILE_GET_INFO( get_tile_info_thoop2_screen1 ) int data2 = state->m_videoram[(0x1000/2) + (tile_index << 1) + 1]; int code = ((data & 0xfffc) >> 2) | ((data & 0x0003) << 14); - tileinfo->category = (data2 >> 6) & 0x03; + tileinfo.category = (data2 >> 6) & 0x03; SET_TILE_INFO(1, code, data2 & 0x3f, TILE_FLIPYX((data2 >> 14) & 0x03)); } @@ -71,7 +71,7 @@ WRITE16_HANDLER( thoop2_vram_w ) { thoop2_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_videoram[offset]); - tilemap_mark_tile_dirty(state->m_pant[offset >> 11],((offset << 1) & 0x0fff) >> 2); + state->m_pant[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2); } /*************************************************************************** @@ -88,8 +88,8 @@ VIDEO_START( thoop2 ) state->m_pant[0] = tilemap_create(machine, get_tile_info_thoop2_screen0,tilemap_scan_rows,16,16,32,32); state->m_pant[1] = tilemap_create(machine, get_tile_info_thoop2_screen1,tilemap_scan_rows,16,16,32,32); - tilemap_set_transmask(state->m_pant[0],0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ - tilemap_set_transmask(state->m_pant[1],0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ + state->m_pant[0]->set_transmask(0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ + state->m_pant[1]->set_transmask(0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ for (i = 0; i < 5; i++){ state->m_sprite_table[i] = auto_alloc_array(machine, int, 512); @@ -203,38 +203,38 @@ SCREEN_UPDATE_IND16( thoop2 ) { thoop2_state *state = screen.machine().driver_data(); /* set scroll registers */ - tilemap_set_scrolly(state->m_pant[0], 0, state->m_vregs[0]); - tilemap_set_scrollx(state->m_pant[0], 0, state->m_vregs[1]+4); - tilemap_set_scrolly(state->m_pant[1], 0, state->m_vregs[2]); - tilemap_set_scrollx(state->m_pant[1], 0, state->m_vregs[3]); + state->m_pant[0]->set_scrolly(0, state->m_vregs[0]); + state->m_pant[0]->set_scrollx(0, state->m_vregs[1]+4); + state->m_pant[1]->set_scrolly(0, state->m_vregs[2]); + state->m_pant[1]->set_scrollx(0, state->m_vregs[3]); thoop2_sort_sprites(screen.machine()); bitmap.fill(0, cliprect ); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_LAYER1 | 3,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_LAYER1 | 3,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3,0); draw_sprites(screen.machine(), bitmap,cliprect,3); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_LAYER0 | 3,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_LAYER0 | 3,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3,0); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_LAYER1 | 2,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_LAYER1 | 2,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2,0); draw_sprites(screen.machine(), bitmap,cliprect,2); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_LAYER0 | 2,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_LAYER0 | 2,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2,0); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_LAYER1 | 1,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_LAYER1 | 1,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1,0); draw_sprites(screen.machine(), bitmap,cliprect,1); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_LAYER0 | 1,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_LAYER0 | 1,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1,0); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_LAYER1 | 0,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_LAYER1 | 0,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0,0); draw_sprites(screen.machine(), bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_LAYER0 | 0,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_LAYER0 | 0,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0,0); draw_sprites(screen.machine(), bitmap,cliprect,4); return 0; diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c index 57887041d83..ea5e5851cb8 100644 --- a/src/mame/video/thunderj.c +++ b/src/mame/video/thunderj.c @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_playfield_tile_info ) int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); - tileinfo->category = (data2 >> 4) & 3; + tileinfo.category = (data2 >> 4) & 3; } @@ -48,7 +48,7 @@ static TILE_GET_INFO( get_playfield2_tile_info ) int code = data1 & 0x7fff; int color = data2 & 0x0f; SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); - tileinfo->category = (data2 >> 4) & 3; + tileinfo.category = (data2 >> 4) & 3; } @@ -104,14 +104,14 @@ VIDEO_START( thunderj ) /* initialize the second playfield */ state->m_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); - tilemap_set_transparent_pen(state->m_playfield2_tilemap, 0); + state->m_playfield2_tilemap->set_transparent_pen(0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); } @@ -132,14 +132,14 @@ SCREEN_UPDATE_IND16( thunderj ) /* draw the playfield */ priority_bitmap.fill(0, cliprect); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0x00); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 1, 0x01); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 2, 0x02); - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 3, 0x03); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 0, 0x80); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 1, 0x84); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 2, 0x88); - tilemap_draw(bitmap, cliprect, state->m_playfield2_tilemap, 3, 0x8c); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0x00); + state->m_playfield_tilemap->draw(bitmap, cliprect, 1, 0x01); + state->m_playfield_tilemap->draw(bitmap, cliprect, 2, 0x02); + state->m_playfield_tilemap->draw(bitmap, cliprect, 3, 0x03); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 0, 0x80); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 1, 0x84); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 2, 0x88); + state->m_playfield2_tilemap->draw(bitmap, cliprect, 3, 0x8c); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -238,7 +238,7 @@ SCREEN_UPDATE_IND16( thunderj ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 3ce7fdf229e..cfdb199c905 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -29,9 +29,9 @@ WRITE8_HANDLER( tiamc1_videoram_w ) if(!(state->m_layers_ctrl & 1)) { state->m_tileram[offset] = data; if (offset < 1024) - tilemap_mark_tile_dirty(state->m_bg_tilemap1, offset & 0x3ff); + state->m_bg_tilemap1->mark_tile_dirty(offset & 0x3ff); else - tilemap_mark_tile_dirty(state->m_bg_tilemap2, offset & 0x3ff); + state->m_bg_tilemap2->mark_tile_dirty(offset & 0x3ff); } } @@ -39,7 +39,7 @@ WRITE8_HANDLER( tiamc1_bankswitch_w ) { tiamc1_state *state = space->machine().driver_data(); if ((data & 128) != (state->m_layers_ctrl & 128)) - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); state->m_layers_ctrl = data; } @@ -197,21 +197,21 @@ SCREEN_UPDATE_IND16( tiamc1 ) for (i = 0; i < 32; i++) { - tilemap_set_scrolly(state->m_bg_tilemap1, i, state->m_bg_vshift ^ 0xff); - tilemap_set_scrolly(state->m_bg_tilemap2, i, state->m_bg_vshift ^ 0xff); + state->m_bg_tilemap1->set_scrolly(i, state->m_bg_vshift ^ 0xff); + state->m_bg_tilemap2->set_scrolly(i, state->m_bg_vshift ^ 0xff); } for (i = 0; i < 32; i++) { - tilemap_set_scrollx(state->m_bg_tilemap1, i, state->m_bg_hshift ^ 0xff); - tilemap_set_scrollx(state->m_bg_tilemap2, i, state->m_bg_hshift ^ 0xff); + state->m_bg_tilemap1->set_scrollx(i, state->m_bg_hshift ^ 0xff); + state->m_bg_tilemap2->set_scrollx(i, state->m_bg_hshift ^ 0xff); } #endif if (state->m_layers_ctrl & 0x80) - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap2, 0, 0); + state->m_bg_tilemap2->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap1, 0, 0); + state->m_bg_tilemap1->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index 305f90a797d..215ba126870 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -7,7 +7,7 @@ WRITE16_HANDLER( tigeroad_videoram_w ) tigeroad_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( tigeroad_videoctrl_w ) @@ -24,7 +24,7 @@ WRITE16_HANDLER( tigeroad_videoctrl_w ) if (flip_screen_get(space->machine()) != (data & 0x02)) { flip_screen_set(space->machine(), data & 0x02); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* bit 2 selects bg char bank */ @@ -34,7 +34,7 @@ WRITE16_HANDLER( tigeroad_videoctrl_w ) if (state->m_bgcharbank != bank) { state->m_bgcharbank = bank; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* bits 4-5 are coin lockouts */ @@ -59,10 +59,10 @@ WRITE16_HANDLER( tigeroad_scroll_w ) switch (offset) { case 0: - tilemap_set_scrollx(state->m_bg_tilemap, 0, scroll); + state->m_bg_tilemap->set_scrollx(0, scroll); break; case 1: - tilemap_set_scrolly(state->m_bg_tilemap, 0, -scroll - 32 * 8); + state->m_bg_tilemap->set_scrolly(0, -scroll - 32 * 8); break; } } @@ -123,7 +123,7 @@ static TILE_GET_INFO( get_bg_tile_info ) int flags = (attr & 0x20) ? TILE_FLIPX : 0; SET_TILE_INFO(1, code, color, flags); - tileinfo->group = (attr & 0x10) ? 1 : 0; + tileinfo.group = (attr & 0x10) ? 1 : 0; } static TILE_GET_INFO( get_fg_tile_info ) @@ -154,20 +154,20 @@ VIDEO_START( tigeroad ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xffff, 0); - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x1ff, 0xfe00); + state->m_bg_tilemap->set_transmask(0, 0xffff, 0); + state->m_bg_tilemap->set_transmask(1, 0x1ff, 0xfe00); - tilemap_set_transparent_pen(state->m_fg_tilemap, 3); + state->m_fg_tilemap->set_transparent_pen(3); } SCREEN_UPDATE_IND16( tigeroad ) { tigeroad_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 1); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1); //draw_sprites(screen.machine(), bitmap, cliprect, 1); draw priority sprites? - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 2); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 2); return 0; } diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c index b24a5b00d70..eddc5b1fb1a 100644 --- a/src/mame/video/timelimt.c +++ b/src/mame/video/timelimt.c @@ -75,7 +75,7 @@ VIDEO_START( timelimt ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } /***************************************************************************/ @@ -85,14 +85,14 @@ WRITE8_HANDLER( timelimt_videoram_w ) timelimt_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( timelimt_bg_videoram_w ) { timelimt_state *state = space->machine().driver_data(); state->m_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( timelimt_scroll_x_lsb_w ) @@ -146,12 +146,12 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( timelimt ) { timelimt_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scrollx); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scrolly); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->set_scrollx(0, state->m_scrollx); + state->m_bg_tilemap->set_scrolly(0, state->m_scrolly); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c index 6effa77f63e..62367c9e29c 100644 --- a/src/mame/video/timeplt.c +++ b/src/mame/video/timeplt.c @@ -97,7 +97,7 @@ static TILE_GET_INFO( get_tile_info ) int color = attr & 0x1f; int flags = TILE_FLIPYX(attr >> 6); - tileinfo->category = (attr & 0x10) >> 4; + tileinfo.category = (attr & 0x10) >> 4; SET_TILE_INFO(0, code, color, flags); } @@ -109,7 +109,7 @@ static TILE_GET_INFO( get_chkun_tile_info ) int color = attr & 0x1f; int flags = 0;//TILE_FLIPYX(attr >> 6); - tileinfo->category = (attr & 0x80) >> 7; + tileinfo.category = (attr & 0x80) >> 7; SET_TILE_INFO(0, code, color, flags); } @@ -145,7 +145,7 @@ WRITE8_HANDLER( timeplt_videoram_w ) { timeplt_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -153,7 +153,7 @@ WRITE8_HANDLER( timeplt_colorram_w ) { timeplt_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -213,8 +213,8 @@ SCREEN_UPDATE_IND16( timeplt ) { timeplt_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 1, 0); return 0; } diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index f3a7ca038e4..05963a1a343 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -275,7 +275,7 @@ VIDEO_START( glfgreat ) tmnt_state *state = machine.driver_data(); state->m_roz_tilemap = tilemap_create(machine, glfgreat_get_roz_tile_info, tilemap_scan_rows, 16, 16, 512, 512); - tilemap_set_transparent_pen(state->m_roz_tilemap,0); + state->m_roz_tilemap->set_transparent_pen(0); state->m_glfgreat_roz_rom_bank = 0; state->m_glfgreat_roz_char_bank = 0; @@ -290,7 +290,7 @@ VIDEO_START( prmrsocr ) tmnt_state *state = machine.driver_data(); state->m_roz_tilemap = tilemap_create(machine, prmrsocr_get_roz_tile_info, tilemap_scan_rows, 16, 16, 512, 256); - tilemap_set_transparent_pen(state->m_roz_tilemap,0); + state->m_roz_tilemap->set_transparent_pen(0); state->m_prmrsocr_sprite_bank = 0; state->m_glfgreat_roz_char_bank = 0; @@ -408,7 +408,7 @@ WRITE16_HANDLER( blswhstl_700300_w ) if (state->m_blswhstl_rombank != ((data & 0x80) >> 7)) { state->m_blswhstl_rombank = (data & 0x80) >> 7; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* other bits unknown */ @@ -448,7 +448,7 @@ WRITE16_HANDLER( glfgreat_122000_w ) if (state->m_glfgreat_roz_rom_bank != (data & 0x20) >> 5) { state->m_glfgreat_roz_rom_bank = (data & 0x20) >> 5; - tilemap_mark_all_tiles_dirty(state->m_roz_tilemap); + state->m_roz_tilemap->mark_all_dirty(); } /* bit 6,7 = 53596 char bank selection for ROM test */ diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index 79078fa00b8..b76ba3c5917 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -149,8 +149,8 @@ static TILE_GET_INFO( get_pf1_tile_info ) tile_number, color, 0); - if (state->m_pf1_tilevram16[2*tile_index+1] & 0x8000) tileinfo->pen_data = state->m_empty_tile; - tileinfo->category = (attrib & 0xf000) >> 12; + if (state->m_pf1_tilevram16[2*tile_index+1] & 0x8000) tileinfo.pen_data = state->m_empty_tile; + tileinfo.category = (attrib & 0xf000) >> 12; } static TILE_GET_INFO( get_pf2_tile_info ) @@ -166,8 +166,8 @@ static TILE_GET_INFO( get_pf2_tile_info ) tile_number, color, 0); - if (state->m_pf2_tilevram16[2*tile_index+1] & 0x8000) tileinfo->pen_data = state->m_empty_tile; - tileinfo->category = (attrib & 0xf000) >> 12; + if (state->m_pf2_tilevram16[2*tile_index+1] & 0x8000) tileinfo.pen_data = state->m_empty_tile; + tileinfo.category = (attrib & 0xf000) >> 12; } static TILE_GET_INFO( get_pf3_tile_info ) @@ -183,8 +183,8 @@ static TILE_GET_INFO( get_pf3_tile_info ) tile_number, color, 0); - if (state->m_pf3_tilevram16[2*tile_index+1] & 0x8000) tileinfo->pen_data = state->m_empty_tile; - tileinfo->category = (attrib & 0xf000) >> 12; + if (state->m_pf3_tilevram16[2*tile_index+1] & 0x8000) tileinfo.pen_data = state->m_empty_tile; + tileinfo.category = (attrib & 0xf000) >> 12; } static TILE_GET_INFO( get_pf4_tile_info ) @@ -200,8 +200,8 @@ static TILE_GET_INFO( get_pf4_tile_info ) tile_number, color, 0); - if (state->m_pf4_tilevram16[2*tile_index+1] & 0x8000) tileinfo->pen_data = state->m_empty_tile; - tileinfo->category = (attrib & 0xf000) >> 12; + if (state->m_pf4_tilevram16[2*tile_index+1] & 0x8000) tileinfo.pen_data = state->m_empty_tile; + tileinfo.category = (attrib & 0xf000) >> 12; } /*************************************************************************** @@ -219,10 +219,10 @@ static void toaplan1_create_tilemaps(running_machine &machine) state->m_pf3_tilemap = tilemap_create(machine, get_pf3_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->m_pf4_tilemap = tilemap_create(machine, get_pf4_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - tilemap_set_transparent_pen(state->m_pf1_tilemap, 0); - tilemap_set_transparent_pen(state->m_pf2_tilemap, 0); - tilemap_set_transparent_pen(state->m_pf3_tilemap, 0); - tilemap_set_transparent_pen(state->m_pf4_tilemap, 0); + state->m_pf1_tilemap->set_transparent_pen(0); + state->m_pf2_tilemap->set_transparent_pen(0); + state->m_pf3_tilemap->set_transparent_pen(0); + state->m_pf4_tilemap->set_transparent_pen(0); memset(state->m_empty_tile, 0x00, sizeof(state->m_empty_tile)); } @@ -281,14 +281,14 @@ static void toaplan1_set_scrolls(running_machine &machine) { toaplan1_state *state = machine.driver_data(); - tilemap_set_scrollx(state->m_pf1_tilemap, 0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1)); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2)); - tilemap_set_scrollx(state->m_pf3_tilemap, 0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3)); - tilemap_set_scrollx(state->m_pf4_tilemap, 0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4)); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf3_tilemap, 0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf4_tilemap, 0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf1_tilemap->set_scrollx(0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1)); + state->m_pf2_tilemap->set_scrollx(0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2)); + state->m_pf3_tilemap->set_scrollx(0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3)); + state->m_pf4_tilemap->set_scrollx(0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4)); + state->m_pf1_tilemap->set_scrolly(0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf2_tilemap->set_scrolly(0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf3_tilemap->set_scrolly(0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf4_tilemap->set_scrolly(0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); } static void rallybik_flipscreen(running_machine &machine) @@ -425,7 +425,7 @@ WRITE16_HANDLER( rallybik_bcu_flipscreen_w ) { logerror("Setting BCU controller flipscreen port to %04x\n",data); state->m_bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */ - tilemap_set_flip_all(space->machine(), (data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); + space->machine().tilemap().set_flip_all((data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); if (state->m_bcu_flipscreen) { state->m_scrollx_offs1 = 0x1c0 - 6; @@ -454,7 +454,7 @@ WRITE16_HANDLER( toaplan1_bcu_flipscreen_w ) { logerror("Setting BCU controller flipscreen port to %04x\n",data); state->m_bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */ - tilemap_set_flip_all(space->machine(), (data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); + space->machine().tilemap().set_flip_all((data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); if (state->m_bcu_flipscreen) { const rectangle &visarea = space->machine().primary_screen->visible_area(); @@ -674,22 +674,22 @@ WRITE16_HANDLER( toaplan1_tileram16_w ) case 0x0000: vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1); COMBINE_DATA(&state->m_pf1_tilevram16[vram_offset]); - tilemap_mark_tile_dirty(state->m_pf1_tilemap, vram_offset/2); + state->m_pf1_tilemap->mark_tile_dirty(vram_offset/2); break; case 0x1000: vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1); COMBINE_DATA(&state->m_pf2_tilevram16[vram_offset]); - tilemap_mark_tile_dirty(state->m_pf2_tilemap, vram_offset/2); + state->m_pf2_tilemap->mark_tile_dirty(vram_offset/2); break; case 0x2000: vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1); COMBINE_DATA(&state->m_pf3_tilevram16[vram_offset]); - tilemap_mark_tile_dirty(state->m_pf3_tilemap, vram_offset/2); + state->m_pf3_tilemap->mark_tile_dirty(vram_offset/2); break; case 0x3000: vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1); COMBINE_DATA(&state->m_pf4_tilevram16[vram_offset]); - tilemap_mark_tile_dirty(state->m_pf4_tilemap, vram_offset/2); + state->m_pf4_tilemap->mark_tile_dirty(vram_offset/2); break; default: logerror("Hmmm, writing %04x to unknown playfield layer address %06x Offset:%01x\n", data, state->m_pf_voffs, offset); @@ -728,28 +728,28 @@ WRITE16_HANDLER( toaplan1_scroll_regs_w ) switch(offset) { case 00: COMBINE_DATA(&state->m_pf1_scrollx); /* 1D3h */ - tilemap_set_scrollx(state->m_pf1_tilemap, 0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1)); + state->m_pf1_tilemap->set_scrollx(0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1)); break; case 01: COMBINE_DATA(&state->m_pf1_scrolly); /* 1EBh */ - tilemap_set_scrolly(state->m_pf1_tilemap, 0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf1_tilemap->set_scrolly(0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); break; case 02: COMBINE_DATA(&state->m_pf2_scrollx); /* 1D5h */ - tilemap_set_scrollx(state->m_pf2_tilemap, 0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2)); + state->m_pf2_tilemap->set_scrollx(0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2)); break; case 03: COMBINE_DATA(&state->m_pf2_scrolly); /* 1EBh */ - tilemap_set_scrolly(state->m_pf2_tilemap, 0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf2_tilemap->set_scrolly(0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); break; case 04: COMBINE_DATA(&state->m_pf3_scrollx); /* 1D7h */ - tilemap_set_scrollx(state->m_pf3_tilemap, 0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3)); + state->m_pf3_tilemap->set_scrollx(0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3)); break; case 05: COMBINE_DATA(&state->m_pf3_scrolly); /* 1EBh */ - tilemap_set_scrolly(state->m_pf3_tilemap, 0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf3_tilemap->set_scrolly(0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); break; case 06: COMBINE_DATA(&state->m_pf4_scrollx); /* 1D9h */ - tilemap_set_scrollx(state->m_pf4_tilemap, 0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4)); + state->m_pf4_tilemap->set_scrollx(0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4)); break; case 07: COMBINE_DATA(&state->m_pf4_scrolly); /* 1EBh */ - tilemap_set_scrolly(state->m_pf4_tilemap, 0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf4_tilemap->set_scrolly(0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); break; default: logerror("Hmmm, writing %08x to unknown video scroll register (%08x) !!!\n",data ,offset); break; @@ -885,40 +885,40 @@ static void toaplan1_log_vram(running_machine &machine) // while (machine.input().code_pressed(KEYCODE_B)) ; state->m_scrollx_offs1 += 0x1; state->m_scrollx_offs2 += 0x1; state->m_scrollx_offs3 += 0x1; state->m_scrollx_offs4 += 0x1; logerror("Scrollx_offs now = %08x\n", state->m_scrollx_offs4); - tilemap_set_scrollx(state->m_pf1_tilemap, 0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1)); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2)); - tilemap_set_scrollx(state->m_pf3_tilemap, 0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3)); - tilemap_set_scrollx(state->m_pf4_tilemap, 0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4)); + state->m_pf1_tilemap->set_scrollx(0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1)); + state->m_pf2_tilemap->set_scrollx(0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2)); + state->m_pf3_tilemap->set_scrollx(0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3)); + state->m_pf4_tilemap->set_scrollx(0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4)); } if ( machine.input().code_pressed(KEYCODE_V) ) { // while (machine.input().code_pressed(KEYCODE_V)) ; state->m_scrollx_offs1 -= 0x1; state->m_scrollx_offs2 -= 0x1; state->m_scrollx_offs3 -= 0x1; state->m_scrollx_offs4 -= 0x1; logerror("Scrollx_offs now = %08x\n", state->m_scrollx_offs4); - tilemap_set_scrollx(state->m_pf1_tilemap, 0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1)); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2)); - tilemap_set_scrollx(state->m_pf3_tilemap, 0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3)); - tilemap_set_scrollx(state->m_pf4_tilemap, 0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4)); + state->m_pf1_tilemap->set_scrollx(0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1)); + state->m_pf2_tilemap->set_scrollx(0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2)); + state->m_pf3_tilemap->set_scrollx(0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3)); + state->m_pf4_tilemap->set_scrollx(0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4)); } if ( machine.input().code_pressed(KEYCODE_C) ) { // while (machine.input().code_pressed(KEYCODE_C)) ; state->m_scrolly_offs += 0x1; logerror("Scrolly_offs now = %08x\n", state->m_scrolly_offs); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf3_tilemap, 0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf4_tilemap, 0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf1_tilemap->set_scrolly(0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf2_tilemap->set_scrolly(0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf3_tilemap->set_scrolly(0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf4_tilemap->set_scrolly(0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); } if ( machine.input().code_pressed(KEYCODE_X) ) { // while (machine.input().code_pressed(KEYCODE_X)) ; state->m_scrolly_offs -= 0x1; logerror("Scrolly_offs now = %08x\n", state->m_scrolly_offs); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf3_tilemap, 0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); - tilemap_set_scrolly(state->m_pf4_tilemap, 0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf1_tilemap->set_scrolly(0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf2_tilemap->set_scrolly(0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf3_tilemap->set_scrolly(0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); + state->m_pf4_tilemap->set_scrolly(0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs)); } if ( machine.input().code_pressed(KEYCODE_L) ) /* Turn Playfield 4 on/off */ @@ -926,28 +926,28 @@ static void toaplan1_log_vram(running_machine &machine) while (machine.input().code_pressed(KEYCODE_L)) ; state->m_display_pf4 += 1; state->m_display_pf4 &= 1; - tilemap_set_enable(state->m_pf4_tilemap, state->m_display_pf4); + state->m_pf4_tilemap->enable(state->m_display_pf4); } if ( machine.input().code_pressed(KEYCODE_K) ) /* Turn Playfield 3 on/off */ { while (machine.input().code_pressed(KEYCODE_K)) ; state->m_display_pf3 += 1; state->m_display_pf3 &= 1; - tilemap_set_enable(state->m_pf3_tilemap, state->m_display_pf3); + state->m_pf3_tilemap->enable(state->m_display_pf3); } if ( machine.input().code_pressed(KEYCODE_J) ) /* Turn Playfield 2 on/off */ { while (machine.input().code_pressed(KEYCODE_J)) ; state->m_display_pf2 += 1; state->m_display_pf2 &= 1; - tilemap_set_enable(state->m_pf2_tilemap, state->m_display_pf2); + state->m_pf2_tilemap->enable(state->m_display_pf2); } if ( machine.input().code_pressed(KEYCODE_H) ) /* Turn Playfield 1 on/off */ { while (machine.input().code_pressed(KEYCODE_H)) ; state->m_display_pf1 += 1; state->m_display_pf1 &= 1; - tilemap_set_enable(state->m_pf1_tilemap, state->m_display_pf1); + state->m_pf1_tilemap->enable(state->m_display_pf1); } #endif } @@ -1170,15 +1170,15 @@ SCREEN_UPDATE_IND16( rallybik ) bitmap.fill(0x120, cliprect); - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, TILEMAP_DRAW_OPAQUE | 0, 0); - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 1, 0); for (priority = 1; priority < 16; priority++) { - tilemap_draw(bitmap, cliprect, state->m_pf4_tilemap, priority, 0); - tilemap_draw(bitmap, cliprect, state->m_pf3_tilemap, priority, 0); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, priority, 0); - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, priority, 0); + state->m_pf4_tilemap->draw(bitmap, cliprect, priority, 0); + state->m_pf3_tilemap->draw(bitmap, cliprect, priority, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, priority, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, priority, 0); rallybik_draw_sprites(screen.machine(), bitmap,cliprect,priority << 8); } @@ -1196,15 +1196,15 @@ SCREEN_UPDATE_IND16( toaplan1 ) bitmap.fill(0x120, cliprect); // it's really correct? - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, TILEMAP_DRAW_OPAQUE | 0, 0); - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | 1, 0); for (priority = 1; priority < 16; priority++) { - tilemap_draw_primask(bitmap, cliprect, state->m_pf4_tilemap, priority, priority, 0); - tilemap_draw_primask(bitmap, cliprect, state->m_pf3_tilemap, priority, priority, 0); - tilemap_draw_primask(bitmap, cliprect, state->m_pf2_tilemap, priority, priority, 0); - tilemap_draw_primask(bitmap, cliprect, state->m_pf1_tilemap, priority, priority, 0); + state->m_pf4_tilemap->draw(bitmap, cliprect, priority, priority, 0); + state->m_pf3_tilemap->draw(bitmap, cliprect, priority, priority, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, priority, priority, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, priority, priority, 0); } draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 6cce3a9be37..d22726d6a33 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -61,9 +61,9 @@ static void truxton2_create_tx_tilemap(running_machine &machine) toaplan2_state *state = machine.driver_data(); state->m_tx_tilemap = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_scroll_rows(state->m_tx_tilemap, 8*32); /* line scrolling */ - tilemap_set_scroll_cols(state->m_tx_tilemap, 1); - tilemap_set_transparent_pen(state->m_tx_tilemap, 0); + state->m_tx_tilemap->set_scroll_rows(8*32); /* line scrolling */ + state->m_tx_tilemap->set_scroll_cols(1); + state->m_tx_tilemap->set_transparent_pen(0); } static void register_state_save(running_machine &machine) @@ -116,7 +116,7 @@ VIDEO_START( truxton2 ) machine.save().register_postload(save_prepost_delegate(FUNC(truxton2_postload), &machine)); truxton2_create_tx_tilemap(machine); - tilemap_set_scrolldx(state->m_tx_tilemap, 0x1d4 +1, 0x2a); + state->m_tx_tilemap->set_scrolldx(0x1d4 +1, 0x2a); } VIDEO_START( fixeightbl ) @@ -143,7 +143,7 @@ VIDEO_START( fixeightbl ) state->m_vdp0->init_scroll_regs(); - tilemap_set_scrolldx(state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->set_scrolldx(0, 0); } VIDEO_START( bgaregga ) @@ -154,7 +154,7 @@ VIDEO_START( bgaregga ) /* Create the Text tilemap for this game */ truxton2_create_tx_tilemap(machine); - tilemap_set_scrolldx(state->m_tx_tilemap, 0x1d4, 0x2a); + state->m_tx_tilemap->set_scrolldx(0x1d4, 0x2a); } VIDEO_START( batrider ) @@ -171,7 +171,7 @@ VIDEO_START( batrider ) machine.save().register_postload(save_prepost_delegate(FUNC(truxton2_postload), &machine)); truxton2_create_tx_tilemap(machine); - tilemap_set_scrolldx(state->m_tx_tilemap, 0x1d4, 0x2a); + state->m_tx_tilemap->set_scrolldx(0x1d4, 0x2a); /* Has special banking */ state->m_vdp0->gp9001_gfxrom_is_banked = 1; @@ -183,7 +183,7 @@ WRITE16_HANDLER( toaplan2_txvideoram16_w ) COMBINE_DATA(&state->m_txvideoram16[offset]); if (offset < (state->m_tx_vram_size/4)) - tilemap_mark_tile_dirty(state->m_tx_tilemap, offset); + state->m_tx_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( toaplan2_txvideoram16_offs_w ) @@ -201,14 +201,14 @@ WRITE16_HANDLER( toaplan2_txvideoram16_offs_w ) if (data & 0x8000) /* Flip off */ { state->m_tx_flip = 0; - tilemap_set_flip(state->m_tx_tilemap, state->m_tx_flip); - tilemap_set_scrolly(state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->set_flip(state->m_tx_flip); + state->m_tx_tilemap->set_scrolly(0, 0); } else /* Flip on */ { state->m_tx_flip = (TILEMAP_FLIPY | TILEMAP_FLIPX); - tilemap_set_flip(state->m_tx_tilemap, state->m_tx_flip); - tilemap_set_scrolly(state->m_tx_tilemap, 0, -16); + state->m_tx_tilemap->set_flip(state->m_tx_flip); + state->m_tx_tilemap->set_scrolly(0, -16); } } COMBINE_DATA(&state->m_txvideoram16_offs[offset]); @@ -223,7 +223,7 @@ WRITE16_HANDLER( toaplan2_txscrollram16_w ) toaplan2_state *state = space->machine().driver_data(); int data_tx = data; - tilemap_set_scrollx(state->m_tx_tilemap, offset, data_tx); + state->m_tx_tilemap->set_scrollx(offset, data_tx); // logerror("Writing %04x to text scroll RAM offset %04x\n",data,offset); COMBINE_DATA(&state->m_txscrollram16[offset]); @@ -431,7 +431,7 @@ SCREEN_UPDATE_IND16( truxton2 ) toaplan2_state *state = screen.machine().driver_data(); SCREEN_UPDATE16_CALL(toaplan2); - tilemap_draw(bitmap, cliprect, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -454,14 +454,14 @@ SCREEN_UPDATE_IND16( batrider ) if (state->m_tx_flip) { clip.min_y = clip.max_y = 256 - line; - tilemap_set_scrolly(state->m_tx_tilemap, 0, 256 - line + state->m_txvideoram16_offs[256 - line]); + state->m_tx_tilemap->set_scrolly(0, 256 - line + state->m_txvideoram16_offs[256 - line]); } else { clip.min_y = clip.max_y = line; - tilemap_set_scrolly(state->m_tx_tilemap, 0, - line + state->m_txvideoram16_offs[ line]); + state->m_tx_tilemap->set_scrolly(0, - line + state->m_txvideoram16_offs[ line]); } - tilemap_draw(bitmap, clip, state->m_tx_tilemap, 0, 0); + state->m_tx_tilemap->draw(bitmap, clip, 0, 0); } return 0; } diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index 722b9a23da4..d7d5403eaa3 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -107,9 +107,9 @@ VIDEO_START( toki ) state->m_background_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_rows,16,16,32,32); state->m_foreground_layer = tilemap_create(machine, get_fore_tile_info,tilemap_scan_rows,16,16,32,32); - tilemap_set_transparent_pen(state->m_text_layer,15); - tilemap_set_transparent_pen(state->m_background_layer,15); - tilemap_set_transparent_pen(state->m_foreground_layer,15); + state->m_text_layer->set_transparent_pen(15); + state->m_background_layer->set_transparent_pen(15); + state->m_foreground_layer->set_transparent_pen(15); } /*************************************/ @@ -119,21 +119,21 @@ WRITE16_HANDLER( toki_foreground_videoram16_w ) toki_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty(state->m_text_layer,offset); + state->m_text_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( toki_background1_videoram16_w ) { toki_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_background1_videoram16[offset]); - tilemap_mark_tile_dirty(state->m_background_layer,offset); + state->m_background_layer->mark_tile_dirty(offset); } WRITE16_HANDLER( toki_background2_videoram16_w ) { toki_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_background2_videoram16[offset]); - tilemap_mark_tile_dirty(state->m_foreground_layer,offset); + state->m_foreground_layer->mark_tile_dirty(offset); } /*************************************************************************** @@ -281,50 +281,50 @@ SCREEN_UPDATE_IND16( toki ) |((state->m_scrollram16[0x05] &0x10) << 4); background_y_scroll=((state->m_scrollram16[0x0d]&0x10)<<4)+((state->m_scrollram16[0x0e]&0x7f)<<1)+((state->m_scrollram16[0x0e]&0x80)>>7); - tilemap_set_scrollx( state->m_background_layer, 0, background_x_scroll ); - tilemap_set_scrolly( state->m_background_layer, 0, background_y_scroll ); + state->m_background_layer->set_scrollx(0, background_x_scroll ); + state->m_background_layer->set_scrolly(0, background_y_scroll ); foreground_x_scroll= ((state->m_scrollram16[0x16] &0x7f) << 1) |((state->m_scrollram16[0x16] &0x80) >> 7) |((state->m_scrollram16[0x15] &0x10) << 4); foreground_y_scroll=((state->m_scrollram16[0x1d]&0x10)<<4)+((state->m_scrollram16[0x1e]&0x7f)<<1)+((state->m_scrollram16[0x1e]&0x80)>>7); - tilemap_set_scrollx( state->m_foreground_layer, 0, foreground_x_scroll ); - tilemap_set_scrolly( state->m_foreground_layer, 0, foreground_y_scroll ); + state->m_foreground_layer->set_scrollx(0, foreground_x_scroll ); + state->m_foreground_layer->set_scrolly(0, foreground_y_scroll ); flip_screen_set(screen.machine(), (state->m_scrollram16[0x28]&0x8000)==0); if (state->m_scrollram16[0x28]&0x100) { - tilemap_draw(bitmap,cliprect,state->m_background_layer,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_foreground_layer,0,0); + state->m_background_layer->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_foreground_layer->draw(bitmap, cliprect, 0,0); } else { - tilemap_draw(bitmap,cliprect,state->m_foreground_layer,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_background_layer,0,0); + state->m_foreground_layer->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_background_layer->draw(bitmap, cliprect, 0,0); } toki_draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_text_layer,0,0); + state->m_text_layer->draw(bitmap, cliprect, 0,0); return 0; } SCREEN_UPDATE_IND16( tokib ) { toki_state *state = screen.machine().driver_data(); - tilemap_set_scroll_rows(state->m_foreground_layer,1); - tilemap_set_scroll_rows(state->m_background_layer,1); - tilemap_set_scrolly( state->m_background_layer, 0, state->m_scrollram16[0]+1 ); - tilemap_set_scrollx( state->m_background_layer, 0, state->m_scrollram16[1]-0x103 ); - tilemap_set_scrolly( state->m_foreground_layer, 0, state->m_scrollram16[2]+1 ); - tilemap_set_scrollx( state->m_foreground_layer, 0, state->m_scrollram16[3]-0x101 ); + state->m_foreground_layer->set_scroll_rows(1); + state->m_background_layer->set_scroll_rows(1); + state->m_background_layer->set_scrolly(0, state->m_scrollram16[0]+1 ); + state->m_background_layer->set_scrollx(0, state->m_scrollram16[1]-0x103 ); + state->m_foreground_layer->set_scrolly(0, state->m_scrollram16[2]+1 ); + state->m_foreground_layer->set_scrollx(0, state->m_scrollram16[3]-0x101 ); if (state->m_scrollram16[3]&0x2000) { - tilemap_draw(bitmap,cliprect,state->m_background_layer,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_foreground_layer,0,0); + state->m_background_layer->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_foreground_layer->draw(bitmap, cliprect, 0,0); } else { - tilemap_draw(bitmap,cliprect,state->m_foreground_layer,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_background_layer,0,0); + state->m_foreground_layer->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_background_layer->draw(bitmap, cliprect, 0,0); } tokib_draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_text_layer,0,0); + state->m_text_layer->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c index 84eee127502..e760dc1e588 100644 --- a/src/mame/video/toobin.c +++ b/src/mame/video/toobin.c @@ -35,7 +35,7 @@ static TILE_GET_INFO( get_playfield_tile_info ) int code = data2 & 0x3fff; int color = data1 & 0x0f; SET_TILE_INFO(0, code, color, TILE_FLIPYX(data2 >> 14)); - tileinfo->category = (data1 >> 4) & 3; + tileinfo.category = (data1 >> 4) & 3; } @@ -94,7 +94,7 @@ VIDEO_START( toobin ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* allocate a playfield bitmap for rendering */ machine.primary_screen->register_screen_bitmap(state->m_pfbitmap); @@ -171,7 +171,7 @@ WRITE16_HANDLER( toobin_xscroll_w ) space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); /* update the playfield scrolling - hscroll is clocked on the following scanline */ - tilemap_set_scrollx(state->m_playfield_tilemap, 0, newscroll >> 6); + state->m_playfield_tilemap->set_scrollx(0, newscroll >> 6); atarimo_set_xscroll(0, newscroll >> 6); /* update the data */ @@ -191,7 +191,7 @@ WRITE16_HANDLER( toobin_yscroll_w ) space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); /* if bit 4 is zero, the scroll value is clocked in right away */ - tilemap_set_scrolly(state->m_playfield_tilemap, 0, newscroll >> 6); + state->m_playfield_tilemap->set_scrolly(0, newscroll >> 6); atarimo_set_yscroll(0, (newscroll >> 6) & 0x1ff); /* update the data */ @@ -239,10 +239,10 @@ SCREEN_UPDATE_RGB32( toobin ) /* draw the playfield */ priority_bitmap.fill(0, cliprect); - tilemap_draw(state->m_pfbitmap, cliprect, state->m_playfield_tilemap, 0, 0); - tilemap_draw(state->m_pfbitmap, cliprect, state->m_playfield_tilemap, 1, 1); - tilemap_draw(state->m_pfbitmap, cliprect, state->m_playfield_tilemap, 2, 2); - tilemap_draw(state->m_pfbitmap, cliprect, state->m_playfield_tilemap, 3, 3); + state->m_playfield_tilemap->draw(state->m_pfbitmap, cliprect, 0, 0); + state->m_playfield_tilemap->draw(state->m_pfbitmap, cliprect, 1, 1); + state->m_playfield_tilemap->draw(state->m_pfbitmap, cliprect, 2, 2); + state->m_playfield_tilemap->draw(state->m_pfbitmap, cliprect, 3, 3); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -275,6 +275,6 @@ SCREEN_UPDATE_RGB32( toobin ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index 2cb98a26db0..672a4ffca51 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -115,7 +115,7 @@ VIDEO_START( toypop ) toypop_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine,get_tile_info,tilemap_scan,8,8,36,28); - tilemap_set_transparent_pen(state->m_bg_tilemap, 0); + state->m_bg_tilemap->set_transparent_pen(0); } @@ -130,7 +130,7 @@ WRITE8_HANDLER( toypop_videoram_w ) { toypop_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( toypop_palettebank_w ) @@ -139,7 +139,7 @@ WRITE8_HANDLER( toypop_palettebank_w ) if (state->m_palettebank != (offset & 1)) { state->m_palettebank = offset & 1; - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -279,7 +279,7 @@ SCREEN_UPDATE_IND16( toypop ) { toypop_state *state = screen.machine().driver_data(); draw_background(screen.machine(), bitmap); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap, cliprect, state->m_spriteram); return 0; } diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index 3e1be01acc0..622793b97fd 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -183,27 +183,27 @@ SCREEN_UPDATE_IND16( tp84 ) if (cliprect.min_y == screen.visible_area().min_y) { - tilemap_mark_all_tiles_dirty_all(screen.machine()); + screen.machine().tilemap().mark_all_dirty(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, *state->m_scroll_x); - tilemap_set_scrolly(state->m_bg_tilemap, 0, *state->m_scroll_y); + state->m_bg_tilemap->set_scrollx(0, *state->m_scroll_x); + state->m_bg_tilemap->set_scrolly(0, *state->m_scroll_y); - tilemap_set_flip_all(screen.machine(), ((*state->m_flipscreen_x & 0x01) ? TILEMAP_FLIPX : 0) | + screen.machine().tilemap().set_flip_all(((*state->m_flipscreen_x & 0x01) ? TILEMAP_FLIPX : 0) | ((*state->m_flipscreen_y & 0x01) ? TILEMAP_FLIPY : 0)); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); /* draw top status region */ clip.min_x = visarea.min_x; clip.max_x = visarea.min_x + 15; - tilemap_draw(bitmap, clip, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, clip, 0, 0); /* draw bottom status region */ clip.min_x = visarea.max_x - 15; clip.max_x = visarea.max_x; - tilemap_draw(bitmap, clip, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, clip, 0, 0); return 0; } diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index ac182256d3e..852e5846a2b 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -93,14 +93,14 @@ WRITE8_HANDLER( trackfld_videoram_w ) { trackfld_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( trackfld_colorram_w ) { trackfld_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( trackfld_flipscreen_w ) @@ -108,7 +108,7 @@ WRITE8_HANDLER( trackfld_flipscreen_w ) if (flip_screen_get(space->machine()) != data) { flip_screen_set(space->machine(), data); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } } @@ -156,7 +156,7 @@ WRITE8_HANDLER( atlantol_gfxbank_w ) if (state->m_bg_bank != (data & 0x8)) { state->m_bg_bank = data & 0x8; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -178,7 +178,7 @@ VIDEO_START( trackfld ) { trackfld_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_scroll_rows(state->m_bg_tilemap, 32); + state->m_bg_tilemap->set_scroll_rows(32); state->m_sprites_gfx_banked = 0; } @@ -257,10 +257,10 @@ SCREEN_UPDATE_IND16( trackfld ) { scrollx = state->m_scroll[row] + 256 * (state->m_scroll2[row] & 0x01); if (flip_screen_get(screen.machine())) scrollx = -scrollx; - tilemap_set_scrollx(state->m_bg_tilemap, row, scrollx); + state->m_bg_tilemap->set_scrollx(row, scrollx); } - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index b75691efa96..7ad51869553 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -201,7 +201,7 @@ static TILE_GET_INFO( get_tile_info ) UINT8 attr = state->m_videoram[2 * tile_index + 1]; int flags = TILE_FLIPXY((attr & 0x30) >> 4); - tileinfo->group = ((attr & 0x0f) == 0x0f) ? 1 : 0; /* tunnels */ + tileinfo.group = ((attr & 0x0f) == 0x0f) ? 1 : 0; /* tunnels */ SET_TILE_INFO( 0, @@ -226,10 +226,10 @@ VIDEO_START( travrusa ) state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transmask(state->m_bg_tilemap, 0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ - tilemap_set_transmask(state->m_bg_tilemap, 1, 0x3f, 0xc0); /* split type 1 has pens 6 and 7 opaque - tunnels */ + state->m_bg_tilemap->set_transmask(0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ + state->m_bg_tilemap->set_transmask(1, 0x3f, 0xc0); /* split type 1 has pens 6 and 7 opaque - tunnels */ - tilemap_set_scroll_rows(state->m_bg_tilemap, 4); + state->m_bg_tilemap->set_scroll_rows(4); } @@ -244,7 +244,7 @@ WRITE8_HANDLER( travrusa_videoram_w ) { travrusa_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -254,9 +254,9 @@ static void set_scroll( running_machine &machine ) int i; for (i = 0; i <= 2; i++) - tilemap_set_scrollx(state->m_bg_tilemap, i, state->m_scrollx[0] + 256 * state->m_scrollx[1]); + state->m_bg_tilemap->set_scrollx(i, state->m_scrollx[0] + 256 * state->m_scrollx[1]); - tilemap_set_scrollx(state->m_bg_tilemap, 3, 0); + state->m_bg_tilemap->set_scrollx(3, 0); } WRITE8_HANDLER( travrusa_scroll_x_low_w ) @@ -335,8 +335,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re SCREEN_UPDATE_IND16( travrusa ) { travrusa_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER1, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, TILEMAP_DRAW_LAYER0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c index 3a319bcf5b8..0d2a04b2b08 100644 --- a/src/mame/video/triplhnt.c +++ b/src/mame/video/triplhnt.c @@ -110,9 +110,9 @@ SCREEN_UPDATE_IND16( triplhnt ) triplhnt_state *state = screen.machine().driver_data(); device_t *discrete = screen.machine().device("discrete"); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/trucocl.c b/src/mame/video/trucocl.c index f310c4d330d..20dd8cb6d09 100644 --- a/src/mame/video/trucocl.c +++ b/src/mame/video/trucocl.c @@ -48,14 +48,14 @@ WRITE8_HANDLER( trucocl_videoram_w ) { trucocl_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( trucocl_colorram_w ) { trucocl_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_bg_tile_info ) @@ -82,6 +82,6 @@ VIDEO_START( trucocl ) SCREEN_UPDATE_IND16( trucocl ) { trucocl_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c index d4dd1fe715b..0c3a541b2db 100644 --- a/src/mame/video/tryout.c +++ b/src/mame/video/tryout.c @@ -68,7 +68,7 @@ WRITE8_HANDLER( tryout_videoram_w ) tryout_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( tryout_vram_w ) @@ -94,7 +94,7 @@ WRITE8_HANDLER( tryout_vram_w ) int newoff=offset&0x3ff; state->m_vram[newoff]=data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,newoff); + state->m_bg_tilemap->mark_tile_dirty(newoff); return; } @@ -179,7 +179,7 @@ VIDEO_START( tryout ) gfx_element_set_source(machine.gfx[2], state->m_vram_gfx); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); } static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect) @@ -239,17 +239,17 @@ SCREEN_UPDATE_IND16( tryout ) int scrollx = 0; if (!flip_screen_get(screen.machine())) - tilemap_set_scrollx(state->m_fg_tilemap, 0, 16); /* Assumed hard-wired */ + state->m_fg_tilemap->set_scrollx(0, 16); /* Assumed hard-wired */ else - tilemap_set_scrollx(state->m_fg_tilemap, 0, -8); /* Assumed hard-wired */ + state->m_fg_tilemap->set_scrollx(0, -8); /* Assumed hard-wired */ scrollx = state->m_gfx_control[1] + ((state->m_gfx_control[0]&1)<<8) + ((state->m_gfx_control[0]&4)<<7) - ((state->m_gfx_control[0] & 2) ? 0 : 0x100); /* wrap-around */ if(state->m_gfx_control[1] == 0) { scrollx+=0x100; } - tilemap_set_scrollx(state->m_bg_tilemap, 0, scrollx+2); /* why +2? hard-wired? */ - tilemap_set_scrolly(state->m_bg_tilemap, 0, -state->m_gfx_control[2]); + state->m_bg_tilemap->set_scrollx(0, scrollx+2); /* why +2? hard-wired? */ + state->m_bg_tilemap->set_scrolly(0, -state->m_gfx_control[2]); if(!(state->m_gfx_control[0] & 0x8)) // screen disable { @@ -258,8 +258,8 @@ SCREEN_UPDATE_IND16( tryout ) } else { - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); } diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c index 48e1363bc37..8cf059be273 100644 --- a/src/mame/video/tsamurai.c +++ b/src/mame/video/tsamurai.c @@ -52,8 +52,8 @@ VIDEO_START( tsamurai ) state->m_background = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,32,32); state->m_foreground = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_background,0); - tilemap_set_transparent_pen(state->m_foreground,0); + state->m_background->set_transparent_pen(0); + state->m_foreground->set_transparent_pen(0); } @@ -66,13 +66,13 @@ VIDEO_START( tsamurai ) WRITE8_HANDLER( tsamurai_scrolly_w ) { tsamurai_state *state = space->machine().driver_data(); - tilemap_set_scrolly( state->m_background, 0, data ); + state->m_background->set_scrolly(0, data ); } WRITE8_HANDLER( tsamurai_scrollx_w ) { tsamurai_state *state = space->machine().driver_data(); - tilemap_set_scrollx( state->m_background, 0, data ); + state->m_background->set_scrollx(0, data ); } WRITE8_HANDLER( tsamurai_bgcolor_w ) @@ -87,7 +87,7 @@ WRITE8_HANDLER( tsamurai_textbank1_w ) if( state->m_textbank1!=data ) { state->m_textbank1 = data; - tilemap_mark_all_tiles_dirty( state->m_foreground ); + state->m_foreground ->mark_all_dirty(); } } @@ -97,7 +97,7 @@ WRITE8_HANDLER( tsamurai_textbank2_w ) if( state->m_textbank2!=data ) { state->m_textbank2 = data; - tilemap_mark_all_tiles_dirty( state->m_foreground ); + state->m_foreground ->mark_all_dirty(); } } @@ -106,13 +106,13 @@ WRITE8_HANDLER( tsamurai_bg_videoram_w ) tsamurai_state *state = space->machine().driver_data(); state->m_bg_videoram[offset]=data; offset = offset/2; - tilemap_mark_tile_dirty(state->m_background,offset); + state->m_background->mark_tile_dirty(offset); } WRITE8_HANDLER( tsamurai_fg_videoram_w ) { tsamurai_state *state = space->machine().driver_data(); state->m_videoram[offset]=data; - tilemap_mark_tile_dirty(state->m_foreground,offset); + state->m_foreground->mark_tile_dirty(offset); } WRITE8_HANDLER( tsamurai_fg_colorram_w ) { @@ -125,7 +125,7 @@ WRITE8_HANDLER( tsamurai_fg_colorram_w ) int col = offset/2; int row; for (row = 0;row < 32;row++) - tilemap_mark_tile_dirty(state->m_foreground,32*row+col); + state->m_foreground->mark_tile_dirty(32*row+col); } } } @@ -203,10 +203,10 @@ SCREEN_UPDATE_IND16( tsamurai ) int i; /* Do the column scroll used for the "660" logo on the title screen */ - tilemap_set_scroll_cols(state->m_foreground, 32); + state->m_foreground->set_scroll_cols(32); for (i = 0 ; i < 32 ; i++) { - tilemap_set_scrolly(state->m_foreground, i, state->m_colorram[i*2]); + state->m_foreground->set_scrolly(i, state->m_colorram[i*2]); } /* end of column scroll code */ @@ -219,9 +219,9 @@ SCREEN_UPDATE_IND16( tsamurai ) (screenshots would be helpful) */ bitmap.fill(state->m_bgcolor, cliprect); - tilemap_draw(bitmap,cliprect,state->m_background,0,0); + state->m_background->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_foreground,0,0); + state->m_foreground->draw(bitmap, cliprect, 0,0); return 0; } @@ -238,7 +238,7 @@ WRITE8_HANDLER( vsgongf_color_w ) if( state->m_vsgongf_color != data ) { state->m_vsgongf_color = data; - tilemap_mark_all_tiles_dirty( state->m_foreground ); + state->m_foreground ->mark_all_dirty(); } } @@ -270,12 +270,12 @@ SCREEN_UPDATE_IND16( vsgongf ) while( screen.machine().input().code_pressed( KEYCODE_Q ) ){ state->m_key_count++; state->m_vsgongf_color = state->m_key_count; - tilemap_mark_all_tiles_dirty( state->m_foreground ); + state->m_foreground ->mark_all_dirty(); } } #endif - tilemap_draw(bitmap,cliprect,state->m_foreground,0,0); + state->m_foreground->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); return 0; } diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index 5229589b2df..b0bec5e62a5 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -224,9 +224,9 @@ WRITE16_HANDLER( bcstory_tilebank_w ) tumbleb_state *state = space->machine().driver_data(); state->m_tilebank = data; - tilemap_mark_all_tiles_dirty(state->m_pf1_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf1_alt_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf2_tilemap); + state->m_pf1_tilemap->mark_all_dirty(); + state->m_pf1_alt_tilemap->mark_all_dirty(); + state->m_pf2_tilemap->mark_all_dirty(); } WRITE16_HANDLER( chokchok_tilebank_w ) @@ -234,9 +234,9 @@ WRITE16_HANDLER( chokchok_tilebank_w ) tumbleb_state *state = space->machine().driver_data(); state->m_tilebank = data << 1; - tilemap_mark_all_tiles_dirty(state->m_pf1_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf1_alt_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf2_tilemap); + state->m_pf1_tilemap->mark_all_dirty(); + state->m_pf1_alt_tilemap->mark_all_dirty(); + state->m_pf2_tilemap->mark_all_dirty(); } WRITE16_HANDLER( wlstar_tilebank_w ) @@ -245,9 +245,9 @@ WRITE16_HANDLER( wlstar_tilebank_w ) /* it just writes 0000 or ffff */ state->m_tilebank = data & 0x4000; - tilemap_mark_all_tiles_dirty(state->m_pf1_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf1_alt_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf2_tilemap); + state->m_pf1_tilemap->mark_all_dirty(); + state->m_pf1_alt_tilemap->mark_all_dirty(); + state->m_pf2_tilemap->mark_all_dirty(); } @@ -256,9 +256,9 @@ WRITE16_HANDLER( suprtrio_tilebank_w ) tumbleb_state *state = space->machine().driver_data(); state->m_tilebank = data << 14; // shift it here, makes using bcstory_tilebank easier - tilemap_mark_all_tiles_dirty(state->m_pf1_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf1_alt_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf2_tilemap); + state->m_pf1_tilemap->mark_all_dirty(); + state->m_pf1_alt_tilemap->mark_all_dirty(); + state->m_pf2_tilemap->mark_all_dirty(); } @@ -267,8 +267,8 @@ WRITE16_HANDLER( tumblepb_pf1_data_w ) tumbleb_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf1_data[offset]); - tilemap_mark_tile_dirty(state->m_pf1_tilemap, offset); - tilemap_mark_tile_dirty(state->m_pf1_alt_tilemap, offset); + state->m_pf1_tilemap->mark_tile_dirty(offset); + state->m_pf1_alt_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( tumblepb_pf2_data_w ) @@ -276,10 +276,10 @@ WRITE16_HANDLER( tumblepb_pf2_data_w ) tumbleb_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf2_data[offset]); - tilemap_mark_tile_dirty(state->m_pf2_tilemap, offset); + state->m_pf2_tilemap->mark_tile_dirty(offset); if (state->m_pf2_alt_tilemap) - tilemap_mark_tile_dirty(state->m_pf2_alt_tilemap, offset); + state->m_pf2_alt_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( fncywld_pf1_data_w ) @@ -287,8 +287,8 @@ WRITE16_HANDLER( fncywld_pf1_data_w ) tumbleb_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf1_data[offset]); - tilemap_mark_tile_dirty(state->m_pf1_tilemap, offset / 2); - tilemap_mark_tile_dirty(state->m_pf1_alt_tilemap, offset / 2); + state->m_pf1_tilemap->mark_tile_dirty(offset / 2); + state->m_pf1_alt_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( fncywld_pf2_data_w ) @@ -296,7 +296,7 @@ WRITE16_HANDLER( fncywld_pf2_data_w ) tumbleb_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf2_data[offset]); - tilemap_mark_tile_dirty(state->m_pf2_tilemap, offset / 2); + state->m_pf2_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( tumblepb_control_0_w ) @@ -311,8 +311,8 @@ WRITE16_HANDLER( pangpang_pf1_data_w ) tumbleb_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf1_data[offset]); - tilemap_mark_tile_dirty(state->m_pf1_tilemap, offset / 2); - tilemap_mark_tile_dirty(state->m_pf1_alt_tilemap, offset / 2); + state->m_pf1_tilemap->mark_tile_dirty(offset / 2); + state->m_pf1_alt_tilemap->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( pangpang_pf2_data_w ) @@ -320,10 +320,10 @@ WRITE16_HANDLER( pangpang_pf2_data_w ) tumbleb_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_pf2_data[offset]); - tilemap_mark_tile_dirty(state->m_pf2_tilemap, offset / 2); + state->m_pf2_tilemap->mark_tile_dirty(offset / 2); if (state->m_pf2_alt_tilemap) - tilemap_mark_tile_dirty(state->m_pf2_alt_tilemap, offset / 2); + state->m_pf2_alt_tilemap->mark_tile_dirty(offset / 2); } /******************************************************************************/ @@ -334,7 +334,7 @@ static TILEMAP_MAPPER( tumblep_scan ) return (col & 0x1f) + ((row & 0x1f) << 5) + ((col & 0x60) << 5); } -INLINE void get_bg_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base) +INLINE void get_bg_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base) { tumbleb_state *state = machine.driver_data(); int data = gfx_base[tile_index]; @@ -361,7 +361,7 @@ static TILE_GET_INFO( get_fg_tile_info ) 0); } -INLINE void get_fncywld_bg_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base) +INLINE void get_fncywld_bg_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base) { int data = gfx_base[tile_index * 2]; int attr = gfx_base[tile_index * 2 + 1]; @@ -440,7 +440,7 @@ static TILE_GET_INFO( get_jumppop_fg_tile_info ) 0); } -INLINE void pangpang_get_bg_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base ) +INLINE void pangpang_get_bg_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base ) { int data = gfx_base[tile_index * 2 + 1]; int attr = gfx_base[tile_index * 2]; @@ -452,7 +452,7 @@ INLINE void pangpang_get_bg_tile_info( running_machine &machine, tile_data *tile 0); } -INLINE void pangpang_get_bg2x_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base ) +INLINE void pangpang_get_bg2x_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base ) { int data = gfx_base[tile_index * 2 + 1]; int attr = gfx_base[tile_index * 2]; @@ -486,11 +486,11 @@ static void tumbleb_tilemap_redraw(running_machine &machine) { tumbleb_state *state = machine.driver_data(); - tilemap_mark_all_tiles_dirty(state->m_pf1_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf1_alt_tilemap); - tilemap_mark_all_tiles_dirty(state->m_pf2_tilemap); + state->m_pf1_tilemap->mark_all_dirty(); + state->m_pf1_alt_tilemap->mark_all_dirty(); + state->m_pf2_tilemap->mark_all_dirty(); if (state->m_pf2_alt_tilemap) - tilemap_mark_all_tiles_dirty(state->m_pf2_alt_tilemap); + state->m_pf2_alt_tilemap->mark_all_dirty(); } VIDEO_START( pangpang ) @@ -501,8 +501,8 @@ VIDEO_START( pangpang ) state->m_pf1_alt_tilemap = tilemap_create(machine, pangpang_get_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); state->m_pf2_tilemap = tilemap_create(machine, pangpang_get_bg2_tile_info, tumblep_scan, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_pf1_tilemap, 0); - tilemap_set_transparent_pen(state->m_pf1_alt_tilemap, 0); + state->m_pf1_tilemap->set_transparent_pen(0); + state->m_pf1_alt_tilemap->set_transparent_pen(0); state->m_sprite_xoffset = -1; state->m_sprite_yoffset = 0; @@ -519,8 +519,8 @@ VIDEO_START( tumblepb ) state->m_pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); state->m_pf2_tilemap = tilemap_create(machine, get_bg2_tile_info, tumblep_scan, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_pf1_tilemap, 0); - tilemap_set_transparent_pen(state->m_pf1_alt_tilemap, 0); + state->m_pf1_tilemap->set_transparent_pen(0); + state->m_pf1_alt_tilemap->set_transparent_pen(0); state->m_sprite_xoffset = -1; state->m_sprite_yoffset = 0; @@ -536,8 +536,8 @@ VIDEO_START( sdfight ) state->m_pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); state->m_pf2_tilemap = tilemap_create(machine, get_bg2_tile_info, tumblep_scan, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_pf1_tilemap, 0); - tilemap_set_transparent_pen(state->m_pf1_alt_tilemap, 0); + state->m_pf1_tilemap->set_transparent_pen(0); + state->m_pf1_alt_tilemap->set_transparent_pen(0); /* aligned to monitor test */ state->m_sprite_xoffset = 0; @@ -554,8 +554,8 @@ VIDEO_START( fncywld ) state->m_pf1_alt_tilemap = tilemap_create(machine, get_fncywld_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); state->m_pf2_tilemap = tilemap_create(machine, get_fncywld_bg2_tile_info, tumblep_scan, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_pf1_tilemap, 15); - tilemap_set_transparent_pen(state->m_pf1_alt_tilemap, 15); + state->m_pf1_tilemap->set_transparent_pen(15); + state->m_pf1_alt_tilemap->set_transparent_pen(15); state->m_sprite_xoffset = -1; state->m_sprite_yoffset = 0; @@ -572,13 +572,13 @@ VIDEO_START( jumppop ) state->m_pf2_tilemap = tilemap_create(machine, get_jumppop_bg2_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->m_pf2_alt_tilemap = tilemap_create(machine, get_jumppop_bg2_alt_tile_info, tilemap_scan_rows, 8, 8, 128, 64); - tilemap_set_transparent_pen(state->m_pf1_tilemap, 0); - tilemap_set_transparent_pen(state->m_pf1_alt_tilemap, 0); + state->m_pf1_tilemap->set_transparent_pen(0); + state->m_pf1_alt_tilemap->set_transparent_pen(0); - tilemap_set_flip(state->m_pf1_tilemap, TILEMAP_FLIPX); - tilemap_set_flip(state->m_pf1_alt_tilemap, TILEMAP_FLIPX); - tilemap_set_flip(state->m_pf2_tilemap, TILEMAP_FLIPX); - tilemap_set_flip(state->m_pf2_alt_tilemap, TILEMAP_FLIPX); + state->m_pf1_tilemap->set_flip(TILEMAP_FLIPX); + state->m_pf1_alt_tilemap->set_flip(TILEMAP_FLIPX); + state->m_pf2_tilemap->set_flip(TILEMAP_FLIPX); + state->m_pf2_alt_tilemap->set_flip(TILEMAP_FLIPX); state->m_sprite_xoffset = -1; state->m_sprite_yoffset = 0; @@ -595,7 +595,7 @@ VIDEO_START( suprtrio ) state->m_pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); state->m_pf2_tilemap = tilemap_create(machine, get_bg2_tile_info, tumblep_scan, 16, 16, 64, 32); - tilemap_set_transparent_pen(state->m_pf1_alt_tilemap, 0); + state->m_pf1_alt_tilemap->set_transparent_pen(0); machine.save().register_postload(save_prepost_delegate(FUNC(tumbleb_tilemap_redraw), &machine)); } @@ -609,7 +609,7 @@ SCREEN_UPDATE_IND16( tumblepb ) int offs, offs2; state->m_flipscreen = state->m_control_0[0] & 0x80; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (state->m_flipscreen) offs = 1; @@ -621,19 +621,19 @@ SCREEN_UPDATE_IND16( tumblepb ) else offs2 = -5; - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offs); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offs); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); tumblepb_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -645,7 +645,7 @@ SCREEN_UPDATE_IND16( jumpkids ) int offs, offs2; state->m_flipscreen = state->m_control_0[0] & 0x80; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (state->m_flipscreen) offs = 1; @@ -657,19 +657,19 @@ SCREEN_UPDATE_IND16( jumpkids ) else offs2 = -5; - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offs); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offs); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); jumpkids_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -681,7 +681,7 @@ SCREEN_UPDATE_IND16( semicom ) int offs, offs2; state->m_flipscreen = state->m_control_0[0] & 0x80; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (state->m_flipscreen) offs = 1; @@ -693,19 +693,19 @@ SCREEN_UPDATE_IND16( semicom ) else offs2 = -5; - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offs); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offs); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); jumpkids_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -722,19 +722,19 @@ SCREEN_UPDATE_IND16( semicom_altoffsets ) offsy = 2; offsx2 = -5; - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offsx2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offsx2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offsx); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4] + offsy); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offsx2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offsx2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offsx); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4] + offsy); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); jumpkids_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -746,7 +746,7 @@ SCREEN_UPDATE_IND16( bcstory ) int offs, offs2; state->m_flipscreen = state->m_control_0[0] & 0x80; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* not sure of this */ if (state->m_flipscreen) @@ -760,19 +760,19 @@ SCREEN_UPDATE_IND16( bcstory ) else offs2 = 8; - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offs); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offs); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); jumpkids_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -784,24 +784,24 @@ SCREEN_UPDATE_IND16( semibase ) int offs, offs2; state->m_flipscreen = state->m_control_0[0] & 0x80; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); offs = -1; offs2 = -2; /* sprites need an offset too */ - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offs); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offs); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); jumpkids_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -813,23 +813,23 @@ SCREEN_UPDATE_IND16( sdfight ) int offs, offs2; state->m_flipscreen = state->m_control_0[0] & 0x80; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); offs = -1; offs2 = -5; // foreground scroll.. /* sprites need an offset too */ - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2] - 16); // needed for the ground ... - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2] - 16); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offs); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2] - 16); // needed for the ground ... + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2] - 16); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offs); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); jumpkids_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -843,7 +843,7 @@ SCREEN_UPDATE_IND16( fncywld ) int offs, offs2; state->m_flipscreen = state->m_control_0[0] & 0x80; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (state->m_flipscreen) offs = 1; @@ -855,19 +855,19 @@ SCREEN_UPDATE_IND16( fncywld ) else offs2 = -5; - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offs); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offs); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); fncywld_draw_sprites(screen.machine(), bitmap, cliprect); return 0; @@ -880,24 +880,24 @@ SCREEN_UPDATE_IND16( jumppop ) // bitmap.fill(get_black_pen(screen.machine()), cliprect); - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control[2] - 0x3a0); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control[3]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control[2] - 0x3a0); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control[3]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control[0] - 0x3a2); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control[1]); - tilemap_set_scrollx(state->m_pf2_alt_tilemap, 0, state->m_control[0] - 0x3a2); - tilemap_set_scrolly(state->m_pf2_alt_tilemap, 0, state->m_control[1]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control[2] - 0x3a0); + state->m_pf1_tilemap->set_scrolly(0, state->m_control[3]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control[2] - 0x3a0); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control[3]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control[0] - 0x3a2); + state->m_pf2_tilemap->set_scrolly(0, state->m_control[1]); + state->m_pf2_alt_tilemap->set_scrollx(0, state->m_control[0] - 0x3a2); + state->m_pf2_alt_tilemap->set_scrolly(0, state->m_control[1]); if (state->m_control[7] & 1) - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf2_alt_tilemap, 0, 0); + state->m_pf2_alt_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control[7] & 2) - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); //popmessage("%04x %04x %04x %04x %04x %04x %04x %04x", state->m_control[0],state->m_control[1],state->m_control[2],state->m_control[3],state->m_control[4],state->m_control[5],state->m_control[6],state->m_control[7]); @@ -910,13 +910,13 @@ SCREEN_UPDATE_IND16( suprtrio ) { tumbleb_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, -state->m_control[1] - 6); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, -state->m_control[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, -state->m_control[3] - 2); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, -state->m_control[4]); + state->m_pf1_alt_tilemap->set_scrollx(0, -state->m_control[1] - 6); + state->m_pf1_alt_tilemap->set_scrolly(0, -state->m_control[2]); + state->m_pf2_tilemap->set_scrollx(0, -state->m_control[3] - 2); + state->m_pf2_tilemap->set_scrolly(0, -state->m_control[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); jumpkids_draw_sprites(screen.machine(), bitmap, cliprect); #if 0 @@ -940,7 +940,7 @@ SCREEN_UPDATE_IND16( pangpang ) int offs, offs2; state->m_flipscreen = state->m_control_0[0] & 0x80; - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (state->m_flipscreen) offs = 1; @@ -952,19 +952,19 @@ SCREEN_UPDATE_IND16( pangpang ) else offs2 = -5; - tilemap_set_scrollx(state->m_pf1_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf1_alt_tilemap, 0, state->m_control_0[1] + offs2); - tilemap_set_scrolly(state->m_pf1_alt_tilemap, 0, state->m_control_0[2]); - tilemap_set_scrollx(state->m_pf2_tilemap, 0, state->m_control_0[3] + offs); - tilemap_set_scrolly(state->m_pf2_tilemap, 0, state->m_control_0[4]); + state->m_pf1_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf1_alt_tilemap->set_scrollx(0, state->m_control_0[1] + offs2); + state->m_pf1_alt_tilemap->set_scrolly(0, state->m_control_0[2]); + state->m_pf2_tilemap->set_scrollx(0, state->m_control_0[3] + offs); + state->m_pf2_tilemap->set_scrolly(0, state->m_control_0[4]); - tilemap_draw(bitmap, cliprect, state->m_pf2_tilemap, 0, 0); + state->m_pf2_tilemap->draw(bitmap, cliprect, 0, 0); if (state->m_control_0[6] & 0x80) - tilemap_draw(bitmap, cliprect, state->m_pf1_tilemap, 0, 0); + state->m_pf1_tilemap->draw(bitmap, cliprect, 0, 0); else - tilemap_draw(bitmap, cliprect, state->m_pf1_alt_tilemap, 0, 0); + state->m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0); jumpkids_draw_sprites(screen.machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index f75e994d035..331da04e12a 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -53,7 +53,7 @@ WRITE8_HANDLER( tunhunt_videoram_w ) tunhunt_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_fg_tile_info ) @@ -80,8 +80,8 @@ VIDEO_START( tunhunt ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrollx(state->m_fg_tilemap, 0, 64); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scrollx(0, 64); } PALETTE_INIT( tunhunt ) @@ -401,6 +401,6 @@ SCREEN_UPDATE_IND16( tunhunt ) state->m_workram[SHL1ST], /* vstretch */ state->m_control&0x10 ); /* hstretch */ - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index 0b3ec9f7f66..eb461626204 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -209,7 +209,7 @@ WRITE8_HANDLER( turbo_videoram_w ) if (offset < 0x400) { space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos()); - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } } @@ -407,7 +407,7 @@ static UINT32 turbo_get_sprite_bits(running_machine &machine, UINT8 road, sprite SCREEN_UPDATE_IND16( turbo ) { turbo_state *state = screen.machine().driver_data(); - bitmap_ind16 &fgpixmap = tilemap_get_pixmap(state->m_fg_tilemap); + bitmap_ind16 &fgpixmap = state->m_fg_tilemap->pixmap(); const UINT8 *road_gfxdata = screen.machine().region("gfx3")->base(); const UINT8 *prom_base = screen.machine().region("proms")->base(); const UINT8 *pr1114 = prom_base + 0x000; @@ -762,7 +762,7 @@ static UINT32 subroc3d_get_sprite_bits(running_machine &machine, sprite_info *sp SCREEN_UPDATE_IND16( subroc3d ) { turbo_state *state = screen.machine().driver_data(); - bitmap_ind16 &fgpixmap = tilemap_get_pixmap(state->m_fg_tilemap); + bitmap_ind16 &fgpixmap = state->m_fg_tilemap->pixmap(); const UINT8 *prom_base = screen.machine().region("proms")->base(); const UINT8 *pr1419 = prom_base + 0x000; const UINT8 *pr1620 = prom_base + 0x200; @@ -982,7 +982,7 @@ static UINT32 buckrog_get_sprite_bits(running_machine &machine, sprite_info *spr SCREEN_UPDATE_IND16( buckrog ) { turbo_state *state = screen.machine().driver_data(); - bitmap_ind16 &fgpixmap = tilemap_get_pixmap(state->m_fg_tilemap); + bitmap_ind16 &fgpixmap = state->m_fg_tilemap->pixmap(); const UINT8 *bgcolor = screen.machine().region("gfx3")->base(); const UINT8 *prom_base = screen.machine().region("proms")->base(); const UINT8 *pr5194 = prom_base + 0x000; diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c index b701de4ece9..66eb8e74fa4 100644 --- a/src/mame/video/twin16.c +++ b/src/mame/video/twin16.c @@ -44,7 +44,7 @@ WRITE16_HANDLER( twin16_text_ram_w ) { twin16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_text_ram[offset]); - tilemap_mark_tile_dirty(state->m_text_tilemap, offset); + state->m_text_tilemap->mark_tile_dirty(offset); } WRITE16_HANDLER( twin16_paletteram_word_w ) @@ -500,7 +500,7 @@ VIDEO_START( twin16 ) { twin16_state *state = machine.driver_data(); state->m_text_tilemap = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_text_tilemap, 0); + state->m_text_tilemap->set_transparent_pen(0); palette_set_shadow_factor(machine,0.4); // screenshots estimate @@ -532,8 +532,8 @@ SCREEN_UPDATE_IND16( twin16 ) draw_layer( screen.machine(), bitmap, 0 ); draw_sprites( screen.machine(), bitmap ); - if (text_flip) tilemap_set_flip(state->m_text_tilemap, text_flip); - tilemap_draw(bitmap, cliprect, state->m_text_tilemap, 0, 0); + if (text_flip) state->m_text_tilemap->set_flip(text_flip); + state->m_text_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index 0337a02b216..ad639aba72a 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -97,8 +97,8 @@ static void twincobr_create_tilemaps(running_machine &machine) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,64); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); } VIDEO_START( toaplan0 ) @@ -159,16 +159,16 @@ void twincobr_display(running_machine &machine, int enable) twincobr_state *state = machine.driver_data(); state->m_display_on = enable; - tilemap_set_enable(state->m_bg_tilemap, enable); - tilemap_set_enable(state->m_fg_tilemap, enable); - tilemap_set_enable(state->m_tx_tilemap, enable); + state->m_bg_tilemap->enable(enable); + state->m_fg_tilemap->enable(enable); + state->m_tx_tilemap->enable(enable); } void twincobr_flipscreen(running_machine &machine, int flip) { twincobr_state *state = machine.driver_data(); - tilemap_set_flip_all(machine, (flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); + machine.tilemap().set_flip_all((flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); state->m_flip_screen = flip; if (flip) { state->m_scroll_x = 0x008; @@ -199,7 +199,7 @@ WRITE16_HANDLER( twincobr_txram_w ) twincobr_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_txvideoram16[state->m_txoffs]); - tilemap_mark_tile_dirty(state->m_tx_tilemap,state->m_txoffs); + state->m_tx_tilemap->mark_tile_dirty(state->m_txoffs); } WRITE16_HANDLER( twincobr_bgoffs_w ) @@ -220,7 +220,7 @@ WRITE16_HANDLER( twincobr_bgram_w ) twincobr_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bgvideoram16[state->m_bgoffs+state->m_bg_ram_bank]); - tilemap_mark_tile_dirty(state->m_bg_tilemap,(state->m_bgoffs+state->m_bg_ram_bank)); + state->m_bg_tilemap->mark_tile_dirty((state->m_bgoffs+state->m_bg_ram_bank)); } WRITE16_HANDLER( twincobr_fgoffs_w ) @@ -241,7 +241,7 @@ WRITE16_HANDLER( twincobr_fgram_w ) twincobr_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fgvideoram16[state->m_fgoffs]); - tilemap_mark_tile_dirty(state->m_fg_tilemap,state->m_fgoffs); + state->m_fg_tilemap->mark_tile_dirty(state->m_fgoffs); } @@ -251,11 +251,11 @@ WRITE16_HANDLER( twincobr_txscroll_w ) if (offset == 0) { COMBINE_DATA(&state->m_txscrollx); - tilemap_set_scrollx(state->m_tx_tilemap,0,(state->m_txscrollx+state->m_scroll_x) & 0x1ff); + state->m_tx_tilemap->set_scrollx(0,(state->m_txscrollx+state->m_scroll_x) & 0x1ff); } else { COMBINE_DATA(&state->m_txscrolly); - tilemap_set_scrolly(state->m_tx_tilemap,0,(state->m_txscrolly+state->m_scroll_y) & 0x1ff); + state->m_tx_tilemap->set_scrolly(0,(state->m_txscrolly+state->m_scroll_y) & 0x1ff); } } @@ -265,11 +265,11 @@ WRITE16_HANDLER( twincobr_bgscroll_w ) if (offset == 0) { COMBINE_DATA(&state->m_bgscrollx); - tilemap_set_scrollx(state->m_bg_tilemap,0,(state->m_bgscrollx+state->m_scroll_x) & 0x1ff); + state->m_bg_tilemap->set_scrollx(0,(state->m_bgscrollx+state->m_scroll_x) & 0x1ff); } else { COMBINE_DATA(&state->m_bgscrolly); - tilemap_set_scrolly(state->m_bg_tilemap,0,(state->m_bgscrolly+state->m_scroll_y) & 0x1ff); + state->m_bg_tilemap->set_scrolly(0,(state->m_bgscrolly+state->m_scroll_y) & 0x1ff); } } @@ -279,11 +279,11 @@ WRITE16_HANDLER( twincobr_fgscroll_w ) if (offset == 0) { COMBINE_DATA(&state->m_fgscrollx); - tilemap_set_scrollx(state->m_fg_tilemap,0,(state->m_fgscrollx+state->m_scroll_x) & 0x1ff); + state->m_fg_tilemap->set_scrollx(0,(state->m_fgscrollx+state->m_scroll_x) & 0x1ff); } else { COMBINE_DATA(&state->m_fgscrolly); - tilemap_set_scrolly(state->m_fg_tilemap,0,(state->m_fgscrolly+state->m_scroll_y) & 0x1ff); + state->m_fg_tilemap->set_scrolly(0,(state->m_fgscrolly+state->m_scroll_y) & 0x1ff); } } @@ -506,11 +506,11 @@ SCREEN_UPDATE_IND16( toaplan0 ) bitmap.fill(0, cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,TILEMAP_DRAW_OPAQUE,0); + state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(), bitmap,cliprect,0x0400); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect,0x0800); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect,0x0c00); return 0; } diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c index bfc19b753ec..496cb5c9bfc 100644 --- a/src/mame/video/ultraman.c +++ b/src/mame/video/ultraman.c @@ -90,7 +90,7 @@ WRITE16_HANDLER( ultraman_gfxctrl_w ) if (state->m_bank0 != ((data & 0x02) >> 1)) { state->m_bank0 = (data & 0x02) >> 1; - tilemap_mark_all_tiles_dirty_all(space->machine()); /* should mark only zoom0 */ + space->machine().tilemap().mark_all_dirty(); /* should mark only zoom0 */ } k051316_wraparound_enable(state->m_k051316_2, data & 0x04); @@ -98,7 +98,7 @@ WRITE16_HANDLER( ultraman_gfxctrl_w ) if (state->m_bank1 != ((data & 0x08) >> 3)) { state->m_bank1 = (data & 0x08) >> 3; - tilemap_mark_all_tiles_dirty_all(space->machine()); /* should mark only zoom1 */ + space->machine().tilemap().mark_all_dirty(); /* should mark only zoom1 */ } k051316_wraparound_enable(state->m_k051316_3, data & 0x10); @@ -106,7 +106,7 @@ WRITE16_HANDLER( ultraman_gfxctrl_w ) if (state->m_bank2 != ((data & 0x20) >> 5)) { state->m_bank2 = (data & 0x20) >> 5; - tilemap_mark_all_tiles_dirty_all(space->machine()); /* should mark only zoom2 */ + space->machine().tilemap().mark_all_dirty(); /* should mark only zoom2 */ } coin_counter_w(space->machine(), 0, data & 0x40); diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index b04a2198f4b..40c0690a9b1 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -61,7 +61,7 @@ SCREEN_UPDATE_IND16( ultratnk ) UINT8 *videoram = state->m_videoram; int i; - tilemap_draw(bitmap, cliprect, state->m_playfield, 0, 0); + state->m_playfield->draw(bitmap, cliprect, 0, 0); for (i = 0; i < 4; i++) { @@ -123,7 +123,7 @@ SCREEN_VBLANK( ultratnk ) rect &= screen.machine().primary_screen->visible_area(); - tilemap_draw(state->m_helper, rect, state->m_playfield, 0, 0); + state->m_playfield->draw(state->m_helper, rect, 0, 0); if (code & 4) bank = 32; @@ -154,5 +154,5 @@ WRITE8_HANDLER( ultratnk_video_ram_w ) ultratnk_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_playfield, offset); + state->m_playfield->mark_tile_dirty(offset); } diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c index 87b2ca72568..70a97086da9 100644 --- a/src/mame/video/unico.c +++ b/src/mame/video/unico.c @@ -110,7 +110,7 @@ WRITE16_HANDLER( unico_vram_w ) UINT16 *vram = state->m_vram; int tile = ((offset / 0x2000) + 1) % 3; COMBINE_DATA(&vram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap[tile],(offset & 0x3fff)/2); + state->m_tilemap[tile]->mark_tile_dirty((offset & 0x3fff)/2); } WRITE32_HANDLER( unico_vram32_w ) @@ -119,7 +119,7 @@ WRITE32_HANDLER( unico_vram32_w ) UINT32 *vram = state->m_vram32; int tile = ((offset / 0x1000) + 1) % 3; COMBINE_DATA(&vram[offset]); - tilemap_mark_tile_dirty(state->m_tilemap[tile],(offset & 0x3fff)); + state->m_tilemap[tile]->mark_tile_dirty((offset & 0x3fff)); } @@ -145,24 +145,24 @@ VIDEO_START( unico ) state->m_tilemap[2] = tilemap_create( machine, get_tile_info,tilemap_scan_rows, 16,16, 0x40, 0x40); - tilemap_set_user_data(state->m_tilemap[0], &state->m_vram[0x8000/2]); - tilemap_set_user_data(state->m_tilemap[1], &state->m_vram[0x0000/2]); - tilemap_set_user_data(state->m_tilemap[2], &state->m_vram[0x4000/2]); + state->m_tilemap[0]->set_user_data(&state->m_vram[0x8000/2]); + state->m_tilemap[1]->set_user_data(&state->m_vram[0x0000/2]); + state->m_tilemap[2]->set_user_data(&state->m_vram[0x4000/2]); state->m_sprites_scrolldx = -0x3f; state->m_sprites_scrolldy = -0x0e; - tilemap_set_scrolldx(state->m_tilemap[0],-0x32,0); - tilemap_set_scrolldx(state->m_tilemap[1],-0x30,0); - tilemap_set_scrolldx(state->m_tilemap[2],-0x2e,0); + state->m_tilemap[0]->set_scrolldx(-0x32,0); + state->m_tilemap[1]->set_scrolldx(-0x30,0); + state->m_tilemap[2]->set_scrolldx(-0x2e,0); - tilemap_set_scrolldy(state->m_tilemap[0],-0x0f,0); - tilemap_set_scrolldy(state->m_tilemap[1],-0x0f,0); - tilemap_set_scrolldy(state->m_tilemap[2],-0x0f,0); + state->m_tilemap[0]->set_scrolldy(-0x0f,0); + state->m_tilemap[1]->set_scrolldy(-0x0f,0); + state->m_tilemap[2]->set_scrolldy(-0x0f,0); - tilemap_set_transparent_pen(state->m_tilemap[0],0x00); - tilemap_set_transparent_pen(state->m_tilemap[1],0x00); - tilemap_set_transparent_pen(state->m_tilemap[2],0x00); + state->m_tilemap[0]->set_transparent_pen(0x00); + state->m_tilemap[1]->set_transparent_pen(0x00); + state->m_tilemap[2]->set_transparent_pen(0x00); } VIDEO_START( zeropnt2 ) @@ -177,24 +177,24 @@ VIDEO_START( zeropnt2 ) state->m_tilemap[2] = tilemap_create( machine, get_tile_info32,tilemap_scan_rows, 16,16, 0x40, 0x40); - tilemap_set_user_data(state->m_tilemap[0], &state->m_vram32[0x8000/4]); - tilemap_set_user_data(state->m_tilemap[1], &state->m_vram32[0x0000/4]); - tilemap_set_user_data(state->m_tilemap[2], &state->m_vram32[0x4000/4]); + state->m_tilemap[0]->set_user_data(&state->m_vram32[0x8000/4]); + state->m_tilemap[1]->set_user_data(&state->m_vram32[0x0000/4]); + state->m_tilemap[2]->set_user_data(&state->m_vram32[0x4000/4]); state->m_sprites_scrolldx = -0x3f; state->m_sprites_scrolldy = -0x0e; - tilemap_set_scrolldx(state->m_tilemap[0],-0x32,0); - tilemap_set_scrolldx(state->m_tilemap[1],-0x30,0); - tilemap_set_scrolldx(state->m_tilemap[2],-0x2e,0); + state->m_tilemap[0]->set_scrolldx(-0x32,0); + state->m_tilemap[1]->set_scrolldx(-0x30,0); + state->m_tilemap[2]->set_scrolldx(-0x2e,0); - tilemap_set_scrolldy(state->m_tilemap[0],-0x0f,0); - tilemap_set_scrolldy(state->m_tilemap[1],-0x0f,0); - tilemap_set_scrolldy(state->m_tilemap[2],-0x0f,0); + state->m_tilemap[0]->set_scrolldy(-0x0f,0); + state->m_tilemap[1]->set_scrolldy(-0x0f,0); + state->m_tilemap[2]->set_scrolldy(-0x0f,0); - tilemap_set_transparent_pen(state->m_tilemap[0],0x00); - tilemap_set_transparent_pen(state->m_tilemap[1],0x00); - tilemap_set_transparent_pen(state->m_tilemap[2],0x00); + state->m_tilemap[0]->set_transparent_pen(0x00); + state->m_tilemap[1]->set_transparent_pen(0x00); + state->m_tilemap[2]->set_transparent_pen(0x00); } @@ -346,14 +346,14 @@ SCREEN_UPDATE_IND16( unico ) unico_state *state = screen.machine().driver_data(); int layers_ctrl = -1; - tilemap_set_scrollx(state->m_tilemap[0], 0, state->m_scroll[0x00]); - tilemap_set_scrolly(state->m_tilemap[0], 0, state->m_scroll[0x01]); + state->m_tilemap[0]->set_scrollx(0, state->m_scroll[0x00]); + state->m_tilemap[0]->set_scrolly(0, state->m_scroll[0x01]); - tilemap_set_scrollx(state->m_tilemap[1], 0, state->m_scroll[0x05]); - tilemap_set_scrolly(state->m_tilemap[1], 0, state->m_scroll[0x0a]); + state->m_tilemap[1]->set_scrollx(0, state->m_scroll[0x05]); + state->m_tilemap[1]->set_scrolly(0, state->m_scroll[0x0a]); - tilemap_set_scrollx(state->m_tilemap[2], 0, state->m_scroll[0x04]); - tilemap_set_scrolly(state->m_tilemap[2], 0, state->m_scroll[0x02]); + state->m_tilemap[2]->set_scrollx(0, state->m_scroll[0x04]); + state->m_tilemap[2]->set_scrolly(0, state->m_scroll[0x02]); #ifdef MAME_DEBUG if ( screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input().code_pressed(KEYCODE_X) ) @@ -371,9 +371,9 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input( bitmap.fill(0x1f00, cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,state->m_tilemap[0],0,1); - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,state->m_tilemap[1],0,2); - if (layers_ctrl & 4) tilemap_draw(bitmap,cliprect,state->m_tilemap[2],0,4); + if (layers_ctrl & 1) state->m_tilemap[0]->draw(bitmap, cliprect, 0,1); + if (layers_ctrl & 2) state->m_tilemap[1]->draw(bitmap, cliprect, 0,2); + if (layers_ctrl & 4) state->m_tilemap[2]->draw(bitmap, cliprect, 0,4); /* Sprites are drawn last, using pdrawgfx */ if (layers_ctrl & 8) unico_draw_sprites(screen.machine(), bitmap,cliprect); @@ -386,14 +386,14 @@ SCREEN_UPDATE_IND16( zeropnt2 ) unico_state *state = screen.machine().driver_data(); int layers_ctrl = -1; - tilemap_set_scrollx(state->m_tilemap[0], 0, state->m_scroll32[0] >> 16); - tilemap_set_scrolly(state->m_tilemap[0], 0, state->m_scroll32[0] & 0xffff); + state->m_tilemap[0]->set_scrollx(0, state->m_scroll32[0] >> 16); + state->m_tilemap[0]->set_scrolly(0, state->m_scroll32[0] & 0xffff); - tilemap_set_scrollx(state->m_tilemap[1], 0, state->m_scroll32[2] & 0xffff); - tilemap_set_scrolly(state->m_tilemap[1], 0, state->m_scroll32[5] >> 16); + state->m_tilemap[1]->set_scrollx(0, state->m_scroll32[2] & 0xffff); + state->m_tilemap[1]->set_scrolly(0, state->m_scroll32[5] >> 16); - tilemap_set_scrollx(state->m_tilemap[2], 0, state->m_scroll32[2] >> 16); - tilemap_set_scrolly(state->m_tilemap[2], 0, state->m_scroll32[1] >> 16); + state->m_tilemap[2]->set_scrollx(0, state->m_scroll32[2] >> 16); + state->m_tilemap[2]->set_scrolly(0, state->m_scroll32[1] >> 16); #ifdef MAME_DEBUG if ( screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input().code_pressed(KEYCODE_X) ) @@ -411,9 +411,9 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input( bitmap.fill(0x1f00, cliprect); screen.machine().priority_bitmap.fill(0, cliprect); - if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,state->m_tilemap[0],0,1); - if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,state->m_tilemap[1],0,2); - if (layers_ctrl & 4) tilemap_draw(bitmap,cliprect,state->m_tilemap[2],0,4); + if (layers_ctrl & 1) state->m_tilemap[0]->draw(bitmap, cliprect, 0,1); + if (layers_ctrl & 2) state->m_tilemap[1]->draw(bitmap, cliprect, 0,2); + if (layers_ctrl & 4) state->m_tilemap[2]->draw(bitmap, cliprect, 0,4); /* Sprites are drawn last, using pdrawgfx */ if (layers_ctrl & 8) zeropnt2_draw_sprites(screen.machine(), bitmap,cliprect); diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c index ea4c910668b..b9546f21ac6 100644 --- a/src/mame/video/usgames.c +++ b/src/mame/video/usgames.c @@ -54,7 +54,7 @@ WRITE8_HANDLER( usgames_videoram_w ) { usgames_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,offset/2); + state->m_tilemap->mark_tile_dirty(offset/2); } WRITE8_HANDLER( usgames_charram_w ) @@ -68,6 +68,6 @@ WRITE8_HANDLER( usgames_charram_w ) SCREEN_UPDATE_IND16(usgames) { usgames_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_tilemap,0,0); + state->m_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c index 7797038659e..4645186fbdb 100644 --- a/src/mame/video/vastar.c +++ b/src/mame/video/vastar.c @@ -76,12 +76,12 @@ VIDEO_START( vastar ) state->m_bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows,8,8,32,32); state->m_bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); - tilemap_set_transparent_pen(state->m_bg1_tilemap,0); - tilemap_set_transparent_pen(state->m_bg2_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_bg1_tilemap->set_transparent_pen(0); + state->m_bg2_tilemap->set_transparent_pen(0); - tilemap_set_scroll_cols(state->m_bg1_tilemap, 32); - tilemap_set_scroll_cols(state->m_bg2_tilemap, 32); + state->m_bg1_tilemap->set_scroll_cols(32); + state->m_bg2_tilemap->set_scroll_cols(32); } @@ -96,7 +96,7 @@ WRITE8_HANDLER( vastar_fgvideoram_w ) vastar_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( vastar_bg1videoram_w ) @@ -104,7 +104,7 @@ WRITE8_HANDLER( vastar_bg1videoram_w ) vastar_state *state = space->machine().driver_data(); state->m_bg1videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg1_tilemap,offset & 0x3ff); + state->m_bg1_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( vastar_bg2videoram_w ) @@ -112,7 +112,7 @@ WRITE8_HANDLER( vastar_bg2videoram_w ) vastar_state *state = space->machine().driver_data(); state->m_bg2videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg2_tilemap,offset & 0x3ff); + state->m_bg2_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -204,31 +204,31 @@ SCREEN_UPDATE_IND16( vastar ) for (i = 0;i < 32;i++) { - tilemap_set_scrolly(state->m_bg1_tilemap,i,state->m_bg1_scroll[i]); - tilemap_set_scrolly(state->m_bg2_tilemap,i,state->m_bg2_scroll[i]); + state->m_bg1_tilemap->set_scrolly(i,state->m_bg1_scroll[i]); + state->m_bg2_tilemap->set_scrolly(i,state->m_bg2_scroll[i]); } switch (*state->m_sprite_priority) { case 0: - tilemap_draw(bitmap,cliprect, state->m_bg1_tilemap, TILEMAP_DRAW_OPAQUE,0); + state->m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect, state->m_bg2_tilemap, 0,0); - tilemap_draw(bitmap,cliprect, state->m_fg_tilemap, 0,0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); break; case 2: - tilemap_draw(bitmap,cliprect, state->m_bg1_tilemap, TILEMAP_DRAW_OPAQUE,0); + state->m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect, state->m_bg1_tilemap, 0,0); - tilemap_draw(bitmap,cliprect, state->m_bg2_tilemap, 0,0); - tilemap_draw(bitmap,cliprect, state->m_fg_tilemap, 0,0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0,0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); break; case 3: - tilemap_draw(bitmap,cliprect, state->m_bg1_tilemap, TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect, state->m_bg2_tilemap, 0,0); - tilemap_draw(bitmap,cliprect, state->m_fg_tilemap, 0,0); + state->m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_bg2_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); break; diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c index a9720e67abd..ca87769ec92 100644 --- a/src/mame/video/vball.c +++ b/src/mame/video/vball.c @@ -43,7 +43,7 @@ VIDEO_START( vb ) vball_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,background_scan, 8, 8,64,64); - tilemap_set_scroll_rows(state->m_bg_tilemap,32); + state->m_bg_tilemap->set_scroll_rows(32); state->m_gfxset=0; state->m_vb_bgprombank=0xff; state->m_vb_spprombank=0xff; @@ -53,7 +53,7 @@ WRITE8_HANDLER( vb_videoram_w ) { vball_state *state = space->machine().driver_data(); state->m_vb_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } #ifdef UNUSED_FUNCTION @@ -68,7 +68,7 @@ WRITE8_HANDLER( vb_attrib_w ) { vball_state *state = space->machine().driver_data(); state->m_vb_attribram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } void vb_bgprombank_w( running_machine &machine, int bank ) @@ -107,7 +107,7 @@ void vb_spprombank_w( running_machine &machine, int bank ) void vb_mark_all_dirty( running_machine &machine ) { vball_state *state = machine.driver_data(); - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } #define DRAW_SPRITE( order, sx, sy ) drawgfx_transpen( bitmap, \ @@ -166,14 +166,14 @@ SCREEN_UPDATE_IND16( vb ) vball_state *state = screen.machine().driver_data(); int i; - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_vb_scrolly_hi + *state->m_vb_scrolly_lo); + state->m_bg_tilemap->set_scrolly(0,state->m_vb_scrolly_hi + *state->m_vb_scrolly_lo); /*To get linescrolling to work properly, we must ignore the 1st two scroll values, no idea why! -SJE */ for (i = 2; i < 256; i++) { - tilemap_set_scrollx(state->m_bg_tilemap,i,state->m_vb_scrollx[i-2]); + state->m_bg_tilemap->set_scrollx(i,state->m_vb_scrollx[i-2]); //logerror("scrollx[%d] = %d\n",i,state->m_vb_scrollx[i]); } - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(),bitmap,cliprect); return 0; } diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c index c2d51a7655b..42d2952121f 100644 --- a/src/mame/video/videopin.c +++ b/src/mame/video/videopin.c @@ -39,9 +39,9 @@ SCREEN_UPDATE_IND16( videopin ) int col; int row; - tilemap_set_scrollx(state->m_bg_tilemap, 0, -8); /* account for delayed loading of shift reg C6 */ + state->m_bg_tilemap->set_scrollx(0, -8); /* account for delayed loading of shift reg C6 */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); for (row = 0; row < 32; row++) { @@ -99,5 +99,5 @@ WRITE8_HANDLER( videopin_video_ram_w ) { videopin_state *state = space->machine().driver_data(); state->m_video_ram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/video/vindictr.c b/src/mame/video/vindictr.c index 9d24ea04afc..32b0619c41f 100644 --- a/src/mame/video/vindictr.c +++ b/src/mame/video/vindictr.c @@ -92,7 +92,7 @@ VIDEO_START( vindictr ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); /* save states */ state->save_item(NAME(state->m_playfield_tile_bank)); @@ -162,7 +162,7 @@ void vindictr_scanline_update(screen_device &screen, int scanline) { screen.update_partial(scanline - 1); state->m_playfield_tile_bank = data & 7; - tilemap_mark_all_tiles_dirty(state->m_playfield_tilemap); + state->m_playfield_tilemap->mark_all_dirty(); } break; @@ -170,7 +170,7 @@ void vindictr_scanline_update(screen_device &screen, int scanline) if (state->m_playfield_xscroll != (data & 0x1ff)) { screen.update_partial(scanline - 1); - tilemap_set_scrollx(state->m_playfield_tilemap, 0, data); + state->m_playfield_tilemap->set_scrollx(0, data); state->m_playfield_xscroll = data & 0x1ff; } break; @@ -201,7 +201,7 @@ void vindictr_scanline_update(screen_device &screen, int scanline) if (state->m_playfield_yscroll != ((data - offset) & 0x1ff)) { screen.update_partial(scanline - 1); - tilemap_set_scrolly(state->m_playfield_tilemap, 0, data - offset); + state->m_playfield_tilemap->set_scrolly(0, data - offset); atarimo_set_yscroll(0, (data - offset) & 0x1ff); } break; @@ -226,7 +226,7 @@ SCREEN_UPDATE_IND16( vindictr ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -267,7 +267,7 @@ SCREEN_UPDATE_IND16( vindictr ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c index 4eb92278c0e..a8d20ed8fa9 100644 --- a/src/mame/video/vulgus.c +++ b/src/mame/video/vulgus.c @@ -88,7 +88,7 @@ static TILE_GET_INFO( get_fg_tile_info ) code + ((color & 0x80) << 1), color & 0x3f, 0); - tileinfo->group = color & 0x3f; + tileinfo.group = color & 0x3f; } static TILE_GET_INFO( get_bg_tile_info ) @@ -132,14 +132,14 @@ WRITE8_HANDLER( vulgus_fgvideoram_w ) { vulgus_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x3ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( vulgus_bgvideoram_w ) { vulgus_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -160,7 +160,7 @@ WRITE8_HANDLER( vulgus_palette_bank_w ) if (state->m_palette_bank != (data & 3)) { state->m_palette_bank = data & 3; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } } @@ -220,11 +220,11 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re SCREEN_UPDATE_IND16( vulgus ) { vulgus_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_scroll_low[1] + 256 * state->m_scroll_high[1]); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_scroll_low[0] + 256 * state->m_scroll_high[0]); + state->m_bg_tilemap->set_scrollx(0, state->m_scroll_low[1] + 256 * state->m_scroll_high[1]); + state->m_bg_tilemap->set_scrolly(0, state->m_scroll_low[0] + 256 * state->m_scroll_high[0]); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c index 4f10cbd3239..579ce02ee3b 100644 --- a/src/mame/video/warpwarp.c +++ b/src/mame/video/warpwarp.c @@ -197,14 +197,14 @@ WRITE8_HANDLER( geebee_videoram_w ) { warpwarp_state *state = space->machine().driver_data(); state->m_geebee_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( warpwarp_videoram_w ) { warpwarp_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -246,7 +246,7 @@ static void draw_ball(running_machine &machine, bitmap_ind16 &bitmap, const rect SCREEN_UPDATE_IND16( geebee ) { warpwarp_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_ball(screen.machine(), bitmap, cliprect, state->m_ball_pen); return 0; diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index e6dcb810b29..a72b78c537f 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -84,8 +84,8 @@ VIDEO_START( wc90 ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,64,32); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); } VIDEO_START( wc90t ) @@ -95,8 +95,8 @@ VIDEO_START( wc90t ) state->m_fg_tilemap = tilemap_create(machine, track_get_fg_tile_info,tilemap_scan_rows,16,16,64,32); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); - tilemap_set_transparent_pen(state->m_tx_tilemap,0); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_tx_tilemap->set_transparent_pen(0); } @@ -110,21 +110,21 @@ WRITE8_HANDLER( wc90_bgvideoram_w ) { wc90_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE8_HANDLER( wc90_fgvideoram_w ) { wc90_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x7ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE8_HANDLER( wc90_txvideoram_w ) { wc90_state *state = space->machine().driver_data(); state->m_txvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset & 0x7ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); } @@ -348,19 +348,19 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( wc90 ) { wc90_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,state->m_scroll2xlo[0] + 256 * state->m_scroll2xhi[0]); - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scroll2ylo[0] + 256 * state->m_scroll2yhi[0]); - tilemap_set_scrollx(state->m_fg_tilemap,0,state->m_scroll1xlo[0] + 256 * state->m_scroll1xhi[0]); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scroll1ylo[0] + 256 * state->m_scroll1yhi[0]); - tilemap_set_scrollx(state->m_tx_tilemap,0,state->m_scroll0xlo[0] + 256 * state->m_scroll0xhi[0]); - tilemap_set_scrolly(state->m_tx_tilemap,0,state->m_scroll0ylo[0] + 256 * state->m_scroll0yhi[0]); + state->m_bg_tilemap->set_scrollx(0,state->m_scroll2xlo[0] + 256 * state->m_scroll2xhi[0]); + state->m_bg_tilemap->set_scrolly(0,state->m_scroll2ylo[0] + 256 * state->m_scroll2yhi[0]); + state->m_fg_tilemap->set_scrollx(0,state->m_scroll1xlo[0] + 256 * state->m_scroll1xhi[0]); + state->m_fg_tilemap->set_scrolly(0,state->m_scroll1ylo[0] + 256 * state->m_scroll1yhi[0]); + state->m_tx_tilemap->set_scrollx(0,state->m_scroll0xlo[0] + 256 * state->m_scroll0xhi[0]); + state->m_tx_tilemap->set_scrolly(0,state->m_scroll0ylo[0] + 256 * state->m_scroll0yhi[0]); // draw_sprites(screen.machine(), bitmap,cliprect, 3 ); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect, 2 ); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect, 1 ); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect, 0 ); return 0; } diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c index 0a471f0aee6..927db801797 100644 --- a/src/mame/video/wc90b.c +++ b/src/mame/video/wc90b.c @@ -57,8 +57,8 @@ VIDEO_START( wc90b ) state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,64,32); state->m_tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); - tilemap_set_transparent_pen(state->m_fg_tilemap,15); - tilemap_set_transparent_pen(state->m_tx_tilemap,15); + state->m_fg_tilemap->set_transparent_pen(15); + state->m_tx_tilemap->set_transparent_pen(15); } @@ -73,21 +73,21 @@ WRITE8_HANDLER( wc90b_bgvideoram_w ) { wc90b_state *state = space->machine().driver_data(); state->m_bgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x7ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE8_HANDLER( wc90b_fgvideoram_w ) { wc90b_state *state = space->machine().driver_data(); state->m_fgvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset & 0x7ff); + state->m_fg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE8_HANDLER( wc90b_txvideoram_w ) { wc90b_state *state = space->machine().driver_data(); state->m_txvideoram[offset] = data; - tilemap_mark_tile_dirty(state->m_tx_tilemap,offset & 0x7ff); + state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); } @@ -135,15 +135,15 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( wc90b ) { wc90b_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_bg_tilemap,0,8 * (state->m_scroll2x[0] & 0x7f) + 256 - 4 + (state->m_scroll_x_lo[0] & 0x07)); - tilemap_set_scrolly(state->m_bg_tilemap,0,state->m_scroll2y[0] + 1 + ((state->m_scroll2x[0] & 0x80) ? 256 : 0)); - tilemap_set_scrollx(state->m_fg_tilemap,0,8 * (state->m_scroll1x[0] & 0x7f) + 256 - 6 + ((state->m_scroll_x_lo[0] & 0x38) >> 3)); - tilemap_set_scrolly(state->m_fg_tilemap,0,state->m_scroll1y[0] + 1 + ((state->m_scroll1x[0] & 0x80) ? 256 : 0)); + state->m_bg_tilemap->set_scrollx(0,8 * (state->m_scroll2x[0] & 0x7f) + 256 - 4 + (state->m_scroll_x_lo[0] & 0x07)); + state->m_bg_tilemap->set_scrolly(0,state->m_scroll2y[0] + 1 + ((state->m_scroll2x[0] & 0x80) ? 256 : 0)); + state->m_fg_tilemap->set_scrollx(0,8 * (state->m_scroll1x[0] & 0x7f) + 256 - 6 + ((state->m_scroll_x_lo[0] & 0x38) >> 3)); + state->m_fg_tilemap->set_scrolly(0,state->m_scroll1y[0] + 1 + ((state->m_scroll1x[0] & 0x80) ? 256 : 0)); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect, 1 ); - tilemap_draw(bitmap,cliprect,state->m_tx_tilemap,0,0); + state->m_tx_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect, 0 ); return 0; } diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index d9d0bd2c697..9924fb315d9 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -441,7 +441,7 @@ WRITE16_HANDLER( wecleman_txtram_w ) state->m_bgpage[1] = (new_data >> 0x0) & 3; state->m_bgpage[2] = (new_data >> 0xc) & 3; state->m_bgpage[3] = (new_data >> 0x8) & 3; - tilemap_mark_all_tiles_dirty(state->m_bg_tilemap); + state->m_bg_tilemap->mark_all_dirty(); } /* pages selector for the foreground */ @@ -451,13 +451,13 @@ WRITE16_HANDLER( wecleman_txtram_w ) state->m_fgpage[1] = (new_data >> 0x0) & 3; state->m_fgpage[2] = (new_data >> 0xc) & 3; state->m_fgpage[3] = (new_data >> 0x8) & 3; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } /* Parallactic horizontal scroll registers follow */ } else - tilemap_mark_tile_dirty(state->m_txt_tilemap, offset); + state->m_txt_tilemap->mark_tile_dirty(offset); } } @@ -506,16 +506,16 @@ WRITE16_HANDLER( wecleman_pageram_w ) row = ( offset / PAGE_NX ) % PAGE_NY; /* background */ - if (state->m_bgpage[0] == page) tilemap_mark_tile_dirty(state->m_bg_tilemap, (col+PAGE_NX*0) + (row+PAGE_NY*0)*PAGE_NX*2 ); - if (state->m_bgpage[1] == page) tilemap_mark_tile_dirty(state->m_bg_tilemap, (col+PAGE_NX*1) + (row+PAGE_NY*0)*PAGE_NX*2 ); - if (state->m_bgpage[2] == page) tilemap_mark_tile_dirty(state->m_bg_tilemap, (col+PAGE_NX*0) + (row+PAGE_NY*1)*PAGE_NX*2 ); - if (state->m_bgpage[3] == page) tilemap_mark_tile_dirty(state->m_bg_tilemap, (col+PAGE_NX*1) + (row+PAGE_NY*1)*PAGE_NX*2 ); + if (state->m_bgpage[0] == page) state->m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*0)*PAGE_NX*2 ); + if (state->m_bgpage[1] == page) state->m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*0)*PAGE_NX*2 ); + if (state->m_bgpage[2] == page) state->m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*1)*PAGE_NX*2 ); + if (state->m_bgpage[3] == page) state->m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*1)*PAGE_NX*2 ); /* foreground */ - if (state->m_fgpage[0] == page) tilemap_mark_tile_dirty(state->m_fg_tilemap, (col+PAGE_NX*0) + (row+PAGE_NY*0)*PAGE_NX*2 ); - if (state->m_fgpage[1] == page) tilemap_mark_tile_dirty(state->m_fg_tilemap, (col+PAGE_NX*1) + (row+PAGE_NY*0)*PAGE_NX*2 ); - if (state->m_fgpage[2] == page) tilemap_mark_tile_dirty(state->m_fg_tilemap, (col+PAGE_NX*0) + (row+PAGE_NY*1)*PAGE_NX*2 ); - if (state->m_fgpage[3] == page) tilemap_mark_tile_dirty(state->m_fg_tilemap, (col+PAGE_NX*1) + (row+PAGE_NY*1)*PAGE_NX*2 ); + if (state->m_fgpage[0] == page) state->m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*0)*PAGE_NX*2 ); + if (state->m_fgpage[1] == page) state->m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*0)*PAGE_NX*2 ); + if (state->m_fgpage[2] == page) state->m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*1)*PAGE_NX*2 ); + if (state->m_fgpage[3] == page) state->m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*1)*PAGE_NX*2 ); } } @@ -954,20 +954,20 @@ VIDEO_START( wecleman ) 8,8, PAGE_NX * 1, PAGE_NY * 1); - tilemap_set_scroll_rows(state->m_bg_tilemap, TILEMAP_DIMY); /* Screen-wise scrolling */ - tilemap_set_scroll_cols(state->m_bg_tilemap, 1); - tilemap_set_transparent_pen(state->m_bg_tilemap,0); + state->m_bg_tilemap->set_scroll_rows(TILEMAP_DIMY); /* Screen-wise scrolling */ + state->m_bg_tilemap->set_scroll_cols(1); + state->m_bg_tilemap->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_fg_tilemap, TILEMAP_DIMY); /* Screen-wise scrolling */ - tilemap_set_scroll_cols(state->m_fg_tilemap, 1); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_fg_tilemap->set_scroll_rows(TILEMAP_DIMY); /* Screen-wise scrolling */ + state->m_fg_tilemap->set_scroll_cols(1); + state->m_fg_tilemap->set_transparent_pen(0); - tilemap_set_scroll_rows(state->m_txt_tilemap, 1); - tilemap_set_scroll_cols(state->m_txt_tilemap, 1); - tilemap_set_transparent_pen(state->m_txt_tilemap,0); + state->m_txt_tilemap->set_scroll_rows(1); + state->m_txt_tilemap->set_scroll_cols(1); + state->m_txt_tilemap->set_transparent_pen(0); - tilemap_set_scrollx(state->m_txt_tilemap, 0, 512-320-16 -BMP_PAD); - tilemap_set_scrolly(state->m_txt_tilemap, 0, -BMP_PAD ); + state->m_txt_tilemap->set_scrollx(0, 512-320-16 -BMP_PAD); + state->m_txt_tilemap->set_scrolly(0, -BMP_PAD ); // patches out a mysterious pixel floating in the sky (tile decoding bug?) *(machine.gfx[0]->gfxdata + (machine.gfx[0]->char_modulo*0xaca+7)) = 0; @@ -1043,8 +1043,8 @@ SCREEN_UPDATE_RGB32( wecleman ) cloud_sx = state->m_txtram[0xfee>>1] + 0xb0; cloud_sy = bg_y; - tilemap_set_scrolly(state->m_bg_tilemap, 0, bg_y -BMP_PAD); - tilemap_set_scrolly(state->m_fg_tilemap, 0, fg_y -BMP_PAD); + state->m_bg_tilemap->set_scrolly(0, bg_y -BMP_PAD); + state->m_fg_tilemap->set_scrolly(0, fg_y -BMP_PAD); for (i=0; i<(28<<2); i+=4) { @@ -1054,8 +1054,8 @@ SCREEN_UPDATE_RGB32( wecleman ) k = i<<1; for (j=0; j<8; j++) { - tilemap_set_scrollx(state->m_fg_tilemap, (fg_y + k + j) & (TILEMAP_DIMY - 1), fg_x); - tilemap_set_scrollx(state->m_bg_tilemap, (bg_y + k + j) & (TILEMAP_DIMY - 1), bg_x); + state->m_fg_tilemap->set_scrollx((fg_y + k + j) & (TILEMAP_DIMY - 1), fg_x); + state->m_bg_tilemap->set_scrollx((bg_y + k + j) & (TILEMAP_DIMY - 1), bg_x); } } @@ -1071,7 +1071,7 @@ SCREEN_UPDATE_RGB32( wecleman ) if (video_on) wecleman_draw_road(screen.machine(), bitmap, cliprect, 0x02); /* Draw the background */ - if (video_on) tilemap_draw(bitmap,cliprect, state->m_bg_tilemap, 0, 0); + if (video_on) state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); // draws the cloud layer; needs work if (state->m_cloud_visible) @@ -1099,7 +1099,7 @@ SCREEN_UPDATE_RGB32( wecleman ) } /* Draw the foreground */ - if (video_on) tilemap_draw(bitmap,cliprect, state->m_fg_tilemap, 0, 0); + if (video_on) state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); /* Draw the road (lines which have priority 0x04) */ if (video_on) wecleman_draw_road(screen.machine(), bitmap,cliprect, 0x04); @@ -1108,7 +1108,7 @@ SCREEN_UPDATE_RGB32( wecleman ) if (video_on) sprite_draw(screen.machine(), bitmap,cliprect); /* Draw the text layer */ - if (video_on) tilemap_draw(bitmap,cliprect, state->m_txt_tilemap, 0, 0); + if (video_on) state->m_txt_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c index 398a3c41960..cc8a1783f07 100644 --- a/src/mame/video/welltris.c +++ b/src/mame/video/welltris.c @@ -148,7 +148,7 @@ static void setbank(welltris_state *state, int num, int bank) if (state->m_gfxbank[num] != bank) { state->m_gfxbank[num] = bank; - tilemap_mark_all_tiles_dirty(state->m_char_tilemap); + state->m_char_tilemap->mark_all_dirty(); } } @@ -164,7 +164,7 @@ WRITE16_HANDLER( welltris_palette_bank_w ) if (state->m_charpalettebank != (data & 0x03)) { state->m_charpalettebank = (data & 0x03); - tilemap_mark_all_tiles_dirty(state->m_char_tilemap); + state->m_char_tilemap->mark_all_dirty(); } flip_screen_set(space->machine(), data & 0x80); @@ -213,7 +213,7 @@ WRITE16_HANDLER( welltris_charvideoram_w ) welltris_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_charvideoram[offset]); - tilemap_mark_tile_dirty(state->m_char_tilemap, offset); + state->m_char_tilemap->mark_tile_dirty(offset); } VIDEO_START( welltris ) @@ -221,7 +221,7 @@ VIDEO_START( welltris ) welltris_state *state = machine.driver_data(); state->m_char_tilemap = tilemap_create(machine, get_welltris_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - tilemap_set_transparent_pen(state->m_char_tilemap, 15); + state->m_char_tilemap->set_transparent_pen(15); } static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -243,11 +243,11 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons SCREEN_UPDATE_IND16( welltris ) { welltris_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_char_tilemap, 0, state->m_scrollx); - tilemap_set_scrolly(state->m_char_tilemap, 0, state->m_scrolly); + state->m_char_tilemap->set_scrollx(0, state->m_scrollx); + state->m_char_tilemap->set_scrolly(0, state->m_scrolly); draw_background(screen.machine(), bitmap, cliprect); - tilemap_draw(bitmap, cliprect, state->m_char_tilemap, 0, 0); + state->m_char_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index 602233a5aec..83dd5c81cb1 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -5,7 +5,7 @@ /*******************************************************************/ -INLINE void common_get_piv_tile_info( running_machine &machine, tile_data *tileinfo, int tile_index, int num ) +INLINE void common_get_piv_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, int num ) { wgp_state *state = machine.driver_data(); UINT16 tilenum = state->m_pivram[tile_index + num * 0x1000]; /* 3 blocks of $2000 */ @@ -45,17 +45,17 @@ static void wgp_core_vh_start( running_machine &machine, int piv_xoffs, int piv_ state->m_piv_xoffs = piv_xoffs; state->m_piv_yoffs = piv_yoffs; - tilemap_set_transparent_pen(state->m_piv_tilemap[0], 0); - tilemap_set_transparent_pen(state->m_piv_tilemap[1], 0); - tilemap_set_transparent_pen(state->m_piv_tilemap[2], 0); + state->m_piv_tilemap[0]->set_transparent_pen(0); + state->m_piv_tilemap[1]->set_transparent_pen(0); + state->m_piv_tilemap[2]->set_transparent_pen(0); /* flipscreen n/a */ - tilemap_set_scrolldx(state->m_piv_tilemap[0], -piv_xoffs, 0); - tilemap_set_scrolldx(state->m_piv_tilemap[1], -piv_xoffs, 0); - tilemap_set_scrolldx(state->m_piv_tilemap[2], -piv_xoffs, 0); - tilemap_set_scrolldy(state->m_piv_tilemap[0], -piv_yoffs, 0); - tilemap_set_scrolldy(state->m_piv_tilemap[1], -piv_yoffs, 0); - tilemap_set_scrolldy(state->m_piv_tilemap[2], -piv_yoffs, 0); + state->m_piv_tilemap[0]->set_scrolldx(-piv_xoffs, 0); + state->m_piv_tilemap[1]->set_scrolldx(-piv_xoffs, 0); + state->m_piv_tilemap[2]->set_scrolldx(-piv_xoffs, 0); + state->m_piv_tilemap[0]->set_scrolldy(-piv_yoffs, 0); + state->m_piv_tilemap[1]->set_scrolldy(-piv_yoffs, 0); + state->m_piv_tilemap[2]->set_scrolldy(-piv_yoffs, 0); /* We don't need tilemap_set_scroll_rows, as the custom draw routine applies rowscroll manually */ tc0100scn_set_colbanks(state->m_tc0100scn, 0x80, 0xc0, 0x40); @@ -136,7 +136,7 @@ WRITE16_HANDLER( wgp_pivram_word_w ) if (offset < 0x3000) { - tilemap_mark_tile_dirty(state->m_piv_tilemap[(offset / 0x1000)], (offset % 0x1000)); + state->m_piv_tilemap[(offset / 0x1000)]->mark_tile_dirty((offset % 0x1000)); } else if ((offset >= 0x3400) && (offset < 0x4000)) { @@ -144,7 +144,7 @@ WRITE16_HANDLER( wgp_pivram_word_w ) } else if ((offset >= 0x8000) && (offset < 0xb000)) { - tilemap_mark_tile_dirty(state->m_piv_tilemap[((offset - 0x8000)/ 0x1000)], (offset % 0x1000)); + state->m_piv_tilemap[((offset - 0x8000)/ 0x1000)]->mark_tile_dirty((offset % 0x1000)); } } @@ -521,8 +521,8 @@ INLINE void bryan2_drawscanline( bitmap_ind16 &bitmap, int x, int y, int length, static void wgp_piv_layer_draw( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int flags, UINT32 priority ) { wgp_state *state = machine.driver_data(); - bitmap_ind16 &srcbitmap = tilemap_get_pixmap(state->m_piv_tilemap[layer]); - bitmap_ind8 &flagsbitmap = tilemap_get_flagsmap(state->m_piv_tilemap[layer]); + bitmap_ind16 &srcbitmap = state->m_piv_tilemap[layer]->pixmap(); + bitmap_ind8 &flagsbitmap = state->m_piv_tilemap[layer]->flagsmap(); UINT16 *dst16,*src16; UINT8 *tsrc; @@ -677,8 +677,8 @@ SCREEN_UPDATE_IND16( wgp ) for (i = 0; i < 3; i++) { - tilemap_set_scrollx(state->m_piv_tilemap[i], 0, state->m_piv_scrollx[i]); - tilemap_set_scrolly(state->m_piv_tilemap[i], 0, state->m_piv_scrolly[i]); + state->m_piv_tilemap[i]->set_scrollx(0, state->m_piv_scrollx[i]); + state->m_piv_tilemap[i]->set_scrolly(0, state->m_piv_scrolly[i]); } tc0100scn_tilemap_update(state->m_tc0100scn); diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c index 16bb649b45a..7a38f9a441a 100644 --- a/src/mame/video/williams.c +++ b/src/mame/video/williams.c @@ -159,7 +159,7 @@ VIDEO_START( williams2 ) /* create the tilemap */ state->m_bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_cols, 24,16, 128,16); - tilemap_set_scrolldx(state->m_bg_tilemap, 2, 0); + state->m_bg_tilemap->set_scrolldx(2, 0); state_save_register(machine); } @@ -250,7 +250,7 @@ SCREEN_UPDATE_RGB32( williams2 ) int x, y; /* draw the background */ - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* fetch the relevant pens */ for (x = 1; x < 16; x++) @@ -428,7 +428,7 @@ WRITE8_HANDLER( williams2_bg_select_w ) data &= 0x3f; break; } - tilemap_set_palette_offset(state->m_bg_tilemap, data * 16); + state->m_bg_tilemap->set_palette_offset(data * 16); } @@ -436,7 +436,7 @@ WRITE8_HANDLER( williams2_tileram_w ) { williams_state *state = space->machine().driver_data(); state->m_williams2_tileram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } @@ -444,7 +444,7 @@ WRITE8_HANDLER( williams2_xscroll_low_w ) { williams_state *state = space->machine().driver_data(); state->m_tilemap_xscroll = (state->m_tilemap_xscroll & ~0x00f) | ((data & 0x80) >> 4) | (data & 0x07); - tilemap_set_scrollx(state->m_bg_tilemap, 0, (state->m_tilemap_xscroll & 7) + ((state->m_tilemap_xscroll >> 3) * 6)); + state->m_bg_tilemap->set_scrollx(0, (state->m_tilemap_xscroll & 7) + ((state->m_tilemap_xscroll >> 3) * 6)); } @@ -452,7 +452,7 @@ WRITE8_HANDLER( williams2_xscroll_high_w ) { williams_state *state = space->machine().driver_data(); state->m_tilemap_xscroll = (state->m_tilemap_xscroll & 0x00f) | (data << 4); - tilemap_set_scrollx(state->m_bg_tilemap, 0, (state->m_tilemap_xscroll & 7) + ((state->m_tilemap_xscroll >> 3) * 6)); + state->m_bg_tilemap->set_scrollx(0, (state->m_tilemap_xscroll & 7) + ((state->m_tilemap_xscroll >> 3) * 6)); } diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c index 27521ca2507..4ebc7a84147 100644 --- a/src/mame/video/wrally.c +++ b/src/mame/video/wrally.c @@ -41,7 +41,7 @@ static TILE_GET_INFO( get_tile_info_wrally_screen0 ) int data2 = state->m_videoram[(tile_index << 1) + 1]; int code = data & 0x3fff; - tileinfo->category = (data2 >> 5) & 0x01; + tileinfo.category = (data2 >> 5) & 0x01; SET_TILE_INFO(0, code, data2 & 0x1f, TILE_FLIPYX((data2 >> 6) & 0x03)); } @@ -53,7 +53,7 @@ static TILE_GET_INFO( get_tile_info_wrally_screen1 ) int data2 = state->m_videoram[(0x2000/2) + (tile_index << 1) + 1]; int code = data & 0x3fff; - tileinfo->category = (data2 >> 5) & 0x01; + tileinfo.category = (data2 >> 5) & 0x01; SET_TILE_INFO(0, code, data2 & 0x1f, TILE_FLIPYX((data2 >> 6) & 0x03)); } @@ -70,8 +70,8 @@ VIDEO_START( wrally ) state->m_pant[0] = tilemap_create(machine, get_tile_info_wrally_screen0,tilemap_scan_rows,16,16,64,32); state->m_pant[1] = tilemap_create(machine, get_tile_info_wrally_screen1,tilemap_scan_rows,16,16,64,32); - tilemap_set_transmask(state->m_pant[0],0,0xff01,0x00ff); /* this layer is split in two (pens 1..7, pens 8-15) */ - tilemap_set_transparent_pen(state->m_pant[1],0); + state->m_pant[0]->set_transmask(0,0xff01,0x00ff); /* this layer is split in two (pens 1..7, pens 8-15) */ + state->m_pant[1]->set_transparent_pen(0); } @@ -181,28 +181,28 @@ SCREEN_UPDATE_IND16( wrally ) wrally_state *state = screen.machine().driver_data(); /* set scroll registers */ if (!flip_screen_get(screen.machine())) { - tilemap_set_scrolly(state->m_pant[0], 0, state->m_vregs[0]); - tilemap_set_scrollx(state->m_pant[0], 0, state->m_vregs[1]+4); - tilemap_set_scrolly(state->m_pant[1], 0, state->m_vregs[2]); - tilemap_set_scrollx(state->m_pant[1], 0, state->m_vregs[3]); + state->m_pant[0]->set_scrolly(0, state->m_vregs[0]); + state->m_pant[0]->set_scrollx(0, state->m_vregs[1]+4); + state->m_pant[1]->set_scrolly(0, state->m_vregs[2]); + state->m_pant[1]->set_scrollx(0, state->m_vregs[3]); } else { - tilemap_set_scrolly(state->m_pant[0], 0, 248 - state->m_vregs[0]); - tilemap_set_scrollx(state->m_pant[0], 0, 1024 - state->m_vregs[1] - 4); - tilemap_set_scrolly(state->m_pant[1], 0, 248 - state->m_vregs[2]); - tilemap_set_scrollx(state->m_pant[1], 0, 1024 - state->m_vregs[3]); + state->m_pant[0]->set_scrolly(0, 248 - state->m_vregs[0]); + state->m_pant[0]->set_scrollx(0, 1024 - state->m_vregs[1] - 4); + state->m_pant[1]->set_scrolly(0, 248 - state->m_vregs[2]); + state->m_pant[1]->set_scrollx(0, 1024 - state->m_vregs[3]); } /* draw tilemaps + sprites */ - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_CATEGORY(0) | TILEMAP_DRAW_LAYER0,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_CATEGORY(0) | TILEMAP_DRAW_LAYER1,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0) | TILEMAP_DRAW_LAYER0,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0) | TILEMAP_DRAW_LAYER1,0); - tilemap_draw(bitmap,cliprect,state->m_pant[1],TILEMAP_DRAW_CATEGORY(1),0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER0,0); + state->m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1),0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER0,0); draw_sprites(screen.machine(),bitmap,cliprect,0); - tilemap_draw(bitmap,cliprect,state->m_pant[0],TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER1,0); + state->m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER1,0); draw_sprites(screen.machine(),bitmap,cliprect,1); diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index 5627369df94..5aea265cf11 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -20,7 +20,7 @@ WRITE16_HANDLER( wwfsstar_fg0_videoram_w ) wwfsstar_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_fg0_videoram[offset]); - tilemap_mark_tile_dirty(state->m_fg0_tilemap,offset/2); + state->m_fg0_tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( wwfsstar_bg0_videoram_w ) @@ -28,7 +28,7 @@ WRITE16_HANDLER( wwfsstar_bg0_videoram_w ) wwfsstar_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg0_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg0_tilemap,offset/2); + state->m_bg0_tilemap->mark_tile_dirty(offset/2); } /******************************************************************************* @@ -214,22 +214,22 @@ VIDEO_START( wwfsstar ) wwfsstar_state *state = machine.driver_data(); state->m_fg0_tilemap = tilemap_create(machine, get_fg0_tile_info,tilemap_scan_rows, 8, 8,32,32); - tilemap_set_transparent_pen(state->m_fg0_tilemap,0); + state->m_fg0_tilemap->set_transparent_pen(0); state->m_bg0_tilemap = tilemap_create(machine, get_bg0_tile_info,bg0_scan, 16, 16,32,32); - tilemap_set_transparent_pen(state->m_fg0_tilemap,0); + state->m_fg0_tilemap->set_transparent_pen(0); } SCREEN_UPDATE_IND16( wwfsstar ) { wwfsstar_state *state = screen.machine().driver_data(); - tilemap_set_scrolly( state->m_bg0_tilemap, 0, state->m_scrolly ); - tilemap_set_scrollx( state->m_bg0_tilemap, 0, state->m_scrollx ); + state->m_bg0_tilemap->set_scrolly(0, state->m_scrolly ); + state->m_bg0_tilemap->set_scrollx(0, state->m_scrollx ); - tilemap_draw(bitmap,cliprect,state->m_bg0_tilemap,0,0); + state->m_bg0_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect ); - tilemap_draw(bitmap,cliprect,state->m_fg0_tilemap,0,0); + state->m_fg0_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c index 5e60d31d6c2..bd768b8129f 100644 --- a/src/mame/video/wwfwfest.c +++ b/src/mame/video/wwfwfest.c @@ -28,21 +28,21 @@ WRITE16_HANDLER( wwfwfest_fg0_videoram_w ) state->m_fg0_videoram[offset]=data&0xff; } - tilemap_mark_tile_dirty(state->m_fg0_tilemap,offset/2); + state->m_fg0_tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( wwfwfest_bg0_videoram_w ) { wwfwfest_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg0_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg0_tilemap,offset/2); + state->m_bg0_tilemap->mark_tile_dirty(offset/2); } WRITE16_HANDLER( wwfwfest_bg1_videoram_w ) { wwfwfest_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_bg1_videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg1_tilemap,offset); + state->m_bg1_tilemap->mark_tile_dirty(offset); } /******************************************************************************* @@ -238,9 +238,9 @@ VIDEO_START( wwfwfest ) state->m_bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows, 16, 16,32,32); state->m_bg0_tilemap = tilemap_create(machine, get_bg0_tile_info,tilemap_scan_rows, 16, 16,32,32); - tilemap_set_transparent_pen(state->m_fg0_tilemap,0); - tilemap_set_transparent_pen(state->m_bg1_tilemap,0); - tilemap_set_transparent_pen(state->m_bg0_tilemap,0); + state->m_fg0_tilemap->set_transparent_pen(0); + state->m_bg1_tilemap->set_transparent_pen(0); + state->m_bg0_tilemap->set_transparent_pen(0); state->m_sprite_xoff = state->m_bg0_dx = state->m_bg1_dx[0] = state->m_bg1_dx[1] = 0; } @@ -259,38 +259,38 @@ SCREEN_UPDATE_IND16( wwfwfest ) { wwfwfest_state *state = screen.machine().driver_data(); if (state->m_pri == 0x0078) { - tilemap_set_scrolly( state->m_bg0_tilemap, 0, state->m_bg0_scrolly ); - tilemap_set_scrollx( state->m_bg0_tilemap, 0, state->m_bg0_scrollx + state->m_bg0_dx); - tilemap_set_scrolly( state->m_bg1_tilemap, 0, state->m_bg1_scrolly ); - tilemap_set_scrollx( state->m_bg1_tilemap, 0, state->m_bg1_scrollx + state->m_bg1_dx[0]); + state->m_bg0_tilemap->set_scrolly(0, state->m_bg0_scrolly ); + state->m_bg0_tilemap->set_scrollx(0, state->m_bg0_scrollx + state->m_bg0_dx); + state->m_bg1_tilemap->set_scrolly(0, state->m_bg1_scrolly ); + state->m_bg1_tilemap->set_scrollx(0, state->m_bg1_scrollx + state->m_bg1_dx[0]); } else { - tilemap_set_scrolly( state->m_bg1_tilemap, 0, state->m_bg0_scrolly ); - tilemap_set_scrollx( state->m_bg1_tilemap, 0, state->m_bg0_scrollx + state->m_bg1_dx[1]); - tilemap_set_scrolly( state->m_bg0_tilemap, 0, state->m_bg1_scrolly ); - tilemap_set_scrollx( state->m_bg0_tilemap, 0, state->m_bg1_scrollx + state->m_bg0_dx); + state->m_bg1_tilemap->set_scrolly(0, state->m_bg0_scrolly ); + state->m_bg1_tilemap->set_scrollx(0, state->m_bg0_scrollx + state->m_bg1_dx[1]); + state->m_bg0_tilemap->set_scrolly(0, state->m_bg1_scrolly ); + state->m_bg0_tilemap->set_scrollx(0, state->m_bg1_scrollx + state->m_bg0_dx); } /* todo : which bits of pri are significant to the order */ if (state->m_pri == 0x007b) { - tilemap_draw(bitmap,cliprect,state->m_bg0_tilemap,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_bg1_tilemap,0,0); + state->m_bg0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_fg0_tilemap,0,0); + state->m_fg0_tilemap->draw(bitmap, cliprect, 0,0); } if (state->m_pri == 0x007c) { - tilemap_draw(bitmap,cliprect,state->m_bg0_tilemap,TILEMAP_DRAW_OPAQUE,0); + state->m_bg0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bg1_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_fg0_tilemap,0,0); + state->m_bg1_tilemap->draw(bitmap, cliprect, 0,0); + state->m_fg0_tilemap->draw(bitmap, cliprect, 0,0); } if (state->m_pri == 0x0078) { - tilemap_draw(bitmap,cliprect,state->m_bg1_tilemap,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_bg0_tilemap,0,0); + state->m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_bg0_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_fg0_tilemap,0,0); + state->m_fg0_tilemap->draw(bitmap, cliprect, 0,0); } return 0; } diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c index c88a9aa9fc9..fe4815fe5c5 100644 --- a/src/mame/video/xain.c +++ b/src/mame/video/xain.c @@ -93,9 +93,9 @@ VIDEO_START( xain ) state->m_bgram1_tilemap = tilemap_create(machine, get_bgram1_tile_info,back_scan, 16,16,32,32); state->m_char_tilemap = tilemap_create(machine, get_char_tile_info,tilemap_scan_rows, 8, 8,32,32); - tilemap_set_transparent_pen(state->m_bgram0_tilemap,0); - tilemap_set_transparent_pen(state->m_bgram1_tilemap,0); - tilemap_set_transparent_pen(state->m_char_tilemap,0); + state->m_bgram0_tilemap->set_transparent_pen(0); + state->m_bgram1_tilemap->set_transparent_pen(0); + state->m_char_tilemap->set_transparent_pen(0); } @@ -110,21 +110,21 @@ WRITE8_HANDLER( xain_bgram0_w ) { xain_state *state = space->machine().driver_data(); state->m_bgram0[offset] = data; - tilemap_mark_tile_dirty(state->m_bgram0_tilemap,offset & 0x3ff); + state->m_bgram0_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( xain_bgram1_w ) { xain_state *state = space->machine().driver_data(); state->m_bgram1[offset] = data; - tilemap_mark_tile_dirty(state->m_bgram1_tilemap,offset & 0x3ff); + state->m_bgram1_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( xain_charram_w ) { xain_state *state = space->machine().driver_data(); state->m_charram[offset] = data; - tilemap_mark_tile_dirty(state->m_char_tilemap,offset & 0x3ff); + state->m_char_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( xain_scrollxP0_w ) @@ -132,7 +132,7 @@ WRITE8_HANDLER( xain_scrollxP0_w ) xain_state *state = space->machine().driver_data(); state->m_scrollxP0[offset] = data; - tilemap_set_scrollx(state->m_bgram0_tilemap, 0, state->m_scrollxP0[0]|(state->m_scrollxP0[1]<<8)); + state->m_bgram0_tilemap->set_scrollx(0, state->m_scrollxP0[0]|(state->m_scrollxP0[1]<<8)); } WRITE8_HANDLER( xain_scrollyP0_w ) @@ -140,7 +140,7 @@ WRITE8_HANDLER( xain_scrollyP0_w ) xain_state *state = space->machine().driver_data(); state->m_scrollyP0[offset] = data; - tilemap_set_scrolly(state->m_bgram0_tilemap, 0, state->m_scrollyP0[0]|(state->m_scrollyP0[1]<<8)); + state->m_bgram0_tilemap->set_scrolly(0, state->m_scrollyP0[0]|(state->m_scrollyP0[1]<<8)); } WRITE8_HANDLER( xain_scrollxP1_w ) @@ -148,7 +148,7 @@ WRITE8_HANDLER( xain_scrollxP1_w ) xain_state *state = space->machine().driver_data(); state->m_scrollxP1[offset] = data; - tilemap_set_scrollx(state->m_bgram1_tilemap, 0, state->m_scrollxP1[0]|(state->m_scrollxP1[1]<<8)); + state->m_bgram1_tilemap->set_scrollx(0, state->m_scrollxP1[0]|(state->m_scrollxP1[1]<<8)); } WRITE8_HANDLER( xain_scrollyP1_w ) @@ -156,7 +156,7 @@ WRITE8_HANDLER( xain_scrollyP1_w ) xain_state *state = space->machine().driver_data(); state->m_scrollyP1[offset] = data; - tilemap_set_scrolly(state->m_bgram1_tilemap, 0, state->m_scrollyP1[0]|(state->m_scrollyP1[1]<<8)); + state->m_bgram1_tilemap->set_scrolly(0, state->m_scrollyP1[0]|(state->m_scrollyP1[1]<<8)); } @@ -229,52 +229,52 @@ SCREEN_UPDATE_IND16( xain ) switch (state->m_pri&0x7) { case 0: - tilemap_draw(bitmap,cliprect,state->m_bgram0_tilemap,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_bgram1_tilemap,0,0); + state->m_bgram0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_bgram1_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_char_tilemap,0,0); + state->m_char_tilemap->draw(bitmap, cliprect, 0,0); break; case 1: - tilemap_draw(bitmap,cliprect,state->m_bgram1_tilemap,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_bgram0_tilemap,0,0); + state->m_bgram1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_bgram0_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_char_tilemap,0,0); + state->m_char_tilemap->draw(bitmap, cliprect, 0,0); break; case 2: - tilemap_draw(bitmap,cliprect,state->m_char_tilemap,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_bgram0_tilemap,0,0); + state->m_char_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_bgram0_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bgram1_tilemap,0,0); + state->m_bgram1_tilemap->draw(bitmap, cliprect, 0,0); break; case 3: - tilemap_draw(bitmap,cliprect,state->m_char_tilemap,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_bgram1_tilemap,0,0); + state->m_char_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_bgram1_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bgram0_tilemap,0,0); + state->m_bgram0_tilemap->draw(bitmap, cliprect, 0,0); break; case 4: - tilemap_draw(bitmap,cliprect,state->m_bgram0_tilemap,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_char_tilemap,0,0); + state->m_bgram0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_char_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bgram1_tilemap,0,0); + state->m_bgram1_tilemap->draw(bitmap, cliprect, 0,0); break; case 5: - tilemap_draw(bitmap,cliprect,state->m_bgram1_tilemap,TILEMAP_DRAW_OPAQUE,0); - tilemap_draw(bitmap,cliprect,state->m_char_tilemap,0,0); + state->m_bgram1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); + state->m_char_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bgram0_tilemap,0,0); + state->m_bgram0_tilemap->draw(bitmap, cliprect, 0,0); break; case 6: - tilemap_draw(bitmap,cliprect,state->m_bgram0_tilemap,TILEMAP_DRAW_OPAQUE,0); + state->m_bgram0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bgram1_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_char_tilemap,0,0); + state->m_bgram1_tilemap->draw(bitmap, cliprect, 0,0); + state->m_char_tilemap->draw(bitmap, cliprect, 0,0); break; case 7: - tilemap_draw(bitmap,cliprect,state->m_bgram1_tilemap,TILEMAP_DRAW_OPAQUE,0); + state->m_bgram1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_bgram0_tilemap,0,0); - tilemap_draw(bitmap,cliprect,state->m_char_tilemap,0,0); + state->m_bgram0_tilemap->draw(bitmap, cliprect, 0,0); + state->m_char_tilemap->draw(bitmap, cliprect, 0,0); break; } return 0; diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index b54196c6e24..35ce44b092a 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -222,11 +222,11 @@ VIDEO_START( xevious ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,64,32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_set_scrolldx(state->m_bg_tilemap,-20,288+27); - tilemap_set_scrolldy(state->m_bg_tilemap,-16,-16); - tilemap_set_scrolldx(state->m_fg_tilemap,-32,288+32); - tilemap_set_scrolldy(state->m_fg_tilemap,-18,-10); - tilemap_set_transparent_pen(state->m_fg_tilemap,0); + state->m_bg_tilemap->set_scrolldx(-20,288+27); + state->m_bg_tilemap->set_scrolldy(-16,-16); + state->m_fg_tilemap->set_scrolldx(-32,288+32); + state->m_fg_tilemap->set_scrolldy(-18,-10); + state->m_fg_tilemap->set_transparent_pen(0); state->m_xevious_bs[0] = 0; state->m_xevious_bs[1] = 0; @@ -246,7 +246,7 @@ WRITE8_HANDLER( xevious_fg_videoram_w ) xevious_state *state = space->machine().driver_data(); state->m_xevious_fg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( xevious_fg_colorram_w ) @@ -254,7 +254,7 @@ WRITE8_HANDLER( xevious_fg_colorram_w ) xevious_state *state = space->machine().driver_data(); state->m_xevious_fg_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap,offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( xevious_bg_videoram_w ) @@ -262,7 +262,7 @@ WRITE8_HANDLER( xevious_bg_videoram_w ) xevious_state *state = space->machine().driver_data(); state->m_xevious_bg_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( xevious_bg_colorram_w ) @@ -270,7 +270,7 @@ WRITE8_HANDLER( xevious_bg_colorram_w ) xevious_state *state = space->machine().driver_data(); state->m_xevious_bg_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_HANDLER( xevious_vh_latch_w ) @@ -285,16 +285,16 @@ WRITE8_HANDLER( xevious_vh_latch_w ) switch (reg) { case 0: - tilemap_set_scrollx(state->m_bg_tilemap,0,scroll); + state->m_bg_tilemap->set_scrollx(0,scroll); break; case 1: - tilemap_set_scrollx(state->m_fg_tilemap,0,scroll); + state->m_fg_tilemap->set_scrollx(0,scroll); break; case 2: - tilemap_set_scrolly(state->m_bg_tilemap,0,scroll); + state->m_bg_tilemap->set_scrolly(0,scroll); break; case 3: - tilemap_set_scrolly(state->m_fg_tilemap,0,scroll); + state->m_fg_tilemap->set_scrolly(0,scroll); break; case 7: flip_screen_set(space->machine(), scroll & 1); @@ -502,8 +502,8 @@ SCREEN_UPDATE_IND16( xevious ) { xevious_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(screen.machine(), bitmap,cliprect); - tilemap_draw(bitmap,cliprect,state->m_fg_tilemap,0,0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c index a4a0c1e8347..4940db3c421 100644 --- a/src/mame/video/xorworld.c +++ b/src/mame/video/xorworld.c @@ -53,7 +53,7 @@ WRITE16_HANDLER( xorworld_videoram16_w ) xorworld_state *state = space->machine().driver_data(); UINT16 *videoram = state->m_videoram; COMBINE_DATA(&videoram[offset]); - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } /* @@ -116,7 +116,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( xorworld ) { xorworld_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c index 4cd3637eec2..b739b428f29 100644 --- a/src/mame/video/xxmissio.c +++ b/src/mame/video/xxmissio.c @@ -77,11 +77,11 @@ VIDEO_START( xxmissio ) state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); - tilemap_set_scroll_cols(state->m_bg_tilemap, 1); - tilemap_set_scroll_rows(state->m_bg_tilemap, 1); - tilemap_set_scrolldx(state->m_bg_tilemap, 2, 12); + state->m_bg_tilemap->set_scroll_cols(1); + state->m_bg_tilemap->set_scroll_rows(1); + state->m_bg_tilemap->set_scrolldx(2, 12); - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); + state->m_fg_tilemap->set_transparent_pen(0); } @@ -139,15 +139,15 @@ static void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, const SCREEN_UPDATE_IND16( xxmissio ) { xxmissio_state *state = screen.machine().driver_data(); - tilemap_mark_all_tiles_dirty_all(screen.machine()); - tilemap_set_flip_all(screen.machine(), state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + screen.machine().tilemap().mark_all_dirty(); + screen.machine().tilemap().set_flip_all(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); - tilemap_set_scrollx(state->m_bg_tilemap, 0, state->m_xscroll * 2); - tilemap_set_scrolly(state->m_bg_tilemap, 0, state->m_yscroll); + state->m_bg_tilemap->set_scrollx(0, state->m_xscroll * 2); + state->m_bg_tilemap->set_scrolly(0, state->m_yscroll); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(bitmap, cliprect, screen.machine().gfx[1]); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/xybots.c b/src/mame/video/xybots.c index b2f552ede6e..b4d9fb167f1 100644 --- a/src/mame/video/xybots.c +++ b/src/mame/video/xybots.c @@ -93,7 +93,7 @@ VIDEO_START( xybots ) /* initialize the alphanumerics */ state->m_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->m_alpha_tilemap, 0); + state->m_alpha_tilemap->set_transparent_pen(0); } @@ -112,7 +112,7 @@ SCREEN_UPDATE_IND16( xybots ) int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->m_playfield_tilemap, 0, 0); + state->m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -166,6 +166,6 @@ SCREEN_UPDATE_IND16( xybots ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->m_alpha_tilemap, 0, 0); + state->m_alpha_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c index 63e40bb1eb5..b1a591d7108 100644 --- a/src/mame/video/xyonix.c +++ b/src/mame/video/xyonix.c @@ -46,7 +46,7 @@ WRITE8_HANDLER( xyonix_vidram_w ) xyonix_state *state = space->machine().driver_data(); state->m_vidram[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap,(offset-1)&0x0fff); + state->m_tilemap->mark_tile_dirty((offset-1)&0x0fff); } VIDEO_START(xyonix) @@ -60,6 +60,6 @@ SCREEN_UPDATE_IND16(xyonix) { xyonix_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_tilemap, 0, 0); + state->m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index e2ffc8a6d31..0d08b46447b 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -789,20 +789,20 @@ SCREEN_UPDATE_IND16( ygv608 ) tilemap_A = tilemap_A_cache_8[index]; else tilemap_A = tilemap_A_cache_16[index]; - tilemap_mark_all_tiles_dirty(tilemap_A); + tilemap_A->mark_all_dirty(); - tilemap_set_transparent_pen( tilemap_A, 0 ); + tilemap_A->set_transparent_pen(0 ); // for NCV1 it's sufficient to scroll only columns - tilemap_set_scroll_cols( tilemap_A, ygv608.page_x ); + tilemap_A->set_scroll_cols(ygv608.page_x ); if ((ygv608.regs.s.r9 & r9_pts) == PTS_8X8 ) tilemap_B = tilemap_B_cache_8[index]; else tilemap_B = tilemap_B_cache_16[index]; - tilemap_mark_all_tiles_dirty(tilemap_B); + tilemap_B->mark_all_dirty(); // for NCV1 it's sufficient to scroll only columns - tilemap_set_scroll_cols( tilemap_B, ygv608.page_x ); + tilemap_B->set_scroll_cols(ygv608.page_x ); // now clear the screen in case we change to 1-plane mode work_bitmap->fill(0, finalclip ); @@ -815,11 +815,11 @@ SCREEN_UPDATE_IND16( ygv608 ) for( col=0; colset_scrolly(col, ( (int)ygv608.scroll_data_table[1][(col>>ygv608.col_shift)<<1] + ( (int)ygv608.scroll_data_table[1][((col>>ygv608.col_shift)<<1)+1] << 8 ) ) ); - tilemap_set_scrolly( tilemap_A, col, + tilemap_A->set_scrolly(col, ( (int)ygv608.scroll_data_table[0][(col>>ygv608.col_shift)<<1] + ( (int)ygv608.scroll_data_table[0][((col>>ygv608.col_shift)<<1)+1] << 8 ) ) ); } @@ -828,24 +828,24 @@ SCREEN_UPDATE_IND16( ygv608 ) #ifdef _ENABLE_SCROLLX - tilemap_set_scrollx( tilemap_B, 0, + tilemap_B->set_scrollx(0, ( (int)ygv608.scroll_data_table[1][0x80] + ( (int)ygv608.scroll_data_table[1][0x81] << 8 ) ) ); - tilemap_set_scrollx( tilemap_A, 0, + tilemap_A->set_scrollx(0, ( (int)ygv608.scroll_data_table[0][0x80] + ( (int)ygv608.scroll_data_table[0][0x81] << 8 ) ) ); #endif - tilemap_set_enable( tilemap_A, ygv608.regs.s.r7 & r7_dspe); + tilemap_A->enable(ygv608.regs.s.r7 & r7_dspe); if((ygv608.regs.s.r7 & r7_md) & MD_1PLANE ) - tilemap_set_enable( tilemap_B, 0 ); + tilemap_B->enable(0 ); else - tilemap_set_enable( tilemap_B, ygv608.regs.s.r7 & r7_dspe); + tilemap_B->enable(ygv608.regs.s.r7 & r7_dspe); - tilemap_mark_all_tiles_dirty( tilemap_A ); - tilemap_mark_all_tiles_dirty( tilemap_B ); + tilemap_A ->mark_all_dirty(); + tilemap_B ->mark_all_dirty(); /* @@ -863,7 +863,7 @@ SCREEN_UPDATE_IND16( ygv608 ) } else #endif - tilemap_draw( *work_bitmap,finalclip, tilemap_B, 0, 0 ); + tilemap_B->draw(*work_bitmap, finalclip, 0, 0 ); #ifdef _ENABLE_ROTATE_ZOOM @@ -900,7 +900,7 @@ SCREEN_UPDATE_IND16( ygv608 ) (ygv608.regs.s.r11 & r11_prm) == PRM_ASEBDX ) draw_sprites(screen.machine(), bitmap,finalclip ); - tilemap_draw( *work_bitmap,finalclip, tilemap_A, 0, 0 ); + tilemap_A->draw(*work_bitmap, finalclip, 0, 0 ); #ifdef _ENABLE_ROTATE_ZOOM if( ygv608.regs.s.zron ) diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index 5079e2ae415..10381709a62 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -63,7 +63,7 @@ WRITE8_HANDLER( yiear_videoram_w ) { yiear_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset / 2); + state->m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_HANDLER( yiear_control_w ) @@ -73,7 +73,7 @@ WRITE8_HANDLER( yiear_control_w ) if (flip_screen_get(space->machine()) != (data & 0x01)) { flip_screen_set(space->machine(), data & 0x01); - tilemap_mark_all_tiles_dirty_all(space->machine()); + space->machine().tilemap().mark_all_dirty(); } /* bit 1 is NMI enable */ @@ -145,7 +145,7 @@ SCREEN_UPDATE_IND16( yiear ) { yiear_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c index 7d4ceec1ded..158a7bc6d48 100644 --- a/src/mame/video/yunsun16.c +++ b/src/mame/video/yunsun16.c @@ -76,7 +76,7 @@ WRITE16_HANDLER( yunsun16_vram_0_w ) yunsun16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_0[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_0, offset / 2); + state->m_tilemap_0->mark_tile_dirty(offset / 2); } WRITE16_HANDLER( yunsun16_vram_1_w ) @@ -84,7 +84,7 @@ WRITE16_HANDLER( yunsun16_vram_1_w ) yunsun16_state *state = space->machine().driver_data(); COMBINE_DATA(&state->m_vram_1[offset]); - tilemap_mark_tile_dirty(state->m_tilemap_1, offset / 2); + state->m_tilemap_1->mark_tile_dirty(offset / 2); } @@ -105,14 +105,14 @@ VIDEO_START( yunsun16 ) state->m_tilemap_1 = tilemap_create(machine, get_tile_info_1,yunsun16_tilemap_scan_pages, 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - tilemap_set_scrolldx(state->m_tilemap_0, -0x34, 0); - tilemap_set_scrolldx(state->m_tilemap_1, -0x38, 0); + state->m_tilemap_0->set_scrolldx(-0x34, 0); + state->m_tilemap_1->set_scrolldx(-0x38, 0); - tilemap_set_scrolldy(state->m_tilemap_0, -0x10, 0); - tilemap_set_scrolldy(state->m_tilemap_1, -0x10, 0); + state->m_tilemap_0->set_scrolldy(-0x10, 0); + state->m_tilemap_1->set_scrolldy(-0x10, 0); - tilemap_set_transparent_pen(state->m_tilemap_0, 0xff); - tilemap_set_transparent_pen(state->m_tilemap_1, 0xff); + state->m_tilemap_0->set_transparent_pen(0xff); + state->m_tilemap_1->set_transparent_pen(0xff); } @@ -204,11 +204,11 @@ SCREEN_UPDATE_IND16( yunsun16 ) { yunsun16_state *state = screen.machine().driver_data(); - tilemap_set_scrollx(state->m_tilemap_0, 0, state->m_scrollram_0[0]); - tilemap_set_scrolly(state->m_tilemap_0, 0, state->m_scrollram_0[1]); + state->m_tilemap_0->set_scrollx(0, state->m_scrollram_0[0]); + state->m_tilemap_0->set_scrolly(0, state->m_scrollram_0[1]); - tilemap_set_scrollx(state->m_tilemap_1, 0, state->m_scrollram_1[0]); - tilemap_set_scrolly(state->m_tilemap_1, 0, state->m_scrollram_1[1]); + state->m_tilemap_1->set_scrollx(0, state->m_scrollram_1[0]); + state->m_tilemap_1->set_scrolly(0, state->m_scrollram_1[1]); //popmessage("%04X", *state->m_priorityram); @@ -217,16 +217,16 @@ SCREEN_UPDATE_IND16( yunsun16 ) if ((*state->m_priorityram & 0x0c) == 4) { /* The color of the this layer's transparent pen goes below everything */ - tilemap_draw(bitmap, cliprect, state->m_tilemap_0, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 2); + state->m_tilemap_0->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_tilemap_0->draw(bitmap, cliprect, 0, 1); + state->m_tilemap_1->draw(bitmap, cliprect, 0, 2); } else if ((*state->m_priorityram & 0x0c) == 8) { /* The color of the this layer's transparent pen goes below everything */ - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 1); - tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 2); + state->m_tilemap_1->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + state->m_tilemap_1->draw(bitmap, cliprect, 0, 1); + state->m_tilemap_0->draw(bitmap, cliprect, 0, 2); } draw_sprites(screen.machine(), bitmap, cliprect); diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index ef787b66c10..8d7d57e71e8 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -98,12 +98,12 @@ WRITE8_HANDLER( yunsung8_videoram_w ) if (bank) { state->m_videoram_0[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_0, tile); + state->m_tilemap_0->mark_tile_dirty(tile); } else { state->m_videoram_1[offset] = data; - tilemap_mark_tile_dirty(state->m_tilemap_1, tile); + state->m_tilemap_1->mark_tile_dirty(tile); } } } @@ -111,7 +111,7 @@ WRITE8_HANDLER( yunsung8_videoram_w ) WRITE8_HANDLER( yunsung8_flipscreen_w ) { - tilemap_set_flip_all(space->machine(), (data & 1) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + space->machine().tilemap().set_flip_all((data & 1) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } @@ -181,7 +181,7 @@ VIDEO_START( yunsung8 ) state->m_tilemap_0 = tilemap_create(machine, get_tile_info_0, tilemap_scan_rows, 8, 8, DIM_NX_0, DIM_NY_0 ); state->m_tilemap_1 = tilemap_create(machine, get_tile_info_1, tilemap_scan_rows, 8, 8, DIM_NX_1, DIM_NY_1 ); - tilemap_set_transparent_pen(state->m_tilemap_1, 0); + state->m_tilemap_1->set_transparent_pen(0); } @@ -210,12 +210,12 @@ if (screen.machine().input().code_pressed(KEYCODE_Z)) #endif if (layers_ctrl & 1) - tilemap_draw(bitmap, cliprect, state->m_tilemap_0, 0, 0); + state->m_tilemap_0->draw(bitmap, cliprect, 0, 0); else bitmap.fill(0, cliprect); if (layers_ctrl & 2) - tilemap_draw(bitmap, cliprect, state->m_tilemap_1, 0, 0); + state->m_tilemap_1->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c index 90872a19a0f..085743392f4 100644 --- a/src/mame/video/zac2650.c +++ b/src/mame/video/zac2650.c @@ -20,7 +20,7 @@ WRITE8_HANDLER( tinvader_videoram_w ) zac2650_state *state = space->machine().driver_data(); UINT8 *videoram = state->m_videoram; videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap, offset); + state->m_bg_tilemap->mark_tile_dirty(offset); } READ8_HANDLER( zac_s2636_r ) @@ -210,7 +210,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( tinvader ) { zac2650_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(screen.machine(), bitmap, cliprect); return 0; } diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c index 6414dca50bf..5701bf1cbe7 100644 --- a/src/mame/video/zaccaria.c +++ b/src/mame/video/zaccaria.c @@ -136,7 +136,7 @@ VIDEO_START( zaccaria ) zaccaria_state *state = machine.driver_data(); state->m_bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); - tilemap_set_scroll_cols(state->m_bg_tilemap,32); + state->m_bg_tilemap->set_scroll_cols(32); } @@ -151,7 +151,7 @@ WRITE8_HANDLER( zaccaria_videoram_w ) { zaccaria_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_bg_tilemap,offset & 0x3ff); + state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_HANDLER( zaccaria_attributes_w ) @@ -164,11 +164,11 @@ WRITE8_HANDLER( zaccaria_attributes_w ) int i; for (i = offset / 2;i < 0x400;i += 32) - tilemap_mark_tile_dirty(state->m_bg_tilemap,i); + state->m_bg_tilemap->mark_tile_dirty(i); } } else - tilemap_set_scrolly(state->m_bg_tilemap,offset / 2,data); + state->m_bg_tilemap->set_scrolly(offset / 2,data); state->m_attributesram[offset] = data; } @@ -246,7 +246,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re SCREEN_UPDATE_IND16( zaccaria ) { zaccaria_state *state = screen.machine().driver_data(); - tilemap_draw(bitmap,cliprect,state->m_bg_tilemap,0,0); + state->m_bg_tilemap->draw(bitmap, cliprect, 0,0); // 3 layers of sprites, each with their own palette and priorities // Not perfect yet, does spriteram(1) layer have a priority bit somewhere? diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index 97ab8cd2ca6..b1c74284be2 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -135,9 +135,9 @@ static void video_start_common(running_machine &machine, tile_get_info_func fg_t state->m_fg_tilemap = tilemap_create(machine, fg_tile_info, tilemap_scan_rows, 8,8, 32,32); /* configure the foreground tilemap */ - tilemap_set_transparent_pen(state->m_fg_tilemap, 0); - tilemap_set_scrolldx(state->m_fg_tilemap, 0, machine.primary_screen->width() - 256); - tilemap_set_scrolldy(state->m_fg_tilemap, 0, machine.primary_screen->height() - 256); + state->m_fg_tilemap->set_transparent_pen(0); + state->m_fg_tilemap->set_scrolldx(0, machine.primary_screen->width() - 256); + state->m_fg_tilemap->set_scrolldy(0, machine.primary_screen->height() - 256); /* register for save states */ state->save_item(NAME(state->m_bg_enable)); @@ -189,7 +189,7 @@ WRITE8_HANDLER( zaxxon_flipscreen_w ) /* low bit controls flip; background and sprite flip are handled at render time */ flip_screen_set_no_update(space->machine(), ~data & 1); - tilemap_set_flip(state->m_fg_tilemap, flip_screen_get(space->machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + state->m_fg_tilemap->set_flip(flip_screen_get(space->machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } @@ -199,7 +199,7 @@ WRITE8_HANDLER( zaxxon_fg_color_w ) /* low bit selects high color palette index */ state->m_fg_color = (data & 1) * 0x80; - tilemap_set_palette_offset(state->m_fg_tilemap, state->m_fg_color + (state->m_congo_color_bank << 8)); + state->m_fg_tilemap->set_palette_offset(state->m_fg_color + (state->m_congo_color_bank << 8)); } @@ -239,7 +239,7 @@ WRITE8_HANDLER( congo_fg_bank_w ) /* low bit controls the topmost character bit */ state->m_congo_fg_bank = data & 1; - tilemap_mark_all_tiles_dirty(state->m_fg_tilemap); + state->m_fg_tilemap->mark_all_dirty(); } @@ -249,7 +249,7 @@ WRITE8_HANDLER( congo_color_bank_w ) /* low bit controls the topmost bit into the color PROM */ state->m_congo_color_bank = data & 1; - tilemap_set_palette_offset(state->m_fg_tilemap, state->m_fg_color + (state->m_congo_color_bank << 8)); + state->m_fg_tilemap->set_palette_offset(state->m_fg_color + (state->m_congo_color_bank << 8)); } @@ -265,7 +265,7 @@ WRITE8_HANDLER( zaxxon_videoram_w ) zaxxon_state *state = space->machine().driver_data(); state->m_videoram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -274,7 +274,7 @@ WRITE8_HANDLER( congo_colorram_w ) zaxxon_state *state = space->machine().driver_data(); state->m_colorram[offset] = data; - tilemap_mark_tile_dirty(state->m_fg_tilemap, offset); + state->m_fg_tilemap->mark_tile_dirty(offset); } @@ -329,7 +329,7 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons /* only draw if enabled */ if (state->m_bg_enable) { - bitmap_ind16 &pixmap = tilemap_get_pixmap(state->m_bg_tilemap); + bitmap_ind16 &pixmap = state->m_bg_tilemap->pixmap(); int colorbase = state->m_bg_color + (state->m_congo_color_bank << 8); int xmask = pixmap.width() - 1; int ymask = pixmap.height() - 1; @@ -481,7 +481,7 @@ SCREEN_UPDATE_IND16( zaxxon ) draw_background(screen.machine(), bitmap, cliprect, TRUE); draw_sprites(screen.machine(), bitmap, cliprect, 0x140, 0x180); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -492,7 +492,7 @@ SCREEN_UPDATE_IND16( futspy ) draw_background(screen.machine(), bitmap, cliprect, TRUE); draw_sprites(screen.machine(), bitmap, cliprect, 0x180, 0x180); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -503,7 +503,7 @@ SCREEN_UPDATE_IND16( razmataz ) draw_background(screen.machine(), bitmap, cliprect, FALSE); draw_sprites(screen.machine(), bitmap, cliprect, 0x140, 0x180); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -514,6 +514,6 @@ SCREEN_UPDATE_IND16( congo ) draw_background(screen.machine(), bitmap, cliprect, TRUE); draw_sprites(screen.machine(), bitmap, cliprect, 0x280, 0x180); - tilemap_draw(bitmap, cliprect, state->m_fg_tilemap, 0, 0); + state->m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/zerozone.c b/src/mame/video/zerozone.c index 525027cab2a..eb8452d4264 100644 --- a/src/mame/video/zerozone.c +++ b/src/mame/video/zerozone.c @@ -10,7 +10,7 @@ WRITE16_MEMBER( zerozone_state::tilemap_w ) { COMBINE_DATA(&m_vram[offset]); - tilemap_mark_tile_dirty(m_zz_tilemap,offset); + m_zz_tilemap->mark_tile_dirty(offset); } @@ -18,7 +18,7 @@ WRITE16_MEMBER( zerozone_state::tilebank_w ) { // popmessage ("Data %04x",data); m_tilebank = data & 0x07; - tilemap_mark_all_tiles_dirty(m_zz_tilemap); + m_zz_tilemap->mark_all_dirty(); } static TILE_GET_INFO( get_zerozone_tile_info ) @@ -42,6 +42,6 @@ void zerozone_state::video_start() UINT32 zerozone_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - tilemap_draw(bitmap, cliprect, m_zz_tilemap, 0, 0); + m_zz_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index 2de42520d37..55321d91e40 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -12,13 +12,13 @@ WRITE8_MEMBER( zodiack_state::videoram_w ) { m_videoram[offset] = data; - tilemap_mark_tile_dirty(m_fg_tilemap, offset); + m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER( zodiack_state::videoram2_w ) { m_videoram_2[offset] = data; - tilemap_mark_tile_dirty(m_bg_tilemap, offset); + m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER( zodiack_state::attributes_w ) @@ -29,8 +29,8 @@ WRITE8_MEMBER( zodiack_state::attributes_w ) for (i = offset / 2; i < m_videoram_size; i += 32) { - tilemap_mark_tile_dirty(m_bg_tilemap, i); - tilemap_mark_tile_dirty(m_fg_tilemap, i); + m_bg_tilemap->mark_tile_dirty(i); + m_fg_tilemap->mark_tile_dirty(i); } } @@ -42,7 +42,7 @@ WRITE8_MEMBER( zodiack_state::flipscreen_w ) if (flip_screen_get(machine()) != (~data & 0x01)) { flip_screen_set(machine(), ~data & 0x01); - tilemap_mark_all_tiles_dirty_all(machine()); + machine().tilemap().mark_all_dirty(); } } @@ -123,8 +123,8 @@ void zodiack_state::video_start() m_bg_tilemap = tilemap_create(machine(), get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); m_fg_tilemap = tilemap_create(machine(), get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - tilemap_set_transparent_pen(m_fg_tilemap, 0); - tilemap_set_scroll_cols(m_fg_tilemap, 32); + m_fg_tilemap->set_transparent_pen(0); + m_fg_tilemap->set_scroll_cols(32); /* FIXME: flip_screen_x should not be written. */ flip_screen_set_no_update(machine(), 0); @@ -184,10 +184,10 @@ void zodiack_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec UINT32 zodiack_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) { for (int i = 0; i < 32; i++) - tilemap_set_scrolly(m_fg_tilemap, i, m_attributeram[i * 2]); + m_fg_tilemap->set_scrolly(i, m_attributeram[i * 2]); - tilemap_draw(bitmap, cliprect, m_bg_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, m_fg_tilemap, 0, 0); + m_bg_tilemap->draw(bitmap, cliprect, 0, 0); + m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_bullets(bitmap, cliprect); draw_sprites(bitmap, cliprect); return 0;