diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index a8e417f6e66..e686f7b663e 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -12,7 +12,6 @@ #include "driver.h" #include "tilemap.h" #include "profiler.h" -#include "deprecat.h" /*************************************************************************** @@ -47,8 +46,8 @@ typedef enum /* internal blitting callbacks */ -typedef void (*blitmask_func)(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); -typedef void (*blitopaque_func)(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); +typedef void (*blitmask_func)(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +typedef void (*blitopaque_func)(void *dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); /* blitting parameters for rendering */ @@ -69,6 +68,7 @@ struct _blit_parameters struct _tilemap { tilemap * next; /* pointer to next tilemap */ + running_machine * machine; /* pointer back to the owning machine */ /* basic tilemap metrics */ UINT32 rows; /* number of tile rows */ @@ -79,14 +79,14 @@ struct _tilemap UINT32 height; /* height of the full tilemap in pixels */ /* logical <-> memory mappings */ - tilemap_mapper_func mapper; /* callback to map a row/column to a memory index */ + tilemap_mapper_func mapper; /* callback to map a row/column to a memory index */ tilemap_logical_index * memory_to_logical; /* map from memory index to logical index */ tilemap_logical_index max_logical_index; /* maximum valid logical index */ tilemap_memory_index * logical_to_memory; /* map from logical index to memory index */ tilemap_memory_index max_memory_index; /* maximum valid memory index */ /* callback to interpret video RAM for the tilemap */ - tile_get_info_func tile_get_info; /* callback to get information about a tile */ + tile_get_info_func tile_get_info; /* callback to get information about a tile */ tile_data tileinfo; /* structure to hold the data for a tile */ void * user_data; /* user data value passed to the callback */ @@ -129,8 +129,6 @@ static tilemap * tilemap_list; static tilemap ** tilemap_tailptr; static int tilemap_instance; -static UINT32 screen_width, screen_height; - /*************************************************************************** @@ -159,18 +157,18 @@ static void tilemap_draw_roz_core(tilemap *tmap, const blit_parameters *blit, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound); /* scanline rasterizers for drawing to the pixmap */ -static void scanline_draw_opaque_null(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_masked_null(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_opaque_ind16(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_masked_ind16(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_opaque_rgb16(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_masked_rgb16(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_opaque_rgb16_alpha(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_masked_rgb16_alpha(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_opaque_rgb32(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_masked_rgb32(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_opaque_rgb32_alpha(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); -static void scanline_draw_masked_rgb32_alpha(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); +static void scanline_draw_opaque_null(void *dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_masked_null(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_opaque_ind16(void *dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_masked_ind16(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_opaque_rgb16(void *dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_masked_rgb16(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_opaque_rgb16_alpha(void *dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_masked_rgb16_alpha(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_opaque_rgb32(void *dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_masked_rgb32(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_opaque_rgb32_alpha(void *dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); +static void scanline_draw_masked_rgb32_alpha(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode); @@ -184,7 +182,7 @@ static void scanline_draw_masked_rgb32_alpha(void *dest, const UINT16 *source, c account tilemap flip states -------------------------------------------------*/ -INLINE INT32 effective_rowscroll(tilemap *tmap, int index) +INLINE INT32 effective_rowscroll(tilemap *tmap, int index, UINT32 screen_width) { INT32 value; @@ -213,7 +211,7 @@ INLINE INT32 effective_rowscroll(tilemap *tmap, int index) account tilemap flip states -------------------------------------------------*/ -INLINE INT32 effective_colscroll(tilemap *tmap, int index) +INLINE INT32 effective_colscroll(tilemap *tmap, int index, UINT32 screen_height) { INT32 value; @@ -264,6 +262,8 @@ INLINE tilemap *indexed_tilemap(int index) void tilemap_init(running_machine *machine) { + UINT32 screen_width, screen_height; + if (machine->primary_screen == NULL) return; @@ -291,9 +291,8 @@ void tilemap_init(running_machine *machine) tilemap_create - allocate a new tilemap -------------------------------------------------*/ -tilemap *tilemap_create(tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) +tilemap *tilemap_create(running_machine *machine, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) { - running_machine *machine = Machine; tilemap *tmap; int group; @@ -302,6 +301,7 @@ tilemap *tilemap_create(tile_get_info_func tile_get_info, tilemap_mapper_func ma memset(tmap, 0, sizeof(tilemap)); /* fill in the basic metrics */ + tmap->machine = machine; tmap->rows = rows; tmap->cols = cols; tmap->tilewidth = tilewidth; @@ -760,6 +760,7 @@ UINT8 *tilemap_get_tile_flags(tilemap *tmap) void tilemap_draw_primask(bitmap_t *dest, const rectangle *cliprect, tilemap *tmap, UINT32 flags, UINT8 priority, UINT8 priority_mask) { + UINT32 width, height; rectangle original_cliprect; blit_parameters blit; int xpos, ypos; @@ -780,11 +781,14 @@ profiler_mark(PROFILER_TILEMAP_DRAW); tmap->all_tiles_dirty = FALSE; } + width = video_screen_get_width(tmap->machine->primary_screen); + height = video_screen_get_height(tmap->machine->primary_screen); + /* XY scrolling playfield */ if (tmap->scrollrows == 1 && tmap->scrollcols == 1) { - int scrollx = effective_rowscroll(tmap, 0); - int scrolly = effective_colscroll(tmap, 0); + int scrollx = effective_rowscroll(tmap, 0, width); + int scrolly = effective_colscroll(tmap, 0, height); /* iterate to handle wraparound */ for (ypos = scrolly - tmap->height; ypos <= blit.cliprect.max_y; ypos += tmap->height) @@ -797,7 +801,7 @@ profiler_mark(PROFILER_TILEMAP_DRAW); { const rectangle original_cliprect = blit.cliprect; int rowheight = tmap->height / tmap->scrollrows; - int scrolly = effective_colscroll(tmap, 0); + int scrolly = effective_colscroll(tmap, 0, height); int currow, nextrow; /* iterate over Y to handle wraparound */ @@ -809,11 +813,11 @@ profiler_mark(PROFILER_TILEMAP_DRAW); /* iterate over rows in the tilemap */ for (currow = firstrow; currow <= lastrow; currow = nextrow) { - int scrollx = effective_rowscroll(tmap, currow); + int scrollx = effective_rowscroll(tmap, currow, width); /* scan forward until we find a non-matching row */ for (nextrow = currow + 1; nextrow <= lastrow; nextrow++) - if (effective_rowscroll(tmap, nextrow) != scrollx) + if (effective_rowscroll(tmap, nextrow, width) != scrollx) break; /* skip if disabled */ @@ -837,17 +841,17 @@ profiler_mark(PROFILER_TILEMAP_DRAW); { const rectangle original_cliprect = blit.cliprect; int colwidth = tmap->width / tmap->scrollcols; - int scrollx = effective_rowscroll(tmap, 0); + int scrollx = effective_rowscroll(tmap, 0, width); int curcol, nextcol; /* iterate over columns in the tilemap */ for (curcol = 0; curcol < tmap->scrollcols; curcol = nextcol) { - int scrolly = effective_colscroll(tmap, curcol); + int scrolly = effective_colscroll(tmap, curcol, height); /* scan forward until we find a non-matching column */ for (nextcol = curcol + 1; nextcol < tmap->scrollcols; nextcol++) - if (effective_colscroll(tmap, nextcol) != scrolly) + if (effective_colscroll(tmap, nextcol, height) != scrolly) break; /* skip if disabled */ @@ -1263,7 +1267,7 @@ profiler_mark(PROFILER_TILEMAP_UPDATE); /* call the get info callback for the associated memory index */ memindex = tmap->logical_to_memory[logindex]; - (*tmap->tile_get_info)(Machine, &tmap->tileinfo, memindex, tmap->user_data); + (*tmap->tile_get_info)(tmap->machine, &tmap->tileinfo, memindex, tmap->user_data); /* apply the global tilemap flip to the returned flip flags */ flags = tmap->tileinfo.flags ^ (tmap->attributes & 0x03); @@ -1645,7 +1649,7 @@ static void tilemap_draw_instance(tilemap *tmap, const blit_parameters *blit, in { for (cury = y; cury < nexty; cury++) { - (*blit->draw_opaque)(dest0, source0, x_end - x_start, pmap0, blit->tilemap_priority_code); + (*blit->draw_opaque)(dest0, source0, x_end - x_start, tmap->machine->pens, pmap0, blit->tilemap_priority_code); dest0 = (UINT8 *)dest0 + dest_line_pitch_bytes; source0 += tmap->pixmap->rowpixels; @@ -1659,7 +1663,7 @@ static void tilemap_draw_instance(tilemap *tmap, const blit_parameters *blit, in const UINT8 *mask0 = mask_baseaddr + x_start; for (cury = y; cury < nexty; cury++) { - (*blit->draw_masked)(dest0, source0, mask0, blit->mask, blit->value, x_end - x_start, pmap0, blit->tilemap_priority_code); + (*blit->draw_masked)(dest0, source0, mask0, blit->mask, blit->value, x_end - x_start, tmap->machine->pens, pmap0, blit->tilemap_priority_code); dest0 = (UINT8 *)dest0 + dest_line_pitch_bytes; source0 += tmap->pixmap->rowpixels; @@ -1715,7 +1719,7 @@ do { \ static void tilemap_draw_roz_core(tilemap *tmap, const blit_parameters *blit, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound) { - const pen_t *clut = &Machine->pens[blit->tilemap_priority_code >> 16]; + const pen_t *clut = &tmap->machine->pens[blit->tilemap_priority_code >> 16]; bitmap_t *destbitmap = blit->bitmap; bitmap_t *srcbitmap = tmap->pixmap; bitmap_t *flagsmap = tmap->flagsmap; @@ -1897,7 +1901,7 @@ static void tilemap_draw_roz_core(tilemap *tmap, const blit_parameters *blit, bitmap, setting priority only -------------------------------------------------*/ -static void scanline_draw_opaque_null(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_opaque_null(void *dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { int i; @@ -1915,7 +1919,7 @@ static void scanline_draw_opaque_null(void *dest, const UINT16 *source, int coun bitmap using a mask, setting priority only -------------------------------------------------*/ -static void scanline_draw_masked_null(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_masked_null(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { int i; @@ -1935,7 +1939,7 @@ static void scanline_draw_masked_null(void *dest, const UINT16 *source, const UI indexed bitmap -------------------------------------------------*/ -static void scanline_draw_opaque_ind16(void *_dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_opaque_ind16(void *_dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { UINT16 *dest = _dest; int pal = pcode >> 16; @@ -1978,7 +1982,7 @@ static void scanline_draw_opaque_ind16(void *_dest, const UINT16 *source, int co indexed bitmap using a mask -------------------------------------------------*/ -static void scanline_draw_masked_ind16(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_masked_ind16(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { UINT16 *dest = _dest; int pal = pcode >> 16; @@ -2011,9 +2015,9 @@ static void scanline_draw_masked_ind16(void *_dest, const UINT16 *source, const RGB bitmap -------------------------------------------------*/ -static void scanline_draw_opaque_rgb16(void *_dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_opaque_rgb16(void *_dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { - const pen_t *clut = &Machine->pens[pcode >> 16]; + const pen_t *clut = &pens[pcode >> 16]; UINT16 *dest = _dest; int i; @@ -2041,9 +2045,9 @@ static void scanline_draw_opaque_rgb16(void *_dest, const UINT16 *source, int co RGB bitmap using a mask -------------------------------------------------*/ -static void scanline_draw_masked_rgb16(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_masked_rgb16(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { - const pen_t *clut = &Machine->pens[pcode >> 16]; + const pen_t *clut = &pens[pcode >> 16]; UINT16 *dest = _dest; int i; @@ -2073,9 +2077,9 @@ static void scanline_draw_masked_rgb16(void *_dest, const UINT16 *source, const 16bpp RGB bitmap with alpha blending -------------------------------------------------*/ -static void scanline_draw_opaque_rgb16_alpha(void *_dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_opaque_rgb16_alpha(void *_dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { - const pen_t *clut = &Machine->pens[pcode >> 16]; + const pen_t *clut = &pens[pcode >> 16]; UINT16 *dest = _dest; int i; @@ -2104,9 +2108,9 @@ static void scanline_draw_opaque_rgb16_alpha(void *_dest, const UINT16 *source, blending -------------------------------------------------*/ -static void scanline_draw_masked_rgb16_alpha(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_masked_rgb16_alpha(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { - const pen_t *clut = &Machine->pens[pcode >> 16]; + const pen_t *clut = &pens[pcode >> 16]; UINT16 *dest = _dest; int i; @@ -2136,9 +2140,9 @@ static void scanline_draw_masked_rgb16_alpha(void *_dest, const UINT16 *source, RGB bitmap -------------------------------------------------*/ -static void scanline_draw_opaque_rgb32(void *_dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_opaque_rgb32(void *_dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { - const pen_t *clut = &Machine->pens[pcode >> 16]; + const pen_t *clut = &pens[pcode >> 16]; UINT32 *dest = _dest; int i; @@ -2166,9 +2170,9 @@ static void scanline_draw_opaque_rgb32(void *_dest, const UINT16 *source, int co RGB bitmap using a mask -------------------------------------------------*/ -static void scanline_draw_masked_rgb32(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_masked_rgb32(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { - const pen_t *clut = &Machine->pens[pcode >> 16]; + const pen_t *clut = &pens[pcode >> 16]; UINT32 *dest = _dest; int i; @@ -2198,9 +2202,9 @@ static void scanline_draw_masked_rgb32(void *_dest, const UINT16 *source, const 32bpp RGB bitmap with alpha blending -------------------------------------------------*/ -static void scanline_draw_opaque_rgb32_alpha(void *_dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_opaque_rgb32_alpha(void *_dest, const UINT16 *source, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { - const pen_t *clut = &Machine->pens[pcode >> 16]; + const pen_t *clut = &pens[pcode >> 16]; UINT32 *dest = _dest; int i; @@ -2229,9 +2233,9 @@ static void scanline_draw_opaque_rgb32_alpha(void *_dest, const UINT16 *source, blending -------------------------------------------------*/ -static void scanline_draw_masked_rgb32_alpha(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode) +static void scanline_draw_masked_rgb32_alpha(void *_dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, const pen_t *pens, UINT8 *pri, UINT32 pcode) { - const pen_t *clut = &Machine->pens[pcode >> 16]; + const pen_t *clut = &pens[pcode >> 16]; UINT32 *dest = _dest; int i; diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index 51b809d6a8b..681236ce6d5 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -191,7 +191,7 @@ VIDEO_START( mydriver ) { // first create the tilemap - tmap = tilemap_create( + tmap = tilemap_create(machine, my_get_info, // pointer to your get_info tilemap_scan_rows, // standard row-major mapper 8,8, // 8x8 tiles @@ -431,7 +431,7 @@ void tilemap_init(running_machine *machine); /* ----- tilemap creation and configuration ----- */ /* create a new tilemap; note that tilemaps are tracked by the core so there is no dispose */ -tilemap *tilemap_create(tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows); +tilemap *tilemap_create(running_machine *machine, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows); /* specify a parameter to be passed into the tile_get_info callback */ void tilemap_set_user_data(tilemap *tmap, void *user_data); diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 34aabd3660c..0a013e16ff5 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -76,7 +76,7 @@ static TILE_GET_INFO( get_k3_bg_tile_info ) static VIDEO_START(k3) { - k3_bg_tilemap = tilemap_create(get_k3_bg_tile_info,tilemap_scan_rows,16, 16, 32,64); + k3_bg_tilemap = tilemap_create(machine, get_k3_bg_tile_info,tilemap_scan_rows,16, 16, 32,64); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index df51372e5b9..390e3dc8f4b 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -151,8 +151,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_START( acommand ) { - tx_tilemap = tilemap_create(ac_get_tx_tile_info,tilemap_scan_cols,8,8,512,32); - bg_tilemap = tilemap_create(ac_get_bg_tile_info,bg_scan,16,16,256,16); + tx_tilemap = tilemap_create(machine, ac_get_tx_tile_info,tilemap_scan_cols,8,8,512,32); + bg_tilemap = tilemap_create(machine, ac_get_bg_tile_info,bg_scan,16,16,256,16); ac_vregs = auto_malloc(0x80); diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index ab54a991a78..38522bf4409 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -73,9 +73,9 @@ static TILEMAP_MAPPER( bsb_bg_scan ) static VIDEO_START(bestleag) { - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,8,8,256, 32); - bg_tilemap = tilemap_create(get_bg_tile_info,bsb_bg_scan,16,16,128, 64); - fg_tilemap = tilemap_create(get_fg_tile_info,bsb_bg_scan,16,16,128, 64); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_cols,8,8,256, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,bsb_bg_scan,16,16,128, 64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,bsb_bg_scan,16,16,128, 64); tilemap_set_transparent_pen(tx_tilemap,15); tilemap_set_transparent_pen(fg_tilemap,15); diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index b14d64401b5..76d4e15bd86 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -162,9 +162,9 @@ static TILE_GET_INFO( get_tx_tile_info ) static VIDEO_START( bigfghtr ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,16,16,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_cols,16,16,64,32); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,16,16,64,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_cols,8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,0xf); tilemap_set_transparent_pen(tx_tilemap,0xf); diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index ecc2b3b6972..904e1d15601 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -67,10 +67,10 @@ static TILE_GET_INFO( get_tile_info2 ) { SET_TILE_INFO(0, bishjan_videoram2[ til static VIDEO_START(bishjan) { - tmap1 = tilemap_create( get_tile_info1, tilemap_scan_rows, + tmap1 = tilemap_create( machine, get_tile_info1, tilemap_scan_rows, 8,8, 0x80,0x40 ); - tmap2 = tilemap_create( get_tile_info2, tilemap_scan_rows, + tmap2 = tilemap_create( machine, get_tile_info2, tilemap_scan_rows, 8,8, 0x80,0x40 ); tilemap_set_transparent_pen(tmap1, 0); diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 51f7dd8ec1d..958382d6fb7 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -466,18 +466,18 @@ static WRITE32_HANDLER( ms32_spramx_w ) static VIDEO_START(bnstars) { - ms32_tx_tilemap[0] = tilemap_create(get_ms32_tx0_tile_info,tilemap_scan_rows, 8, 8,64,64); - ms32_tx_tilemap[1] = tilemap_create(get_ms32_tx1_tile_info,tilemap_scan_rows, 8, 8,64,64); + ms32_tx_tilemap[0] = tilemap_create(machine, get_ms32_tx0_tile_info,tilemap_scan_rows, 8, 8,64,64); + ms32_tx_tilemap[1] = tilemap_create(machine, get_ms32_tx1_tile_info,tilemap_scan_rows, 8, 8,64,64); tilemap_set_transparent_pen(ms32_tx_tilemap[0],0); tilemap_set_transparent_pen(ms32_tx_tilemap[1],0); - ms32_bg_tilemap[0] = tilemap_create(get_ms32_bg0_tile_info,tilemap_scan_rows,16,16,64,64); - ms32_bg_tilemap[1] = tilemap_create(get_ms32_bg1_tile_info,tilemap_scan_rows,16,16,64,64); + ms32_bg_tilemap[0] = tilemap_create(machine, get_ms32_bg0_tile_info,tilemap_scan_rows,16,16,64,64); + ms32_bg_tilemap[1] = tilemap_create(machine, get_ms32_bg1_tile_info,tilemap_scan_rows,16,16,64,64); tilemap_set_transparent_pen(ms32_bg_tilemap[0],0); tilemap_set_transparent_pen(ms32_bg_tilemap[1],0); - ms32_roz_tilemap[0] = tilemap_create(get_ms32_roz0_tile_info,tilemap_scan_rows,16,16,128,128); - ms32_roz_tilemap[1] = tilemap_create(get_ms32_roz1_tile_info,tilemap_scan_rows,16,16,128,128); + ms32_roz_tilemap[0] = tilemap_create(machine, get_ms32_roz0_tile_info,tilemap_scan_rows,16,16,128,128); + ms32_roz_tilemap[1] = tilemap_create(machine, get_ms32_roz1_tile_info,tilemap_scan_rows,16,16,128,128); tilemap_set_transparent_pen(ms32_roz_tilemap[0],0); tilemap_set_transparent_pen(ms32_roz_tilemap[1],0); diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 573e63ef82b..3064b35beb1 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -109,8 +109,8 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( calorie ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,16,16,16,16); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8, 8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,16,16,16,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8, 8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); } diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 514b36fdd1a..e7daff41867 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -28,7 +28,7 @@ static WRITE8_HANDLER( cball_vram_w ) static VIDEO_START( cball ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index fd330c8fed6..161d68deb29 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -111,8 +111,8 @@ static TILE_GET_INFO( get_bg2_tile_info ) static VIDEO_START(chanbara ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,8, 8, 32, 32); - bg2_tilemap = tilemap_create(get_bg2_tile_info, tilemap_scan_rows,16, 16, 16, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows,8, 8, 32, 32); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows,16, 16, 16, 32); tilemap_set_transparent_pen(bg_tilemap,0); } diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c index 3586bd7dacc..3b13b8b536e 100644 --- a/src/mame/drivers/cherrym.c +++ b/src/mame/drivers/cherrym.c @@ -97,7 +97,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_START(cm) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c index 0a7e131227d..1982a7728f7 100644 --- a/src/mame/drivers/cherrym2.c +++ b/src/mame/drivers/cherrym2.c @@ -53,7 +53,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START(cm2) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 995718c89bd..9ee57ed75f2 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -82,8 +82,8 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( zerotrgt ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16,16,64,64); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows_flip_x,8, 8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16,16,64,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows_flip_x,8, 8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index 4006e7185c1..1fb68890c02 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -535,7 +535,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( coinmstr ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8, 8, 46, 64); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8, 8, 46, 64); } static VIDEO_UPDATE( coinmstr ) diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index e8652354494..4a9b1075664 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -32,7 +32,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( cowrace ) { - tmap = tilemap_create( get_tile_info, tilemap_scan_rows, + tmap = tilemap_create( machine, get_tile_info, tilemap_scan_rows, 8,8, 0x20,0x20 ); tilemap_set_transparent_pen(tmap, 0); diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index bbd08acaa46..956df082b22 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -139,7 +139,7 @@ static WRITE8_HANDLER(cshooter_txram_w) static VIDEO_START(cshooter) { - cshooter_txtilemap = tilemap_create(get_cstx_tile_info,tilemap_scan_rows, 8,8,32, 32); + cshooter_txtilemap = tilemap_create(machine, get_cstx_tile_info,tilemap_scan_rows, 8,8,32, 32); tilemap_set_transparent_pen(cshooter_txtilemap, 3); } diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 6412a10434f..da20cbda6a5 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -44,9 +44,9 @@ static TILE_GET_INFO( get_bg0_tile_info ) static VIDEO_START( cultures ) { - bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,8,8,512,512); - bg1_tilemap = tilemap_create(get_bg1_tile_info,tilemap_scan_rows,8,8,512,512); - bg0_tilemap = tilemap_create(get_bg0_tile_info,tilemap_scan_rows,8,8, 64,128); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows,8,8,512,512); + bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows,8,8,512,512); + bg0_tilemap = tilemap_create(machine, get_bg0_tile_info,tilemap_scan_rows,8,8, 64,128); tilemap_set_transparent_pen(bg1_tilemap,0); tilemap_set_transparent_pen(bg0_tilemap,0); diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index c511d3a506c..2e46498f909 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -193,7 +193,7 @@ static TILE_GET_INFO( get_tx_tile_info ) static VIDEO_START( cybertnk ) { - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows,8,8,128,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows,8,8,128,32); } static VIDEO_UPDATE( cybertnk ) diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index 4b6c6f1b2c7..7c8da4d26f9 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -295,8 +295,8 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( dacholer ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); } diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 42a99a3ec7a..24b5bca1d69 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -138,10 +138,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_START( darkhors ) { - darkhors_tmap = tilemap_create( get_tile_info_0, tilemap_scan_rows, + darkhors_tmap = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x40,0x40 ); - darkhors_tmap2 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + darkhors_tmap2 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 0x40,0x40 ); tilemap_set_transparent_pen(darkhors_tmap, 0); diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 853c98a9ac3..86f7adc27d7 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -340,7 +340,7 @@ static TILE_GET_INFO( get_tile_info_bg ) static VIDEO_START( ddayjlc ) { - bg_tilemap = tilemap_create(get_tile_info_bg,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info_bg,tilemap_scan_rows,8,8,32,32); } static VIDEO_UPDATE( ddayjlc ) diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 0e5d7f70f1f..b04f33735ca 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -138,7 +138,7 @@ static TILE_GET_INFO( get_back_tile_info ) static VIDEO_START( ddealer ) { ddealer_flipscreen = 0; - back_tilemap = tilemap_create(get_back_tile_info,tilemap_scan_cols,8,8,64,32); + back_tilemap = tilemap_create(machine, get_back_tile_info,tilemap_scan_cols,8,8,64,32); } static void ddealer_draw_video_layer( running_machine *machine, UINT16* vreg_base, UINT16* top, UINT16* bottom, bitmap_t* bitmap, const rectangle *cliprect, int flipy) diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index d8375509280..4d25a518742 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -187,8 +187,8 @@ static TILE_GET_INFO( get_dreamwld_bg2_tile_info ) static VIDEO_START( dreamwld ) { - dreamwld_bg_tilemap = tilemap_create(get_dreamwld_bg_tile_info,tilemap_scan_rows, 16, 16, 64,32); - dreamwld_bg2_tilemap = tilemap_create(get_dreamwld_bg2_tile_info,tilemap_scan_rows, 16, 16, 64,32); + dreamwld_bg_tilemap = tilemap_create(machine, get_dreamwld_bg_tile_info,tilemap_scan_rows, 16, 16, 64,32); + dreamwld_bg2_tilemap = tilemap_create(machine, get_dreamwld_bg2_tile_info,tilemap_scan_rows, 16, 16, 64,32); tilemap_set_transparent_pen(dreamwld_bg2_tilemap,0); dreamwld_tilebankold[0] = dreamwld_tilebankold[1] = -1; dreamwld_tilebank[0] = dreamwld_tilebank[1] = 0; diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 2902438aa2e..9e6602fada6 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -91,8 +91,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_START( drtomy ) { - tilemap_bg = tilemap_create(get_tile_info_bg,tilemap_scan_rows,16,16,32,32); - tilemap_fg = tilemap_create(get_tile_info_fg,tilemap_scan_rows,16,16,32,32); + tilemap_bg = tilemap_create(machine, get_tile_info_bg,tilemap_scan_rows,16,16,32,32); + tilemap_fg = tilemap_create(machine, get_tile_info_fg,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(tilemap_fg,0); } diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index e87f5c1bb20..2dd56f51224 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -107,7 +107,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( drw80pkr ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25); } static VIDEO_UPDATE( drw80pkr ) diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index df392428060..0e4dfc18e18 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -93,10 +93,10 @@ static TILE_GET_INFO( get_tile_info2 ) static VIDEO_START(dunhuang) { - tmap = tilemap_create( get_tile_info, tilemap_scan_rows, + tmap = tilemap_create( machine, get_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20 ); - tmap2 = tilemap_create( get_tile_info2, tilemap_scan_rows, + tmap2 = tilemap_create( machine, get_tile_info2, tilemap_scan_rows, 8,32, 0x40,0x8 ); tilemap_set_transparent_pen(tmap, 0); diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index 64861ed965d..3bcf4757a78 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -171,8 +171,8 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( dynadice ) { /* pacman - style videoram layout */ - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); - top_tilemap = tilemap_create(get_tile_info,tilemap_scan_cols,8,8,2,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); + top_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_cols,8,8,2,32); tilemap_set_scrollx(bg_tilemap, 0, -16 ); } diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 2dd8722078a..fbc54d10394 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -144,7 +144,7 @@ static WRITE8_HANDLER( egghunt_atram_w ) static VIDEO_START(egghunt) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,64, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64, 32); egghunt_bgram = auto_malloc(0x1000); egghunt_spram = auto_malloc(0x1000); } diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 8982b9cca5c..8797e6f7a9c 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -194,8 +194,8 @@ static TILE_GET_INFO( get_tile_info_fg ) static VIDEO_START( ettrivia ) { - bg_tilemap = tilemap_create( get_tile_info_bg,tilemap_scan_rows,8,8,64,32 ); - fg_tilemap = tilemap_create( get_tile_info_fg,tilemap_scan_rows,8,8,64,32 ); + bg_tilemap = tilemap_create( machine, get_tile_info_bg,tilemap_scan_rows,8,8,64,32 ); + fg_tilemap = tilemap_create( machine, get_tile_info_fg,tilemap_scan_rows,8,8,64,32 ); tilemap_set_transparent_pen(fg_tilemap,0); } diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 31c90906f6a..86e7b9047b8 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -157,7 +157,7 @@ static WRITE8_HANDLER( tileram_w ) static VIDEO_START( firefox ) { - bgtiles = tilemap_create(bgtile_get_info, tilemap_scan_rows, 8,8, 64,64); + bgtiles = tilemap_create(machine, bgtile_get_info, tilemap_scan_rows, 8,8, 64,64); tilemap_set_transparent_pen(bgtiles, 0); tilemap_set_scrolldy(bgtiles, video_screen_get_visible_area(machine->primary_screen)->min_y, 0); } diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index 8842e340355..812726d410f 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -108,12 +108,12 @@ static WRITE16_HANDLER( galaxi_fg_w ) static VIDEO_START(galaxi) { - bg1_tmap = tilemap_create( get_bg1_tile_info, tilemap_scan_rows, 16,16, 0x20,0x10 ); - bg2_tmap = tilemap_create( get_bg2_tile_info, tilemap_scan_rows, 16,16, 0x20,0x10 ); - bg3_tmap = tilemap_create( get_bg3_tile_info, tilemap_scan_rows, 16,16, 0x20,0x10 ); - bg4_tmap = tilemap_create( get_bg4_tile_info, tilemap_scan_rows, 16,16, 0x20,0x10 ); + bg1_tmap = tilemap_create( machine, get_bg1_tile_info, tilemap_scan_rows, 16,16, 0x20,0x10 ); + bg2_tmap = tilemap_create( machine, get_bg2_tile_info, tilemap_scan_rows, 16,16, 0x20,0x10 ); + bg3_tmap = tilemap_create( machine, get_bg3_tile_info, tilemap_scan_rows, 16,16, 0x20,0x10 ); + bg4_tmap = tilemap_create( machine, get_bg4_tile_info, tilemap_scan_rows, 16,16, 0x20,0x10 ); - fg_tmap = tilemap_create( get_fg_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20 ); + fg_tmap = tilemap_create( machine, get_fg_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20 ); tilemap_set_transparent_pen(bg1_tmap, 0); tilemap_set_transparent_pen(bg2_tmap, 0); diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 6316721f2b8..35acce80189 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -640,7 +640,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( goldnpkr ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 29); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 29); } static VIDEO_UPDATE( goldnpkr ) diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index b0fad9a41ca..1c9580edf55 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -70,8 +70,8 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( good ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16, 16, 32,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows, 16, 16, 32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16, 16, 32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows, 16, 16, 32,32); tilemap_set_transparent_pen(fg_tilemap,0xf); } diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 98f5a498e9a..03f83fe8cc8 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -349,9 +349,9 @@ static TILE_GET_INFO( get_gs3_tile_info ) static VIDEO_START(gstream) { - gstream_tilemap1 = tilemap_create(get_gs1_tile_info,tilemap_scan_rows, 32, 32,16,16); - gstream_tilemap2 = tilemap_create(get_gs2_tile_info,tilemap_scan_rows, 32, 32,16,16); - gstream_tilemap3 = tilemap_create(get_gs3_tile_info,tilemap_scan_rows, 32, 32,16,16); + gstream_tilemap1 = tilemap_create(machine, get_gs1_tile_info,tilemap_scan_rows, 32, 32,16,16); + gstream_tilemap2 = tilemap_create(machine, get_gs2_tile_info,tilemap_scan_rows, 32, 32,16,16); + gstream_tilemap3 = tilemap_create(machine, get_gs3_tile_info,tilemap_scan_rows, 32, 32,16,16); tilemap_set_transparent_pen(gstream_tilemap1,0); tilemap_set_transparent_pen(gstream_tilemap2,0); diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index 012723efc8c..38a4e8bcb9e 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -57,13 +57,13 @@ static WRITE8_HANDLER( hitme_vidram_w ) static VIDEO_START(hitme) { - hitme_tilemap = tilemap_create(get_hitme_tile_info,tilemap_scan_rows, 8,10, 40,19); + hitme_tilemap = tilemap_create(machine, get_hitme_tile_info,tilemap_scan_rows, 8,10, 40,19); } static VIDEO_START(barricad) { - hitme_tilemap = tilemap_create(get_hitme_tile_info,tilemap_scan_rows, 8,8, 32,24); + hitme_tilemap = tilemap_create(machine, get_hitme_tile_info,tilemap_scan_rows, 8,8, 32,24); } diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 58dce8b13d4..1e48c4521c6 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -435,13 +435,13 @@ static int K037122_vh_start(running_machine *machine, int chip) if (chip == 0) { - K037122_layer[chip][0] = tilemap_create(K037122_0_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 64); - K037122_layer[chip][1] = tilemap_create(K037122_0_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64); + K037122_layer[chip][0] = tilemap_create(machine, K037122_0_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 64); + K037122_layer[chip][1] = tilemap_create(machine, K037122_0_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64); } else { - K037122_layer[chip][0] = tilemap_create(K037122_1_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 64); - K037122_layer[chip][1] = tilemap_create(K037122_1_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64); + K037122_layer[chip][0] = tilemap_create(machine, K037122_1_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 64); + K037122_layer[chip][1] = tilemap_create(machine, K037122_1_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64); } tilemap_set_transparent_pen(K037122_layer[chip][0], 0); diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 4fa4e8ff6c9..73378d179c7 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -75,8 +75,8 @@ static WRITE8_HANDLER( fg_color_w ) static VIDEO_START(jingbell) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 32, 0x80,0x20); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 0x80,0x20); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 32, 0x80,0x20); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 0x80,0x20); tilemap_set_transparent_pen(bg_tilemap, 0); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c index 8162f62809d..ecf53dcefa0 100644 --- a/src/mame/drivers/igs_180.c +++ b/src/mame/drivers/igs_180.c @@ -64,8 +64,8 @@ static WRITE8_HANDLER( bg_w ) static VIDEO_START(igs_180) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,0xf); tilemap_set_transparent_pen(bg_tilemap,0xf); diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 51db185f4fc..090c79a0c52 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -132,10 +132,10 @@ static WRITE32_HANDLER( igs_pallete32_w ) static VIDEO_START(igs_majhong) { - igs_tx_tilemap= tilemap_create(get_tx_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); + igs_tx_tilemap= tilemap_create(machine, get_tx_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(igs_tx_tilemap,15); - igs_bg_tilemap= tilemap_create(get_bg_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); - //igs_bg_tilemap= tilemap_create(get_bg_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); + igs_bg_tilemap= tilemap_create(machine, get_bg_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); + //igs_bg_tilemap= tilemap_create(machine, get_bg_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); //tilemap_set_transparent_pen(igs_bg_tilemap,15); logerror("Video START OK!\n"); } diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index 91dd1ff7839..1ac631925ec 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -142,9 +142,9 @@ static const gfx_layout tiles8x8_layout = static VIDEO_START(jackpool) { - jackpool_layer0_tilemap = tilemap_create(get_jackpool_layer0_tile_info,tilemap_scan_rows, 8, 8,64,32); - jackpool_layer1_tilemap = tilemap_create(get_jackpool_layer1_tile_info,tilemap_scan_rows, 8, 8,64,32); - jackpool_layer2_tilemap = tilemap_create(get_jackpool_layer2_tile_info,tilemap_scan_rows, 8, 8,64,32); + jackpool_layer0_tilemap = tilemap_create(machine, get_jackpool_layer0_tile_info,tilemap_scan_rows, 8, 8,64,32); + jackpool_layer1_tilemap = tilemap_create(machine, get_jackpool_layer1_tile_info,tilemap_scan_rows, 8, 8,64,32); + jackpool_layer2_tilemap = tilemap_create(machine, get_jackpool_layer2_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(jackpool_layer0_tilemap,0); tilemap_set_transparent_pen(jackpool_layer2_tilemap,0); diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index 4455fcf18dd..465cdc8bc9c 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -203,25 +203,25 @@ static TILE_GET_INFO( get_sc3_tile_info ) static VIDEO_START( jalmah ) { - sc0_tilemap_0 = tilemap_create(get_sc0_tile_info,range0_16x16,16,16,256,32); - sc0_tilemap_1 = tilemap_create(get_sc0_tile_info,range1_16x16,16,16,128,64); - sc0_tilemap_2 = tilemap_create(get_sc0_tile_info,range2_16x16,16,16,64,128); - sc0_tilemap_3 = tilemap_create(get_sc0_tile_info,range3_16x16,16,16,32,256); + sc0_tilemap_0 = tilemap_create(machine, get_sc0_tile_info,range0_16x16,16,16,256,32); + sc0_tilemap_1 = tilemap_create(machine, get_sc0_tile_info,range1_16x16,16,16,128,64); + sc0_tilemap_2 = tilemap_create(machine, get_sc0_tile_info,range2_16x16,16,16,64,128); + sc0_tilemap_3 = tilemap_create(machine, get_sc0_tile_info,range3_16x16,16,16,32,256); - sc1_tilemap_0 = tilemap_create(get_sc1_tile_info,range0_16x16,16,16,256,32); - sc1_tilemap_1 = tilemap_create(get_sc1_tile_info,range1_16x16,16,16,128,64); - sc1_tilemap_2 = tilemap_create(get_sc1_tile_info,range2_16x16,16,16,64,128); - sc1_tilemap_3 = tilemap_create(get_sc1_tile_info,range3_16x16,16,16,32,256); + sc1_tilemap_0 = tilemap_create(machine, get_sc1_tile_info,range0_16x16,16,16,256,32); + sc1_tilemap_1 = tilemap_create(machine, get_sc1_tile_info,range1_16x16,16,16,128,64); + sc1_tilemap_2 = tilemap_create(machine, get_sc1_tile_info,range2_16x16,16,16,64,128); + sc1_tilemap_3 = tilemap_create(machine, get_sc1_tile_info,range3_16x16,16,16,32,256); - sc2_tilemap_0 = tilemap_create(get_sc2_tile_info,range0_16x16,16,16,256,32); - sc2_tilemap_1 = tilemap_create(get_sc2_tile_info,range1_16x16,16,16,128,64); - sc2_tilemap_2 = tilemap_create(get_sc2_tile_info,range2_16x16,16,16,64,128); - sc2_tilemap_3 = tilemap_create(get_sc2_tile_info,range3_16x16,16,16,32,256); + sc2_tilemap_0 = tilemap_create(machine, get_sc2_tile_info,range0_16x16,16,16,256,32); + sc2_tilemap_1 = tilemap_create(machine, get_sc2_tile_info,range1_16x16,16,16,128,64); + sc2_tilemap_2 = tilemap_create(machine, get_sc2_tile_info,range2_16x16,16,16,64,128); + sc2_tilemap_3 = tilemap_create(machine, get_sc2_tile_info,range3_16x16,16,16,32,256); - sc3_tilemap_0 = tilemap_create(get_sc3_tile_info,tilemap_scan_cols,8,8,256,32); -// sc3_tilemap_1 = tilemap_create(get_sc3_tile_info,tilemap_scan_cols,8,8,256,32); - sc3_tilemap_2 = tilemap_create(get_sc3_tile_info,range2_8x8,8,8,128,64); - sc3_tilemap_3 = tilemap_create(get_sc3_tile_info,range3_8x8,8,8,64,128); + sc3_tilemap_0 = tilemap_create(machine, get_sc3_tile_info,tilemap_scan_cols,8,8,256,32); +// sc3_tilemap_1 = tilemap_create(machine, get_sc3_tile_info,tilemap_scan_cols,8,8,256,32); + sc3_tilemap_2 = tilemap_create(machine, get_sc3_tile_info,range2_8x8,8,8,128,64); + sc3_tilemap_3 = tilemap_create(machine, get_sc3_tile_info,range3_8x8,8,8,64,128); jm_scrollram = auto_malloc(0x80); jm_vregs = auto_malloc(0x40); @@ -248,8 +248,8 @@ static VIDEO_START( jalmah ) static VIDEO_START( urashima ) { - sc0_tilemap_0 = tilemap_create(get_sc0_tile_info,range0_16x16,16,16,256,32); - sc3_tilemap_0 = tilemap_create(get_sc3_tile_info,range2_8x8,8,8,128,64); + sc0_tilemap_0 = tilemap_create(machine, get_sc0_tile_info,range0_16x16,16,16,256,32); + sc3_tilemap_0 = tilemap_create(machine, get_sc3_tile_info,range2_8x8,8,8,128,64); jm_scrollram = auto_malloc(0x80); jm_vregs = auto_malloc(0x40); diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index 0d0c6d7ae61..bfaef01da26 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -135,7 +135,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( jokrwild ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 24, 26); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 24, 26); } diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 2ea0f143e5f..52163525a6d 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -273,7 +273,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( jollyjgr ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 0); tilemap_set_scroll_cols(bg_tilemap, 32); diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index 3717bf1e908..51b41c2d110 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -60,8 +60,8 @@ static TILE_GET_INFO( get_t2_tile_info ) static VIDEO_START( koftball ) { - tilemap_1 = tilemap_create(get_t1_tile_info,tilemap_scan_rows,8,8,64,32); - tilemap_2 = tilemap_create(get_t2_tile_info,tilemap_scan_rows,8,8,64,32); + tilemap_1 = tilemap_create(machine, get_t1_tile_info,tilemap_scan_rows,8,8,64,32); + tilemap_2 = tilemap_create(machine, get_t2_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(tilemap_1,0); } diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 86d7857fb68..a9b7e58903f 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -218,7 +218,7 @@ static PALETTE_INIT( koikoi ) //wrong static VIDEO_START(koikoi) { - koikoi_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + koikoi_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); } static VIDEO_UPDATE(koikoi) diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 0b3ca792944..cc1038e1d81 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -505,7 +505,7 @@ static VIDEO_START( laserbat ) int screen_width = video_screen_get_width(machine->primary_screen); int screen_height = video_screen_get_height(machine->primary_screen); - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); videoram = (UINT8 *)auto_malloc(0x400); colorram = (UINT8 *)auto_malloc(0x400); diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 1c89b8633d9..04eb637b589 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -434,9 +434,9 @@ static void copy_sprites(running_machine *machine, bitmap_t *bitmap, bitmap_t *s static VIDEO_START( limenko ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,128,64); - md_tilemap = tilemap_create(get_md_tile_info,tilemap_scan_rows,8,8,128,64); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,128,64); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,128,64); + md_tilemap = tilemap_create(machine, get_md_tile_info,tilemap_scan_rows,8,8,128,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,128,64); tilemap_set_transparent_pen(md_tilemap,0); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index d0846faa31e..a824337582f 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -176,7 +176,7 @@ static VIDEO_START( looping ) { looping_state *state = machine->driver_data; - state->bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8,8, 32,32); + state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 32,32); tilemap_set_scroll_cols(state->bg_tilemap, 0x20); } diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index dc6b56b38b6..ecdd0948055 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_ltcasino_tile_info ) static VIDEO_START(ltcasino) { - ltcasino_tilemap = tilemap_create(get_ltcasino_tile_info,tilemap_scan_rows,8, 8,64,32); + ltcasino_tilemap = tilemap_create(machine, get_ltcasino_tile_info,tilemap_scan_rows,8, 8,64,32); } diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c index 60d18c74093..70fb91366b2 100644 --- a/src/mame/drivers/lucky8.c +++ b/src/mame/drivers/lucky8.c @@ -85,7 +85,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START(lucky8) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 16001b525c3..f3489a532d7 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -247,10 +247,10 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( m63 ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(bg_tilemap, 32); diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 72dd6c66ec8..dbfbf20bf10 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -144,9 +144,9 @@ static TILE_GET_INFO( get_layer2_tile_info ) static VIDEO_START( magic10 ) { - layer0_tilemap = tilemap_create(get_layer0_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - layer1_tilemap = tilemap_create(get_layer1_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - layer2_tilemap = tilemap_create(get_layer2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + layer0_tilemap = tilemap_create(machine, get_layer0_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + layer1_tilemap = tilemap_create(machine, get_layer1_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + layer2_tilemap = tilemap_create(machine, get_layer2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); tilemap_set_transparent_pen(layer1_tilemap, 0); tilemap_set_transparent_pen(layer2_tilemap, 0); diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 8d7d78df0af..d651164e962 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -445,7 +445,7 @@ static TILE_GET_INFO( get_magicfly_tile_info ) static VIDEO_START(magicfly) { - bg_tilemap = tilemap_create(get_magicfly_tile_info, tilemap_scan_rows, 8, 8, 32, 29); + bg_tilemap = tilemap_create(machine, get_magicfly_tile_info, tilemap_scan_rows, 8, 8, 32, 29); } static TILE_GET_INFO( get_7mezzo_tile_info ) @@ -475,7 +475,7 @@ static TILE_GET_INFO( get_7mezzo_tile_info ) static VIDEO_START( 7mezzo ) { - bg_tilemap = tilemap_create(get_7mezzo_tile_info, tilemap_scan_rows, 8, 8, 32, 29); + bg_tilemap = tilemap_create(machine, get_7mezzo_tile_info, tilemap_scan_rows, 8, 8, 32, 29); } static VIDEO_UPDATE( magicfly ) diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index f7c8054b77d..cd9eee237fe 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -441,7 +441,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( marinedt ) { - tx_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8,32,32); + tx_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(tx_tilemap, 0); tilemap_set_scrolldx(tx_tilemap, 0, 4*8); diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 25f9e731cea..8596b08897d 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -34,7 +34,7 @@ static WRITE8_HANDLER( mgolf_vram_w ) static VIDEO_START( mgolf ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 9438898be08..46d874b672f 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -66,7 +66,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( livequiz ) { - tmap = tilemap_create( get_tile_info, tilemap_scan_cols, + tmap = tilemap_create( machine, get_tile_info, tilemap_scan_cols, 8,8, 0x80,0x20 ); tilemap_set_transparent_pen(tmap, 0); diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index 1973e383656..14a89542557 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -142,10 +142,10 @@ VIDEO_START(mil4000) for (i=0;i<0x800;i++) palette_set_color(space->machine, i, MAKE_RGB(0, 0, 0)); - sc0_tilemap = tilemap_create(get_sc0_tile_info,tilemap_scan_rows,8,8,64,64); - sc1_tilemap = tilemap_create(get_sc1_tile_info,tilemap_scan_rows,8,8,64,64); - sc2_tilemap = tilemap_create(get_sc2_tile_info,tilemap_scan_rows,8,8,64,64); - sc3_tilemap = tilemap_create(get_sc3_tile_info,tilemap_scan_rows,8,8,64,64); + sc0_tilemap = tilemap_create(machine, get_sc0_tile_info,tilemap_scan_rows,8,8,64,64); + sc1_tilemap = tilemap_create(machine, get_sc1_tile_info,tilemap_scan_rows,8,8,64,64); + sc2_tilemap = tilemap_create(machine, get_sc2_tile_info,tilemap_scan_rows,8,8,64,64); + sc3_tilemap = tilemap_create(machine, get_sc3_tile_info,tilemap_scan_rows,8,8,64,64); tilemap_set_transparent_pen(sc1_tilemap,0); tilemap_set_transparent_pen(sc2_tilemap,0); diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index 52175bc1072..9578ecdd6a7 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -166,7 +166,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( miniboy7 ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 37, 37); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 37, 37); } static VIDEO_UPDATE( miniboy7 ) diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 6185263fe86..51383ace214 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_mogura_tile_info ) static VIDEO_START( mogura ) { - mogura_tilemap = tilemap_create(get_mogura_tile_info,tilemap_scan_rows,8,8,64, 32); + mogura_tilemap = tilemap_create(machine, get_mogura_tile_info,tilemap_scan_rows,8,8,64, 32); } static VIDEO_UPDATE( mogura ) diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index a2de71732e3..529431a771a 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -309,10 +309,10 @@ static TILE_GET_INFO( get_tx_tile_info ) static VIDEO_START( mwarr ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, 16, 16,64,16); - mlow_tilemap = tilemap_create(get_mlow_tile_info, tilemap_scan_cols, 16, 16,64,16); - mhigh_tilemap = tilemap_create(get_mhigh_tile_info,tilemap_scan_cols, 16, 16,64,16); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_rows, 8, 8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16,64,16); + mlow_tilemap = tilemap_create(machine, get_mlow_tile_info, tilemap_scan_cols, 16, 16,64,16); + mhigh_tilemap = tilemap_create(machine, get_mhigh_tile_info,tilemap_scan_cols, 16, 16,64,16); + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8,64,32); sprites_buffer = auto_malloc(sizeof(UINT16) * 0x800); diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c index 8c1239d4cf0..91a8ccffde0 100644 --- a/src/mame/drivers/namcoic.c +++ b/src/mame/drivers/namcoic.c @@ -52,7 +52,7 @@ static TILE_GET_INFO( get_tile_info4 ) { get_tile_info(machine,tileinfo,tile_ind static TILE_GET_INFO( get_tile_info5 ) { get_tile_info(machine,tileinfo,tile_index,&mTilemapInfo.videoram[0x4408]); } void -namco_tilemap_init( int gfxbank, void *maskBaseAddr, +namco_tilemap_init( running_machine *machine, int gfxbank, void *maskBaseAddr, void (*cb)( UINT16 code, int *gfx, int *mask) ) { int i; @@ -62,14 +62,14 @@ namco_tilemap_init( int gfxbank, void *maskBaseAddr, mTilemapInfo.videoram = auto_malloc( 0x10000*2 ); /* four scrolling tilemaps */ - mTilemapInfo.tmap[0] = tilemap_create(get_tile_info0,tilemap_scan_rows,8,8,64,64); - mTilemapInfo.tmap[1] = tilemap_create(get_tile_info1,tilemap_scan_rows,8,8,64,64); - mTilemapInfo.tmap[2] = tilemap_create(get_tile_info2,tilemap_scan_rows,8,8,64,64); - mTilemapInfo.tmap[3] = tilemap_create(get_tile_info3,tilemap_scan_rows,8,8,64,64); + mTilemapInfo.tmap[0] = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,8,8,64,64); + mTilemapInfo.tmap[1] = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,8,8,64,64); + mTilemapInfo.tmap[2] = tilemap_create(machine, get_tile_info2,tilemap_scan_rows,8,8,64,64); + mTilemapInfo.tmap[3] = tilemap_create(machine, get_tile_info3,tilemap_scan_rows,8,8,64,64); /* two non-scrolling tilemaps */ - mTilemapInfo.tmap[4] = tilemap_create(get_tile_info4,tilemap_scan_rows,8,8,36,28); - mTilemapInfo.tmap[5] = tilemap_create(get_tile_info5,tilemap_scan_rows,8,8,36,28); + mTilemapInfo.tmap[4] = tilemap_create(machine, get_tile_info4,tilemap_scan_rows,8,8,36,28); + mTilemapInfo.tmap[5] = tilemap_create(machine, get_tile_info5,tilemap_scan_rows,8,8,36,28); /* define offsets for scrolling */ for( i=0; i<4; i++ ) @@ -1119,7 +1119,7 @@ TILEMAP_MAPPER( namco_roz_scan ) } /* namco_roz_scan*/ void -namco_roz_init( int gfxbank, const char * maskregion ) +namco_roz_init( running_machine *machine, int gfxbank, const char * maskregion ) { int i; static const tile_get_info_func roz_info[ROZ_TILEMAP_COUNT] = @@ -1137,7 +1137,7 @@ namco_roz_init( int gfxbank, const char * maskregion ) for( i=0; itotal_colors = 0x3f; machine->gfx[gfxbank] = pGfx; - mpRoadTilemap = tilemap_create( + mpRoadTilemap = tilemap_create(machine, get_road_info,tilemap_scan_rows, ROAD_TILE_SIZE,ROAD_TILE_SIZE, ROAD_COLS,ROAD_ROWS); diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index ef7a5992758..0819f1bf6ce 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -775,7 +775,7 @@ static WRITE32_HANDLER( namcos23_textram_w ) static VIDEO_START( ss23 ) { - bgtilemap = tilemap_create(TextTilemapGetInfo, tilemap_scan_rows, 16, 16, 64, 64); + bgtilemap = tilemap_create(machine, TextTilemapGetInfo, tilemap_scan_rows, 16, 16, 64, 64); tilemap_set_transparent_pen(bgtilemap, 0xf); } diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 2de356e74dd..860c4081852 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -798,8 +798,8 @@ static TILE_GET_INFO( bg_get_tile_info ) { get_tile_info(machine,tileinfo,tile_i static VIDEO_START( nmg5 ) { - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,8,8,64,64); - fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan_rows,8,8,64,64); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,8,8,64,64); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan_rows,8,8,64,64); tilemap_set_transparent_pen(fg_tilemap,0); } diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 7a2d11f11a5..48c417d458b 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -431,21 +431,21 @@ int K001604_vh_start(running_machine *machine, int chip) { int roz_tile_size = K001604_roz_size[chip] ? 16 : 8; int roz_width = K001604_layer_size ? 64 : 128; - K001604_layer_8x8[chip][0] = tilemap_create(K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_0, 8, 8, 64, 64); - K001604_layer_8x8[chip][1] = tilemap_create(K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_1, 8, 8, 64, 64); + K001604_layer_8x8[chip][0] = tilemap_create(machine, K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_0, 8, 8, 64, 64); + K001604_layer_8x8[chip][1] = tilemap_create(machine, K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_1, 8, 8, 64, 64); - K001604_layer_roz[chip][0] = tilemap_create(K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_0, roz_tile_size, roz_tile_size, roz_width, 64); - K001604_layer_roz[chip][1] = tilemap_create(K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_1, roz_tile_size, roz_tile_size, 64, 64); + K001604_layer_roz[chip][0] = tilemap_create(machine, K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_0, roz_tile_size, roz_tile_size, roz_width, 64); + K001604_layer_roz[chip][1] = tilemap_create(machine, K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_1, roz_tile_size, roz_tile_size, 64, 64); } else { int roz_tile_size = K001604_roz_size[chip] ? 16 : 8; int roz_width = K001604_layer_size ? 64 : 128; - K001604_layer_8x8[chip][0] = tilemap_create(K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_0, 8, 8, 64, 64); - K001604_layer_8x8[chip][1] = tilemap_create(K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_1, 8, 8, 64, 64); + K001604_layer_8x8[chip][0] = tilemap_create(machine, K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_0, 8, 8, 64, 64); + K001604_layer_8x8[chip][1] = tilemap_create(machine, K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_1, 8, 8, 64, 64); - K001604_layer_roz[chip][0] = tilemap_create(K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_0, roz_tile_size, roz_tile_size, roz_width, 64); - K001604_layer_roz[chip][1] = tilemap_create(K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_1, roz_tile_size, roz_tile_size, 64, 64); + K001604_layer_roz[chip][0] = tilemap_create(machine, K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_0, roz_tile_size, roz_tile_size, roz_width, 64); + K001604_layer_roz[chip][1] = tilemap_create(machine, K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_1, roz_tile_size, roz_tile_size, 64, 64); } tilemap_set_transparent_pen(K001604_layer_8x8[chip][0], 0); diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 35bb5e92cd2..0f259a9bc15 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -88,7 +88,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( olibochu ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 70eb8c6f9bc..801579a91a0 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -254,7 +254,7 @@ GFXDECODE_END static VIDEO_START( onetwo ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); } static VIDEO_UPDATE( onetwo ) diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 98aadcce6e7..e3b08ffabf1 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -188,9 +188,9 @@ ADDRESS_MAP_END static VIDEO_START( panicr ) { - bgtilemap = tilemap_create( get_bgtile_info,tilemap_scan_rows,16,16,1024,16 ); + bgtilemap = tilemap_create( machine, get_bgtile_info,tilemap_scan_rows,16,16,1024,16 ); - txttilemap = tilemap_create( get_txttile_info,tilemap_scan_rows,8,8,32,32 ); + txttilemap = tilemap_create( machine, get_txttile_info,tilemap_scan_rows,8,8,32,32 ); colortable_configure_tilemap_groups(machine->colortable, txttilemap, machine->gfx[0], 0); } diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index f2bf619c873..bfc995c17db 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -614,7 +614,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( peplus ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25); palette_ram = auto_malloc(0x3000); memset(palette_ram, 0, 0x3000); } diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index f8d1e01cb37..5ad71fd0a07 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -90,8 +90,8 @@ static TILE_GET_INFO( get_tile_info2 ) static VIDEO_START ( pipeline ) { palram=auto_malloc(0x1000); - tilemap1 = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,64,32 ); - tilemap2 = tilemap_create( get_tile_info2,tilemap_scan_rows,8,8,64,32 ); + tilemap1 = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,64,32 ); + tilemap2 = tilemap_create( machine, get_tile_info2,tilemap_scan_rows,8,8,64,32 ); tilemap_set_transparent_pen(tilemap2,0); } diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 3ea513c354e..7d97a4b0f79 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -225,9 +225,9 @@ static TIMER_CALLBACK( scanline_callback ) static VIDEO_START( pkscramble ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8,32,32); - md_tilemap = tilemap_create(get_md_tile_info, tilemap_scan_rows, 8, 8,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8,32,32); + md_tilemap = tilemap_create(machine, get_md_tile_info, tilemap_scan_rows, 8, 8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(md_tilemap,15); tilemap_set_transparent_pen(fg_tilemap,15); diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 3ecb87935f9..0c5f16241b8 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -439,7 +439,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan static VIDEO_START( powerbal ) { - bg_tilemap = tilemap_create(powerbal_get_bg_tile_info,tilemap_scan_rows,8, 8,64,32); + bg_tilemap = tilemap_create(machine, powerbal_get_bg_tile_info,tilemap_scan_rows,8, 8,64,32); xoffset = -20; diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index c3c5fb652b1..35959171a66 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -325,8 +325,8 @@ static TILE_GET_INFO( get_ppmast93_fg_tile_info ) static VIDEO_START( ppmast93 ) { - ppmast93_bg_tilemap = tilemap_create(get_ppmast93_bg_tile_info,tilemap_scan_rows,8,8,32, 32); - ppmast93_fg_tilemap = tilemap_create(get_ppmast93_fg_tile_info,tilemap_scan_rows,8,8,32, 32); + ppmast93_bg_tilemap = tilemap_create(machine, get_ppmast93_bg_tile_info,tilemap_scan_rows,8,8,32, 32); + ppmast93_fg_tilemap = tilemap_create(machine, get_ppmast93_fg_tile_info,tilemap_scan_rows,8,8,32, 32); tilemap_set_transparent_pen(ppmast93_fg_tilemap,0); } diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index 4e5b6b5aff5..b6b8836660d 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -120,9 +120,9 @@ static TILE_GET_INFO( get_pturn_bg_tile_info ) static VIDEO_START(pturn) { - pturn_fgmap = tilemap_create(get_pturn_tile_info,tilemap_scan_rows,8, 8,32,32); + pturn_fgmap = tilemap_create(machine, get_pturn_tile_info,tilemap_scan_rows,8, 8,32,32); tilemap_set_transparent_pen(pturn_fgmap,0); - pturn_bgmap = tilemap_create(get_pturn_bg_tile_info,tilemap_scan_rows,8, 8,32,32*8); + pturn_bgmap = tilemap_create(machine, get_pturn_bg_tile_info,tilemap_scan_rows,8, 8,32,32*8); tilemap_set_transparent_pen(pturn_bgmap,0); } diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index e49f13a95c2..b2ecccc4078 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -77,8 +77,8 @@ static WRITE8_HANDLER( fg_ram_w ) static VIDEO_START(quizpun2) { - bg_tmap = tilemap_create( get_bg_tile_info, tilemap_scan_rows, 8,16, 0x20,0x20 ); - fg_tmap = tilemap_create( get_fg_tile_info, tilemap_scan_rows, 8,16, 0x20,0x20 ); + bg_tmap = tilemap_create( machine, get_bg_tile_info, tilemap_scan_rows, 8,16, 0x20,0x20 ); + fg_tmap = tilemap_create( machine, get_fg_tile_info, tilemap_scan_rows, 8,16, 0x20,0x20 ); tilemap_set_transparent_pen(bg_tmap, 0); tilemap_set_transparent_pen(fg_tmap, 0); diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index de552c231e1..7e5ca959bf7 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -347,10 +347,10 @@ static VIDEO_START(rabbit) memset(rabbit_tilemap_ram[2], 0, 0x20000); memset(rabbit_tilemap_ram[3], 0, 0x20000); - rabbit_tilemap[0] = tilemap_create(get_rabbit_tilemap0_tile_info,tilemap_scan_rows,16, 16, 128,32); - rabbit_tilemap[1] = tilemap_create(get_rabbit_tilemap1_tile_info,tilemap_scan_rows,16, 16, 128,32); - rabbit_tilemap[2] = tilemap_create(get_rabbit_tilemap2_tile_info,tilemap_scan_rows,16, 16, 128,32); - rabbit_tilemap[3] = tilemap_create(get_rabbit_tilemap3_tile_info,tilemap_scan_rows, 8, 8, 128,32); + rabbit_tilemap[0] = tilemap_create(machine, get_rabbit_tilemap0_tile_info,tilemap_scan_rows,16, 16, 128,32); + rabbit_tilemap[1] = tilemap_create(machine, get_rabbit_tilemap1_tile_info,tilemap_scan_rows,16, 16, 128,32); + rabbit_tilemap[2] = tilemap_create(machine, get_rabbit_tilemap2_tile_info,tilemap_scan_rows,16, 16, 128,32); + rabbit_tilemap[3] = tilemap_create(machine, get_rabbit_tilemap3_tile_info,tilemap_scan_rows, 8, 8, 128,32); tilemap_set_transparent_pen(rabbit_tilemap[0],0x0); tilemap_set_transparent_pen(rabbit_tilemap[1],0x0); tilemap_set_transparent_pen(rabbit_tilemap[2],0x0); @@ -1116,10 +1116,10 @@ static VIDEO_START(tmmjprd) memset(rabbit_tilemap_ram[2], 0, 0x20000); memset(rabbit_tilemap_ram[3], 0, 0x20000); - rabbit_tilemap[0] = tilemap_create(get_tmmjprd_tilemap0_tile_info,tilemap_scan_rows, 8, 8, 64, 64); - rabbit_tilemap[1] = tilemap_create(get_tmmjprd_tilemap1_tile_info,tilemap_scan_rows,16, 16, 64, 64); - rabbit_tilemap[2] = tilemap_create(get_tmmjprd_tilemap2_tile_info,tilemap_scan_rows,16, 16, 64, 64); - rabbit_tilemap[3] = tilemap_create(get_tmmjprd_tilemap3_tile_info,tilemap_scan_rows,16, 16, 64, 64); + rabbit_tilemap[0] = tilemap_create(machine, get_tmmjprd_tilemap0_tile_info,tilemap_scan_rows, 8, 8, 64, 64); + rabbit_tilemap[1] = tilemap_create(machine, get_tmmjprd_tilemap1_tile_info,tilemap_scan_rows,16, 16, 64, 64); + rabbit_tilemap[2] = tilemap_create(machine, get_tmmjprd_tilemap2_tile_info,tilemap_scan_rows,16, 16, 64, 64); + rabbit_tilemap[3] = tilemap_create(machine, get_tmmjprd_tilemap3_tile_info,tilemap_scan_rows,16, 16, 64, 64); tilemap_set_transparent_pen(rabbit_tilemap[0],0x0); tilemap_set_transparent_pen(rabbit_tilemap[1],0x0); tilemap_set_transparent_pen(rabbit_tilemap[2],0x0); diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index b124a226b02..53c7468ccd5 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -341,10 +341,10 @@ static void set_scroll(tilemap *tm, int plane) static VIDEO_START( raiden2 ) { - text_layer = tilemap_create(get_text_tile_info, tilemap_scan_rows, 8, 8, 64,32 ); - background_layer = tilemap_create(get_back_tile_info, tilemap_scan_rows, 16,16, 32,32 ); - midground_layer = tilemap_create(get_mid_tile_info, tilemap_scan_rows, 16,16, 32,32 ); - foreground_layer = tilemap_create(get_fore_tile_info, tilemap_scan_rows, 16,16, 32,32 ); + text_layer = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 64,32 ); + background_layer = tilemap_create(machine, get_back_tile_info, tilemap_scan_rows, 16,16, 32,32 ); + midground_layer = tilemap_create(machine, get_mid_tile_info, tilemap_scan_rows, 16,16, 32,32 ); + foreground_layer = tilemap_create(machine, get_fore_tile_info, tilemap_scan_rows, 16,16, 32,32 ); tilemap_set_transparent_pen(midground_layer, 15); tilemap_set_transparent_pen(foreground_layer, 15); diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c index 4f6f83b58b4..fc753bca2b8 100644 --- a/src/mame/drivers/rcasino.c +++ b/src/mame/drivers/rcasino.c @@ -102,7 +102,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START(rcasino) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index e3d5c653abd..697ab155500 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -58,7 +58,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( rmhaihai ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index f156beaf18f..8a4df3c2d12 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -158,8 +158,8 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( safarir ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index f2aa522eaa6..999e3c78b55 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -103,7 +103,7 @@ static VIDEO_UPDATE(sbowling) static VIDEO_START(sbowling) { tmpbitmap = auto_bitmap_alloc(32*8,32*8,video_screen_get_format(machine->primary_screen)); - sb_tilemap = tilemap_create(get_sb_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + sb_tilemap = tilemap_create(machine, get_sb_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static WRITE8_HANDLER( pix_shift_w ) diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index 3692450cf62..9999e2e3f9c 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -285,7 +285,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( sbrkout ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 2d9352ce351..6ebdaf2c848 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -99,7 +99,7 @@ static PALETTE_INIT( skyarmy ) static VIDEO_START( skyarmy ) { - skyarmy_tilemap = tilemap_create(get_skyarmy_tile_info,tilemap_scan_rows,8,8,32,32); + skyarmy_tilemap = tilemap_create(machine, get_skyarmy_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_scroll_cols(skyarmy_tilemap,32); } diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index d01e35f56df..22c1acf9c2a 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -70,10 +70,10 @@ static TILEMAP_MAPPER( skylncr_tilemap_scan_pages ) static VIDEO_START( skylncr ) { - tmap = tilemap_create( get_tile_info, tilemap_scan_rows, + tmap = tilemap_create( machine, get_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20 ); - tmap2 = tilemap_create( get_tile_info2, skylncr_tilemap_scan_pages, + tmap2 = tilemap_create( machine, get_tile_info2, skylncr_tilemap_scan_pages, 8,32, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y ); diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index c97754d7965..ae8dd154b3b 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -108,7 +108,7 @@ static TILE_GET_INFO( get_spool99_tile_info ) VIDEO_START(spool99) { - sc0_tilemap = tilemap_create(get_spool99_tile_info,tilemap_scan_rows,8,8,64,32); + sc0_tilemap = tilemap_create(machine, get_spool99_tile_info,tilemap_scan_rows,8,8,64,32); } VIDEO_UPDATE(spool99) diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index 3cd0dbd2ab7..d68c9d147af 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -126,12 +126,12 @@ static WRITE8_HANDLER( statriv2_videoram_w ) static VIDEO_START (statriv2) { - statriv2_tilemap = tilemap_create(get_statriv2_tile_info,tilemap_scan_rows,8,16,64, 16); + statriv2_tilemap = tilemap_create(machine, get_statriv2_tile_info,tilemap_scan_rows,8,16,64, 16); } static VIDEO_START (statriv2v) { - statriv2_tilemap = tilemap_create(get_statriv2_tile_info,tilemap_scan_rows,16,8,32, 32); + statriv2_tilemap = tilemap_create(machine, get_statriv2_tile_info,tilemap_scan_rows,16,8,32, 32); } diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 25d5fb0ef1a..0319b671c1a 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -61,7 +61,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( subsino ) { - tmap = tilemap_create( get_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20 ); + tmap = tilemap_create( machine, get_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20 ); tilemap_set_transparent_pen( tmap, 0 ); tiles_offset = 0; } diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 388adb47295..5f5276916a7 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -249,7 +249,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( supdrapo ) { - fg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); } static VIDEO_UPDATE( supdrapo ) diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 43892f99f02..ca2680ea5b1 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -43,7 +43,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( superdq ) { - superdq_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows, 8, 8, 32, 32); + superdq_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE( superdq ) diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 9e146343fff..f1e12cc8c4f 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -62,7 +62,7 @@ static MACHINE_RESET( suprgolf ) static VIDEO_START( suprgolf ) { - suprgolf_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,32,32 ); + suprgolf_tilemap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,32,32 ); } static VIDEO_UPDATE( suprgolf ) diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index 65e6b76d5aa..a822208014a 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -49,7 +49,7 @@ static VIDEO_UPDATE( tattack ) static VIDEO_START( tattack ) { - tmap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,32,32 ); + tmap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,32,32 ); } static ADDRESS_MAP_START( mem, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index 3daf674a580..2924a94a5b7 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -591,16 +591,16 @@ static VIDEO_START(deroon) bitmap_fill(tmp_tilemap_renderbitmap, NULL, 0x0000); - txt_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32*2,32*2); + txt_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32*2,32*2); tilemap_set_transparent_pen(txt_tilemap,0); - bg0tilemap = tilemap_create(get_bg0tile_info,tilemap_scan_rows,16,16,32,32); + bg0tilemap = tilemap_create(machine, get_bg0tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(bg0tilemap,0); - bg1tilemap = tilemap_create(get_bg1tile_info,tilemap_scan_rows,16,16,32,32); + bg1tilemap = tilemap_create(machine, get_bg1tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(bg1tilemap,0); - bg2tilemap = tilemap_create(get_bg2tile_info,tilemap_scan_rows,16,16,32,32); + bg2tilemap = tilemap_create(machine, get_bg2tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(bg2tilemap,0); } diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 409da4485ee..7d578a8e834 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -264,7 +264,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( trvmadns ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap,1); } diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index ee819b27379..49569b9a5ad 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -404,12 +404,12 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( videopkr ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_START( vidadcba ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); } diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index bbd7962de73..b8f9d558a1b 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -395,9 +395,9 @@ static TILE_GET_INFO( get_vmetal_mid2tilemap_tile_info ) static VIDEO_START(varia) { - vmetal_texttilemap = tilemap_create(get_vmetal_texttilemap_tile_info,tilemap_scan_rows, 8, 8, 256,256); - vmetal_mid1tilemap = tilemap_create(get_vmetal_mid1tilemap_tile_info,tilemap_scan_rows,16,16, 256,256); - vmetal_mid2tilemap = tilemap_create(get_vmetal_mid2tilemap_tile_info,tilemap_scan_rows,16,16, 256,256); + vmetal_texttilemap = tilemap_create(machine, get_vmetal_texttilemap_tile_info,tilemap_scan_rows, 8, 8, 256,256); + vmetal_mid1tilemap = tilemap_create(machine, get_vmetal_mid1tilemap_tile_info,tilemap_scan_rows,16,16, 256,256); + vmetal_mid2tilemap = tilemap_create(machine, get_vmetal_mid2tilemap_tile_info,tilemap_scan_rows,16,16, 256,256); tilemap_set_transparent_pen(vmetal_texttilemap,15); tilemap_set_transparent_pen(vmetal_mid1tilemap,15); tilemap_set_transparent_pen(vmetal_mid2tilemap,15); diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 855c319b46a..6c07fd10dd2 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -86,7 +86,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START(vroulet) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index 7d6c16475e8..a68c29ef2b4 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -127,7 +127,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( wallc ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); } static VIDEO_UPDATE( wallc ) diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index b61943f57b4..ed12ed69973 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -269,7 +269,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( wink ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE( wink ) diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 775637b461b..4c6faf2bc2c 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -680,9 +680,9 @@ GFXDECODE_END static VIDEO_START(witch) { - gfx0a_tilemap = tilemap_create(get_gfx0a_tile_info,tilemap_scan_rows,8,8,32,32); - gfx0b_tilemap = tilemap_create(get_gfx0b_tile_info,tilemap_scan_rows,8,8,32,32); - gfx1_tilemap = tilemap_create(get_gfx1_tile_info,tilemap_scan_rows,8,8,32,32); + gfx0a_tilemap = tilemap_create(machine, get_gfx0a_tile_info,tilemap_scan_rows,8,8,32,32); + gfx0b_tilemap = tilemap_create(machine, get_gfx0b_tile_info,tilemap_scan_rows,8,8,32,32); + gfx1_tilemap = tilemap_create(machine, get_gfx1_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(gfx0a_tilemap,0); tilemap_set_transparent_pen(gfx0b_tilemap,0); diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c index ae63400bab4..cc32bb7d7eb 100644 --- a/src/mame/drivers/yumefuda.c +++ b/src/mame/drivers/yumefuda.c @@ -78,7 +78,7 @@ static TILE_GET_INFO( y_get_bg_tile_info ) static VIDEO_START( yumefuda ) { - bg_tilemap = tilemap_create(y_get_bg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, y_get_bg_tile_info,tilemap_scan_rows,8,8,32,32); } static VIDEO_UPDATE( yumefuda ) diff --git a/src/mame/includes/namcoic.h b/src/mame/includes/namcoic.h index 0193d47d9dc..96c655b6fd6 100644 --- a/src/mame/includes/namcoic.h +++ b/src/mame/includes/namcoic.h @@ -91,7 +91,7 @@ C102 - Controls CPU access to ROZ Memory Area. /*----------- defined in drivers/namcoic.c -----------*/ void namco_tilemap_init( - int gfxbank, void *pMaskROM, + running_machine *machine, int gfxbank, void *pMaskROM, void (*cb)( UINT16 code, int *gfx, int *mask) ); void namco_tilemap_draw( bitmap_t *bitmap, const rectangle *cliprect, int pri ); void namco_tilemap_invalidate( void ); @@ -141,7 +141,7 @@ READ32_HANDLER( namco_spritepos32_r ); /***********************************************************************************/ /* C169 ROZ Layer Emulation */ -void namco_roz_init( int gfxbank, const char *maskregion ); +void namco_roz_init( running_machine *machine, int gfxbank, const char *maskregion ); void namco_roz_draw( bitmap_t *bitmap, const rectangle *cliprect, int pri ); READ16_HANDLER( namco_rozcontrol16_r ); diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index 0fa78b8fa89..96504040712 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -131,8 +131,8 @@ static TILE_GET_INFO( get_bg_tile_info ) ***************************************************************************/ VIDEO_START( 1942 ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows, 8, 8,32,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols, 16,16,32,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows, 8, 8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols, 16,16,32,16); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index b35e257c9ae..39b6e1d9e10 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -209,13 +209,13 @@ static TILE_GET_INFO( c1943_get_fg_tile_info ) VIDEO_START( 1943 ) { - bg2_tilemap = tilemap_create(c1943_get_bg2_tile_info, tilemap_scan_cols, + bg2_tilemap = tilemap_create(machine, c1943_get_bg2_tile_info, tilemap_scan_cols, 32, 32, 2048, 8); - bg_tilemap = tilemap_create(c1943_get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, c1943_get_bg_tile_info, tilemap_scan_cols, 32, 32, 2048, 8); - fg_tilemap = tilemap_create(c1943_get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, c1943_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[1], 0x0f); diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c index 16664e15b18..7c8d8ede940 100644 --- a/src/mame/video/40love.c +++ b/src/mame/video/40love.c @@ -112,7 +112,7 @@ VIDEO_START( fortyl ) pixel_bitmap1 = auto_bitmap_alloc(256,256,video_screen_get_format(machine->primary_screen)); pixel_bitmap2 = auto_bitmap_alloc(256,256,video_screen_get_format(machine->primary_screen)); - background = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8,8,64,32); + background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8,8,64,32); tilemap_set_scroll_rows(background,32); tilemap_set_transparent_pen(background,0); diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c index d9e0652fcaa..b3a0ae10da7 100644 --- a/src/mame/video/4enraya.c +++ b/src/mame/video/4enraya.c @@ -29,7 +29,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( 4enraya ) { - bg_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,32,32 ); + bg_tilemap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,32,32 ); } VIDEO_UPDATE( 4enraya) diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c index ac1303afe46..ab3beace1fa 100644 --- a/src/mame/video/actfancr.c +++ b/src/mame/video/actfancr.c @@ -86,9 +86,9 @@ static void register_savestate(running_machine *machine) VIDEO_START( actfancr ) { - pf1_tilemap = tilemap_create(get_tile_info,actfancr_scan,16,16,256,16); - pf1_alt_tilemap = tilemap_create(get_tile_info,actfancr_scan2,16,16,128,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_rows,8,8,32,32); + pf1_tilemap = tilemap_create(machine, get_tile_info,actfancr_scan,16,16,256,16); + pf1_alt_tilemap = tilemap_create(machine, get_tile_info,actfancr_scan2,16,16,128,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(pf2_tilemap,0); @@ -97,8 +97,8 @@ VIDEO_START( actfancr ) VIDEO_START( triothep ) { - pf1_tilemap = tilemap_create(get_trio_tile_info,triothep_scan,16,16,32,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_rows,8,8,32,32); + pf1_tilemap = tilemap_create(machine, get_trio_tile_info,triothep_scan,16,16,32,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(pf2_tilemap,0); diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index d91210f160b..6d65f6507a4 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -42,7 +42,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( aeroboto ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,64); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,64); tilemap_set_transparent_pen(bg_tilemap,0); diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index ce1f40d04a1..078b9ef547b 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -97,7 +97,7 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( pspikes ) { - bg1_tilemap = tilemap_create(get_pspikes_tile_info,tilemap_scan_rows,8,8,64,32); + bg1_tilemap = tilemap_create(machine, get_pspikes_tile_info,tilemap_scan_rows,8,8,64,32); /* no bg2 in this game */ sprite_gfx = 1; @@ -106,8 +106,8 @@ VIDEO_START( pspikes ) VIDEO_START( karatblz ) { - bg1_tilemap = tilemap_create(karatblz_bg1_tile_info,tilemap_scan_rows, 8,8,64,64); - bg2_tilemap = tilemap_create(karatblz_bg2_tile_info,tilemap_scan_rows,8,8,64,64); + bg1_tilemap = tilemap_create(machine, karatblz_bg1_tile_info,tilemap_scan_rows, 8,8,64,64); + bg2_tilemap = tilemap_create(machine, karatblz_bg2_tile_info,tilemap_scan_rows,8,8,64,64); tilemap_set_transparent_pen(bg2_tilemap,15); @@ -120,8 +120,8 @@ VIDEO_START( spinlbrk ) { int i; - bg1_tilemap = tilemap_create(spinlbrk_bg1_tile_info,tilemap_scan_rows, 8,8,64,64); - bg2_tilemap = tilemap_create(karatblz_bg2_tile_info,tilemap_scan_rows,8,8,64,64); + bg1_tilemap = tilemap_create(machine, spinlbrk_bg1_tile_info,tilemap_scan_rows, 8,8,64,64); + bg2_tilemap = tilemap_create(machine, karatblz_bg2_tile_info,tilemap_scan_rows,8,8,64,64); tilemap_set_transparent_pen(bg2_tilemap,15); @@ -145,8 +145,8 @@ VIDEO_START( spinlbrk ) VIDEO_START( turbofrc ) { - bg1_tilemap = tilemap_create(get_bg1_tile_info,tilemap_scan_rows, 8,8,64,64); - bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,8,8,64,64); + bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows, 8,8,64,64); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows,8,8,64,64); tilemap_set_transparent_pen(bg2_tilemap,15); @@ -157,7 +157,7 @@ VIDEO_START( turbofrc ) VIDEO_START( wbbc97 ) { - bg1_tilemap = tilemap_create(get_pspikes_tile_info,tilemap_scan_rows,8,8,64,32); + 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(bg1_tilemap,15); diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c index 6bb3087f5fe..a68fa71ba25 100644 --- a/src/mame/video/airbustr.c +++ b/src/mame/video/airbustr.c @@ -115,8 +115,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( airbustr ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); sprites_bitmap = video_screen_auto_bitmap_alloc(machine->primary_screen); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index efac8ca63af..032dc0486f5 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -68,7 +68,7 @@ WRITE16_HANDLER( alpha68k_videoram_w ) VIDEO_START( alpha68k ) { - fix_tilemap = tilemap_create(get_tile_info,tilemap_scan_cols,8,8,32,32); + fix_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_cols,8,8,32,32); tilemap_set_transparent_pen(fix_tilemap,0); } diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c index a5f0528a141..de1f6c88bf3 100644 --- a/src/mame/video/ampoker2.c +++ b/src/mame/video/ampoker2.c @@ -142,13 +142,13 @@ static TILE_GET_INFO( s2k_get_bg_tile_info ) VIDEO_START(ampoker2) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } VIDEO_START(sigma2k) { - bg_tilemap = tilemap_create(s2k_get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, s2k_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index b65cba3c509..1cbb756c386 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -78,7 +78,7 @@ static TILEMAP_MAPPER( tilemap_scan_cols_back ) VIDEO_START( amspdwy ) { - bg_tilemap = tilemap_create( get_tile_info, tilemap_scan_cols_back, + bg_tilemap = tilemap_create( machine, get_tile_info, tilemap_scan_cols_back, 8,8, 0x20, 0x20 ); } diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 8bc1d5f168a..c681ad9d09a 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -263,13 +263,13 @@ WRITE8_HANDLER( angelkds_paletteram_w ) VIDEO_START( angelkds ) { - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(tx_tilemap,0); - bgbot_tilemap = tilemap_create(get_bgbot_tile_info,tilemap_scan_rows, 8, 8,32,32); + bgbot_tilemap = tilemap_create(machine, get_bgbot_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(bgbot_tilemap,15); - bgtop_tilemap = tilemap_create(get_bgtop_tile_info,tilemap_scan_rows, 8, 8,32,32); + bgtop_tilemap = tilemap_create(machine, get_bgtop_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(bgtop_tilemap,15); } diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index aee0fc79996..8f4120614be 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -139,8 +139,8 @@ static TILE_GET_INFO( get_bg_tile_info ) ***************************************************************************/ VIDEO_START( appoooh ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_scrolldy(fg_tilemap,8,8); diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c index dec3da1c797..81033947766 100644 --- a/src/mame/video/aquarium.c +++ b/src/mame/video/aquarium.c @@ -147,11 +147,11 @@ WRITE16_HANDLER( aquarium_bak_videoram_w ) VIDEO_START(aquarium) { - aquarium_txt_tilemap = tilemap_create(get_aquarium_txt_tile_info,tilemap_scan_rows, 8, 8,64,64); + aquarium_txt_tilemap = tilemap_create(machine, get_aquarium_txt_tile_info,tilemap_scan_rows, 8, 8,64,64); tilemap_set_transparent_pen(aquarium_txt_tilemap,0); - aquarium_bak_tilemap = tilemap_create(get_aquarium_bak_tile_info,tilemap_scan_rows, 16, 16,32,32); - aquarium_mid_tilemap = tilemap_create(get_aquarium_mid_tile_info,tilemap_scan_rows, 16, 16,32,32); + aquarium_bak_tilemap = tilemap_create(machine, get_aquarium_bak_tile_info,tilemap_scan_rows, 16, 16,32,32); + aquarium_mid_tilemap = tilemap_create(machine, get_aquarium_mid_tile_info,tilemap_scan_rows, 16, 16,32,32); tilemap_set_transparent_pen(aquarium_mid_tilemap,0); } diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index 1fcd3af5ee6..ff7ffe5a2d4 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -313,9 +313,9 @@ static void reset_common(running_machine *machine) VIDEO_START( argus ) { /* info offset w h col row */ - bg0_tilemap = tilemap_create(argus_get_bg0_tile_info, tilemap_scan_cols, 16, 16, 32, 32); - bg1_tilemap = tilemap_create(argus_get_bg1_tile_info, tilemap_scan_cols, 16, 16, 32, 32); - tx_tilemap = tilemap_create(argus_get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); + bg0_tilemap = tilemap_create(machine, argus_get_bg0_tile_info, tilemap_scan_cols, 16, 16, 32, 32); + bg1_tilemap = tilemap_create(machine, argus_get_bg1_tile_info, tilemap_scan_cols, 16, 16, 32, 32); + tx_tilemap = tilemap_create(machine, argus_get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(bg1_tilemap, 15); tilemap_set_transparent_pen(tx_tilemap, 15); @@ -339,8 +339,8 @@ VIDEO_RESET( argus ) VIDEO_START( valtric ) { /* info offset w h col row */ - bg1_tilemap = tilemap_create(valtric_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); - tx_tilemap = tilemap_create(valtric_get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); + bg1_tilemap = tilemap_create(machine, valtric_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); + tx_tilemap = tilemap_create(machine, valtric_get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(tx_tilemap, 15); @@ -358,9 +358,9 @@ VIDEO_RESET( valtric ) VIDEO_START( butasan ) { /* info offset w h col row */ - bg0_tilemap = tilemap_create(butasan_get_bg0_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - bg1_tilemap = tilemap_create(butasan_get_bg1_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - tx_tilemap = tilemap_create(butasan_get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg0_tilemap = tilemap_create(machine, butasan_get_bg0_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + bg1_tilemap = tilemap_create(machine, butasan_get_bg1_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + tx_tilemap = tilemap_create(machine, butasan_get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(bg1_tilemap, 15); tilemap_set_transparent_pen(tx_tilemap, 15); diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index 07cf58b44ae..3bfd5316704 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -80,7 +80,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( arkanoid ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state_save_register_global(machine, gfxbank); diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index 1903c20db68..b4221952f88 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -108,10 +108,10 @@ VIDEO_START( armedf ) sprite_offy = 128; } - //bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,16,16,64,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,16,16,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_cols,16,16,64,32); - armedf_tx_tilemap = tilemap_create(get_tx_tile_info,armedf_scan,8,8,64,32); + //bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,16,16,64,32); + armedf_tx_tilemap = tilemap_create(machine, get_tx_tile_info,armedf_scan,8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,0xf); tilemap_set_transparent_pen(armedf_tx_tilemap,0xf); diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c index 2b38dca36e2..f615d66fb46 100644 --- a/src/mame/video/ashnojoe.c +++ b/src/mame/video/ashnojoe.c @@ -185,13 +185,13 @@ WRITE16_HANDLER( joe_tilemaps_yscroll_w ) VIDEO_START( ashnojoe ) { - joetilemap = tilemap_create(get_joe_tile_info, tilemap_scan_rows, 8, 8,64,32); - joetilemap2 = tilemap_create(get_joe_tile_info_2,tilemap_scan_rows,16,16,32,32); - joetilemap3 = tilemap_create(get_joe_tile_info_3,tilemap_scan_rows, 8, 8,64,64); - joetilemap4 = tilemap_create(get_joe_tile_info_4,tilemap_scan_rows, 8, 8,64,64); - joetilemap5 = tilemap_create(get_joe_tile_info_5,tilemap_scan_rows,16,16,32,32); - joetilemap6 = tilemap_create(get_joe_tile_info_6,tilemap_scan_rows, 16,16,32,32); - joetilemap7 = tilemap_create(get_joe_tile_info_7,tilemap_scan_rows, 16,16,32,32); + joetilemap = tilemap_create(machine, get_joe_tile_info, tilemap_scan_rows, 8, 8,64,32); + joetilemap2 = tilemap_create(machine, get_joe_tile_info_2,tilemap_scan_rows,16,16,32,32); + joetilemap3 = tilemap_create(machine, get_joe_tile_info_3,tilemap_scan_rows, 8, 8,64,64); + joetilemap4 = tilemap_create(machine, get_joe_tile_info_4,tilemap_scan_rows, 8, 8,64,64); + joetilemap5 = tilemap_create(machine, get_joe_tile_info_5,tilemap_scan_rows,16,16,32,32); + joetilemap6 = tilemap_create(machine, get_joe_tile_info_6,tilemap_scan_rows, 16,16,32,32); + joetilemap7 = tilemap_create(machine, get_joe_tile_info_7,tilemap_scan_rows, 16,16,32,32); tilemap_set_transparent_pen(joetilemap, 15); tilemap_set_transparent_pen(joetilemap2,15); diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index 7125b19c555..1929a22e3ad 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -99,9 +99,9 @@ WRITE8_HANDLER( atarifb_field_videoram_w ) VIDEO_START( atarifb ) { - alpha1_tilemap = tilemap_create(alpha1_get_tile_info, tilemap_scan_cols, 8,8, 3,32); - alpha2_tilemap = tilemap_create(alpha2_get_tile_info, tilemap_scan_cols, 8,8, 3,32); - field_tilemap = tilemap_create(field_get_tile_info, tilemap_scan_rows, 8,8, 32,32); + alpha1_tilemap = tilemap_create(machine, alpha1_get_tile_info, tilemap_scan_cols, 8,8, 3,32); + alpha2_tilemap = tilemap_create(machine, alpha2_get_tile_info, tilemap_scan_cols, 8,8, 3,32); + field_tilemap = tilemap_create(machine, field_get_tile_info, tilemap_scan_rows, 8,8, 32,32); } diff --git a/src/mame/video/atarig1.c b/src/mame/video/atarig1.c index 5384f8ead80..d3ced74186c 100644 --- a/src/mame/video/atarig1.c +++ b/src/mame/video/atarig1.c @@ -114,13 +114,13 @@ VIDEO_START( atarig1 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x10); /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,64); /* initialize the motion objects */ atarirle_init(machine, 0, atarig1_pitfight ? &modesc_pitfight : &modesc_hydra); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* reset statics */ diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index 7dfabc912a7..3d45bb76a11 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -120,7 +120,7 @@ VIDEO_START( atarig42 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, atarig42_playfield_scan, 8,8, 128,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarig42_playfield_scan, 8,8, 128,64); /* initialize the motion objects */ adjusted_modesc.palettebase = atarig42_motion_object_base; @@ -129,7 +129,7 @@ VIDEO_START( atarig42 ) atarirle_init(machine, 0, &adjusted_modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* reset statics */ diff --git a/src/mame/video/atarigt.c b/src/mame/video/atarigt.c index dfeb8bd64d7..d33fb7b0f20 100644 --- a/src/mame/video/atarigt.c +++ b/src/mame/video/atarigt.c @@ -140,13 +140,13 @@ VIDEO_START( atarigt ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, atarigt_playfield_scan, 8,8, 128,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigt_playfield_scan, 8,8, 128,64); /* initialize the motion objects */ atarirle_init(machine, 0, &adjusted_modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); /* allocate temp bitmaps */ width = video_screen_get_width(machine->primary_screen); diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c index 2425a985e38..2b8462b8280 100644 --- a/src/mame/video/atarigx2.c +++ b/src/mame/video/atarigx2.c @@ -120,7 +120,7 @@ VIDEO_START( atarigx2 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, atarigx2_playfield_scan, 8,8, 128,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigx2_playfield_scan, 8,8, 128,64); /* initialize the motion objects */ adjusted_modesc.palettebase = atarigx2_motion_object_base; @@ -129,7 +129,7 @@ VIDEO_START( atarigx2 ) atarirle_init(machine, 0, &adjusted_modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* reset statics */ diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index ad094f77738..58660982765 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -196,13 +196,13 @@ VIDEO_START( atarisy1 ) decode_gfx(machine, playfield_lookup, motable); /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* modify the motion object code lookup */ diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c index 7615a4ab956..0eac47bfaf4 100644 --- a/src/mame/video/atarisy2.c +++ b/src/mame/video/atarisy2.c @@ -123,13 +123,13 @@ VIDEO_START( atarisy2 ) atarigen_playfield = &vram[0x2000]; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_rows, 8,8, 128,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 128,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* reset the statics */ diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c index cb9c7a8d1e0..bd4e06a3a2d 100644 --- a/src/mame/video/atetris.c +++ b/src/mame/video/atetris.c @@ -49,7 +49,7 @@ WRITE8_HANDLER( atetris_videoram_w ) VIDEO_START( atetris ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8,8, 64,32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 64,32); } diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c index 2e6d33118f7..d64ac7f1a88 100644 --- a/src/mame/video/badlands.c +++ b/src/mame/video/badlands.c @@ -82,7 +82,7 @@ VIDEO_START( badlands ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,32); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c index eb80432f26e..7e2f884e70b 100644 --- a/src/mame/video/bagman.c +++ b/src/mame/video/bagman.c @@ -104,7 +104,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( bagman ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c index 158f89c1727..1a7c17ad086 100644 --- a/src/mame/video/bankp.c +++ b/src/mame/video/bankp.c @@ -154,10 +154,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( bankp ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[1], 0); diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index 1bd53693ea4..ba575a82208 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -119,9 +119,9 @@ static TILE_GET_INFO( get_tile_info1 ) VIDEO_START( baraduke ) { - tx_tilemap = tilemap_create(tx_get_tile_info,tx_tilemap_scan,8,8,36,28); - bg_tilemap[0] = tilemap_create(get_tile_info0,tilemap_scan_rows,8,8,64,32); - bg_tilemap[1] = tilemap_create(get_tile_info1,tilemap_scan_rows,8,8,64,32); + tx_tilemap = tilemap_create(machine, tx_get_tile_info,tx_tilemap_scan,8,8,36,28); + bg_tilemap[0] = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,8,8,64,32); + bg_tilemap[1] = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(tx_tilemap,3); tilemap_set_transparent_pen(bg_tilemap[0],7); diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c index 7b8cf64e1af..529705c3674 100644 --- a/src/mame/video/batman.c +++ b/src/mame/video/batman.c @@ -106,17 +106,17 @@ VIDEO_START( batman ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the second playfield */ - atarigen_playfield2_tilemap = tilemap_create(get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); tilemap_set_transparent_pen(atarigen_playfield2_tilemap, 0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); } diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index 6d1d1fcba7f..83aa51d9b66 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -143,7 +143,7 @@ static TILEMAP_MAPPER( battlane_tilemap_scan_rows_2x2 ) ***************************************************************************/ VIDEO_START( battlane ) { - bg_tilemap = tilemap_create(get_tile_info_bg, battlane_tilemap_scan_rows_2x2, + bg_tilemap = tilemap_create(machine, get_tile_info_bg, battlane_tilemap_scan_rows_2x2, 16, 16, 32, 32); screen_bitmap = auto_bitmap_alloc(32 * 8, 32 * 8, BITMAP_FORMAT_INDEXED8); diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index 8798d6d1e5f..ca55dc72de2 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -77,7 +77,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( battlex ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index e31ee38b0a3..1b43d76b560 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -71,9 +71,9 @@ WRITE16_HANDLER( bbuster_pf2_w ) VIDEO_START( bbuster ) { - fix_tilemap = tilemap_create(get_bbuster_tile_info,tilemap_scan_rows,8,8,32,32); - pf1_tilemap = tilemap_create(get_pf1_tile_info,tilemap_scan_cols,16,16,128,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_cols,16,16,128,32); + fix_tilemap = tilemap_create(machine, get_bbuster_tile_info,tilemap_scan_rows,8,8,32,32); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_cols,16,16,128,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,tilemap_scan_cols,16,16,128,32); tilemap_set_transparent_pen(pf1_tilemap, 15); tilemap_set_transparent_pen(fix_tilemap, 15); @@ -81,9 +81,9 @@ VIDEO_START( bbuster ) VIDEO_START( mechatt ) { - fix_tilemap = tilemap_create(get_bbuster_tile_info,tilemap_scan_rows,8,8,32,32); - pf1_tilemap = tilemap_create(get_pf1_tile_info,tilemap_scan_cols,16,16,256,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_cols,16,16,256,32); + fix_tilemap = tilemap_create(machine, get_bbuster_tile_info,tilemap_scan_rows,8,8,32,32); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_cols,16,16,256,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,tilemap_scan_cols,16,16,256,32); tilemap_set_transparent_pen(pf1_tilemap, 15); tilemap_set_transparent_pen(fix_tilemap, 15); diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index 55a8c13f3ab..bb1d8657f5d 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -208,9 +208,9 @@ VIDEO_START( adder2 ) state_save_register_item_array(machine, "Adder", NULL, 0, adder_ram); state_save_register_item_2d_array(machine, "Adder", NULL, 0, adder_screen_ram); - tilemap0 = tilemap_create(get_tile0_info, tilemap_scan_rows, 8, 8, 50, 35); + tilemap0 = tilemap_create(machine, get_tile0_info, tilemap_scan_rows, 8, 8, 50, 35); - tilemap1 = tilemap_create(get_tile1_info, tilemap_scan_rows, 8, 8, 50, 35); + tilemap1 = tilemap_create(machine, get_tile1_info, tilemap_scan_rows, 8, 8, 50, 35); } // video update /////////////////////////////////////////////////////////// diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index f30efc387ad..bfdd8cade0b 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -115,9 +115,9 @@ WRITE16_HANDLER( bsb_videoram3_w ) VIDEO_START(bigstrkb) { - bsb_tilemap = tilemap_create(get_bsb_tile_info,tilemap_scan_cols, 8, 8,64,32); - bsb_tilemap2 = tilemap_create(get_bsb_tile2_info,bsb_bg_scan, 16, 16,128,64); - bsb_tilemap3 = tilemap_create(get_bsb_tile3_info,bsb_bg_scan, 16, 16,128,64); + bsb_tilemap = tilemap_create(machine, get_bsb_tile_info,tilemap_scan_cols, 8, 8,64,32); + bsb_tilemap2 = tilemap_create(machine, get_bsb_tile2_info,bsb_bg_scan, 16, 16,128,64); + bsb_tilemap3 = tilemap_create(machine, get_bsb_tile3_info,bsb_bg_scan, 16, 16,128,64); tilemap_set_transparent_pen(bsb_tilemap,15); // tilemap_set_transparent_pen(bsb_tilemap2,15); diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index 29938ec2bac..3385ba02fed 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -93,9 +93,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( bionicc ) { - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,16,16,64,64); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8, 8,64,64); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,64,64); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8, 8,64,64); tilemap_set_transparent_pen(tx_tilemap,3); tilemap_set_transmask(fg_tilemap,0,0xffff,0x8000); /* split type 0 is completely transparent in front half */ diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index 1922f4d7c82..b5b75055888 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -246,7 +246,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( bking ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); helper0 = video_screen_auto_bitmap_alloc(machine->primary_screen); helper1 = video_screen_auto_bitmap_alloc(machine->primary_screen); } diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index 23226198568..c643e2bcc10 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -73,9 +73,9 @@ VIDEO_START( blktiger ) { scroll_ram = auto_malloc(BGRAM_BANK_SIZE * BGRAM_BANKS); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows,8,8,32,32); - bg_tilemap8x4 = tilemap_create(get_bg_tile_info,bg8x4_scan, 16,16,128,64); - bg_tilemap4x8 = tilemap_create(get_bg_tile_info,bg4x8_scan, 16,16,64,128); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap8x4 = tilemap_create(machine, get_bg_tile_info,bg8x4_scan, 16,16,128,64); + bg_tilemap4x8 = tilemap_create(machine, get_bg_tile_info,bg4x8_scan, 16,16,64,128); tilemap_set_transparent_pen(tx_tilemap,3); diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index 0235b7c8fbd..83d02d68193 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -125,10 +125,10 @@ WRITE16_HANDLER( blmbycar_vram_1_w ) VIDEO_START( blmbycar ) { - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, DIM_NX, DIM_NY ); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, DIM_NX, DIM_NY ); tilemap_set_scroll_rows(tilemap_0,1); diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c index 83ab1a65ec0..3932f7ca450 100644 --- a/src/mame/video/blockade.c +++ b/src/mame/video/blockade.c @@ -24,7 +24,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( blockade ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c index 1010353e4d2..0cbe586a290 100644 --- a/src/mame/video/bloodbro.c +++ b/src/mame/video/bloodbro.c @@ -59,9 +59,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( bloodbro ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16,16,32,16); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,16,16,32,16); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16,16,32,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,32,16); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(fg_tilemap,15); tilemap_set_transparent_pen(tx_tilemap,15); diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c index 5a915836e0e..52f6178da70 100644 --- a/src/mame/video/blstroid.c +++ b/src/mame/video/blstroid.c @@ -82,7 +82,7 @@ VIDEO_START( blstroid ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_rows, 16,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 16,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index 129287cdd3e..6c1ba0de1ef 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -78,7 +78,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( blueprnt ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols_flip_x, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_x, 8, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 0); diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index d14543010bb..83dafc6f5ca 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -89,10 +89,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( bogeyman ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index eaa869d39ef..75bd568034c 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -65,10 +65,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( bombjack ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index 0a6a4f97763..3d7ccc3e9fc 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -136,8 +136,8 @@ static TILE_GET_INFO( fg_get_tile_info ) VIDEO_START( bosco ) { - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[0], 0x1f); colortable_configure_tilemap_groups(machine->colortable, fg_tilemap, machine->gfx[0], 0x1f); diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index c5e674d07ba..1b767784425 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -117,8 +117,8 @@ WRITE8_HANDLER( brkthru_fgram_w ) VIDEO_START( brkthru ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,16,16,32,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,32,16); tilemap_set_transparent_pen( fg_tilemap, 0 ); tilemap_set_transparent_pen( bg_tilemap, 0 ); diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index d1952c3845f..7480641b287 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -29,7 +29,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( bsktball ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index c1f9168d53d..40b8245bcd0 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -196,9 +196,9 @@ VIDEO_START( bwing ) UINT32 *dwptr; int i; - charmap = tilemap_create(get_charinfo,tilemap_scan_cols, 8, 8,32,32); - fgmap = tilemap_create(get_fgtileinfo,bwing_scan_cols,16,16,64,64); - bgmap = tilemap_create(get_bgtileinfo,bwing_scan_cols,16,16,64,64); + charmap = tilemap_create(machine, get_charinfo,tilemap_scan_cols, 8, 8,32,32); + fgmap = tilemap_create(machine, get_fgtileinfo,bwing_scan_cols,16,16,64,64); + bgmap = tilemap_create(machine, get_bgtileinfo,bwing_scan_cols,16,16,64,64); srxlat = auto_malloc(0x8000); scrollmap[0] = fgmap; diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index 7dddf3f416c..04304a616af 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -42,8 +42,8 @@ static TILE_GET_INFO( get_text_tile_info ) VIDEO_START( cabal ) { - background_layer = tilemap_create(get_back_tile_info,tilemap_scan_rows,16,16,16,16); - text_layer = tilemap_create(get_text_tile_info,tilemap_scan_rows, 8,8,32,32); + background_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_rows,16,16,16,16); + text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8,8,32,32); tilemap_set_transparent_pen(text_layer,3); tilemap_set_transparent_pen(background_layer,15); diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c index 249935ffa87..c6f984bd7bb 100644 --- a/src/mame/video/calomega.c +++ b/src/mame/video/calomega.c @@ -56,7 +56,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( calomega ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 31); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 31); } VIDEO_UPDATE( calomega ) diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index 29dfa482d02..0f5c748d468 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -29,7 +29,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( canyon ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index f9e06d82048..3d2a9ed6733 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -80,7 +80,7 @@ WRITE8_HANDLER( carjmbre_videoram_w ){ VIDEO_START( carjmbre ) { - carjmbre_tilemap = tilemap_create( get_carjmbre_tile_info,tilemap_scan_rows,8,8,32,32 ); + carjmbre_tilemap = tilemap_create( machine, get_carjmbre_tile_info,tilemap_scan_rows,8,8,32,32 ); state_save_register_global(machine, carjmbre_flipscreen); state_save_register_global(machine, carjmbre_bgcolor); diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index a3de332e1b0..9427ffce6be 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -455,25 +455,25 @@ static void cave_vh_start(running_machine *machine, int num) switch( num ) { case 4: - tilemap_3 = tilemap_create( get_tile_info_3, tilemap_scan_rows, 8,8, 512/8,512/8 ); + tilemap_3 = tilemap_create( machine, get_tile_info_3, tilemap_scan_rows, 8,8, 512/8,512/8 ); tilemap_set_transparent_pen(tilemap_3, 0); tilemap_set_scroll_rows(tilemap_3, 1); tilemap_set_scroll_cols(tilemap_3, 1); case 3: - tilemap_2 = tilemap_create( get_tile_info_2, tilemap_scan_rows, 8,8, 512/8,512/8 ); + tilemap_2 = tilemap_create( machine, get_tile_info_2, tilemap_scan_rows, 8,8, 512/8,512/8 ); tilemap_set_transparent_pen(tilemap_2, 0); tilemap_set_scroll_rows(tilemap_2, 1); tilemap_set_scroll_cols(tilemap_2, 1); case 2: - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, 8,8, 512/8,512/8 ); + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 8,8, 512/8,512/8 ); tilemap_set_transparent_pen(tilemap_1, 0); tilemap_set_scroll_rows(tilemap_1, 1); tilemap_set_scroll_cols(tilemap_1, 1); case 1: - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, 8,8, 512/8,512/8 ); + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 8,8, 512/8,512/8 ); tilemap_set_transparent_pen(tilemap_0, 0); tilemap_set_scroll_rows(tilemap_0, 1); tilemap_set_scroll_cols(tilemap_0, 1); @@ -519,7 +519,7 @@ VIDEO_START( sailormn_3_layers ) cave_vh_start(machine, 2); /* Layer 2 (8x8) needs to be handled differently */ - tilemap_2 = tilemap_create( sailormn_get_tile_info_2, tilemap_scan_rows, + tilemap_2 = tilemap_create( machine, sailormn_get_tile_info_2, tilemap_scan_rows, 8,8, 512/8,512/8 ); tilemap_set_transparent_pen(tilemap_2, 0); tilemap_set_scroll_rows(tilemap_2, 1); diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index 0f49b9ac409..9716dca24f9 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -48,8 +48,8 @@ VIDEO_START( cbasebal ) cbasebal_textram = auto_malloc(0x1000); cbasebal_scrollram = auto_malloc(0x1000); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,3); } diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index be8041d8caa..0fb7790518a 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -453,11 +453,11 @@ static TILE_GET_INFO( toproller_get_bg_tile_info ) VIDEO_START( cclimber ) { - pf_tilemap = tilemap_create(cclimber_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + pf_tilemap = tilemap_create(machine, cclimber_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(pf_tilemap, 0); tilemap_set_scroll_cols(pf_tilemap, 32); - bs_tilemap = tilemap_create(cclimber_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bs_tilemap = tilemap_create(machine, cclimber_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(bs_tilemap, 1); tilemap_set_scroll_rows(bs_tilemap, 1); tilemap_set_transmask(bs_tilemap, 0, 0x01, 0); /* pen 0 is transaprent */ @@ -467,11 +467,11 @@ VIDEO_START( cclimber ) VIDEO_START( swimmer ) { - pf_tilemap = tilemap_create(swimmer_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + pf_tilemap = tilemap_create(machine, swimmer_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(pf_tilemap, 0); tilemap_set_scroll_cols(pf_tilemap, 32); - bs_tilemap = tilemap_create(cclimber_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bs_tilemap = tilemap_create(machine, cclimber_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(bs_tilemap, 1); tilemap_set_scroll_rows(bs_tilemap, 1); tilemap_set_transmask(bs_tilemap, 0, 0x01, 0); /* pen 0 is transaprent */ @@ -481,13 +481,13 @@ VIDEO_START( swimmer ) VIDEO_START( toprollr ) { - pf_tilemap = tilemap_create(toprollr_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + pf_tilemap = tilemap_create(machine, toprollr_get_pf_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(pf_tilemap, 0); - toproller_bg_tilemap = tilemap_create(toproller_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + toproller_bg_tilemap = tilemap_create(machine, toproller_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(toproller_bg_tilemap, 1); - bs_tilemap = tilemap_create(toprollr_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bs_tilemap = tilemap_create(machine, toprollr_get_bs_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(bs_tilemap, 1); tilemap_set_scroll_rows(bs_tilemap, 1); tilemap_set_transmask(bs_tilemap, 0, 0x01, 0); /* pen 0 is transaprent */ diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index eb73cf04216..b9ff4dfb971 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -86,7 +86,7 @@ static void init_penmask(void) VIDEO_START( centiped ) { - bg_tilemap = tilemap_create(centiped_get_tile_info, tilemap_scan_rows, 8,8, 32,32); + bg_tilemap = tilemap_create(machine, centiped_get_tile_info, tilemap_scan_rows, 8,8, 32,32); init_penmask(); @@ -99,7 +99,7 @@ VIDEO_START( centiped ) VIDEO_START( warlords ) { - bg_tilemap = tilemap_create(warlords_get_tile_info, tilemap_scan_rows, 8,8, 32,32); + bg_tilemap = tilemap_create(machine, warlords_get_tile_info, tilemap_scan_rows, 8,8, 32,32); centiped_flipscreen = 0; } @@ -107,7 +107,7 @@ VIDEO_START( warlords ) VIDEO_START( milliped ) { - bg_tilemap = tilemap_create(milliped_get_tile_info, tilemap_scan_rows, 8,8, 32,32); + bg_tilemap = tilemap_create(machine, milliped_get_tile_info, tilemap_scan_rows, 8,8, 32,32); init_penmask(); @@ -119,7 +119,7 @@ VIDEO_START( milliped ) VIDEO_START( bullsdrt ) { - bg_tilemap = tilemap_create(bullsdrt_get_tile_info, tilemap_scan_rows, 8,8, 32,32); + bg_tilemap = tilemap_create(machine, bullsdrt_get_tile_info, tilemap_scan_rows, 8,8, 32,32); init_penmask(); diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index 9ce9df6509d..bfde3003a9a 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -184,7 +184,7 @@ VIDEO_START( chaknpop ) UINT8 *RAM = memory_region(machine, "main"); /* info offset type w h col row */ - tx_tilemap = tilemap_create(chaknpop_get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + tx_tilemap = tilemap_create(machine, chaknpop_get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); vram1 = &RAM[0x10000]; vram2 = &RAM[0x12000]; diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index b2ee53d649b..f8342965d8c 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -153,7 +153,7 @@ static TILE_GET_INFO( exctsccr_get_bg_tile_info ) VIDEO_START( champbas ) { - bg_tilemap = tilemap_create(champbas_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, champbas_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); // talbot has only 1 bank gfx_bank = 0; @@ -162,7 +162,7 @@ VIDEO_START( champbas ) VIDEO_START( exctsccr ) { - bg_tilemap = tilemap_create(exctsccr_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, exctsccr_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index 92551a6b41d..7070cf3097b 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -100,7 +100,7 @@ static TILE_GET_INFO( cheekyms_get_tile_info ) VIDEO_START( cheekyms ) { - cheekyms_tilemap = tilemap_create(cheekyms_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + cheekyms_tilemap = tilemap_create(machine, cheekyms_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(cheekyms_tilemap, 0); } diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c index 4d8b6278409..fed010835f5 100644 --- a/src/mame/video/circus.c +++ b/src/mame/video/circus.c @@ -47,7 +47,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( circus ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c index 25431b4eaf6..62bcfeb8b45 100644 --- a/src/mame/video/circusc.c +++ b/src/mame/video/circusc.c @@ -127,7 +127,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( circusc ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_scroll_cols(bg_tilemap,32); } diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index 51c4a265708..6e1a85d49d0 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -60,8 +60,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( citycon ) { - fg_tilemap = tilemap_create(get_fg_tile_info,citycon_scan,8,8,128,32); - bg_tilemap = tilemap_create(get_bg_tile_info,citycon_scan, 8,8,128,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,citycon_scan,8,8,128,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,citycon_scan, 8,8,128,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_scroll_rows(fg_tilemap,32); diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index ecf8374a976..71efd77aae1 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -172,7 +172,7 @@ static STATE_POSTLOAD( cloak_postload ) VIDEO_START( cloak ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); bitmap_videoram1 = auto_malloc(256*256); bitmap_videoram2 = auto_malloc(256*256); diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c index 47a49c8bf17..618cca4316f 100644 --- a/src/mame/video/clshroad.c +++ b/src/mame/video/clshroad.c @@ -217,10 +217,10 @@ WRITE8_HANDLER( clshroad_vram_1_w ) VIDEO_START( firebatl ) { /* These 2 use the graphics and scroll value */ - tilemap_0a = tilemap_create(get_tile_info_0a,tilemap_scan_rows,16,16,0x20,0x10); - tilemap_0b = tilemap_create(get_tile_info_0b,tilemap_scan_rows,16,16,0x20,0x10); + tilemap_0a = tilemap_create(machine, get_tile_info_0a,tilemap_scan_rows,16,16,0x20,0x10); + tilemap_0b = tilemap_create(machine, get_tile_info_0b,tilemap_scan_rows,16,16,0x20,0x10); /* Text (No scrolling) */ - tilemap_1 = tilemap_create(get_tile_info_fb1,tilemap_scan_rows_extra,8,8,0x24,0x20); + tilemap_1 = tilemap_create(machine, get_tile_info_fb1,tilemap_scan_rows_extra,8,8,0x24,0x20); tilemap_set_scroll_rows( tilemap_0a, 1); tilemap_set_scroll_rows( tilemap_0b, 1); @@ -240,10 +240,10 @@ VIDEO_START( firebatl ) VIDEO_START( clshroad ) { /* These 2 use the graphics and scroll value */ - tilemap_0a = tilemap_create(get_tile_info_0a,tilemap_scan_rows,16,16,0x20,0x10); - tilemap_0b = tilemap_create(get_tile_info_0b,tilemap_scan_rows,16,16,0x20,0x10); + tilemap_0a = tilemap_create(machine, get_tile_info_0a,tilemap_scan_rows,16,16,0x20,0x10); + tilemap_0b = tilemap_create(machine, get_tile_info_0b,tilemap_scan_rows,16,16,0x20,0x10); /* Text (No scrolling) */ - tilemap_1 = tilemap_create(get_tile_info_1,tilemap_scan_rows_extra,8,8,0x24,0x20); + tilemap_1 = tilemap_create(machine, get_tile_info_1,tilemap_scan_rows_extra,8,8,0x24,0x20); tilemap_set_scroll_rows( tilemap_0a, 1); tilemap_set_scroll_rows( tilemap_0b, 1); diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index 2ab3d6b2c07..06a324358bf 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -260,9 +260,9 @@ VIDEO_START( combasc ) { combasc_vreg = -1; - bg_tilemap[0] = tilemap_create(get_tile_info0,tilemap_scan_rows,8,8,32,32); - bg_tilemap[1] = tilemap_create(get_tile_info1,tilemap_scan_rows,8,8,32,32); - textlayer = tilemap_create(get_text_info, tilemap_scan_rows, 8,8,32,32); + bg_tilemap[0] = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,8,8,32,32); + bg_tilemap[1] = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,8,8,32,32); + textlayer = tilemap_create(machine, get_text_info, tilemap_scan_rows, 8,8,32,32); private_spriteram[0] = auto_malloc(0x800); private_spriteram[1] = auto_malloc(0x800); @@ -280,9 +280,9 @@ VIDEO_START( combascb ) { combasc_vreg = -1; - bg_tilemap[0] = tilemap_create(get_tile_info0_bootleg,tilemap_scan_rows,8,8,32,32); - bg_tilemap[1] = tilemap_create(get_tile_info1_bootleg,tilemap_scan_rows,8,8,32,32); - textlayer = tilemap_create(get_text_info_bootleg, tilemap_scan_rows,8,8,32,32); + bg_tilemap[0] = tilemap_create(machine, get_tile_info0_bootleg,tilemap_scan_rows,8,8,32,32); + bg_tilemap[1] = tilemap_create(machine, get_tile_info1_bootleg,tilemap_scan_rows,8,8,32,32); + textlayer = tilemap_create(machine, get_text_info_bootleg, tilemap_scan_rows,8,8,32,32); private_spriteram[0] = auto_malloc(0x800); private_spriteram[1] = auto_malloc(0x800); diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index 5a4c764bd22..dd2b2e2c33a 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -87,10 +87,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( commando ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 3); diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c index e44fc0d5399..44b206c3656 100644 --- a/src/mame/video/compgolf.c +++ b/src/mame/video/compgolf.c @@ -71,8 +71,8 @@ static TILE_GET_INFO( get_back_info ) VIDEO_START( compgolf ) { - background_tilemap = tilemap_create(get_back_info,back_scan, 16, 16, 32, 32); - text_tilemap = tilemap_create(get_text_info,tilemap_scan_rows, 8, 8, 32, 32); + background_tilemap = tilemap_create(machine, get_back_info,back_scan, 16, 16, 32, 32); + text_tilemap = tilemap_create(machine, get_text_info,tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(text_tilemap,0); } diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index cf969159dc8..12fcfc41ee7 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -158,9 +158,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( contra ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8,8,32,32); private_spriteram = auto_malloc(0x800); private_spriteram_2 = auto_malloc(0x800); diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c index d6c5ff9e318..9c13eaee5ae 100644 --- a/src/mame/video/cop01.c +++ b/src/mame/video/cop01.c @@ -105,8 +105,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( cop01 ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8,8,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(fg_tilemap,15); diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index 45a87e1ed30..e2fd0d21172 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -2040,9 +2040,9 @@ static VIDEO_START( cps ) MACHINE_RESET_CALL(cps); - cps1_bg_tilemap[0] = tilemap_create(get_tile0_info,tilemap0_scan, 8, 8,64,64); - cps1_bg_tilemap[1] = tilemap_create(get_tile1_info,tilemap1_scan,16,16,64,64); - cps1_bg_tilemap[2] = tilemap_create(get_tile2_info,tilemap2_scan,32,32,64,64); + cps1_bg_tilemap[0] = tilemap_create(machine, get_tile0_info,tilemap0_scan, 8, 8,64,64); + cps1_bg_tilemap[1] = tilemap_create(machine, get_tile1_info,tilemap1_scan,16,16,64,64); + cps1_bg_tilemap[2] = tilemap_create(machine, get_tile2_info,tilemap2_scan,32,32,64,64); /* front masks will change at runtime to handle sprite occluding */ cps1_update_transmasks(); diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c index 2eac869d0d8..f47debd432e 100644 --- a/src/mame/video/crbaloon.c +++ b/src/mame/video/crbaloon.c @@ -78,7 +78,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( crbaloon ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows_flip_xy, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows_flip_xy, 8, 8, 32, 32); state_save_register_global(machine, crbaloon_collision_address); state_save_register_global(machine, crbaloon_collision_address_clear); diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c index 2fb9846fdc2..1582674c624 100644 --- a/src/mame/video/crospang.c +++ b/src/mame/video/crospang.c @@ -190,8 +190,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_START( crospang ) { - bg_layer = tilemap_create(get_bg_tile_info,tilemap_scan_rows,16,16,32,32); - fg_layer = tilemap_create(get_fg_tile_info,tilemap_scan_rows,16,16,32,32); + bg_layer = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,16,16,32,32); + fg_layer = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(fg_layer,0); bestri_tilebank = 0; diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index ec3ab752832..89af2b46486 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -41,8 +41,8 @@ static TILE_GET_INFO( get_tile_info2 ) VIDEO_START( crshrace ) { - tilemap1 = tilemap_create(get_tile_info1,tilemap_scan_rows,16,16,64,64); - tilemap2 = tilemap_create(get_tile_info2,tilemap_scan_rows, 8, 8,64,64); + tilemap1 = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,16,16,64,64); + tilemap2 = tilemap_create(machine, get_tile_info2,tilemap_scan_rows, 8, 8,64,64); K053936_wraparound_enable(0, 1); K053936_set_offset(0, -48, -21); diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index 400b2355d51..fec2f3b719b 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -167,27 +167,27 @@ static void video_start_cyberbal_common(running_machine* machine, int screens) atarimo_1_slipram = ¤t_slip[1]; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_rows, 16,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 16,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &mo0desc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* allocate the second screen if necessary */ if (screens == 2) { /* initialize the playfield */ - atarigen_playfield2_tilemap = tilemap_create(get_playfield2_tile_info, tilemap_scan_rows, 16,8, 64,64); + atarigen_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_rows, 16,8, 64,64); tilemap_set_scrollx(atarigen_playfield2_tilemap, 0, 0); /* initialize the motion objects */ atarimo_init(machine, 1, &mo1desc); /* initialize the alphanumerics */ - atarigen_alpha2_tilemap = tilemap_create(get_alpha2_tile_info, tilemap_scan_rows, 16,8, 64,32); + atarigen_alpha2_tilemap = tilemap_create(machine, get_alpha2_tile_info, tilemap_scan_rows, 16,8, 64,32); tilemap_set_scrollx(atarigen_alpha2_tilemap, 0, 0); tilemap_set_transparent_pen(atarigen_alpha2_tilemap, 0); } diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index 1188a5e0507..0216507fb2f 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -40,7 +40,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( darius ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,128,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,128,64); spritelist = auto_malloc(0x800 * sizeof(*spritelist)); diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index 28b97d48ad8..132174634be 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -122,9 +122,9 @@ static void set_pens(colortable_t *colortable) VIDEO_START(darkmist) { - bgtilemap = tilemap_create( get_bgtile_info,tilemap_scan_rows,16,16,512,64 ); - fgtilemap = tilemap_create( get_fgtile_info,tilemap_scan_rows,16,16,64,256 ); - txtilemap = tilemap_create( get_txttile_info,tilemap_scan_rows,8,8,32,32 ); + bgtilemap = tilemap_create( machine, get_bgtile_info,tilemap_scan_rows,16,16,512,64 ); + fgtilemap = tilemap_create( machine, get_fgtile_info,tilemap_scan_rows,16,16,64,256 ); + txtilemap = tilemap_create( machine, get_txttile_info,tilemap_scan_rows,8,8,32,32 ); tilemap_set_transparent_pen(fgtilemap, 0); tilemap_set_transparent_pen(txtilemap, 0); } diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c index 489d9c475a3..128805c7e20 100644 --- a/src/mame/video/darkseal.c +++ b/src/mame/video/darkseal.c @@ -267,9 +267,9 @@ WRITE16_HANDLER( darkseal_control_1_w ) VIDEO_START( darkseal ) { - pf1_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,64,64); - pf2_tilemap = tilemap_create(get_bg_tile_info2,darkseal_scan, 16,16,64,64); - pf3_tilemap = tilemap_create(get_bg_tile_info3,darkseal_scan, 16,16,64,64); + pf1_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,64,64); + pf2_tilemap = tilemap_create(machine, get_bg_tile_info2,darkseal_scan, 16,16,64,64); + pf3_tilemap = tilemap_create(machine, get_bg_tile_info3,darkseal_scan, 16,16,64,64); tilemap_set_transparent_pen(pf1_tilemap,0); tilemap_set_transparent_pen(pf2_tilemap,0); diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c index 6e03067906b..8306e33414c 100644 --- a/src/mame/video/dbz.c +++ b/src/mame/video/dbz.c @@ -97,8 +97,8 @@ VIDEO_START( dbz ) K056832_vh_start(machine, "gfx1", K056832_BPP_4, 1, NULL, dbz_tile_callback, 1); K053247_vh_start(machine, "gfx2", -52, 16, NORMAL_PLANE_ORDER, dbz_sprite_callback); - dbz_bg1_tilemap = tilemap_create(get_dbz_bg1_tile_info,tilemap_scan_rows, 16, 16,64,32); - dbz_bg2_tilemap = tilemap_create(get_dbz_bg2_tile_info,tilemap_scan_rows, 16, 16,64,32); + dbz_bg1_tilemap = tilemap_create(machine, get_dbz_bg1_tile_info,tilemap_scan_rows, 16, 16,64,32); + dbz_bg2_tilemap = tilemap_create(machine, get_dbz_bg2_tile_info,tilemap_scan_rows, 16, 16,64,32); tilemap_set_transparent_pen(dbz_bg1_tilemap,0); tilemap_set_transparent_pen(dbz_bg2_tilemap,0); diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c index 6092a28dd62..be1d5708a51 100644 --- a/src/mame/video/dcon.c +++ b/src/mame/video/dcon.c @@ -131,10 +131,10 @@ static TILE_GET_INFO( get_text_tile_info ) VIDEO_START( dcon ) { - background_layer = tilemap_create(get_back_tile_info,tilemap_scan_rows, 16,16,32,32); - foreground_layer = tilemap_create(get_fore_tile_info,tilemap_scan_rows,16,16,32,32); - midground_layer = tilemap_create(get_mid_tile_info, tilemap_scan_rows,16,16,32,32); - text_layer = tilemap_create(get_text_tile_info,tilemap_scan_rows, 8,8,64,32); + background_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_rows, 16,16,32,32); + foreground_layer = tilemap_create(machine, get_fore_tile_info,tilemap_scan_rows,16,16,32,32); + midground_layer = tilemap_create(machine, get_mid_tile_info, tilemap_scan_rows,16,16,32,32); + text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8,8,64,32); tilemap_set_transparent_pen(midground_layer,15); tilemap_set_transparent_pen(foreground_layer,15); diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index 384114bfc69..13f98fb6a61 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -216,10 +216,10 @@ static TILE_GET_INFO( get_sl_tile_info ) VIDEO_START( dday ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows,8,8,32,32); - text_tilemap = tilemap_create(get_text_tile_info,tilemap_scan_rows,8,8,32,32); - sl_tilemap = tilemap_create(get_sl_tile_info, tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows,8,8,32,32); + text_tilemap = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows,8,8,32,32); + sl_tilemap = tilemap_create(machine, get_sl_tile_info, tilemap_scan_rows,8,8,32,32); main_bitmap = video_screen_auto_bitmap_alloc(machine->primary_screen); diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c index 1c858ab05f8..a9615c09826 100644 --- a/src/mame/video/ddragon.c +++ b/src/mame/video/ddragon.c @@ -105,8 +105,8 @@ static TILE_GET_INFO( get_fg_16color_tile_info ) VIDEO_START( ddragon ) { - bg_tilemap = tilemap_create(get_bg_tile_info,background_scan, 16,16,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows, 8, 8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,background_scan, 16,16,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_scrolldx(fg_tilemap, 0, 384 - 256); @@ -120,8 +120,8 @@ VIDEO_START( ddragon ) VIDEO_START( chinagat ) { - bg_tilemap = tilemap_create(get_bg_tile_info,background_scan,16,16,32,32); - fg_tilemap = tilemap_create(get_fg_16color_tile_info,tilemap_scan_rows,8, 8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,background_scan,16,16,32,32); + fg_tilemap = tilemap_create(machine, get_fg_16color_tile_info,tilemap_scan_rows,8, 8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_scrolldy(fg_tilemap, -8, -8); diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c index 8fedee52dc0..1ac501e05db 100644 --- a/src/mame/video/ddragon3.c +++ b/src/mame/video/ddragon3.c @@ -93,10 +93,10 @@ VIDEO_START( ddragon3 ) state_save_register_global(machine, ddragon3_fg_scrolly); state_save_register_global(machine, ddragon3_bg_tilebase); - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 0); diff --git a/src/mame/video/ddrible.c b/src/mame/video/ddrible.c index 95febdb187f..b527eae5bf6 100644 --- a/src/mame/video/ddrible.c +++ b/src/mame/video/ddrible.c @@ -134,8 +134,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( ddrible ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan,8,8,64,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan, 8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan, 8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); } diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c index 13e0b77c092..90ffee907e1 100644 --- a/src/mame/video/deadang.c +++ b/src/mame/video/deadang.c @@ -71,10 +71,10 @@ static TILE_GET_INFO( get_text_tile_info ) VIDEO_START( deadang ) { - pf3_layer = tilemap_create(get_pf3_tile_info,bg_scan, 16,16,128,256); - pf2_layer = tilemap_create(get_pf2_tile_info,bg_scan, 16,16,128,256); - pf1_layer = tilemap_create(get_pf1_tile_info,tilemap_scan_cols,16,16, 32, 32); - text_layer = tilemap_create(get_text_tile_info,tilemap_scan_rows, 8, 8, 32, 32); + pf3_layer = tilemap_create(machine, get_pf3_tile_info,bg_scan, 16,16,128,256); + pf2_layer = tilemap_create(machine, get_pf2_tile_info,bg_scan, 16,16,128,256); + pf1_layer = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_cols,16,16, 32, 32); + text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(pf2_layer, 15); tilemap_set_transparent_pen(pf1_layer, 15); diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c index cb2754820d2..ab1419b55f1 100644 --- a/src/mame/video/dec0.c +++ b/src/mame/video/dec0.c @@ -695,15 +695,15 @@ static TILE_GET_INFO( get_pf3_tile_info ) VIDEO_START( dec0_nodma ) { - pf1_tilemap_0 = tilemap_create(get_pf1_tile_info,tile_shape0_8x8_scan, 8, 8,128, 32); - pf1_tilemap_1 = tilemap_create(get_pf1_tile_info,tile_shape1_8x8_scan, 8, 8, 64, 64); - pf1_tilemap_2 = tilemap_create(get_pf1_tile_info,tile_shape2_8x8_scan, 8, 8, 32,128); - pf2_tilemap_0 = tilemap_create(get_pf2_tile_info,tile_shape0_scan, 16,16, 64, 16); - pf2_tilemap_1 = tilemap_create(get_pf2_tile_info,tile_shape1_scan, 16,16, 32, 32); - pf2_tilemap_2 = tilemap_create(get_pf2_tile_info,tile_shape2_scan, 16,16, 16, 64); - pf3_tilemap_0 = tilemap_create(get_pf3_tile_info,tile_shape0_scan, 16,16, 64, 16); - pf3_tilemap_1 = tilemap_create(get_pf3_tile_info,tile_shape1_scan, 16,16, 32, 32); - pf3_tilemap_2 = tilemap_create(get_pf3_tile_info,tile_shape2_scan, 16,16, 16, 64); + pf1_tilemap_0 = tilemap_create(machine, get_pf1_tile_info,tile_shape0_8x8_scan, 8, 8,128, 32); + pf1_tilemap_1 = tilemap_create(machine, get_pf1_tile_info,tile_shape1_8x8_scan, 8, 8, 64, 64); + pf1_tilemap_2 = tilemap_create(machine, get_pf1_tile_info,tile_shape2_8x8_scan, 8, 8, 32,128); + pf2_tilemap_0 = tilemap_create(machine, get_pf2_tile_info,tile_shape0_scan, 16,16, 64, 16); + pf2_tilemap_1 = tilemap_create(machine, get_pf2_tile_info,tile_shape1_scan, 16,16, 32, 32); + pf2_tilemap_2 = tilemap_create(machine, get_pf2_tile_info,tile_shape2_scan, 16,16, 16, 64); + pf3_tilemap_0 = tilemap_create(machine, get_pf3_tile_info,tile_shape0_scan, 16,16, 64, 16); + pf3_tilemap_1 = tilemap_create(machine, get_pf3_tile_info,tile_shape1_scan, 16,16, 32, 32); + pf3_tilemap_2 = tilemap_create(machine, get_pf3_tile_info,tile_shape2_scan, 16,16, 16, 64); dec0_spriteram=spriteram16; } diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 894eacd6485..87c95f45fff 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -511,9 +511,9 @@ static TILE_GET_INFO( get_cobracom_fix_tile_info ) VIDEO_START( cobracom ) { - dec8_pf0_tilemap = tilemap_create(get_bac0_tile_info,bac0_scan_rows,16,16,32,32); - dec8_pf1_tilemap = tilemap_create(get_bac1_tile_info,bac0_scan_rows,16,16,32,32); - dec8_fix_tilemap = tilemap_create(get_cobracom_fix_tile_info,tilemap_scan_rows,8,8,32,32); + dec8_pf0_tilemap = tilemap_create(machine, get_bac0_tile_info,bac0_scan_rows,16,16,32,32); + dec8_pf1_tilemap = tilemap_create(machine, get_bac1_tile_info,bac0_scan_rows,16,16,32,32); + dec8_fix_tilemap = tilemap_create(machine, get_cobracom_fix_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(dec8_pf1_tilemap,0); tilemap_set_transparent_pen(dec8_fix_tilemap,0); @@ -559,8 +559,8 @@ static TILE_GET_INFO( get_ghostb_fix_tile_info ) VIDEO_START( ghostb ) { - dec8_pf0_tilemap = tilemap_create(get_bac0_tile_info,bac0_scan_rows,16,16,32,32); - dec8_fix_tilemap = tilemap_create(get_ghostb_fix_tile_info,tilemap_scan_rows,8,8,32,32); + dec8_pf0_tilemap = tilemap_create(machine, get_bac0_tile_info,bac0_scan_rows,16,16,32,32); + dec8_fix_tilemap = tilemap_create(machine, get_ghostb_fix_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(dec8_fix_tilemap,0); game_uses_priority=0; @@ -599,8 +599,8 @@ static TILE_GET_INFO( get_oscar_fix_tile_info ) VIDEO_START( oscar ) { - dec8_pf0_tilemap = tilemap_create(get_bac0_tile_info,bac0_scan_rows,16,16,32,32); - dec8_fix_tilemap = tilemap_create(get_oscar_fix_tile_info,tilemap_scan_rows,8,8,32,32); + dec8_pf0_tilemap = tilemap_create(machine, get_bac0_tile_info,bac0_scan_rows,16,16,32,32); + dec8_fix_tilemap = tilemap_create(machine, get_oscar_fix_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(dec8_fix_tilemap,0); tilemap_set_transmask(dec8_pf0_tilemap,0,0x00ff,0xff00); /* Bottom 8 pens */ @@ -672,8 +672,8 @@ static TILE_GET_INFO( get_lastmiss_fix_tile_info ) VIDEO_START( lastmiss ) { - dec8_pf0_tilemap = tilemap_create(get_lastmiss_tile_info,lastmiss_scan_rows,16,16,32,32); - dec8_fix_tilemap = tilemap_create(get_lastmiss_fix_tile_info,tilemap_scan_rows,8,8,32,32); + dec8_pf0_tilemap = tilemap_create(machine, get_lastmiss_tile_info,lastmiss_scan_rows,16,16,32,32); + dec8_fix_tilemap = tilemap_create(machine, get_lastmiss_fix_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(dec8_fix_tilemap,0); game_uses_priority=0; @@ -681,8 +681,8 @@ VIDEO_START( lastmiss ) VIDEO_START( shackled ) { - dec8_pf0_tilemap = tilemap_create(get_lastmiss_tile_info,lastmiss_scan_rows,16,16,32,32); - dec8_fix_tilemap = tilemap_create(get_lastmiss_fix_tile_info,tilemap_scan_rows,8,8,32,32); + dec8_pf0_tilemap = tilemap_create(machine, get_lastmiss_tile_info,lastmiss_scan_rows,16,16,32,32); + dec8_fix_tilemap = tilemap_create(machine, get_lastmiss_fix_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(dec8_fix_tilemap,0); tilemap_set_transmask(dec8_pf0_tilemap,0,0x000f,0xfff0); /* Bottom 12 pens */ @@ -737,8 +737,8 @@ static TILE_GET_INFO( get_srdarwin_tile_info ) VIDEO_START( srdarwin ) { - dec8_pf0_tilemap = tilemap_create(get_srdarwin_tile_info,tilemap_scan_rows,16,16,32,16); - dec8_fix_tilemap = tilemap_create(get_srdarwin_fix_tile_info,tilemap_scan_rows,8,8,32,32); + dec8_pf0_tilemap = tilemap_create(machine, get_srdarwin_tile_info,tilemap_scan_rows,16,16,32,16); + dec8_fix_tilemap = tilemap_create(machine, get_srdarwin_fix_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(dec8_fix_tilemap,0); tilemap_set_transmask(dec8_pf0_tilemap,0,0xffff,0x0000); //* draw as background only @@ -804,8 +804,8 @@ static TILE_GET_INFO( get_gondo_tile_info ) VIDEO_START( gondo ) { - dec8_fix_tilemap=tilemap_create(get_gondo_fix_tile_info,tilemap_scan_rows,8,8,32,32); - dec8_pf0_tilemap=tilemap_create(get_gondo_tile_info,tilemap_scan_rows,16,16,32,32); + dec8_fix_tilemap=tilemap_create(machine, get_gondo_fix_tile_info,tilemap_scan_rows,8,8,32,32); + dec8_pf0_tilemap=tilemap_create(machine, get_gondo_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(dec8_fix_tilemap,0); tilemap_set_transmask(dec8_pf0_tilemap,0,0x00ff,0xff00); /* Bottom 8 pens */ @@ -814,8 +814,8 @@ VIDEO_START( gondo ) VIDEO_START( garyoret ) { - dec8_fix_tilemap=tilemap_create(get_gondo_fix_tile_info,tilemap_scan_rows,8,8,32,32); - dec8_pf0_tilemap=tilemap_create(get_gondo_tile_info,tilemap_scan_rows,16,16,32,32); + dec8_fix_tilemap=tilemap_create(machine, get_gondo_fix_tile_info,tilemap_scan_rows,8,8,32,32); + dec8_pf0_tilemap=tilemap_create(machine, get_gondo_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(dec8_fix_tilemap,0); game_uses_priority=1; diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index bd0bd8785f3..4ce1794e6f1 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -522,22 +522,22 @@ static void deco16_video_init(running_machine *machine, int pf12_only, int split int height = video_screen_get_height(machine->primary_screen); sprite_priority_bitmap = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED8 ); - pf1_tilemap_16x16 = tilemap_create(get_pf1_tile_info, deco16_scan_rows, 16,16,64,32); - pf1_tilemap_8x8 = tilemap_create(get_pf1_tile_info_b, tilemap_scan_rows,8,8,64,32); + pf1_tilemap_16x16 = tilemap_create(machine, get_pf1_tile_info, deco16_scan_rows, 16,16,64,32); + pf1_tilemap_8x8 = tilemap_create(machine, get_pf1_tile_info_b, tilemap_scan_rows,8,8,64,32); if (split) - pf2_tilemap_16x16 = tilemap_create(get_pf2_tile_info, deco16_scan_rows, 16,16,full_width ? 64 : 32,32); + pf2_tilemap_16x16 = tilemap_create(machine, get_pf2_tile_info, deco16_scan_rows, 16,16,full_width ? 64 : 32,32); else - pf2_tilemap_16x16 = tilemap_create(get_pf2_tile_info, deco16_scan_rows, 16,16,full_width ? 64 : 32,32); - pf2_tilemap_8x8 = tilemap_create(get_pf2_tile_info_b, tilemap_scan_rows,8,8,full_width ? 64 : 32,32); + pf2_tilemap_16x16 = tilemap_create(machine, get_pf2_tile_info, deco16_scan_rows, 16,16,full_width ? 64 : 32,32); + pf2_tilemap_8x8 = tilemap_create(machine, get_pf2_tile_info_b, tilemap_scan_rows,8,8,full_width ? 64 : 32,32); dirty_palette = auto_malloc(4096); deco16_raster_display_list=auto_malloc(20 * 256); if (!pf12_only) { - pf4_tilemap_16x16 = tilemap_create(get_pf4_tile_info, deco16_scan_rows, 16,16,full_width ? 64 : 32,32); - pf3_tilemap_16x16 = tilemap_create(get_pf3_tile_info, deco16_scan_rows, 16,16,full_width ? 64 : 32,32); + pf4_tilemap_16x16 = tilemap_create(machine, get_pf4_tile_info, deco16_scan_rows, 16,16,full_width ? 64 : 32,32); + pf3_tilemap_16x16 = tilemap_create(machine, get_pf3_tile_info, deco16_scan_rows, 16,16,full_width ? 64 : 32,32); } else { diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index df1377bf0b8..53429085fe8 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -951,10 +951,10 @@ static TILE_GET_INFO( get_ll_pf4_tile_info ) VIDEO_START( captaven ) { - pf1_tilemap = tilemap_create(get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf1a_tilemap =tilemap_create(get_pf1a_tile_info, deco16_scan_rows,16,16,64,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info, deco16_scan_rows,16,16,64,32); - pf3_tilemap = tilemap_create(get_ca_pf3_tile_info, tilemap_scan_rows,16,16,32,32); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf1a_tilemap =tilemap_create(machine, get_pf1a_tile_info, deco16_scan_rows,16,16,64,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, deco16_scan_rows,16,16,64,32); + pf3_tilemap = tilemap_create(machine, get_ca_pf3_tile_info, tilemap_scan_rows,16,16,32,32); deco32_raster_display_list=auto_malloc(10 * 256); memset(deco32_raster_display_list, 0, 10 * 256); @@ -970,10 +970,10 @@ VIDEO_START( captaven ) VIDEO_START( fghthist ) { - pf1_tilemap = tilemap_create(get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info, deco16_scan_rows,16,16,64,32); - pf3_tilemap = tilemap_create(get_pf3_tile_info, deco16_scan_rows,16,16,64,32); - pf4_tilemap = tilemap_create(get_pf4_tile_info, deco16_scan_rows, 16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, deco16_scan_rows,16,16,64,32); + pf3_tilemap = tilemap_create(machine, get_pf3_tile_info, deco16_scan_rows,16,16,64,32); + pf4_tilemap = tilemap_create(machine, get_pf4_tile_info, deco16_scan_rows, 16,16,64,32); pf1a_tilemap =0; dirty_palette = auto_malloc(4096); @@ -990,11 +990,11 @@ VIDEO_START( fghthist ) VIDEO_START( dragngun ) { - pf1_tilemap = tilemap_create(get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info, deco16_scan_rows,16,16,64,32); - pf3_tilemap = tilemap_create(get_ll_pf3_tile_info, deco16_scan_rows,16,16,64,32); - pf4_tilemap = tilemap_create(get_ll_pf4_tile_info, deco16_scan_rows, 16,16,64,32); - pf1a_tilemap =tilemap_create(get_pf1a_tile_info, deco16_scan_rows,16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, deco16_scan_rows,16,16,64,32); + pf3_tilemap = tilemap_create(machine, get_ll_pf3_tile_info, deco16_scan_rows,16,16,64,32); + pf4_tilemap = tilemap_create(machine, get_ll_pf4_tile_info, deco16_scan_rows, 16,16,64,32); + pf1a_tilemap =tilemap_create(machine, get_pf1a_tile_info, deco16_scan_rows,16,16,64,32); dirty_palette = auto_malloc(4096); deco32_raster_display_list = auto_malloc(10 * 256); @@ -1013,11 +1013,11 @@ VIDEO_START( dragngun ) VIDEO_START( lockload ) { - pf1_tilemap = tilemap_create(get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info, deco16_scan_rows,16,16,64,32); - pf3_tilemap = tilemap_create(get_ll_pf3_tile_info, deco16_scan_rows,16,16,32,32); - pf4_tilemap = tilemap_create(get_ll_pf4_tile_info, deco16_scan_rows, 16,16,32,32); - pf1a_tilemap =tilemap_create(get_pf1a_tile_info, deco16_scan_rows,16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, deco16_scan_rows,16,16,64,32); + pf3_tilemap = tilemap_create(machine, get_ll_pf3_tile_info, deco16_scan_rows,16,16,32,32); + pf4_tilemap = tilemap_create(machine, get_ll_pf4_tile_info, deco16_scan_rows, 16,16,32,32); + pf1a_tilemap =tilemap_create(machine, get_pf1a_tile_info, deco16_scan_rows,16,16,64,32); dirty_palette = auto_malloc(4096); deco32_raster_display_list = auto_malloc(10 * 256); memset(deco32_raster_display_list, 0, 10 * 256); @@ -1039,10 +1039,10 @@ VIDEO_START( nslasher ) { int width, height; - pf1_tilemap = tilemap_create(get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info, deco16_scan_rows,16,16,64,32); - pf3_tilemap = tilemap_create(get_pf3_tile_info, deco16_scan_rows,16,16,64,32); - pf4_tilemap = tilemap_create(get_pf4_tile_info, deco16_scan_rows, 16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, deco16_scan_rows,16,16,64,32); + pf3_tilemap = tilemap_create(machine, get_pf3_tile_info, deco16_scan_rows,16,16,64,32); + pf4_tilemap = tilemap_create(machine, get_pf4_tile_info, deco16_scan_rows, 16,16,64,32); pf1a_tilemap =0; dirty_palette = auto_malloc(4096); diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index e172eb00833..ab23104315d 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -583,9 +583,9 @@ VIDEO_START( decocass ) char_dirty = auto_malloc(1024); tile_dirty = auto_malloc(16); - bg_tilemap_l = tilemap_create( get_bg_l_tile_info, bgvideoram_scan_cols, 16, 16, 32, 32 ); - bg_tilemap_r = tilemap_create( get_bg_r_tile_info, bgvideoram_scan_cols, 16, 16, 32, 32 ); - fg_tilemap = tilemap_create( get_fg_tile_info, fgvideoram_scan_cols, 8, 8, 32, 32 ); + bg_tilemap_l = tilemap_create( machine, get_bg_l_tile_info, bgvideoram_scan_cols, 16, 16, 32, 32 ); + bg_tilemap_r = tilemap_create( machine, get_bg_r_tile_info, bgvideoram_scan_cols, 16, 16, 32, 32 ); + fg_tilemap = tilemap_create( machine, get_fg_tile_info, fgvideoram_scan_cols, 8, 8, 32, 32 ); tilemap_set_transparent_pen( bg_tilemap_l, 0 ); tilemap_set_transparent_pen( bg_tilemap_r, 0 ); diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c index 66186160e55..38f3ca17e96 100644 --- a/src/mame/video/deniam.c +++ b/src/mame/video/deniam.c @@ -97,9 +97,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( deniam ) { - bg_tilemap = tilemap_create(get_bg_tile_info,scan_pages, 8,8,128,64); - fg_tilemap = tilemap_create(get_fg_tile_info,scan_pages, 8,8,128,64); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows,8,8, 64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,scan_pages, 8,8,128,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,scan_pages, 8,8,128,64); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows,8,8, 64,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(tx_tilemap,0); diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index ef05f6c4544..162867b0a98 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -149,8 +149,8 @@ static TILE_GET_INFO( tx_get_tile_info ) VIDEO_START( digdug ) { - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan, 8,8,36,28); - tx_tilemap = tilemap_create(tx_get_tile_info,tilemap_scan,8,8,36,28); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan, 8,8,36,28); + tx_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan,8,8,36,28); tilemap_set_transparent_pen(tx_tilemap, 0); diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c index 01611512107..4de20ee5257 100644 --- a/src/mame/video/djboy.c +++ b/src/mame/video/djboy.c @@ -44,7 +44,7 @@ WRITE8_HANDLER( djboy_videoram_w ) VIDEO_START( djboy ) { - background = tilemap_create(get_bg_tile_info,tilemap_scan_rows,16,16,64,32); + background = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,16,16,64,32); pandora_start(machine,0,0,0); } diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index 2acb9d179c7..fd0a059ff58 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -958,11 +958,11 @@ VIDEO_START( dkong ) /* fall through */ case HARDWARE_TKG04: case HARDWARE_TKG02: - state->bg_tilemap = tilemap_create(dkong_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + state->bg_tilemap = tilemap_create(machine, dkong_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scrolldx(state->bg_tilemap, 0, 128); break; case HARDWARE_TRS01: - state->bg_tilemap = tilemap_create(radarsc1_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + state->bg_tilemap = tilemap_create(machine, radarsc1_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scrolldx(state->bg_tilemap, 0, 128); state->bg_bits = video_screen_auto_bitmap_alloc(machine->primary_screen); diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c index 7726aee30d5..96033ba8d2d 100644 --- a/src/mame/video/docastle.c +++ b/src/mame/video/docastle.c @@ -111,7 +111,7 @@ static TILE_GET_INFO( get_tile_info ) static void video_start_common(running_machine *machine, UINT32 tile_transmask) { - docastle_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + docastle_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transmask(docastle_tilemap, 0, tile_transmask, 0x0000); } diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c index 1d7853a663d..45e9a31fb66 100644 --- a/src/mame/video/dogfgt.c +++ b/src/mame/video/dogfgt.c @@ -81,7 +81,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( dogfgt ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,16,16,32,32); bitmapram = auto_malloc(BITMAPRAM_SIZE); diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index 5f07f98c973..d0c69bd6a5b 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -630,11 +630,11 @@ VIDEO_START( lastday ) tx_tilemap_mode = 0; /* Create tilemaps */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_cols, + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -667,11 +667,11 @@ VIDEO_START( gulfstrm ) tx_tilemap_mode = 0; /* Create tilemaps */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_cols, + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -703,11 +703,11 @@ VIDEO_START( pollux ) tx_tilemap_mode = 0; /* Create tilemaps */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_cols, + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -739,13 +739,13 @@ VIDEO_START( bluehawk ) tx_tilemap_mode = 1; /* Create tilemaps */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - fg2_tilemap = tilemap_create(get_fg2_tile_info, tilemap_scan_cols, + fg2_tilemap = tilemap_create(machine, get_fg2_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_cols, + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -776,11 +776,11 @@ VIDEO_START( flytiger ) tx_tilemap_mode = 0; /* Create tilemaps */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - fg_tilemap = tilemap_create(flytiger_get_fg_tile_info, tilemap_scan_cols, + fg_tilemap = tilemap_create(machine, flytiger_get_fg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_cols, + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -811,11 +811,11 @@ VIDEO_START( primella ) tx_tilemap_mode = 1; /* Create tilemaps */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_cols, + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 64, 32); /* Configure tilemap transparency */ @@ -850,13 +850,13 @@ VIDEO_START( rshark ) fg2_gfx = 1; /* Create tilemaps */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 64, 32); - bg2_tilemap = tilemap_create(get_bg2_tile_info, tilemap_scan_cols, + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_cols, 16, 16, 64, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 16, 16, 64, 32); - fg2_tilemap = tilemap_create(get_fg2_tile_info, tilemap_scan_cols, + fg2_tilemap = tilemap_create(machine, get_fg2_tile_info, tilemap_scan_cols, 16, 16, 64, 32); /* Configure tilemap transparency */ @@ -884,7 +884,7 @@ VIDEO_START( popbingo ) bg_gfx = 1; /* Create tilemaps */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 32, 32, 32, 8); bg2_tilemap = fg_tilemap = fg2_tilemap = NULL; /* Stop scroll handler from crashing on these */ diff --git a/src/mame/video/dragrace.c b/src/mame/video/dragrace.c index 1f8b983c8a9..6fc2731b8a1 100644 --- a/src/mame/video/dragrace.c +++ b/src/mame/video/dragrace.c @@ -49,7 +49,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( dragrace ) { - bg_tilemap = tilemap_create( + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 16, 16, 16); } diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c index 0cd5c855aa5..152743cc9b6 100644 --- a/src/mame/video/drgnmst.c +++ b/src/mame/video/drgnmst.c @@ -126,13 +126,13 @@ static TILEMAP_MAPPER( drgnmst_bg_tilemap_scan_cols ) VIDEO_START(drgnmst) { - drgnmst_fg_tilemap = tilemap_create(get_drgnmst_fg_tile_info,drgnmst_fg_tilemap_scan_cols, 8, 8, 64,64); + drgnmst_fg_tilemap = tilemap_create(machine, get_drgnmst_fg_tile_info,drgnmst_fg_tilemap_scan_cols, 8, 8, 64,64); tilemap_set_transparent_pen(drgnmst_fg_tilemap,15); - drgnmst_md_tilemap = tilemap_create(get_drgnmst_md_tile_info,drgnmst_md_tilemap_scan_cols, 16, 16, 64,64); + drgnmst_md_tilemap = tilemap_create(machine, get_drgnmst_md_tile_info,drgnmst_md_tilemap_scan_cols, 16, 16, 64,64); tilemap_set_transparent_pen(drgnmst_md_tilemap,15); - drgnmst_bg_tilemap = tilemap_create(get_drgnmst_bg_tile_info,drgnmst_bg_tilemap_scan_cols, 32, 32, 64,64); + drgnmst_bg_tilemap = tilemap_create(machine, get_drgnmst_bg_tile_info,drgnmst_bg_tilemap_scan_cols, 32, 32, 64,64); tilemap_set_transparent_pen(drgnmst_bg_tilemap,15); // do the other tilemaps have rowscroll too? probably not .. diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c index 6f19b0c3621..afebf0cc6f8 100644 --- a/src/mame/video/drmicro.c +++ b/src/mame/video/drmicro.c @@ -114,8 +114,8 @@ VIDEO_START( drmicro) { drmicro_videoram = auto_malloc(0x1000); - drmicro_bg1 = tilemap_create(get_bg1_tile_info, tilemap_scan_rows, 8,8,32,32); - drmicro_bg2 = tilemap_create(get_bg2_tile_info, tilemap_scan_rows, 8,8,32,32); + drmicro_bg1 = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows, 8,8,32,32); + drmicro_bg2 = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 8,8,32,32); tilemap_set_transparent_pen(drmicro_bg2,0); } diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index 69e9942daff..ca4bdb9f3f3 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -80,9 +80,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( dynduke ) { - bg_layer = tilemap_create(get_bg_tile_info,tilemap_scan_cols, 16,16,32,32); - fg_layer = tilemap_create(get_fg_tile_info,tilemap_scan_cols,16,16,32,32); - tx_layer = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); + bg_layer = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols, 16,16,32,32); + fg_layer = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,16,16,32,32); + tx_layer = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(fg_layer,15); tilemap_set_transparent_pen(tx_layer,15); diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c index b6c3af4195e..0dcad07abe9 100644 --- a/src/mame/video/eprom.c +++ b/src/mame/video/eprom.c @@ -132,13 +132,13 @@ VIDEO_START( eprom ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* global brightess (not used by klax and guts) */ @@ -189,13 +189,13 @@ VIDEO_START( guts ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(guts_get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, guts_get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* global brightess (not used by guts) */ diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index a13990ae79f..f5f79e641e9 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -123,10 +123,10 @@ VIDEO_START( equites ) { equites_fg_videoram = auto_malloc(0x800); - fg_tilemap = tilemap_create(equites_fg_info, tilemap_scan_cols, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, equites_fg_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); - bg_tilemap = tilemap_create(equites_bg_info, tilemap_scan_rows, 16, 16, 16, 16); + bg_tilemap = tilemap_create(machine, equites_bg_info, tilemap_scan_rows, 16, 16, 16, 16); tilemap_set_transparent_pen(bg_tilemap, 0); tilemap_set_scrolldx(bg_tilemap, 0, -10); } @@ -137,11 +137,11 @@ VIDEO_START( splndrbt ) equites_fg_videoram = auto_malloc(0x800); - fg_tilemap = tilemap_create(splndrbt_fg_info, tilemap_scan_cols, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, splndrbt_fg_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); tilemap_set_scrolldx(fg_tilemap, 8, -8); - bg_tilemap = tilemap_create(splndrbt_bg_info, tilemap_scan_rows, 16, 16, 32, 32); + bg_tilemap = tilemap_create(machine, splndrbt_bg_info, tilemap_scan_rows, 16, 16, 32, 32); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[1], 0x10); fg_char_bank = 0; diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c index eacdcd8b3a9..d8e0b2117a5 100644 --- a/src/mame/video/esd16.c +++ b/src/mame/video/esd16.c @@ -145,18 +145,18 @@ WRITE16_HANDLER( esd16_tilemap0_color_w ) VIDEO_START( esd16 ) { - esdtilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + esdtilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 8,8, 0x80,0x40); - esdtilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + esdtilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 8,8, 0x80,0x40); /* swatpolc changes tilemap 0 to 16x16 at various times */ - esdtilemap_0_16x16 = tilemap_create( get_tile_info_0_16x16, tilemap_scan_rows, + esdtilemap_0_16x16 = tilemap_create( machine, get_tile_info_0_16x16, tilemap_scan_rows, 16,16, 0x40,0x40); /* hedpanic changes tilemap 1 to 16x16 at various times */ - esdtilemap_1_16x16 = tilemap_create( get_tile_info_1_16x16, tilemap_scan_rows, + esdtilemap_1_16x16 = tilemap_create( machine, get_tile_info_1_16x16, tilemap_scan_rows, 16,16, 0x40,0x40); tilemap_set_scrolldx(esdtilemap_0, -0x60 + 2, -0x60 ); diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c index 9b225e72cd4..94f61e8ab06 100644 --- a/src/mame/video/espial.c +++ b/src/mame/video/espial.c @@ -100,7 +100,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( espial ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_scroll_cols(bg_tilemap, 32); } @@ -108,7 +108,7 @@ VIDEO_START( espial ) VIDEO_START( netwars ) { /* Net Wars has a tile map that's twice as big as Espial's */ - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,64); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,64); tilemap_set_scroll_cols(bg_tilemap, 32); tilemap_set_scrolldy(bg_tilemap, 0, 0x100); diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index 21eef94d607..4ec2735c455 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -170,13 +170,13 @@ static TILEMAP_MAPPER( exedexes_fg_tilemap_scan ) VIDEO_START( exedexes ) { - bg_tilemap = tilemap_create(get_bg_tile_info, exedexes_bg_tilemap_scan, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, exedexes_bg_tilemap_scan, 32, 32, 64, 64); - fg_tilemap = tilemap_create(get_fg_tile_info, exedexes_fg_tilemap_scan, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, exedexes_fg_tilemap_scan, 16, 16, 128, 128); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_rows, + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index 9da34396037..2a84f119897 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -82,10 +82,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( exprraid ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(bg_tilemap, 2); diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index 58980149446..e802d88ff9e 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -55,8 +55,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( f1gp ) { - roz_tilemap = tilemap_create(f1gp_get_roz_tile_info,tilemap_scan_rows,16,16,64,64); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); + roz_tilemap = tilemap_create(machine, f1gp_get_roz_tile_info,tilemap_scan_rows,16,16,64,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); K053936_wraparound_enable(0, 1); K053936_set_offset(0, -58, -2); @@ -71,8 +71,8 @@ VIDEO_START( f1gp ) VIDEO_START( f1gpb ) { - roz_tilemap = tilemap_create(f1gp_get_roz_tile_info,tilemap_scan_rows,16,16,64,64); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); + roz_tilemap = tilemap_create(machine, f1gp_get_roz_tile_info,tilemap_scan_rows,16,16,64,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(fg_tilemap,0xff); @@ -84,8 +84,8 @@ VIDEO_START( f1gpb ) VIDEO_START( f1gp2 ) { - roz_tilemap = tilemap_create(f1gp2_get_roz_tile_info,tilemap_scan_rows,16,16,64,64); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); + roz_tilemap = tilemap_create(machine, f1gp2_get_roz_tile_info,tilemap_scan_rows,16,16,64,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); K053936_wraparound_enable(0, 1); K053936_set_offset(0, -48, -21); diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c index c9b303b301f..83af5dedffa 100644 --- a/src/mame/video/fastfred.c +++ b/src/mame/video/fastfred.c @@ -123,7 +123,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( fastfred ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(bg_tilemap, 0); tilemap_set_scroll_cols(bg_tilemap, 32); @@ -356,9 +356,9 @@ WRITE8_HANDLER( imago_charbank_w ) VIDEO_START( imago ) { - web_tilemap = tilemap_create(imago_get_tile_info_web,tilemap_scan_rows, 8,8,32,32); - bg_tilemap = tilemap_create(imago_get_tile_info_bg, tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(imago_get_tile_info_fg, tilemap_scan_rows,8,8,32,32); + web_tilemap = tilemap_create(machine, imago_get_tile_info_web,tilemap_scan_rows, 8,8,32,32); + bg_tilemap = tilemap_create(machine, imago_get_tile_info_bg, tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, imago_get_tile_info_fg, tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(bg_tilemap, 0); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c index 67ec45dde9f..5d496f78c79 100644 --- a/src/mame/video/fastlane.c +++ b/src/mame/video/fastlane.c @@ -106,8 +106,8 @@ static TILE_GET_INFO( get_tile_info1 ) VIDEO_START( fastlane ) { - layer0 = tilemap_create(get_tile_info0,tilemap_scan_rows,8,8,32,32); - layer1 = tilemap_create(get_tile_info1,tilemap_scan_rows,8,8,32,32); + layer0 = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,8,8,32,32); + layer1 = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,8,8,32,32); tilemap_set_scroll_rows( layer0, 32 ); diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 5cfd522f8fb..70b5b301537 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -119,7 +119,7 @@ PALETTE_INIT( fcombat ) VIDEO_START( fcombat ) { - bgmap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16, 16,32*8*2,32); + bgmap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16, 16,32*8*2,32); } diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c index ce57f9e35cb..e8382399e29 100644 --- a/src/mame/video/firetrap.c +++ b/src/mame/video/firetrap.c @@ -136,9 +136,9 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( firetrap ) { - fg_tilemap = tilemap_create(get_fg_tile_info, get_fg_memory_offset, 8, 8,32,32); - bg1_tilemap = tilemap_create(get_bg1_tile_info,get_bg_memory_offset,16,16,32,32); - bg2_tilemap = tilemap_create(get_bg2_tile_info,get_bg_memory_offset, 16,16,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, get_fg_memory_offset, 8, 8,32,32); + bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,get_bg_memory_offset,16,16,32,32); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,get_bg_memory_offset, 16,16,32,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(bg1_tilemap,0); diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index 97b2a6bf230..0f6cbb8fbe7 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -237,8 +237,8 @@ VIDEO_START( firetrk ) helper1 = video_screen_auto_bitmap_alloc(machine->primary_screen); helper2 = video_screen_auto_bitmap_alloc(machine->primary_screen); - tilemap1 = tilemap_create(firetrk_get_tile_info1, tilemap_scan_rows, 16, 16, 16, 16); - tilemap2 = tilemap_create(firetrk_get_tile_info2, tilemap_scan_rows, 16, 16, 16, 16); + tilemap1 = tilemap_create(machine, firetrk_get_tile_info1, tilemap_scan_rows, 16, 16, 16, 16); + tilemap2 = tilemap_create(machine, firetrk_get_tile_info2, tilemap_scan_rows, 16, 16, 16, 16); } @@ -247,8 +247,8 @@ VIDEO_START( superbug ) helper1 = video_screen_auto_bitmap_alloc(machine->primary_screen); helper2 = video_screen_auto_bitmap_alloc(machine->primary_screen); - tilemap1 = tilemap_create(superbug_get_tile_info1, tilemap_scan_rows, 16, 16, 16, 16); - tilemap2 = tilemap_create(superbug_get_tile_info2, tilemap_scan_rows, 16, 16, 16, 16); + tilemap1 = tilemap_create(machine, superbug_get_tile_info1, tilemap_scan_rows, 16, 16, 16, 16); + tilemap2 = tilemap_create(machine, superbug_get_tile_info2, tilemap_scan_rows, 16, 16, 16, 16); } @@ -257,8 +257,8 @@ VIDEO_START( montecar ) helper1 = video_screen_auto_bitmap_alloc(machine->primary_screen); helper2 = video_screen_auto_bitmap_alloc(machine->primary_screen); - tilemap1 = tilemap_create(montecar_get_tile_info1, tilemap_scan_rows, 16, 16, 16, 16); - tilemap2 = tilemap_create(montecar_get_tile_info2, tilemap_scan_rows, 16, 16, 16, 16); + tilemap1 = tilemap_create(machine, montecar_get_tile_info1, tilemap_scan_rows, 16, 16, 16, 16); + tilemap2 = tilemap_create(machine, montecar_get_tile_info2, tilemap_scan_rows, 16, 16, 16, 16); } diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index e1b14e8349d..41a1c1559e7 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -94,13 +94,13 @@ WRITE16_HANDLER( fof_txt_tileram_w ) VIDEO_START(fitfight) { - fof_bak_tilemap = tilemap_create(get_fof_bak_tile_info,tilemap_scan_cols,8,8,128, 32); + fof_bak_tilemap = tilemap_create(machine, get_fof_bak_tile_info,tilemap_scan_cols,8,8,128, 32); /* opaque */ - fof_mid_tilemap = tilemap_create(get_fof_mid_tile_info,tilemap_scan_cols,8,8,128, 32); + fof_mid_tilemap = tilemap_create(machine, get_fof_mid_tile_info,tilemap_scan_cols,8,8,128, 32); tilemap_set_transparent_pen(fof_mid_tilemap,0); - fof_txt_tilemap = tilemap_create(get_fof_txt_tile_info,tilemap_scan_cols,8,8,128, 32); + fof_txt_tilemap = tilemap_create(machine, get_fof_txt_tile_info,tilemap_scan_cols,8,8,128, 32); tilemap_set_transparent_pen(fof_txt_tilemap,0); } diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index 3278481f592..9afe424637b 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -72,8 +72,8 @@ static TILE_GET_INFO( get_tile_info_B ) VIDEO_START( flkatck ) { - k007121_tilemap[0] = tilemap_create(get_tile_info_A,tilemap_scan_rows,8,8,32,32); - k007121_tilemap[1] = tilemap_create(get_tile_info_B,tilemap_scan_rows,8,8,32,32); + k007121_tilemap[0] = tilemap_create(machine, get_tile_info_A,tilemap_scan_rows,8,8,32,32); + k007121_tilemap[1] = tilemap_create(machine, get_tile_info_B,tilemap_scan_rows,8,8,32,32); } diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c index 80596d901fe..1ccafdfb7cf 100644 --- a/src/mame/video/flower.c +++ b/src/mame/video/flower.c @@ -149,10 +149,10 @@ static TILE_GET_INFO( get_text_tile_info ) VIDEO_START(flower) { - flower_bg0_tilemap = tilemap_create(get_bg0_tile_info, tilemap_scan_rows, 16,16,16,16); - flower_bg1_tilemap = tilemap_create(get_bg1_tile_info, tilemap_scan_rows,16,16,16,16); - flower_text_tilemap = tilemap_create(get_text_tile_info,tilemap_scan_rows, 8, 8,32,32); - flower_text_right_tilemap = tilemap_create(get_text_tile_info,tilemap_scan_cols, 8, 8, 2,32); + flower_bg0_tilemap = tilemap_create(machine, get_bg0_tile_info, tilemap_scan_rows, 16,16,16,16); + flower_bg1_tilemap = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows,16,16,16,16); + flower_text_tilemap = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8, 8,32,32); + flower_text_right_tilemap = tilemap_create(machine, get_text_tile_info,tilemap_scan_cols, 8, 8, 2,32); tilemap_set_transparent_pen(flower_bg1_tilemap,15); tilemap_set_transparent_pen(flower_text_tilemap,3); diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c index 78f8a9e6f57..ce3120b7822 100644 --- a/src/mame/video/flstory.c +++ b/src/mame/video/flstory.c @@ -47,7 +47,7 @@ static TILE_GET_INFO( victnine_get_tile_info ) VIDEO_START( flstory ) { - bg_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,32,32 ); + bg_tilemap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,32,32 ); // tilemap_set_transparent_pen( bg_tilemap,15 ); tilemap_set_transmask(bg_tilemap,0,0x3fff,0xc000); /* split type 0 has pens 0-13 transparent in front half */ tilemap_set_transmask(bg_tilemap,1,0x8000,0x7fff); /* split type 1 has pen 15 transparent in front half */ @@ -59,7 +59,7 @@ VIDEO_START( flstory ) VIDEO_START( victnine ) { - bg_tilemap = tilemap_create( victnine_get_tile_info,tilemap_scan_rows,8,8,32,32 ); + bg_tilemap = tilemap_create( machine, victnine_get_tile_info,tilemap_scan_rows,8,8,32,32 ); tilemap_set_scroll_cols(bg_tilemap,32); paletteram = auto_malloc(0x200); diff --git a/src/mame/video/flyball.c b/src/mame/video/flyball.c index f8847a4d8af..4e98ffc493d 100644 --- a/src/mame/video/flyball.c +++ b/src/mame/video/flyball.c @@ -49,7 +49,7 @@ static TILE_GET_INFO( flyball_get_tile_info ) VIDEO_START( flyball ) { - flyball_tilemap = tilemap_create(flyball_get_tile_info, + flyball_tilemap = tilemap_create(machine, flyball_get_tile_info, flyball_get_memory_offset, 8, 16, 32, 16); } diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c index 29a30cbe009..c9aa7e173a5 100644 --- a/src/mame/video/foodf.c +++ b/src/mame/video/foodf.c @@ -42,7 +42,7 @@ VIDEO_START( foodf ) static const int resistances[3] = { 1000, 470, 220 }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 32,32); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 32,32); tilemap_set_transparent_pen(atarigen_playfield_tilemap, 0); /* adjust the playfield for the 8 pixel offset */ diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c index a62d8d65228..ddb01e5aeeb 100644 --- a/src/mame/video/freekick.c +++ b/src/mame/video/freekick.c @@ -19,7 +19,7 @@ static TILE_GET_INFO( get_freek_tile_info ) VIDEO_START(freekick) { - freek_tilemap = tilemap_create(get_freek_tile_info,tilemap_scan_rows, 8, 8,32,32); + freek_tilemap = tilemap_create(machine, get_freek_tile_info,tilemap_scan_rows, 8, 8,32,32); } diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index 093dce3a9ae..50b5e1401f5 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -371,14 +371,14 @@ WRITE16_HANDLER( fromanc4_gfxreg_2_w ) VIDEO_START( fromanc2 ) { - fromanc2_tilemap[0][0] = tilemap_create(fromanc2_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[0][1] = tilemap_create(fromanc2_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[0][2] = tilemap_create(fromanc2_get_v0_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[0][3] = tilemap_create(fromanc2_get_v0_l3_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[1][0] = tilemap_create(fromanc2_get_v1_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[1][1] = tilemap_create(fromanc2_get_v1_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[1][2] = tilemap_create(fromanc2_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[1][3] = tilemap_create(fromanc2_get_v1_l3_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[0][0] = tilemap_create(machine, fromanc2_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[0][1] = tilemap_create(machine, fromanc2_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[0][2] = tilemap_create(machine, fromanc2_get_v0_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[0][3] = tilemap_create(machine, fromanc2_get_v0_l3_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[1][0] = tilemap_create(machine, fromanc2_get_v1_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[1][1] = tilemap_create(machine, fromanc2_get_v1_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[1][2] = tilemap_create(machine, fromanc2_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[1][3] = tilemap_create(machine, fromanc2_get_v1_l3_tile_info, tilemap_scan_rows, 8, 8, 64, 64); fromanc2_videoram[0][0] = auto_malloc((64 * 64) * sizeof(UINT16)); fromanc2_videoram[0][1] = auto_malloc((64 * 64) * sizeof(UINT16)); @@ -402,13 +402,13 @@ VIDEO_START( fromanc2 ) VIDEO_START( fromancr ) { - fromanc2_tilemap[0][0] = tilemap_create(fromancr_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[0][1] = tilemap_create(fromancr_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[0][2] = tilemap_create(fromancr_get_v0_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[0][0] = tilemap_create(machine, fromancr_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[0][1] = tilemap_create(machine, fromancr_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[0][2] = tilemap_create(machine, fromancr_get_v0_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); fromanc2_tilemap[0][3] = 0; - fromanc2_tilemap[1][0] = tilemap_create(fromancr_get_v1_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[1][1] = tilemap_create(fromancr_get_v1_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - fromanc2_tilemap[1][2] = tilemap_create(fromancr_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[1][0] = tilemap_create(machine, fromancr_get_v1_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[1][1] = tilemap_create(machine, fromancr_get_v1_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + fromanc2_tilemap[1][2] = tilemap_create(machine, fromancr_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); fromanc2_tilemap[1][3] = 0; fromanc2_videoram[0][0] = auto_malloc((64 * 64) * sizeof(UINT16)); @@ -430,13 +430,13 @@ VIDEO_START( fromancr ) VIDEO_START( fromanc4 ) { - fromanc2_tilemap[0][0] = tilemap_create(fromancr_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 256, 64); - fromanc2_tilemap[0][1] = tilemap_create(fromancr_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 256, 64); - fromanc2_tilemap[0][2] = tilemap_create(fromancr_get_v0_l2_tile_info, tilemap_scan_rows, 8, 8, 256, 64); + fromanc2_tilemap[0][0] = tilemap_create(machine, fromancr_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 256, 64); + fromanc2_tilemap[0][1] = tilemap_create(machine, fromancr_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 256, 64); + fromanc2_tilemap[0][2] = tilemap_create(machine, fromancr_get_v0_l2_tile_info, tilemap_scan_rows, 8, 8, 256, 64); fromanc2_tilemap[0][3] = 0; - fromanc2_tilemap[1][0] = tilemap_create(fromancr_get_v1_l0_tile_info, tilemap_scan_rows, 8, 8, 256, 64); - fromanc2_tilemap[1][1] = tilemap_create(fromancr_get_v1_l1_tile_info, tilemap_scan_rows, 8, 8, 256, 64); - fromanc2_tilemap[1][2] = tilemap_create(fromancr_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 256, 64); + fromanc2_tilemap[1][0] = tilemap_create(machine, fromancr_get_v1_l0_tile_info, tilemap_scan_rows, 8, 8, 256, 64); + fromanc2_tilemap[1][1] = tilemap_create(machine, fromancr_get_v1_l1_tile_info, tilemap_scan_rows, 8, 8, 256, 64); + fromanc2_tilemap[1][2] = tilemap_create(machine, fromancr_get_v1_l2_tile_info, tilemap_scan_rows, 8, 8, 256, 64); fromanc2_tilemap[1][3] = 0; fromanc2_videoram[0][0] = auto_malloc((256 * 64) * sizeof(UINT16)); diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index 1bd7d4f1c89..5d81f617074 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -113,8 +113,8 @@ static void init_common(running_machine *machine) VIDEO_START( fromance ) { /* allocate tilemaps */ - bg_tilemap = tilemap_create(get_fromance_bg_tile_info, tilemap_scan_rows, 8,4, 64,64); - fg_tilemap = tilemap_create(get_fromance_fg_tile_info, tilemap_scan_rows, 8,4, 64,64); + bg_tilemap = tilemap_create(machine, get_fromance_bg_tile_info, tilemap_scan_rows, 8,4, 64,64); + fg_tilemap = tilemap_create(machine, get_fromance_fg_tile_info, tilemap_scan_rows, 8,4, 64,64); init_common(machine); } @@ -122,8 +122,8 @@ VIDEO_START( fromance ) VIDEO_START( nekkyoku ) { /* allocate tilemaps */ - bg_tilemap = tilemap_create(get_nekkyoku_bg_tile_info, tilemap_scan_rows, 8,4, 64,64); - fg_tilemap = tilemap_create(get_nekkyoku_fg_tile_info, tilemap_scan_rows, 8,4, 64,64); + bg_tilemap = tilemap_create(machine, get_nekkyoku_bg_tile_info, tilemap_scan_rows, 8,4, 64,64); + fg_tilemap = tilemap_create(machine, get_nekkyoku_fg_tile_info, tilemap_scan_rows, 8,4, 64,64); init_common(machine); } diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index cfafea95338..4525b2969fe 100644 --- a/src/mame/video/funkybee.c +++ b/src/mame/video/funkybee.c @@ -89,7 +89,7 @@ static TILEMAP_MAPPER( funkybee_tilemap_scan ) VIDEO_START( funkybee ) { - bg_tilemap = tilemap_create(get_bg_tile_info, funkybee_tilemap_scan, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, funkybee_tilemap_scan, 8, 8, 32, 32); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c index e6f7e524426..d9a24a3e55b 100644 --- a/src/mame/video/funworld.c +++ b/src/mame/video/funworld.c @@ -149,12 +149,12 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START(funworld) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 4, 8, 96, 29); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 4, 8, 96, 29); } VIDEO_START(magicrd2) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 4, 8, 112, 34); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 4, 8, 112, 34); } VIDEO_UPDATE(funworld) diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c index 3aba5460bf8..e8f8b854a4a 100644 --- a/src/mame/video/fuukifg2.c +++ b/src/mame/video/fuukifg2.c @@ -96,16 +96,16 @@ PALETTE_INIT( fuuki16 ) VIDEO_START( fuuki16 ) { - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16, 16, 64,32); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16, 16, 64,32); - tilemap_2 = tilemap_create( get_tile_info_2, tilemap_scan_rows, + tilemap_2 = tilemap_create( machine, get_tile_info_2, tilemap_scan_rows, 8, 8, 64,32); - tilemap_3 = tilemap_create( get_tile_info_3, tilemap_scan_rows, + tilemap_3 = tilemap_create( machine, get_tile_info_3, tilemap_scan_rows, 8, 8, 64,32); tilemap_set_transparent_pen(tilemap_0,0x0f); // 4 bits diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c index bb7811f286c..bb2c9195dc1 100644 --- a/src/mame/video/fuukifg3.c +++ b/src/mame/video/fuukifg3.c @@ -109,16 +109,16 @@ VIDEO_START( fuuki32 ) buffered_spriteram32 = auto_malloc(spriteram_size); buffered_spriteram32_2 = auto_malloc(spriteram_size); - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16, 16, 64,32); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16, 16, 64,32); - tilemap_2 = tilemap_create( get_tile_info_2, tilemap_scan_rows, + tilemap_2 = tilemap_create( machine, get_tile_info_2, tilemap_scan_rows, 8, 8, 64,32); - tilemap_3 = tilemap_create( get_tile_info_3, tilemap_scan_rows, + tilemap_3 = tilemap_create( machine, get_tile_info_3, tilemap_scan_rows, 8, 8, 64,32); tilemap_set_transparent_pen(tilemap_0,0xff); // 8 bits diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index 95a631165c3..57c14e2b728 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -81,8 +81,8 @@ WRITE16_HANDLER( gaelco_vram_w ) VIDEO_START( bigkarnk ) { - pant[0] = tilemap_create(get_tile_info_gaelco_screen0,tilemap_scan_rows,16,16,32,32); - pant[1] = tilemap_create(get_tile_info_gaelco_screen1,tilemap_scan_rows,16,16,32,32); + pant[0] = tilemap_create(machine, get_tile_info_gaelco_screen0,tilemap_scan_rows,16,16,32,32); + pant[1] = tilemap_create(machine, get_tile_info_gaelco_screen1,tilemap_scan_rows,16,16,32,32); tilemap_set_transmask(pant[0],0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ tilemap_set_transmask(pant[1],0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ @@ -90,8 +90,8 @@ VIDEO_START( bigkarnk ) VIDEO_START( maniacsq ) { - pant[0] = tilemap_create(get_tile_info_gaelco_screen0,tilemap_scan_rows,16,16,32,32); - pant[1] = tilemap_create(get_tile_info_gaelco_screen1,tilemap_scan_rows,16,16,32,32); + pant[0] = tilemap_create(machine, get_tile_info_gaelco_screen0,tilemap_scan_rows,16,16,32,32); + pant[1] = tilemap_create(machine, get_tile_info_gaelco_screen1,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(pant[0],0); tilemap_set_transparent_pen(pant[1],0); diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index de5e739c271..c9c3b4ecff8 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -268,8 +268,8 @@ VIDEO_START( gaelco2 ) gaelco2_videoram = spriteram16; /* create tilemaps */ - pant[0] = tilemap_create(get_tile_info_gaelco2_screen0,tilemap_scan_rows,16,16,64,32); - pant[1] = tilemap_create(get_tile_info_gaelco2_screen1,tilemap_scan_rows,16,16,64,32); + pant[0] = tilemap_create(machine, get_tile_info_gaelco2_screen0,tilemap_scan_rows,16,16,64,32); + pant[1] = tilemap_create(machine, get_tile_info_gaelco2_screen1,tilemap_scan_rows,16,16,64,32); /* set tilemap properties */ tilemap_set_transparent_pen(pant[0],0); @@ -288,8 +288,8 @@ VIDEO_START( gaelco2_dual ) gaelco2_videoram = spriteram16; /* create tilemaps */ - pant[0] = tilemap_create(get_tile_info_gaelco2_screen0_dual,tilemap_scan_rows,16,16,64,32); - pant[1] = tilemap_create(get_tile_info_gaelco2_screen1_dual,tilemap_scan_rows,16,16,64,32); + pant[0] = tilemap_create(machine, get_tile_info_gaelco2_screen0_dual,tilemap_scan_rows,16,16,64,32); + 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(pant[0],0); diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c index 18b27149f16..2daefdd4f9a 100644 --- a/src/mame/video/gaiden.c +++ b/src/mame/video/gaiden.c @@ -77,9 +77,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( gaiden ) { /* set up tile layers */ - background = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); - foreground = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); - text_layer = tilemap_create(get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); + foreground = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); + text_layer = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(background, 0); tilemap_set_transparent_pen(foreground, 0); @@ -95,9 +95,9 @@ VIDEO_START( raiga ) tile_bitmap_bg = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16); tile_bitmap_fg = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16); - background = tilemap_create(get_bg_tile_info, tilemap_scan_rows,16,16,64,32); - foreground = tilemap_create(get_fg_tile_info_raiga,tilemap_scan_rows,16,16,64,32); - text_layer = tilemap_create(get_tx_tile_info, tilemap_scan_rows, 8, 8,32,32); + background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows,16,16,64,32); + foreground = tilemap_create(machine, get_fg_tile_info_raiga,tilemap_scan_rows,16,16,64,32); + text_layer = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(background,0); tilemap_set_transparent_pen(foreground,0); @@ -110,9 +110,9 @@ VIDEO_START( raiga ) VIDEO_START( drgnbowl ) { /* set up tile layers */ - background = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); - foreground = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); - text_layer = tilemap_create(get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); + foreground = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); + text_layer = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(foreground, 15); tilemap_set_transparent_pen(text_layer, 15); diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index b1a4aab4425..8653d224d32 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -440,7 +440,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( galaga ) { - tx_tilemap = tilemap_create(get_tile_info,tilemap_scan,8,8,36,28); + tx_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan,8,8,36,28); colortable_configure_tilemap_groups(machine->colortable, tx_tilemap, machine->gfx[0], 0x1f); galaga_gfxbank = 0; diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index 6cd72f10cfe..dbb0bcd5442 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -444,7 +444,7 @@ VIDEO_START( galaxian ) if (!galaxian_sfx_tilemap) { /* normal galaxian hardware is row-based and individually scrolling columns */ - bg_tilemap = tilemap_create(bg_get_tile_info, tilemap_scan_rows, GALAXIAN_XSCALE*8,8, 32,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, GALAXIAN_XSCALE*8,8, 32,32); tilemap_set_scroll_cols(bg_tilemap, 32); tilemap_set_scrolldx(bg_tilemap, 0, -GALAXIAN_XSCALE * 128); tilemap_set_scrolldy(bg_tilemap, 0, 8); @@ -452,7 +452,7 @@ VIDEO_START( galaxian ) else { /* sfx hardware is column-based and individually scrolling rows */ - bg_tilemap = tilemap_create(bg_get_tile_info, tilemap_scan_cols, GALAXIAN_XSCALE*8,8, 32,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_cols, GALAXIAN_XSCALE*8,8, 32,32); tilemap_set_scroll_rows(bg_tilemap, 32); tilemap_set_scrolldx(bg_tilemap, 0, -GALAXIAN_XSCALE * 128); tilemap_set_scrolldy(bg_tilemap, 0, 8); diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index b2d159c952c..0f28a577c27 100644 --- a/src/mame/video/galaxold.c +++ b/src/mame/video/galaxold.c @@ -483,7 +483,7 @@ static void state_save_register(running_machine *machine) static void video_start_common(running_machine *machine, tilemap_mapper_func get_memory_offset) { - bg_tilemap = tilemap_create(get_tile_info,get_memory_offset,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,get_memory_offset,8,8,32,32); tilemap_set_transparent_pen(bg_tilemap,0); @@ -720,7 +720,7 @@ static void rockclim_modify_spritecode(UINT8 *spriteram,int *code,int *flipx,int VIDEO_START( rockclim ) { VIDEO_START_CALL(galaxold); - rockclim_tilemap = tilemap_create(rockclim_get_tile_info,tilemap_scan_rows,8,8,64,32); + rockclim_tilemap = tilemap_create(machine, rockclim_get_tile_info,tilemap_scan_rows,8,8,64,32); draw_background = rockclim_draw_background; modify_charcode = mooncrst_modify_charcode; modify_spritecode = rockclim_modify_spritecode; @@ -744,7 +744,7 @@ static TILE_GET_INFO( drivfrcg_get_tile_info ) VIDEO_START( drivfrcg ) { - bg_tilemap = tilemap_create(drivfrcg_get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, drivfrcg_get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(bg_tilemap,0); tilemap_set_scroll_cols(bg_tilemap, 32); @@ -782,7 +782,7 @@ VIDEO_START( drivfrcg ) VIDEO_START( ad2083 ) { - bg_tilemap = tilemap_create(drivfrcg_get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, drivfrcg_get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(bg_tilemap,0); tilemap_set_scroll_cols(bg_tilemap, 32); @@ -840,7 +840,7 @@ static TILE_GET_INFO( racknrol_get_tile_info ) VIDEO_START( racknrol ) { - bg_tilemap = tilemap_create(racknrol_get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, racknrol_get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(bg_tilemap,0); tilemap_set_scroll_cols(bg_tilemap, 32); @@ -925,7 +925,7 @@ VIDEO_START( dambustr ) /* make a copy of the tilemap to emulate background priority */ dambustr_videoram2 = auto_malloc(0x0400); - dambustr_tilemap2 = tilemap_create(dambustr_get_tile_info2,tilemap_scan_rows,8,8,32,32); + dambustr_tilemap2 = tilemap_create(machine, dambustr_get_tile_info2,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(dambustr_tilemap2,0); } diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index c0bf518cec6..9440c679379 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -186,8 +186,8 @@ VIDEO_START( galivan ) UINT8 *rombase = memory_region(machine, "main"); memory_configure_bank(machine, 1, 0, 2, &rombase[0x10000], 0x2000); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16,16,128,128); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16,16,128,128); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_cols,8,8,32,32); tilemap_set_transparent_pen(tx_tilemap,15); @@ -205,8 +205,8 @@ VIDEO_START( ninjemak ) UINT8 *rombase = memory_region(machine, "main"); memory_configure_bank(machine, 1, 0, 4, &rombase[0x10000], 0x2000); - bg_tilemap = tilemap_create(ninjemak_get_bg_tile_info,tilemap_scan_cols, 16,16,512,32); - tx_tilemap = tilemap_create(ninjemak_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); + bg_tilemap = tilemap_create(machine, ninjemak_get_bg_tile_info,tilemap_scan_cols, 16,16,512,32); + tx_tilemap = tilemap_create(machine, ninjemak_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); tilemap_set_transparent_pen(tx_tilemap,15); diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c index b959f1305e9..ceedecd652b 100644 --- a/src/mame/video/gaplus.c +++ b/src/mame/video/gaplus.c @@ -195,7 +195,7 @@ static void starfield_init(running_machine *machine) VIDEO_START( gaplus ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan,8,8,36,28); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan,8,8,36,28); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[0], 0xff); diff --git a/src/mame/video/gatron.c b/src/mame/video/gatron.c index 46d50d68e12..9fae232e0d2 100644 --- a/src/mame/video/gatron.c +++ b/src/mame/video/gatron.c @@ -44,7 +44,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( gat ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, 8, 16, 48, 16); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 16, 48, 16); } VIDEO_UPDATE( gat ) diff --git a/src/mame/video/gauntlet.c b/src/mame/video/gauntlet.c index c9a7d88da0e..97c4a9bb641 100644 --- a/src/mame/video/gauntlet.c +++ b/src/mame/video/gauntlet.c @@ -106,13 +106,13 @@ VIDEO_START( gauntlet ) int i, size; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* modify the motion object code lookup table to account for the code XOR */ diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index 259ef120cf8..d7549eb1934 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -125,7 +125,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( gberet ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[0], 0x10); tilemap_set_scroll_rows(bg_tilemap, 32); diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c index 8145f0b708b..5d581375283 100644 --- a/src/mame/video/gcpinbal.c +++ b/src/mame/video/gcpinbal.c @@ -64,14 +64,14 @@ static void dirty_tilemaps(void) // will be used for save states } #endif -static void gcpinbal_core_vh_start (void) +static void gcpinbal_core_vh_start (running_machine *machine) { int xoffs = 0; int yoffs = 0; - gcpinbal_tilemap[0] = tilemap_create(get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); - gcpinbal_tilemap[1] = tilemap_create(get_bg1_tile_info,tilemap_scan_rows,16,16,32,32); - gcpinbal_tilemap[2] = tilemap_create(get_fg_tile_info, tilemap_scan_rows,8,8,64,64); + gcpinbal_tilemap[0] = tilemap_create(machine, get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); + gcpinbal_tilemap[1] = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows,16,16,32,32); + gcpinbal_tilemap[2] = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows,8,8,64,64); tilemap_set_transparent_pen( gcpinbal_tilemap[0],0 ); tilemap_set_transparent_pen( gcpinbal_tilemap[1],0 ); @@ -88,7 +88,7 @@ static void gcpinbal_core_vh_start (void) VIDEO_START( gcpinbal ) { - gcpinbal_core_vh_start(); + gcpinbal_core_vh_start(machine); } diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index 346e94c288f..32c542b7247 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -142,9 +142,9 @@ WRITE16_HANDLER( ginganin_txtram16_w ) VIDEO_START( ginganin ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,16,16,BG_NX,BG_NY); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_cols,16,16,FG_NX,FG_NY); - tx_tilemap = tilemap_create(get_txt_tile_info,tilemap_scan_rows,8,8,TXT_NX,TXT_NY); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,BG_NX,BG_NY); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,16,16,FG_NX,FG_NY); + tx_tilemap = tilemap_create(machine, get_txt_tile_info,tilemap_scan_rows,8,8,TXT_NX,TXT_NY); tilemap_set_transparent_pen(fg_tilemap,15); tilemap_set_transparent_pen(tx_tilemap,15); diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c index a97939b2e37..ce7dabdefb6 100644 --- a/src/mame/video/gladiatr.c +++ b/src/mame/video/gladiatr.c @@ -53,8 +53,8 @@ static TILE_GET_INFO( fg_get_tile_info ) VIDEO_START( ppking ) { - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,8,8,32,64); - fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan_rows,8,8,32,64); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,8,8,32,64); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan_rows,8,8,32,64); tilemap_set_transparent_pen(fg_tilemap,0); @@ -65,8 +65,8 @@ VIDEO_START( ppking ) VIDEO_START( gladiatr ) { - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,8,8,64,32); - fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,8,8,64,32); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index 46f7c435fce..2ca9fd70aab 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -131,8 +131,8 @@ WRITE16_HANDLER( glass_vram_w ) VIDEO_START( glass ) { - pant[0] = tilemap_create(get_tile_info_glass_screen0,tilemap_scan_rows,16,16,32,32); - pant[1] = tilemap_create(get_tile_info_glass_screen1,tilemap_scan_rows,16,16,32,32); + pant[0] = tilemap_create(machine, get_tile_info_glass_screen0,tilemap_scan_rows,16,16,32,32); + pant[1] = tilemap_create(machine, get_tile_info_glass_screen1,tilemap_scan_rows,16,16,32,32); screen_bitmap = auto_bitmap_alloc (320, 200, video_screen_get_format(machine->primary_screen)); tilemap_set_transparent_pen(pant[0],0); diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index 1ab9450386a..9bb40a9aa62 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -55,8 +55,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( gng ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols, 16,16,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols, 16,16,32,32); tilemap_set_transparent_pen(fg_tilemap,3); diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c index cfa21b61caf..0bd697c7aa9 100644 --- a/src/mame/video/goal92.c +++ b/src/mame/video/goal92.c @@ -135,9 +135,9 @@ static void draw_sprites(running_machine *machine,bitmap_t *bitmap,const rectang VIDEO_START( goal92 ) { - background_layer = tilemap_create(get_back_tile_info,tilemap_scan_rows,16,16,32,32); - foreground_layer = tilemap_create(get_fore_tile_info,tilemap_scan_rows,16,16,32,32); - text_layer = tilemap_create(get_text_tile_info,tilemap_scan_rows, 8,8,64,32); + background_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_rows,16,16,32,32); + foreground_layer = tilemap_create(machine, get_fore_tile_info,tilemap_scan_rows,16,16,32,32); + text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8,8,64,32); buffered_spriteram16 = auto_malloc(0x400*2); diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c index 3053a00d07d..4b77f158411 100644 --- a/src/mame/video/goindol.c +++ b/src/mame/video/goindol.c @@ -58,8 +58,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( goindol ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); } diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c index 82e20c1e7ac..44c9687e85e 100644 --- a/src/mame/video/gomoku.c +++ b/src/mame/video/gomoku.c @@ -122,7 +122,7 @@ VIDEO_START( gomoku ) gomoku_bg_bitmap = video_screen_auto_bitmap_alloc(machine->primary_screen); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32, 32); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/goodejan.c b/src/mame/video/goodejan.c index 41b60c9d1a4..e82b3e89859 100644 --- a/src/mame/video/goodejan.c +++ b/src/mame/video/goodejan.c @@ -86,8 +86,8 @@ WRITE16_HANDLER( goodejan_bg_scrolly_w ) VIDEO_START( goodejan ) { - bg_tilemap = tilemap_create(goodejan_bg_tile_info,tilemap_scan_rows, 16,16,32,32); - tx_tilemap = tilemap_create(goodejan_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); + bg_tilemap = tilemap_create(machine, goodejan_bg_tile_info,tilemap_scan_rows, 16,16,32,32); + tx_tilemap = tilemap_create(machine, goodejan_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(tx_tilemap,15); } diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c index 22e13e48589..f7b3b7403ae 100644 --- a/src/mame/video/gotcha.c +++ b/src/mame/video/gotcha.c @@ -39,8 +39,8 @@ static TILE_GET_INFO( bg_get_tile_info ) { get_tile_info(machine,tileinfo,tile_i VIDEO_START( gotcha ) { - fg_tilemap = tilemap_create(fg_get_tile_info,gotcha_tilemap_scan,16,16,64,32); - bg_tilemap = tilemap_create(bg_get_tile_info,gotcha_tilemap_scan, 16,16,64,32); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,gotcha_tilemap_scan,16,16,64,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,gotcha_tilemap_scan, 16,16,64,32); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index 34673bd86d4..87cfc7d716f 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -159,7 +159,7 @@ VIDEO_START( gottlieb ) transparent0 = FALSE; /* configure the background tilemap */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 0); tilemap_set_scrolldx(bg_tilemap, 0, 318 - 256); diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index 53b192907f8..3ca61bcbd54 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -112,7 +112,7 @@ static TILEMAP_MAPPER( tilemap_scan_rows_thehand ) VIDEO_START( gotya ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows_thehand, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows_thehand, 8, 8, 64, 32); } diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index 452e39acacf..375690e16e2 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -110,10 +110,10 @@ VIDEO_START( grchamp ) state->work_bitmap = auto_bitmap_alloc(32,32,video_screen_get_format(machine->primary_screen)); /* allocate tilemaps for each of the three sections */ - state->text_tilemap = tilemap_create(get_text_tile_info, tilemap_scan_rows, 8,8, 32,32); - state->left_tilemap = tilemap_create(get_left_tile_info, get_memory_offset, 8,8, 64,32); - state->right_tilemap = tilemap_create(get_right_tile_info, get_memory_offset, 8,8, 64,32); - state->center_tilemap = tilemap_create(get_center_tile_info, get_memory_offset, 8,8, 64,32); + state->text_tilemap = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8,8, 32,32); + state->left_tilemap = tilemap_create(machine, get_left_tile_info, get_memory_offset, 8,8, 64,32); + state->right_tilemap = tilemap_create(machine, get_right_tile_info, get_memory_offset, 8,8, 64,32); + state->center_tilemap = tilemap_create(machine, get_center_tile_info, get_memory_offset, 8,8, 64,32); } #if 0 diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c index 652dab7e06f..1052dc73077 100644 --- a/src/mame/video/gstriker.c +++ b/src/mame/video/gstriker.c @@ -58,7 +58,7 @@ WRITE16_HANDLER( VS920A_1_vram_w ) tilemap_mark_tile_dirty(VS920A[1].tmap, offset); } -static void VS920A_init(int numchips) +static void VS920A_init(running_machine *machine, int numchips) { int i; @@ -67,7 +67,7 @@ static void VS920A_init(int numchips) for (i=0;icolortable, fg_tilemap, machine->gfx[0], 0x4f); diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index 6a2be70393f..eb165c40d00 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -120,7 +120,7 @@ static TILE_GET_INFO( gyruss_get_tile_info ) VIDEO_START( gyruss ) { - gyruss_tilemap = tilemap_create(gyruss_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + gyruss_tilemap = tilemap_create(machine, gyruss_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transmask(gyruss_tilemap, 0, 0x00, 0); /* opaque */ tilemap_set_transmask(gyruss_tilemap, 1, 0x0f, 0); /* transparent */ } diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c index c7647517c69..43dea05dd0d 100644 --- a/src/mame/video/hanaawas.c +++ b/src/mame/video/hanaawas.c @@ -102,7 +102,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( hanaawas ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } VIDEO_UPDATE( hanaawas ) diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c index 98718a516b3..5e1dd228e6f 100644 --- a/src/mame/video/hcastle.c +++ b/src/mame/video/hcastle.c @@ -128,8 +128,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( hcastle ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan,8,8,64,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan, 8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan, 8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); } diff --git a/src/mame/video/hexa.c b/src/mame/video/hexa.c index 44c4bf7b830..b93abcc3e08 100644 --- a/src/mame/video/hexa.c +++ b/src/mame/video/hexa.c @@ -63,7 +63,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( hexa ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c index 64f292e5934..1acb31e5512 100644 --- a/src/mame/video/hexion.c +++ b/src/mame/video/hexion.c @@ -43,8 +43,8 @@ static TILE_GET_INFO( get_tile_info1 ) VIDEO_START( hexion ) { - bg_tilemap[0] = tilemap_create(get_tile_info0,tilemap_scan_rows,8,8,64,32); - bg_tilemap[1] = tilemap_create(get_tile_info1,tilemap_scan_rows, 8,8,64,32); + bg_tilemap[0] = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,8,8,64,32); + bg_tilemap[1] = tilemap_create(machine, get_tile_info1,tilemap_scan_rows, 8,8,64,32); tilemap_set_transparent_pen(bg_tilemap[0],0); tilemap_set_scrollx(bg_tilemap[1],0,-4); diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c index 26def452598..e89b9408073 100644 --- a/src/mame/video/higemaru.c +++ b/src/mame/video/higemaru.c @@ -97,7 +97,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( higemaru ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index a9ce06c88f6..59dc609c3d2 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -1257,7 +1257,7 @@ VIDEO_UPDATE( hng64 ) tilemap2Offset = hng64_videoregs[0xc] ; tilemap_dispose(hng64_tilemap1) ; - hng64_tilemap1 = tilemap_create(get_hng64_tile2_info,tilemap_scan_rows, 16, 16, 128,128); // 128x128x4 = 0x10000 + hng64_tilemap1 = tilemap_create(machine, get_hng64_tile2_info,tilemap_scan_rows, 16, 16, 128,128); // 128x128x4 = 0x10000 } */ @@ -1302,10 +1302,10 @@ VIDEO_START( hng64 ) { const rectangle *visarea = video_screen_get_visible_area(machine->primary_screen); - hng64_tilemap0 = tilemap_create(get_hng64_tile0_info, tilemap_scan_rows, 8, 8, 128,128); /* 128x128x4 = 0x10000 */ - hng64_tilemap1 = tilemap_create(get_hng64_tile1_info, tilemap_scan_rows, 16, 16, 128,128); /* 128x128x4 = 0x10000 */ - hng64_tilemap2 = tilemap_create(get_hng64_tile2_info, tilemap_scan_rows, 16, 16, 128,128); /* 128x128x4 = 0x10000 */ - hng64_tilemap3 = tilemap_create(get_hng64_tile3_info, tilemap_scan_rows, 16, 16, 128,128); /* 128x128x4 = 0x10000 */ + hng64_tilemap0 = tilemap_create(machine, get_hng64_tile0_info, tilemap_scan_rows, 8, 8, 128,128); /* 128x128x4 = 0x10000 */ + hng64_tilemap1 = tilemap_create(machine, get_hng64_tile1_info, tilemap_scan_rows, 16, 16, 128,128); /* 128x128x4 = 0x10000 */ + hng64_tilemap2 = tilemap_create(machine, get_hng64_tile2_info, tilemap_scan_rows, 16, 16, 128,128); /* 128x128x4 = 0x10000 */ + hng64_tilemap3 = tilemap_create(machine, get_hng64_tile3_info, tilemap_scan_rows, 16, 16, 128,128); /* 128x128x4 = 0x10000 */ tilemap_set_transparent_pen(hng64_tilemap0,0); tilemap_set_transparent_pen(hng64_tilemap1,0); tilemap_set_transparent_pen(hng64_tilemap2,0); diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index 5920fa3f62f..6c1d60f431a 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -56,7 +56,7 @@ static TILE_GET_INFO( crzrally_get_tile_info ) VIDEO_START( holeland ) { - bg_tilemap = tilemap_create(holeland_get_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap = tilemap_create(machine, holeland_get_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transmask(bg_tilemap,0,0xff,0x00); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(bg_tilemap,1,0x01,0xfe); /* split type 1 has pen 0? transparent in front half */ @@ -64,7 +64,7 @@ VIDEO_START( holeland ) VIDEO_START( crzrally ) { - bg_tilemap = tilemap_create(crzrally_get_tile_info,tilemap_scan_cols,8,8,32,32); + bg_tilemap = tilemap_create(machine, crzrally_get_tile_info,tilemap_scan_cols,8,8,32,32); } WRITE8_HANDLER( holeland_videoram_w ) diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index f1bc8211579..f758f52d2ba 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -502,10 +502,10 @@ static TILE_GET_INFO( lemnangl_get_info1_1 ) { lemnangl_info( machine, tileinfo, VIDEO_START( mrokumei ) { - bg_tilemap[0][0] = tilemap_create( mrokumei_get_info0_0, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[0][1] = tilemap_create( mrokumei_get_info0_1, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[1][0] = tilemap_create( mrokumei_get_info1_0, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[1][1] = tilemap_create( mrokumei_get_info1_1, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[0][0] = tilemap_create( machine, mrokumei_get_info0_0, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[0][1] = tilemap_create( machine, mrokumei_get_info0_1, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[1][0] = tilemap_create( machine, mrokumei_get_info1_0, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[1][1] = tilemap_create( machine, mrokumei_get_info1_1, tilemap_scan_rows, 8, 8, 64,32 ); tilemap_set_transparent_pen(bg_tilemap[0][1],0); tilemap_set_transparent_pen(bg_tilemap[1][1],0); @@ -513,14 +513,14 @@ VIDEO_START( mrokumei ) VIDEO_START( reikaids ) { - bg_tilemap[0][0] = tilemap_create( reikaids_get_info0_0, tilemap_scan_rows, 8, 8, 32, 32 ); - bg_tilemap[0][1] = tilemap_create( reikaids_get_info0_1, tilemap_scan_rows, 8, 8, 32, 32 ); - bg_tilemap[0][2] = tilemap_create( reikaids_get_info0_2, tilemap_scan_rows, 8, 8, 32, 32 ); - bg_tilemap[0][3] = tilemap_create( reikaids_get_info0_3, tilemap_scan_rows, 8, 8, 32, 32 ); - bg_tilemap[1][0] = tilemap_create( reikaids_get_info1_0, tilemap_scan_rows, 8, 8, 32, 32 ); - bg_tilemap[1][1] = tilemap_create( reikaids_get_info1_1, tilemap_scan_rows, 8, 8, 32, 32 ); - bg_tilemap[1][2] = tilemap_create( reikaids_get_info1_2, tilemap_scan_rows, 8, 8, 32, 32 ); - bg_tilemap[1][3] = tilemap_create( reikaids_get_info1_3, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap[0][0] = tilemap_create( machine, reikaids_get_info0_0, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap[0][1] = tilemap_create( machine, reikaids_get_info0_1, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap[0][2] = tilemap_create( machine, reikaids_get_info0_2, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap[0][3] = tilemap_create( machine, reikaids_get_info0_3, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap[1][0] = tilemap_create( machine, reikaids_get_info1_0, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap[1][1] = tilemap_create( machine, reikaids_get_info1_1, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap[1][2] = tilemap_create( machine, reikaids_get_info1_2, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap[1][3] = tilemap_create( machine, reikaids_get_info1_3, tilemap_scan_rows, 8, 8, 32, 32 ); tilemap_set_transparent_pen(bg_tilemap[0][0],0xff); tilemap_set_transparent_pen(bg_tilemap[0][1],0xff); @@ -534,10 +534,10 @@ VIDEO_START( reikaids ) VIDEO_START( pteacher ) { - bg_tilemap[0][0] = tilemap_create( pteacher_get_info0_0, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[0][1] = tilemap_create( pteacher_get_info0_1, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[1][0] = tilemap_create( pteacher_get_info1_0, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[1][1] = tilemap_create( pteacher_get_info1_1, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[0][0] = tilemap_create( machine, pteacher_get_info0_0, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[0][1] = tilemap_create( machine, pteacher_get_info0_1, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[1][0] = tilemap_create( machine, pteacher_get_info1_0, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[1][1] = tilemap_create( machine, pteacher_get_info1_1, tilemap_scan_rows, 8, 8, 64,32 ); tilemap_set_transparent_pen(bg_tilemap[0][1],0xff); tilemap_set_transparent_pen(bg_tilemap[1][1],0xff); @@ -545,10 +545,10 @@ VIDEO_START( pteacher ) VIDEO_START( lemnangl ) { - bg_tilemap[0][0] = tilemap_create( lemnangl_get_info0_0, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[0][1] = tilemap_create( lemnangl_get_info0_1, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[1][0] = tilemap_create( lemnangl_get_info1_0, tilemap_scan_rows, 8, 8, 64,32 ); - bg_tilemap[1][1] = tilemap_create( lemnangl_get_info1_1, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[0][0] = tilemap_create( machine, lemnangl_get_info0_0, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[0][1] = tilemap_create( machine, lemnangl_get_info0_1, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[1][0] = tilemap_create( machine, lemnangl_get_info1_0, tilemap_scan_rows, 8, 8, 64,32 ); + bg_tilemap[1][1] = tilemap_create( machine, lemnangl_get_info1_1, tilemap_scan_rows, 8, 8, 64,32 ); tilemap_set_transparent_pen(bg_tilemap[0][1],0x0f); tilemap_set_transparent_pen(bg_tilemap[1][1],0x0f); diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 07daa7f77a8..44ff681d154 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -62,7 +62,7 @@ static TILE_GET_INFO( get_homerun_tile_info ) VIDEO_START(homerun) { - homerun_tilemap = tilemap_create(get_homerun_tile_info,tilemap_scan_rows, 8, 8,64,64); + homerun_tilemap = tilemap_create(machine, get_homerun_tile_info,tilemap_scan_rows, 8, 8,64,64); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index 5b4e4e2b6ef..46ceccb73b0 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -123,7 +123,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( hyperspt ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scroll_rows(bg_tilemap, 32); } @@ -201,7 +201,7 @@ static TILE_GET_INFO( roadf_get_bg_tile_info ) VIDEO_START( roadf ) { - bg_tilemap = tilemap_create(roadf_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + bg_tilemap = tilemap_create(machine, roadf_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scroll_rows(bg_tilemap, 32); } diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index 1decc81a563..6359aea49e2 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -319,9 +319,9 @@ VIDEO_START( hyprduel_14220 ) hypr_tiletable_old = auto_malloc(hyprduel_tiletable_size); dirtyindex = auto_malloc(hyprduel_tiletable_size/4); - bg_tilemap[0] = tilemap_create(get_tile_info_0_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - bg_tilemap[1] = tilemap_create(get_tile_info_1_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - bg_tilemap[2] = tilemap_create(get_tile_info_2_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[0] = tilemap_create(machine, get_tile_info_0_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[1] = tilemap_create(machine, get_tile_info_1_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[2] = tilemap_create(machine, get_tile_info_2_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); tilemap_set_transparent_pen(bg_tilemap[0],0); tilemap_set_transparent_pen(bg_tilemap[1],0); diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c index e2daec19504..93c826a960c 100644 --- a/src/mame/video/inufuku.c +++ b/src/mame/video/inufuku.c @@ -215,8 +215,8 @@ WRITE16_HANDLER( inufuku_text_videoram_w ) VIDEO_START( inufuku ) { - inufuku_bg_tilemap = tilemap_create(get_inufuku_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 64); - inufuku_text_tilemap = tilemap_create(get_inufuku_text_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + inufuku_bg_tilemap = tilemap_create(machine, get_inufuku_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 64); + inufuku_text_tilemap = tilemap_create(machine, get_inufuku_text_tile_info, tilemap_scan_rows, 8, 8, 64, 64); tilemap_set_transparent_pen(inufuku_bg_tilemap, 255); tilemap_set_transparent_pen(inufuku_text_tilemap, 255); diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c index c4f6fc832db..f92a28dc23a 100644 --- a/src/mame/video/iqblock.c +++ b/src/mame/video/iqblock.c @@ -47,8 +47,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( iqblock ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8, 8,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,32,64, 8); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8, 8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,32,64, 8); tilemap_set_transparent_pen(bg_tilemap,0); tilemap_set_scroll_cols(fg_tilemap,64); diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index e4c1adfedb8..9ce37f137a8 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -146,7 +146,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( ironhors ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(bg_tilemap, 32); diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index 56d35b141b9..1b332ca3783 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -55,7 +55,7 @@ static UINT32 tilemap_scan_cols_flipy( UINT32 col, UINT32 row, UINT32 num_cols, VIDEO_START( jack ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols_flipy, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flipy, 8, 8, 32, 32); } static void jack_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) @@ -136,7 +136,7 @@ static TILE_GET_INFO( joinem_get_bg_tile_info ) VIDEO_START( joinem ) { - bg_tilemap = tilemap_create(joinem_get_bg_tile_info, tilemap_scan_cols_flipy, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, joinem_get_bg_tile_info, tilemap_scan_cols_flipy, 8, 8, 32, 32); } static void joinem_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index 739e564569e..561baebd62e 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -78,7 +78,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( jackal ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c index eec9ca40418..9ae22c6e310 100644 --- a/src/mame/video/jailbrek.c +++ b/src/mame/video/jailbrek.c @@ -61,7 +61,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( jailbrek ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scrolldx(bg_tilemap, 0, 396 - 256); } diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index 31f9848d969..2ad0492d823 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -130,9 +130,9 @@ VIDEO_START( kaneko16_sprites ) VIDEO_START( kaneko16_1xVIEW2_tilemaps ) { - kaneko16_tmap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + kaneko16_tmap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x20,0x20 ); - kaneko16_tmap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + kaneko16_tmap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 0x20,0x20 ); kaneko16_tmap_2 = 0; @@ -187,9 +187,9 @@ VIDEO_START( kaneko16_2xVIEW2 ) { VIDEO_START_CALL(kaneko16_1xVIEW2); - kaneko16_tmap_2 = tilemap_create( get_tile_info_2, tilemap_scan_rows, + kaneko16_tmap_2 = tilemap_create( machine, get_tile_info_2, tilemap_scan_rows, 16,16, 0x20,0x20 ); - kaneko16_tmap_3 = tilemap_create( get_tile_info_3, tilemap_scan_rows, + kaneko16_tmap_3 = tilemap_create( machine, get_tile_info_3, tilemap_scan_rows, 16,16, 0x20,0x20 ); { @@ -299,9 +299,9 @@ VIDEO_START( galsnew ) { VIDEO_START_CALL(kaneko16_sprites); - kaneko16_tmap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + kaneko16_tmap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x20,0x20 ); - kaneko16_tmap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + kaneko16_tmap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 0x20,0x20 ); kaneko16_tmap_2 = 0; diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 4bae3bb7a33..e193c80ba7f 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -207,7 +207,7 @@ VIDEO_START( karnov ) /* Allocate bitmaps */ bitmap_f = auto_bitmap_alloc(512,512,video_screen_get_format(machine->primary_screen)); - fix_tilemap=tilemap_create(get_fix_tile_info,tilemap_scan_rows,8,8,32,32); + fix_tilemap=tilemap_create(machine, get_fix_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(fix_tilemap,0); } @@ -217,7 +217,7 @@ VIDEO_START( wndrplnt ) /* Allocate bitmaps */ bitmap_f = auto_bitmap_alloc(512,512,video_screen_get_format(machine->primary_screen)); - fix_tilemap=tilemap_create(get_fix_tile_info,tilemap_scan_cols,8,8,32,32); + fix_tilemap=tilemap_create(machine, get_fix_tile_info,tilemap_scan_cols,8,8,32,32); tilemap_set_transparent_pen(fix_tilemap,0); } diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c index 9c582dd7888..ef821a4b2f9 100644 --- a/src/mame/video/kchamp.c +++ b/src/mame/video/kchamp.c @@ -51,7 +51,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( kchamp ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c index 996a4671c1d..4b2c0d7be64 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -55,11 +55,11 @@ static TILEMAP_MAPPER( tilemap_scan_kicksfg ) VIDEO_START( kickgoal ) { - kickgoal_fgtm = tilemap_create(get_kickgoal_fg_tile_info,tilemap_scan_kicksfg, 8, 16,64,64); + kickgoal_fgtm = tilemap_create(machine, get_kickgoal_fg_tile_info,tilemap_scan_kicksfg, 8, 16,64,64); tilemap_set_transparent_pen(kickgoal_fgtm,15); - kickgoal_bgtm = tilemap_create(get_kickgoal_bg_tile_info,tilemap_scan_kicksbg, 16, 32,64,64); + kickgoal_bgtm = tilemap_create(machine, get_kickgoal_bg_tile_info,tilemap_scan_kicksbg, 16, 32,64,64); tilemap_set_transparent_pen(kickgoal_bgtm,15); - kickgoal_bg2tm = tilemap_create(get_kickgoal_bg2_tile_info,tilemap_scan_kicksbg2, 32, 64,64,64); + kickgoal_bg2tm = tilemap_create(machine, get_kickgoal_bg2_tile_info,tilemap_scan_kicksbg2, 32, 64,64,64); } @@ -200,9 +200,9 @@ static TILEMAP_MAPPER( tilemap_scan_actionhwfg ) VIDEO_START( actionhw ) { - kickgoal_fgtm = tilemap_create(get_actionhw_fg_tile_info,tilemap_scan_actionhwfg, 8, 8,64,64); - kickgoal_bgtm = tilemap_create(get_actionhw_bg_tile_info,tilemap_scan_actionhwbg, 16,16,64,64); - kickgoal_bg2tm = tilemap_create(get_actionhw_bg2_tile_info,tilemap_scan_actionhwbg2, 16,16,64,64); + kickgoal_fgtm = tilemap_create(machine, get_actionhw_fg_tile_info,tilemap_scan_actionhwfg, 8, 8,64,64); + kickgoal_bgtm = tilemap_create(machine, get_actionhw_bg_tile_info,tilemap_scan_actionhwbg, 16,16,64,64); + kickgoal_bg2tm = tilemap_create(machine, get_actionhw_bg2_tile_info,tilemap_scan_actionhwbg2, 16,16,64,64); tilemap_set_transparent_pen(kickgoal_fgtm,15); tilemap_set_transparent_pen(kickgoal_bgtm,15); diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index b3e5631b3d2..c7cdbda8eeb 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -203,8 +203,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( kingofb ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols_flip_y, 16, 16, 16, 16); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_y, 16, 16, 16, 16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } @@ -266,10 +266,10 @@ static TILE_GET_INFO( ringking_get_bg_tile_info ) VIDEO_START( ringking ) { - bg_tilemap = tilemap_create(ringking_get_bg_tile_info, tilemap_scan_cols_flip_y, + bg_tilemap = tilemap_create(machine, ringking_get_bg_tile_info, tilemap_scan_cols_flip_y, 16, 16, 16, 16); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols_flip_y, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/klax.c b/src/mame/video/klax.c index 490b900c807..8bf8beeb651 100644 --- a/src/mame/video/klax.c +++ b/src/mame/video/klax.c @@ -73,7 +73,7 @@ VIDEO_START( klax ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,32); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,32); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 4a66a74f600..b13ea41b6cc 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -106,7 +106,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( kncljoe ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_scroll_rows(bg_tilemap,4); diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 664f759b764..abbb4fc2bb8 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -272,7 +272,7 @@ VIDEO_START(konamigx_type3) _gxcommoninit(machine); - gx_psac_tilemap = tilemap_create(get_gx_psac3_tile_info, tilemap_scan_rows, 16, 16, 256, 1024); + gx_psac_tilemap = tilemap_create(machine, get_gx_psac3_tile_info, tilemap_scan_rows, 16, 16, 256, 1024); gx_rozenable = 1; K053936_wraparound_enable(0, 1); @@ -285,7 +285,7 @@ VIDEO_START(konamigx_type4) _gxcommoninit(machine); - gx_psac_tilemap = tilemap_create(get_gx_psac_tile_info, tilemap_scan_rows, 16, 16, 128, 128); + gx_psac_tilemap = tilemap_create(machine, get_gx_psac_tile_info, tilemap_scan_rows, 16, 16, 128, 128); gx_rozenable = 1; K053936_wraparound_enable(0, 0); @@ -320,8 +320,8 @@ VIDEO_START(opengolf) K056832_set_LayerOffset(2, 2+1, 0); K056832_set_LayerOffset(3, 3+1, 0); - gx_psac_tilemap = tilemap_create(get_gx_psac1a_tile_info, tilemap_scan_rows, 16, 16, 128, 128); - gx_psac_tilemap2 = tilemap_create(get_gx_psac1b_tile_info, tilemap_scan_rows, 16, 16, 128, 128); + gx_psac_tilemap = tilemap_create(machine, get_gx_psac1a_tile_info, tilemap_scan_rows, 16, 16, 128, 128); + gx_psac_tilemap2 = tilemap_create(machine, get_gx_psac1b_tile_info, tilemap_scan_rows, 16, 16, 128, 128); tilemap_set_transparent_pen(gx_psac_tilemap, 0); tilemap_set_transparent_pen(gx_psac_tilemap2, 0); @@ -340,8 +340,8 @@ VIDEO_START(racinfrc) K056832_set_LayerOffset(2, 2+1, 0); K056832_set_LayerOffset(3, 3+1, 0); - gx_psac_tilemap = tilemap_create(get_gx_psac1a_tile_info, tilemap_scan_rows, 16, 16, 128, 128); - gx_psac_tilemap2 = tilemap_create(get_gx_psac1b_tile_info, tilemap_scan_rows, 16, 16, 128, 128); + gx_psac_tilemap = tilemap_create(machine, get_gx_psac1a_tile_info, tilemap_scan_rows, 16, 16, 128, 128); + gx_psac_tilemap2 = tilemap_create(machine, get_gx_psac1b_tile_info, tilemap_scan_rows, 16, 16, 128, 128); tilemap_set_transparent_pen(gx_psac_tilemap, 0); tilemap_set_transparent_pen(gx_psac_tilemap2, 0); diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index a0f141c7ed5..f72f3109ec4 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -1523,8 +1523,8 @@ void K007342_vh_start(running_machine *machine, int gfx_index, void (*callback)( K007342_gfxnum = gfx_index; K007342_callback = callback; - K007342_tilemap[0] = tilemap_create(K007342_get_tile_info0,K007342_scan,8,8,64,32); - K007342_tilemap[1] = tilemap_create(K007342_get_tile_info1,K007342_scan,8,8,64,32); + K007342_tilemap[0] = tilemap_create(machine, K007342_get_tile_info0,K007342_scan,8,8,64,32); + K007342_tilemap[1] = tilemap_create(machine, K007342_get_tile_info1,K007342_scan,8,8,64,32); K007342_ram = auto_malloc(0x2000); K007342_scroll_ram = auto_malloc(0x0200); @@ -2041,9 +2041,9 @@ void K052109_vh_start(running_machine *machine,const char *gfx_memory_region,int has_extra_video_ram = 0; - K052109_tilemap[0] = tilemap_create(K052109_get_tile_info0,tilemap_scan_rows,8,8,64,32); - K052109_tilemap[1] = tilemap_create(K052109_get_tile_info1,tilemap_scan_rows,8,8,64,32); - K052109_tilemap[2] = tilemap_create(K052109_get_tile_info2,tilemap_scan_rows,8,8,64,32); + K052109_tilemap[0] = tilemap_create(machine, K052109_get_tile_info0,tilemap_scan_rows,8,8,64,32); + K052109_tilemap[1] = tilemap_create(machine, K052109_get_tile_info1,tilemap_scan_rows,8,8,64,32); + K052109_tilemap[2] = tilemap_create(machine, K052109_get_tile_info2,tilemap_scan_rows,8,8,64,32); K052109_ram = auto_malloc(0x6000); @@ -4701,7 +4701,7 @@ static void K051316_vh_start(running_machine *machine,int chip, const char *gfx_ K051316_bpp[chip] = bpp; K051316_callback[chip] = callback; - K051316_tilemap[chip] = tilemap_create(get_tile_info[chip],tilemap_scan_rows,16,16,32,32); + K051316_tilemap[chip] = tilemap_create(machine, get_tile_info[chip],tilemap_scan_rows,16,16,32,32); K051316_ram[chip] = auto_malloc(0x800); @@ -5790,22 +5790,22 @@ void K056832_vh_start(running_machine *machine, const char *gfx_memory_region, i K056832_videoram = auto_malloc(0x2000 * (K056832_PAGE_COUNT+1)); - K056832_tilemap[0x0] = tilemap_create(K056832_get_tile_info0, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x1] = tilemap_create(K056832_get_tile_info1, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x2] = tilemap_create(K056832_get_tile_info2, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x3] = tilemap_create(K056832_get_tile_info3, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x4] = tilemap_create(K056832_get_tile_info4, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x5] = tilemap_create(K056832_get_tile_info5, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x6] = tilemap_create(K056832_get_tile_info6, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x7] = tilemap_create(K056832_get_tile_info7, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x8] = tilemap_create(K056832_get_tile_info8, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0x9] = tilemap_create(K056832_get_tile_info9, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0xa] = tilemap_create(K056832_get_tile_infoa, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0xb] = tilemap_create(K056832_get_tile_infob, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0xc] = tilemap_create(K056832_get_tile_infoc, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0xd] = tilemap_create(K056832_get_tile_infod, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0xe] = tilemap_create(K056832_get_tile_infoe, tilemap_scan_rows, 8, 8, 64, 32); - K056832_tilemap[0xf] = tilemap_create(K056832_get_tile_infof, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x0] = tilemap_create(machine, K056832_get_tile_info0, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x1] = tilemap_create(machine, K056832_get_tile_info1, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x2] = tilemap_create(machine, K056832_get_tile_info2, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x3] = tilemap_create(machine, K056832_get_tile_info3, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x4] = tilemap_create(machine, K056832_get_tile_info4, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x5] = tilemap_create(machine, K056832_get_tile_info5, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x6] = tilemap_create(machine, K056832_get_tile_info6, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x7] = tilemap_create(machine, K056832_get_tile_info7, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x8] = tilemap_create(machine, K056832_get_tile_info8, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0x9] = tilemap_create(machine, K056832_get_tile_info9, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0xa] = tilemap_create(machine, K056832_get_tile_infoa, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0xb] = tilemap_create(machine, K056832_get_tile_infob, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0xc] = tilemap_create(machine, K056832_get_tile_infoc, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0xd] = tilemap_create(machine, K056832_get_tile_infod, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0xe] = tilemap_create(machine, K056832_get_tile_infoe, tilemap_scan_rows, 8, 8, 64, 32); + K056832_tilemap[0xf] = tilemap_create(machine, K056832_get_tile_infof, tilemap_scan_rows, 8, 8, 64, 32); for (i=0; iprimary_screen)); - vram_tilemap = tilemap_create(get_tile_info,tilemap_scan_cols,8,8,64,32); + vram_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_cols,8,8,64,32); vram_buffer = (UINT8*)auto_malloc(2048*64); /* 64 bytes per VRAM character */ vram_dirty = (UINT8*)auto_malloc(2048); diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 7aa205b22a8..39d06a6da50 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -118,16 +118,16 @@ WRITE8_HANDLER( liberate_videoram_w ) VIDEO_START( prosoccr ) { - background_tilemap = tilemap_create(get_back_tile_info,back_scan,16,16,32,32); - fix_tilemap = tilemap_create(get_fix_tile_info,fix_scan,8,8,32,32); + background_tilemap = tilemap_create(machine, get_back_tile_info,back_scan,16,16,32,32); + fix_tilemap = tilemap_create(machine, get_fix_tile_info,fix_scan,8,8,32,32); tilemap_set_transparent_pen(fix_tilemap,0); } VIDEO_START( boomrang ) { - background_tilemap = tilemap_create(get_back_tile_info,back_scan,16,16,32,32); - fix_tilemap = tilemap_create(get_fix_tile_info,fix_scan,8,8,32,32); + background_tilemap = tilemap_create(machine, get_back_tile_info,back_scan,16,16,32,32); + fix_tilemap = tilemap_create(machine, get_fix_tile_info,fix_scan,8,8,32,32); tilemap_set_transmask(background_tilemap,0,0x0001,0x007e); /* Bottom 1 pen/Top 7 pens */ tilemap_set_transparent_pen(fix_tilemap,0); @@ -135,8 +135,8 @@ VIDEO_START( boomrang ) VIDEO_START( liberate ) { - background_tilemap = tilemap_create(get_back_tile_info,back_scan,16,16,32,32); - fix_tilemap = tilemap_create(get_fix_tile_info,fix_scan,8,8,32,32); + background_tilemap = tilemap_create(machine, get_back_tile_info,back_scan,16,16,32,32); + fix_tilemap = tilemap_create(machine, get_fix_tile_info,fix_scan,8,8,32,32); tilemap_set_transparent_pen(fix_tilemap,0); } diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index bde55a67759..c3233eedfdb 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -82,9 +82,9 @@ VIDEO_START( lkage ) { bg_tile_bank = fg_tile_bank = 0; - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(tx_tilemap,0); diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index ada2eac4818..c5312b3a85a 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -934,7 +934,7 @@ static void hud_draw(running_machine *machine, bitmap_t *bitmap, const rectangle VIDEO_START( lockon ) { - lockon_tilemap = tilemap_create(get_lockon_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + lockon_tilemap = tilemap_create(machine, get_lockon_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(lockon_tilemap, 0); /* Allocate the two frame buffers for rotation */ diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index aa979ae4773..c216433adcd 100644 --- a/src/mame/video/lordgun.c +++ b/src/mame/video/lordgun.c @@ -121,16 +121,16 @@ WRITE16_HANDLER( lordgun_vram_3_w ) VIDEO_START( lordgun ) { - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 8,8, 0x100, 0x40 ); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 0x80,0x20 ); - tilemap_2 = tilemap_create( get_tile_info_2, tilemap_scan_rows, + tilemap_2 = tilemap_create( machine, get_tile_info_2, tilemap_scan_rows, 32,32, 0x40,0x40 ); - tilemap_3 = tilemap_create( get_tile_info_3, tilemap_scan_rows, + tilemap_3 = tilemap_create( machine, get_tile_info_3, tilemap_scan_rows, 8,8, 0x40,0x20 ); tilemap_set_scroll_rows(tilemap_0,1); diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c index 698dffc5333..d45a843fdd6 100644 --- a/src/mame/video/lucky74.c +++ b/src/mame/video/lucky74.c @@ -231,8 +231,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( lucky74 ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } diff --git a/src/mame/video/lvcards.c b/src/mame/video/lvcards.c index f7d36bbf3e2..e26761ae91e 100644 --- a/src/mame/video/lvcards.c +++ b/src/mame/video/lvcards.c @@ -104,7 +104,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( lvcards ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index 532528887b8..3f61dbe0051 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -91,17 +91,17 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( lwings ) { - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,32,32); - bg1_tilemap = tilemap_create(lwings_get_bg1_tile_info,tilemap_scan_cols, 16,16,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,32,32); + bg1_tilemap = tilemap_create(machine, lwings_get_bg1_tile_info,tilemap_scan_cols, 16,16,32,32); tilemap_set_transparent_pen(fg_tilemap,3); } VIDEO_START( trojan ) { - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,32,32); - bg1_tilemap = tilemap_create(trojan_get_bg1_tile_info,tilemap_scan_cols, 16,16,32,32); - bg2_tilemap = tilemap_create(get_bg2_tile_info, get_bg2_memory_offset, 16,16,32,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,32,32); + bg1_tilemap = tilemap_create(machine, trojan_get_bg1_tile_info,tilemap_scan_cols, 16,16,32,32); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, get_bg2_memory_offset, 16,16,32,16); tilemap_set_transparent_pen(fg_tilemap,3); tilemap_set_transmask(bg1_tilemap,0,0xffff,0x0001); /* split type 0 is totally transparent in front half */ diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index b54cc38f704..ab48612428e 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -94,7 +94,7 @@ VIDEO_START( m10 ) for (i=0;i<32*8;i++) extyoffs[i] = i*8; - tx_tilemap = tilemap_create(get_tile_info,tilemap_scan,8,8,32,32); + tx_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan,8,8,32,32); tilemap_set_transparent_pen(tx_tilemap, 0); tilemap_set_scrolldx(tx_tilemap, 0, 62); tilemap_set_scrolldy(tx_tilemap, 0, 0); @@ -115,7 +115,7 @@ VIDEO_START( m15 ) decodegfx(machine->gfx[0], state->chargen,0,256); - tx_tilemap = tilemap_create(get_tile_info,tilemap_scan,8,8,32,32); + tx_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan,8,8,32,32); tilemap_set_scrolldx(tx_tilemap, 0, 116); tilemap_set_scrolldy(tx_tilemap, 0, 0); diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c index 91197753257..c748c153adb 100644 --- a/src/mame/video/m107.c +++ b/src/mame/video/m107.c @@ -133,7 +133,7 @@ VIDEO_START( m107 ) pf_layer_info *layer = &pf_layer[laynum]; /* allocate a tilemaps per layer */ - layer->tmap = tilemap_create(get_pf_tile_info, tilemap_scan_rows, 8,8, 64,64); + 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, &pf_layer[laynum]); diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index 0b5fa3a1d41..80647a5625e 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -155,7 +155,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( m52 ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 0); tilemap_set_scrolldx(bg_tilemap, 128 - 1, -1); diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index 5cc943a43f7..e24f3e7be24 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -144,7 +144,7 @@ WRITE8_HANDLER( m57_videoram_w ) VIDEO_START( m57 ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(bg_tilemap, 256); } diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index 389ce1a063b..e8ca2672231 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -184,7 +184,7 @@ VIDEO_START( yard ) bitmap_format format = video_screen_get_format(machine->primary_screen); const rectangle *visarea = video_screen_get_visible_area(machine->primary_screen); - bg_tilemap = tilemap_create(yard_get_bg_tile_info, yard_tilemap_scan_rows, 8, 8, 64, 32); + bg_tilemap = tilemap_create(machine, yard_get_bg_tile_info, yard_tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scrolldx(bg_tilemap, visarea->min_x, width - (visarea->max_x + 1)); tilemap_set_scrolldy(bg_tilemap, visarea->min_y - 8, height + 16 - (visarea->max_y + 1)); diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index b9e047d9bab..ca4349c413f 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -403,7 +403,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static void m62_start( running_machine *machine, tile_get_info_func tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ) { - m62_background = tilemap_create( tile_get_info, tilemap_scan_rows, x1, y1, x2, y2 ); + m62_background = tilemap_create( machine, tile_get_info, tilemap_scan_rows, x1, y1, x2, y2 ); m62_background_hscroll = 0; m62_background_vscroll = 0; @@ -420,9 +420,9 @@ static void m62_start( running_machine *machine, tile_get_info_func tile_get_inf } } -static void m62_textlayer( tile_get_info_func tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ) +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 ) { - m62_foreground = tilemap_create( tile_get_info, tilemap_scan_rows, x1, y1, x2, y2 ); + m62_foreground = tilemap_create( machine, tile_get_info, tilemap_scan_rows, x1, y1, x2, y2 ); if( rows != 0 ) { @@ -624,7 +624,7 @@ static TILE_GET_INFO( get_battroad_fg_tile_info ) VIDEO_START( battroad ) { m62_start( machine, get_battroad_bg_tile_info, 1, 1, 8, 8, 64, 32 ); - m62_textlayer( get_battroad_fg_tile_info, 1, 1, 8, 8, 32, 32 ); + m62_textlayer( machine, get_battroad_fg_tile_info, 1, 1, 8, 8, 32, 32 ); tilemap_set_transmask(m62_background,0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(m62_background,1,0x0001,0xfffe); /* split type 1 has pen 0 transparent in front half */ } @@ -699,7 +699,7 @@ static TILE_GET_INFO( get_lotlot_fg_tile_info ) VIDEO_START( lotlot ) { m62_start( machine, get_lotlot_bg_tile_info, 1, 1, 12, 10, 32, 64 ); - m62_textlayer( get_lotlot_fg_tile_info, 1, 1, 12, 10, 32, 64 ); + m62_textlayer( machine, get_lotlot_fg_tile_info, 1, 1, 12, 10, 32, 64 ); } VIDEO_UPDATE( lotlot ) @@ -757,7 +757,7 @@ static TILE_GET_INFO( get_kidniki_fg_tile_info ) VIDEO_START( kidniki ) { - m62_background = tilemap_create( get_kidniki_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32 ); + m62_background = tilemap_create( machine, get_kidniki_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32 ); m62_background_hscroll = 0; m62_background_vscroll = 0; @@ -767,7 +767,7 @@ VIDEO_START( kidniki ) register_savestate(machine); - m62_textlayer( get_kidniki_fg_tile_info, 1, 1, 12, 8, 32, 64 ); + m62_textlayer( machine, get_kidniki_fg_tile_info, 1, 1, 12, 8, 32, 64 ); } VIDEO_UPDATE( kidniki ) @@ -817,7 +817,7 @@ if (color&0xe0) popmessage("fg tilemap %x %x",tile_index,color&0xe0); VIDEO_START( spelunkr ) { m62_start( machine, get_spelunkr_bg_tile_info, 1, 1, 8, 8, 64, 64 ); - m62_textlayer( get_spelunkr_fg_tile_info, 1, 1, 12, 8, 32, 32 ); + m62_textlayer( machine, get_spelunkr_fg_tile_info, 1, 1, 12, 8, 32, 32 ); } VIDEO_UPDATE( spelunkr ) @@ -859,7 +859,7 @@ static TILE_GET_INFO( get_spelunk2_bg_tile_info ) VIDEO_START( spelunk2 ) { m62_start( machine, get_spelunk2_bg_tile_info, 1, 1, 8, 8, 64, 64 ); - m62_textlayer( get_spelunkr_fg_tile_info, 1, 1, 12, 8, 32, 32 ); + m62_textlayer( machine, get_spelunkr_fg_tile_info, 1, 1, 12, 8, 32, 32 ); } VIDEO_UPDATE( spelunk2 ) @@ -906,7 +906,7 @@ static TILE_GET_INFO( get_youjyudn_fg_tile_info ) VIDEO_START( youjyudn ) { m62_start( machine, get_youjyudn_bg_tile_info, 1, 0, 8, 16, 64, 16 ); - m62_textlayer( get_youjyudn_fg_tile_info, 1, 1, 12, 8, 32, 32 ); + m62_textlayer( machine, get_youjyudn_fg_tile_info, 1, 1, 12, 8, 32, 32 ); tilemap_set_transmask(m62_background,0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(m62_background,1,0x0001,0xfffe); /* split type 1 has pen 0 transparent in front half */ } diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c index 08a6c3ad6d7..224cc6da7f2 100644 --- a/src/mame/video/m72.c +++ b/src/mame/video/m72.c @@ -121,8 +121,8 @@ static void register_savestate(running_machine *machine) VIDEO_START( m72 ) { - bg_tilemap = tilemap_create(m72_get_bg_tile_info,tilemap_scan_rows,8,8,64,64); - fg_tilemap = tilemap_create(m72_get_fg_tile_info,tilemap_scan_rows,8,8,64,64); + bg_tilemap = tilemap_create(machine, m72_get_bg_tile_info,tilemap_scan_rows,8,8,64,64); + fg_tilemap = tilemap_create(machine, m72_get_fg_tile_info,tilemap_scan_rows,8,8,64,64); m72_spriteram = auto_malloc(spriteram_size); @@ -148,8 +148,8 @@ VIDEO_START( m72 ) VIDEO_START( rtype2 ) { - bg_tilemap = tilemap_create(rtype2_get_bg_tile_info,tilemap_scan_rows,8,8,64,64); - fg_tilemap = tilemap_create(rtype2_get_fg_tile_info,tilemap_scan_rows,8,8,64,64); + bg_tilemap = tilemap_create(machine, rtype2_get_bg_tile_info,tilemap_scan_rows,8,8,64,64); + fg_tilemap = tilemap_create(machine, rtype2_get_fg_tile_info,tilemap_scan_rows,8,8,64,64); m72_spriteram = auto_malloc(spriteram_size); @@ -186,9 +186,9 @@ VIDEO_START( majtitle ) { // The tilemap can be 256x64, but seems to be used at 128x64 (scroll wraparound). // The layout ramains 256x64, the right half is just not displayed. -// bg_tilemap = tilemap_create(rtype2_get_bg_tile_info,tilemap_scan_rows,8,8,256,64); - bg_tilemap = tilemap_create(rtype2_get_bg_tile_info,majtitle_scan_rows,8,8,128,64); - fg_tilemap = tilemap_create(rtype2_get_fg_tile_info,tilemap_scan_rows,8,8,64,64); +// bg_tilemap = tilemap_create(machine, rtype2_get_bg_tile_info,tilemap_scan_rows,8,8,256,64); + bg_tilemap = tilemap_create(machine, rtype2_get_bg_tile_info,majtitle_scan_rows,8,8,128,64); + fg_tilemap = tilemap_create(machine, rtype2_get_fg_tile_info,tilemap_scan_rows,8,8,64,64); m72_spriteram = auto_malloc(spriteram_size); @@ -213,8 +213,8 @@ VIDEO_START( majtitle ) VIDEO_START( hharry ) { - bg_tilemap = tilemap_create(hharry_get_bg_tile_info,tilemap_scan_rows,8,8,64,64); - fg_tilemap = tilemap_create(m72_get_fg_tile_info, tilemap_scan_rows,8,8,64,64); + bg_tilemap = tilemap_create(machine, hharry_get_bg_tile_info,tilemap_scan_rows,8,8,64,64); + fg_tilemap = tilemap_create(machine, m72_get_fg_tile_info, tilemap_scan_rows,8,8,64,64); m72_spriteram = auto_malloc(spriteram_size); diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c index 6dd06525954..08570fa81f9 100644 --- a/src/mame/video/m90.c +++ b/src/mame/video/m90.c @@ -95,10 +95,10 @@ static TILE_GET_INFO( dynablsb_get_pf2w_tile_info ) { dynablsb_get_tile_info(mac VIDEO_START( m90 ) { - pf1_layer = tilemap_create(get_pf1_tile_info, tilemap_scan_rows,8,8,64,64); - pf1_wide_layer = tilemap_create(get_pf1w_tile_info,tilemap_scan_rows,8,8,128,64); - pf2_layer = tilemap_create(get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); - pf2_wide_layer = tilemap_create(get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); + pf1_layer = tilemap_create(machine, get_pf1_tile_info, tilemap_scan_rows,8,8,64,64); + pf1_wide_layer = tilemap_create(machine, get_pf1w_tile_info,tilemap_scan_rows,8,8,128,64); + pf2_layer = tilemap_create(machine, get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); + pf2_wide_layer = tilemap_create(machine, get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); tilemap_set_transparent_pen(pf1_layer,0); tilemap_set_transparent_pen(pf1_wide_layer,0); @@ -108,10 +108,10 @@ VIDEO_START( m90 ) VIDEO_START( bomblord ) { - pf1_layer = tilemap_create(bomblord_get_pf1_tile_info, tilemap_scan_rows,8,8,64,64); - pf1_wide_layer = tilemap_create(bomblord_get_pf1w_tile_info,tilemap_scan_rows,8,8,128,64); - pf2_layer = tilemap_create(bomblord_get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); - pf2_wide_layer = tilemap_create(bomblord_get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); + pf1_layer = tilemap_create(machine, bomblord_get_pf1_tile_info, tilemap_scan_rows,8,8,64,64); + pf1_wide_layer = tilemap_create(machine, bomblord_get_pf1w_tile_info,tilemap_scan_rows,8,8,128,64); + pf2_layer = tilemap_create(machine, bomblord_get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); + pf2_wide_layer = tilemap_create(machine, bomblord_get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); tilemap_set_transparent_pen(pf2_layer,0); tilemap_set_transparent_pen(pf2_wide_layer,0); @@ -123,10 +123,10 @@ VIDEO_START( bomblord ) VIDEO_START( dynablsb ) { - pf1_layer = tilemap_create(dynablsb_get_pf1_tile_info, tilemap_scan_rows,8,8,64,64); - pf1_wide_layer = tilemap_create(dynablsb_get_pf1w_tile_info,tilemap_scan_rows,8,8,128,64); - pf2_layer = tilemap_create(dynablsb_get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); - pf2_wide_layer = tilemap_create(dynablsb_get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); + pf1_layer = tilemap_create(machine, dynablsb_get_pf1_tile_info, tilemap_scan_rows,8,8,64,64); + pf1_wide_layer = tilemap_create(machine, dynablsb_get_pf1w_tile_info,tilemap_scan_rows,8,8,128,64); + pf2_layer = tilemap_create(machine, dynablsb_get_pf2_tile_info, tilemap_scan_rows,8,8,64,64); + pf2_wide_layer = tilemap_create(machine, dynablsb_get_pf2w_tile_info,tilemap_scan_rows,8,8,128,64); tilemap_set_transparent_pen(pf2_layer,0); tilemap_set_transparent_pen(pf2_wide_layer,0); diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index 8f0dd608b3b..b73cb96d155 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -250,8 +250,8 @@ VIDEO_START( m92 ) pf_layer_info *layer = &pf_layer[laynum]; /* allocate two tilemaps per layer, one normal, one wide */ - layer->tmap = tilemap_create(get_pf_tile_info, tilemap_scan_rows, 8,8, 64,64); - layer->wide_tmap = tilemap_create(get_pf_tile_info, tilemap_scan_rows, 8,8, 128,64); + layer->tmap = tilemap_create(machine, get_pf_tile_info, tilemap_scan_rows, 8,8, 64,64); + 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, &pf_layer[laynum]); diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index 7329f64887e..64a4e9be228 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -152,10 +152,10 @@ VIDEO_START(macrossp) memset(spriteram_old,0,spriteram_size); memset(spriteram_old2,0,spriteram_size); - macrossp_text_tilemap = tilemap_create(get_macrossp_text_tile_info,tilemap_scan_rows,16,16,64,64); - macrossp_scra_tilemap = tilemap_create(get_macrossp_scra_tile_info,tilemap_scan_rows,16,16,64,64); - macrossp_scrb_tilemap = tilemap_create(get_macrossp_scrb_tile_info,tilemap_scan_rows,16,16,64,64); - macrossp_scrc_tilemap = tilemap_create(get_macrossp_scrc_tile_info,tilemap_scan_rows,16,16,64,64); + macrossp_text_tilemap = tilemap_create(machine, get_macrossp_text_tile_info,tilemap_scan_rows,16,16,64,64); + macrossp_scra_tilemap = tilemap_create(machine, get_macrossp_scra_tile_info,tilemap_scan_rows,16,16,64,64); + macrossp_scrb_tilemap = tilemap_create(machine, get_macrossp_scrb_tile_info,tilemap_scan_rows,16,16,64,64); + macrossp_scrc_tilemap = tilemap_create(machine, get_macrossp_scrc_tile_info,tilemap_scan_rows,16,16,64,64); tilemap_set_transparent_pen(macrossp_text_tilemap,0); tilemap_set_transparent_pen(macrossp_scra_tilemap,0); diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index b0082b5e5c9..973ea6b4b13 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -142,18 +142,18 @@ static VIDEO_START( madalien ) 16, 16, 32, 32 }; - tilemap_fg = tilemap_create(get_tile_info_FG, tilemap_scan_cols_flip_x, 8, 8, 32, 32); + tilemap_fg = tilemap_create(machine, get_tile_info_FG, tilemap_scan_cols_flip_x, 8, 8, 32, 32); tilemap_set_transparent_pen(tilemap_fg, 0); tilemap_set_scrolldx(tilemap_fg, 0, 0x50); tilemap_set_scrolldy(tilemap_fg, 0, 0x20); for (i = 0; i < 4; i++) { - tilemap_edge1[i] = tilemap_create(get_tile_info_BG_1, scan_functions[i], 16, 16, tilemap_cols[i], 8); + tilemap_edge1[i] = tilemap_create(machine, get_tile_info_BG_1, scan_functions[i], 16, 16, tilemap_cols[i], 8); tilemap_set_scrolldx(tilemap_edge1[i], 0, 0x50); tilemap_set_scrolldy(tilemap_edge1[i], 0, 0x20); - tilemap_edge2[i] = tilemap_create(get_tile_info_BG_2, scan_functions[i], 16, 16, tilemap_cols[i], 8); + tilemap_edge2[i] = tilemap_create(machine, get_tile_info_BG_2, scan_functions[i], 16, 16, tilemap_cols[i], 8); tilemap_set_scrolldx(tilemap_edge2[i], 0, 0x50); tilemap_set_scrolldy(tilemap_edge2[i], 0, video_screen_get_height(machine->primary_screen) - 256); } diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index d1849048f69..dceb78a7124 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -113,10 +113,10 @@ static TILE_GET_INFO( get_pf3a_tile_info ) VIDEO_START( madmotor ) { - madmotor_pf1_tilemap = tilemap_create(get_pf1_tile_info, pf1_scan, 8, 8, 64,64); - madmotor_pf2_tilemap = tilemap_create(get_pf2_tile_info, pf2_scan, 16,16, 32,32); - madmotor_pf3_tilemap = tilemap_create(get_pf3_tile_info, pf3_scan, 16,16, 32,64); - madmotor_pf3a_tilemap= tilemap_create(get_pf3a_tile_info,pf3a_scan, 16,16,128,16); + madmotor_pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, pf1_scan, 8, 8, 64,64); + madmotor_pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, pf2_scan, 16,16, 32,32); + madmotor_pf3_tilemap = tilemap_create(machine, get_pf3_tile_info, pf3_scan, 16,16, 32,64); + madmotor_pf3a_tilemap= tilemap_create(machine, get_pf3a_tile_info,pf3a_scan, 16,16,128,16); tilemap_set_transparent_pen(madmotor_pf1_tilemap,0); tilemap_set_transparent_pen(madmotor_pf2_tilemap,0); diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c index 503d8dd263e..fbedff3b0eb 100644 --- a/src/mame/video/mainsnk.c +++ b/src/mame/video/mainsnk.c @@ -41,8 +41,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START(mainsnk) { - tx_tilemap = tilemap_create(get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(tx_tilemap,15); tilemap_set_scrolldy(tx_tilemap, 8, 8); diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c index 56d83d0ce8f..9822a2dfcbf 100644 --- a/src/mame/video/mappy.c +++ b/src/mame/video/mappy.c @@ -322,7 +322,7 @@ static TILE_GET_INFO( mappy_get_tile_info ) VIDEO_START( superpac ) { - bg_tilemap = tilemap_create(superpac_get_tile_info,superpac_tilemap_scan,8,8,36,28); + bg_tilemap = tilemap_create(machine, superpac_get_tile_info,superpac_tilemap_scan,8,8,36,28); sprite_bitmap = video_screen_auto_bitmap_alloc(machine->primary_screen); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[0], 31); @@ -334,7 +334,7 @@ VIDEO_START( superpac ) VIDEO_START( phozon ) { - bg_tilemap = tilemap_create(phozon_get_tile_info,superpac_tilemap_scan,8,8,36,28); + bg_tilemap = tilemap_create(machine, phozon_get_tile_info,superpac_tilemap_scan,8,8,36,28); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[0], 15); @@ -345,7 +345,7 @@ VIDEO_START( phozon ) VIDEO_START( mappy ) { - bg_tilemap = tilemap_create(mappy_get_tile_info,mappy_tilemap_scan,8,8,36,60); + bg_tilemap = tilemap_create(machine, mappy_get_tile_info,mappy_tilemap_scan,8,8,36,60); colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[0], 31); tilemap_set_scroll_cols(bg_tilemap, 36); diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c index 97f42885698..1463cb8cb67 100644 --- a/src/mame/video/marineb.c +++ b/src/mame/video/marineb.c @@ -49,7 +49,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( marineb ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_scroll_cols(bg_tilemap, 32); } diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index 1442141d2af..d0df5bac663 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -144,7 +144,7 @@ VIDEO_START( mario ) { mario_state *state = machine->driver_data; - state->bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->gfx_bank = 0; diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index 7cd3041635f..206ad98cae9 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -69,7 +69,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( markham ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_scroll_rows(bg_tilemap, 32); diff --git a/src/mame/video/mayumi.c b/src/mame/video/mayumi.c index d433cfdb8e4..7d432a294a0 100644 --- a/src/mame/video/mayumi.c +++ b/src/mame/video/mayumi.c @@ -24,7 +24,7 @@ VIDEO_START( mayumi ) { mayumi_videoram = auto_malloc(0x1800); - mayumi_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,64,32 ); + mayumi_tilemap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,64,32 ); } WRITE8_HANDLER( mayumi_videoram_w ) diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index 1c17de7e81e..97d62ee009f 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -247,10 +247,10 @@ VIDEO_UPDATE( mcatadv ) VIDEO_START( mcatadv ) { - mcatadv_tilemap1 = tilemap_create(get_mcatadv_tile_info1,tilemap_scan_rows, 16, 16,32,32); + mcatadv_tilemap1 = tilemap_create(machine, get_mcatadv_tile_info1,tilemap_scan_rows, 16, 16,32,32); tilemap_set_transparent_pen(mcatadv_tilemap1,0); - mcatadv_tilemap2 = tilemap_create(get_mcatadv_tile_info2,tilemap_scan_rows, 16, 16,32,32); + mcatadv_tilemap2 = tilemap_create(machine, get_mcatadv_tile_info2,tilemap_scan_rows, 16, 16,32,32); tilemap_set_transparent_pen(mcatadv_tilemap2,0); spriteram_old = auto_malloc(spriteram_size); diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c index cd8e4df8bca..9115aeb6bcb 100644 --- a/src/mame/video/mcr.c +++ b/src/mame/video/mcr.c @@ -98,19 +98,19 @@ VIDEO_START( mcr ) switch (mcr_cpu_board) { case 90009: - bg_tilemap = tilemap_create(mcr_90009_get_tile_info, tilemap_scan_rows, 16,16, 32,30); + bg_tilemap = tilemap_create(machine, mcr_90009_get_tile_info, tilemap_scan_rows, 16,16, 32,30); break; case 90010: - bg_tilemap = tilemap_create(mcr_90010_get_tile_info, tilemap_scan_rows, 16,16, 32,30); + bg_tilemap = tilemap_create(machine, mcr_90010_get_tile_info, tilemap_scan_rows, 16,16, 32,30); break; case 91475: - bg_tilemap = tilemap_create(mcr_90010_get_tile_info, tilemap_scan_rows, 16,16, 32,30); + bg_tilemap = tilemap_create(machine, mcr_90010_get_tile_info, tilemap_scan_rows, 16,16, 32,30); break; case 91490: - bg_tilemap = tilemap_create(mcr_91490_get_tile_info, tilemap_scan_rows, 16,16, 32,30); + bg_tilemap = tilemap_create(machine, mcr_91490_get_tile_info, tilemap_scan_rows, 16,16, 32,30); break; default: diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c index 05217f1453b..b25e5937898 100644 --- a/src/mame/video/mcr3.c +++ b/src/mame/video/mcr3.c @@ -108,24 +108,24 @@ PALETTE_INIT( spyhunt ) VIDEO_START( mcr3 ) { /* initialize the background tilemap */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 16,16, 32,30); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16,16, 32,30); } VIDEO_START( mcrmono ) { /* initialize the background tilemap */ - bg_tilemap = tilemap_create(mcrmono_get_bg_tile_info, tilemap_scan_rows, 16,16, 32,30); + bg_tilemap = tilemap_create(machine, mcrmono_get_bg_tile_info, tilemap_scan_rows, 16,16, 32,30); } VIDEO_START( spyhunt ) { /* initialize the background tilemap */ - bg_tilemap = tilemap_create(spyhunt_get_bg_tile_info, spyhunt_bg_scan, 64,32, 64,32); + bg_tilemap = tilemap_create(machine, spyhunt_get_bg_tile_info, spyhunt_bg_scan, 64,32, 64,32); /* initialize the text tilemap */ - alpha_tilemap = tilemap_create(spyhunt_get_alpha_tile_info, tilemap_scan_cols, 16,16, 32,32); + alpha_tilemap = tilemap_create(machine, spyhunt_get_alpha_tile_info, tilemap_scan_cols, 16,16, 32,32); tilemap_set_transparent_pen(alpha_tilemap, 0); tilemap_set_scrollx(alpha_tilemap, 0, 16); diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index 21cc583a5ed..bf32819081e 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -63,7 +63,7 @@ static TILE_GET_INFO( zwackery_get_fg_tile_info ) VIDEO_START( mcr68 ) { /* initialize the background tilemap */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 16,16, 32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16,16, 32,32); tilemap_set_transparent_pen(bg_tilemap, 0); } @@ -76,10 +76,10 @@ VIDEO_START( zwackery ) int code, y, x; /* initialize the background tilemap */ - bg_tilemap = tilemap_create(zwackery_get_bg_tile_info, tilemap_scan_rows, 16,16, 32,32); + bg_tilemap = tilemap_create(machine, zwackery_get_bg_tile_info, tilemap_scan_rows, 16,16, 32,32); /* initialize the foreground tilemap */ - fg_tilemap = tilemap_create(zwackery_get_fg_tile_info, tilemap_scan_rows, 16,16, 32,32); + fg_tilemap = tilemap_create(machine, zwackery_get_fg_tile_info, tilemap_scan_rows, 16,16, 32,32); tilemap_set_transparent_pen(fg_tilemap, 0); /* "colorize" each code */ diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c index 0a8fbd26680..6c0eef9ea7c 100644 --- a/src/mame/video/meadows.c +++ b/src/mame/video/meadows.c @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( meadows ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8,8, 32,30); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 32,30); } diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index cef0a189797..64c01c36448 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -214,7 +214,7 @@ static tilemap *megasys1_tilemap[3][2][4]; /* Variables defined in driver: */ static int hardware_type_z; -static void create_tilemaps(void); +static void create_tilemaps(running_machine *machine); @@ -247,7 +247,7 @@ VIDEO_START( megasys1 ) spriteram16 = &megasys1_ram[0x8000/2]; - create_tilemaps(); + create_tilemaps(machine); megasys1_tmap[0] = megasys1_tilemap[0][0][0]; megasys1_tmap[1] = megasys1_tilemap[1][0][0]; megasys1_tmap[2] = megasys1_tilemap[2][0][0]; @@ -377,30 +377,30 @@ static TILE_GET_INFO( megasys1_get_scroll_tile_info_16x16 ) SET_TILE_INFO(tmap, (code & 0xfff) * megasys1_16x16_scroll_factor[tmap] + (tile_index & 3), code >> (16 - megasys1_bits_per_color_code), 0); } -static void create_tilemaps(void) +static void create_tilemaps(running_machine *machine) { int layer, i; for (layer = 0; layer < 3; layer++) { /* 16x16 tilemaps */ - megasys1_tilemap[layer][0][0] = tilemap_create(megasys1_get_scroll_tile_info_16x16, megasys1_scan_16x16, + megasys1_tilemap[layer][0][0] = tilemap_create(machine, megasys1_get_scroll_tile_info_16x16, megasys1_scan_16x16, 8,8, TILES_PER_PAGE_X * 16, TILES_PER_PAGE_Y * 2); - megasys1_tilemap[layer][0][1] = tilemap_create(megasys1_get_scroll_tile_info_16x16, megasys1_scan_16x16, + megasys1_tilemap[layer][0][1] = tilemap_create(machine, megasys1_get_scroll_tile_info_16x16, megasys1_scan_16x16, 8,8, TILES_PER_PAGE_X * 8, TILES_PER_PAGE_Y * 4); - megasys1_tilemap[layer][0][2] = tilemap_create(megasys1_get_scroll_tile_info_16x16, megasys1_scan_16x16, + megasys1_tilemap[layer][0][2] = tilemap_create(machine, megasys1_get_scroll_tile_info_16x16, megasys1_scan_16x16, 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 8); - megasys1_tilemap[layer][0][3] = tilemap_create(megasys1_get_scroll_tile_info_16x16, megasys1_scan_16x16, + megasys1_tilemap[layer][0][3] = tilemap_create(machine, megasys1_get_scroll_tile_info_16x16, megasys1_scan_16x16, 8,8, TILES_PER_PAGE_X * 2, TILES_PER_PAGE_Y * 16); /* 8x8 tilemaps */ - megasys1_tilemap[layer][1][0] = tilemap_create(megasys1_get_scroll_tile_info_8x8, megasys1_scan_8x8, + megasys1_tilemap[layer][1][0] = tilemap_create(machine, megasys1_get_scroll_tile_info_8x8, megasys1_scan_8x8, 8,8, TILES_PER_PAGE_X * 8, TILES_PER_PAGE_Y * 1); - megasys1_tilemap[layer][1][1] = tilemap_create(megasys1_get_scroll_tile_info_8x8, megasys1_scan_8x8, + megasys1_tilemap[layer][1][1] = tilemap_create(machine, megasys1_get_scroll_tile_info_8x8, megasys1_scan_8x8, 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 2); - megasys1_tilemap[layer][1][2] = tilemap_create(megasys1_get_scroll_tile_info_8x8, megasys1_scan_8x8, + megasys1_tilemap[layer][1][2] = tilemap_create(machine, megasys1_get_scroll_tile_info_8x8, megasys1_scan_8x8, 8,8, TILES_PER_PAGE_X * 4, TILES_PER_PAGE_Y * 2); - megasys1_tilemap[layer][1][3] = tilemap_create(megasys1_get_scroll_tile_info_8x8, megasys1_scan_8x8, + megasys1_tilemap[layer][1][3] = tilemap_create(machine, megasys1_get_scroll_tile_info_8x8, megasys1_scan_8x8, 8,8, TILES_PER_PAGE_X * 2, TILES_PER_PAGE_Y * 4); /* set user data and transparency */ diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 812c014c6c4..398e66387cb 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -156,10 +156,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( mermaid ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(bg_tilemap, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(fg_tilemap, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 3f71a7a3fd0..d5a42b618b5 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -144,8 +144,8 @@ VIDEO_START( metlclsh ) { metlclsh_otherram = auto_malloc(0x800); // banked ram - bg_tilemap = tilemap_create(get_bg_tile_info,metlclsh_bgtilemap_scan,16,16,32,16); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,metlclsh_bgtilemap_scan,16,16,32,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen( bg_tilemap, 0 ); tilemap_set_transparent_pen( fg_tilemap, 0 ); diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 3e316edc7f0..0c24ba11a74 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -411,9 +411,9 @@ VIDEO_START( metro_14100 ) metro_tiletable_old = auto_malloc(metro_tiletable_size); dirtyindex = auto_malloc(metro_tiletable_size/4); - bg_tilemap[0] = tilemap_create(get_tile_info_0,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - bg_tilemap[1] = tilemap_create(get_tile_info_1,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - bg_tilemap[2] = tilemap_create(get_tile_info_2,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[0] = tilemap_create(machine, get_tile_info_0,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[1] = tilemap_create(machine, get_tile_info_1,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[2] = tilemap_create(machine, get_tile_info_2,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); tilemap_16x16[0] = NULL; tilemap_16x16[1] = NULL; @@ -440,9 +440,9 @@ VIDEO_START( metro_14220 ) metro_tiletable_old = auto_malloc(metro_tiletable_size); dirtyindex = auto_malloc(metro_tiletable_size/4); - bg_tilemap[0] = tilemap_create(get_tile_info_0_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - bg_tilemap[1] = tilemap_create(get_tile_info_1_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - bg_tilemap[2] = tilemap_create(get_tile_info_2_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[0] = tilemap_create(machine, get_tile_info_0_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[1] = tilemap_create(machine, get_tile_info_1_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[2] = tilemap_create(machine, get_tile_info_2_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); tilemap_16x16[0] = NULL; tilemap_16x16[1] = NULL; @@ -472,13 +472,13 @@ VIDEO_START( metro_14300 ) metro_tiletable_old = auto_malloc(metro_tiletable_size); dirtyindex = auto_malloc(metro_tiletable_size/4); - bg_tilemap[0] = tilemap_create(get_tile_info_0_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - bg_tilemap[1] = tilemap_create(get_tile_info_1_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - bg_tilemap[2] = tilemap_create(get_tile_info_2_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[0] = tilemap_create(machine, get_tile_info_0_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[1] = tilemap_create(machine, get_tile_info_1_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); + bg_tilemap[2] = tilemap_create(machine, get_tile_info_2_8bit,tilemap_scan_rows,8,8,WIN_NX,WIN_NY); - tilemap_16x16[0] = tilemap_create(get_tile_info_0_16x16_8bit,tilemap_scan_rows,16,16,WIN_NX,WIN_NY); - tilemap_16x16[1] = tilemap_create(get_tile_info_1_16x16_8bit,tilemap_scan_rows,16,16,WIN_NX,WIN_NY); - tilemap_16x16[2] = tilemap_create(get_tile_info_2_16x16_8bit,tilemap_scan_rows,16,16,WIN_NX,WIN_NY); + tilemap_16x16[0] = tilemap_create(machine, get_tile_info_0_16x16_8bit,tilemap_scan_rows,16,16,WIN_NX,WIN_NY); + tilemap_16x16[1] = tilemap_create(machine, get_tile_info_1_16x16_8bit,tilemap_scan_rows,16,16,WIN_NX,WIN_NY); + tilemap_16x16[2] = tilemap_create(machine, get_tile_info_2_16x16_8bit,tilemap_scan_rows,16,16,WIN_NX,WIN_NY); tilemap_map_pen_to_layer(bg_tilemap[0], 0, 15, TILEMAP_PIXEL_TRANSPARENT); tilemap_map_pen_to_layer(bg_tilemap[0], 1, 255, TILEMAP_PIXEL_TRANSPARENT); @@ -507,7 +507,7 @@ VIDEO_START( blzntrnd ) has_zoom = 1; - metro_K053936_tilemap = tilemap_create(metro_K053936_get_tile_info, tilemap_scan_rows, + metro_K053936_tilemap = tilemap_create(machine, metro_K053936_get_tile_info, tilemap_scan_rows, 8,8, 256, 512 ); K053936_wraparound_enable(0, 0); @@ -524,7 +524,7 @@ VIDEO_START( gstrik2 ) has_zoom = 1; - metro_K053936_tilemap = tilemap_create(metro_K053936_gstrik2_get_tile_info, tilemap_scan_gstrik2, + metro_K053936_tilemap = tilemap_create(machine, metro_K053936_gstrik2_get_tile_info, tilemap_scan_gstrik2, 16,16, 128, 256 ); K053936_wraparound_enable(0, 0); diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index 2c245ca0391..0111662d0f7 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -131,7 +131,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( mikie ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index 0705aea0f9a..3c24d6efc41 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -52,7 +52,7 @@ VIDEO_START( pang ) paletteram=NULL; - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(bg_tilemap,15); diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index 4e47c48c137..059475a838e 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -32,7 +32,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( mjkjidai ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,64,32); } diff --git a/src/mame/video/mole.c b/src/mame/video/mole.c index 092db2374f1..cadee350f07 100644 --- a/src/mame/video/mole.c +++ b/src/mame/video/mole.c @@ -31,7 +31,7 @@ VIDEO_START( mole ) { tileram = (UINT16 *)auto_malloc(0x400 * sizeof(UINT16)); - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25); } WRITE8_HANDLER( mole_videoram_w ) diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c index 6b09c124983..a3aee980bc2 100644 --- a/src/mame/video/mosaic.c +++ b/src/mame/video/mosaic.c @@ -52,8 +52,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( mosaic ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,0xff); } diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 0c2b30b5f7d..e64ed7c64b1 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -166,8 +166,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( mrdo ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(bg_tilemap,0); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index b069e5cea39..bf3e2f1f4dd 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -98,7 +98,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( mrjong ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows_flip_xy, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows_flip_xy, 8, 8, 32, 32); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c index df40a69e1bc..3936bc076df 100644 --- a/src/mame/video/ms32.c +++ b/src/mame/video/ms32.c @@ -73,9 +73,9 @@ static int brt_r,brt_g,brt_b; VIDEO_START( ms32 ) { - ms32_tx_tilemap = tilemap_create(get_ms32_tx_tile_info,tilemap_scan_rows,8, 8,64,64); - ms32_bg_tilemap = tilemap_create(get_ms32_bg_tile_info,tilemap_scan_rows,16,16,64,64); - ms32_roz_tilemap = tilemap_create(get_ms32_roz_tile_info,tilemap_scan_rows,16,16,128,128); + ms32_tx_tilemap = tilemap_create(machine, get_ms32_tx_tile_info,tilemap_scan_rows,8, 8,64,64); + ms32_bg_tilemap = tilemap_create(machine, get_ms32_bg_tile_info,tilemap_scan_rows,16,16,64,64); + ms32_roz_tilemap = tilemap_create(machine, get_ms32_roz_tile_info,tilemap_scan_rows,16,16,128,128); tilemap_set_transparent_pen(ms32_tx_tilemap,0); tilemap_set_transparent_pen(ms32_bg_tilemap,0); diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c index a301e14021d..bb09cb8d166 100644 --- a/src/mame/video/msisaac.c +++ b/src/mame/video/msisaac.c @@ -61,9 +61,9 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( msisaac ) { - background = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8,8,32,32); - background2 = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,8,8,32,32); - foreground = tilemap_create(get_fg_tile_info, tilemap_scan_rows,8,8,32,32); + background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8,8,32,32); + background2 = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows,8,8,32,32); + foreground = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(background2,0); tilemap_set_transparent_pen(foreground,0); diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index ae00340960d..e7793f6a464 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -140,10 +140,10 @@ WRITE16_HANDLER (mugsmash_reg_w) VIDEO_START( mugsmash ) { - mugsmash_tilemap1 = tilemap_create(get_mugsmash_tile_info1,tilemap_scan_rows, 16, 16,32,32); + mugsmash_tilemap1 = tilemap_create(machine, get_mugsmash_tile_info1,tilemap_scan_rows, 16, 16,32,32); tilemap_set_transparent_pen(mugsmash_tilemap1,0); - mugsmash_tilemap2 = tilemap_create(get_mugsmash_tile_info2,tilemap_scan_rows, 16, 16,32,32); + mugsmash_tilemap2 = tilemap_create(machine, get_mugsmash_tile_info2,tilemap_scan_rows, 16, 16,32,32); } VIDEO_UPDATE( mugsmash ) diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c index 071dc0d631c..78753e09cd5 100644 --- a/src/mame/video/mustache.c +++ b/src/mame/video/mustache.c @@ -88,7 +88,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( mustache ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows_flip_x, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows_flip_x, 8, 8, 64, 32); tilemap_set_scroll_rows(bg_tilemap, 4); diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index e5a8e2e1fbc..56c3a70cb4e 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -221,9 +221,9 @@ static VIDEO_START( mystston ) { mystston_state *state = machine->driver_data; - state->bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols_flip_x, 16, 16, 16, 32); + state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_x, 16, 16, 16, 32); - state->fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols_flip_x, 8, 8, 32, 32); + state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_x, 8, 8, 32, 32); tilemap_set_transparent_pen(state->fg_tilemap, 0); /* create the interrupt timer */ diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c index c3b6a5e05f3..48d5f5a5f64 100644 --- a/src/mame/video/mystwarr.c +++ b/src/mame/video/mystwarr.c @@ -182,7 +182,7 @@ VIDEO_START(gaiapols) K053936_wraparound_enable(0, 1); K053936GP_set_offset(0, -10, 0); // floor tiles in demo loop2 (Elaine vs. boss) - ult_936_tilemap = tilemap_create(get_gai_936_tile_info, tilemap_scan_rows, 16, 16, 512, 512); + ult_936_tilemap = tilemap_create(machine, get_gai_936_tile_info, tilemap_scan_rows, 16, 16, 512, 512); tilemap_set_transparent_pen(ult_936_tilemap, 0); } @@ -226,7 +226,7 @@ VIDEO_START(dadandrn) K053936_wraparound_enable(0, 1); K053936GP_set_offset(0, -8, 0); // Brainy's laser - ult_936_tilemap = tilemap_create(get_ult_936_tile_info, tilemap_scan_rows, 16, 16, 512, 512); + ult_936_tilemap = tilemap_create(machine, get_ult_936_tile_info, tilemap_scan_rows, 16, 16, 512, 512); tilemap_set_transparent_pen(ult_936_tilemap, 0); } diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c index a78b12878d1..711594b2f74 100644 --- a/src/mame/video/namcofl.c +++ b/src/mame/video/namcofl.c @@ -183,7 +183,7 @@ VIDEO_START( namcofl ) old_coin_state = 0x00; //input_port_read(machine, "IN3") & 0x30; - namco_tilemap_init( NAMCONB1_TILEGFX, memory_region(machine, NAMCONB1_TILEMASKREGION), TilemapCB ); + namco_tilemap_init( machine, NAMCONB1_TILEGFX, memory_region(machine, NAMCONB1_TILEMASKREGION), TilemapCB ); namco_obj_init(NAMCONB1_SPRITEGFX,0x0,FLobjcode2tile); - namco_roz_init(NAMCONB1_ROTGFX,NAMCONB1_ROTMASKREGION); + namco_roz_init(machine,NAMCONB1_ROTGFX,NAMCONB1_ROTMASKREGION); } /* namcofl_vh_start */ diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c index eabb3951547..348c49486a7 100644 --- a/src/mame/video/namcona1.c +++ b/src/mame/video/namcona1.c @@ -328,12 +328,12 @@ VIDEO_START( namcona1 ) int i; gfx_element *gfx0,*gfx1,*gfx2; - roz_tilemap = tilemap_create( roz_get_info, tilemap_scan_rows, 8,8,64,64 ); + roz_tilemap = tilemap_create( machine, roz_get_info, tilemap_scan_rows, 8,8,64,64 ); roz_palette = -1; for( i=0; iprimary_screen)); @@ -118,9 +118,9 @@ VIDEO_START( bioship ) VIDEO_START( strahl ) { - bg_tilemap = tilemap_create(macross_get_bg_tile_info,bg_scan,16,16,256,32); - fg_tilemap = tilemap_create(strahl_get_fg_tile_info, bg_scan,16,16,256,32); - tx_tilemap = tilemap_create(macross_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); + bg_tilemap = tilemap_create(machine, macross_get_bg_tile_info,bg_scan,16,16,256,32); + fg_tilemap = tilemap_create(machine, strahl_get_fg_tile_info, bg_scan,16,16,256,32); + tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); spriteram_old = auto_malloc(0x1000); spriteram_old2 = auto_malloc(0x1000); @@ -136,8 +136,8 @@ VIDEO_START( strahl ) VIDEO_START( macross ) { - bg_tilemap = tilemap_create(macross_get_bg_tile_info,bg_scan,16,16,256,32); - tx_tilemap = tilemap_create(macross_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); + bg_tilemap = tilemap_create(machine, macross_get_bg_tile_info,bg_scan,16,16,256,32); + tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,32,32); spriteram_old = auto_malloc(0x1000); spriteram_old2 = auto_malloc(0x1000); @@ -152,8 +152,8 @@ VIDEO_START( macross ) VIDEO_START( gunnail ) { - bg_tilemap = tilemap_create(macross_get_bg_tile_info,bg_scan,16,16,256,32); - tx_tilemap = tilemap_create(macross_get_tx_tile_info,tilemap_scan_cols,8,8,64,32); + bg_tilemap = tilemap_create(machine, macross_get_bg_tile_info,bg_scan,16,16,256,32); + tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,64,32); spriteram_old = auto_malloc(0x1000); spriteram_old2 = auto_malloc(0x1000); @@ -170,8 +170,8 @@ VIDEO_START( gunnail ) VIDEO_START( macross2 ) { - bg_tilemap = tilemap_create(macross_get_bg_tile_info,bg_scan,16,16,1024,128); - tx_tilemap = tilemap_create(macross_get_tx_tile_info,tilemap_scan_cols,8,8,64,32); + bg_tilemap = tilemap_create(machine, macross_get_bg_tile_info,bg_scan,16,16,1024,128); + tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,64,32); spriteram_old = auto_malloc(0x1000); spriteram_old2 = auto_malloc(0x1000); @@ -187,8 +187,8 @@ VIDEO_START( macross2 ) VIDEO_START( tdragon2 ) { - bg_tilemap = tilemap_create(macross_get_bg_tile_info,bg_scan_td2,16,16,1024,32); - tx_tilemap = tilemap_create(macross_get_tx_tile_info,tilemap_scan_cols,8,8,64,32); + bg_tilemap = tilemap_create(machine, macross_get_bg_tile_info,bg_scan_td2,16,16,1024,32); + tx_tilemap = tilemap_create(machine, macross_get_tx_tile_info,tilemap_scan_cols,8,8,64,32); spriteram_old = auto_malloc(0x1000); spriteram_old2 = auto_malloc(0x1000); @@ -204,7 +204,7 @@ VIDEO_START( tdragon2 ) VIDEO_START( bjtwin ) { - bg_tilemap = tilemap_create(bjtwin_get_bg_tile_info,tilemap_scan_cols,8,8,64,32); + bg_tilemap = tilemap_create(machine, bjtwin_get_bg_tile_info,tilemap_scan_cols,8,8,64,32); spriteram_old = auto_malloc(0x1000); spriteram_old2 = auto_malloc(0x1000); @@ -990,12 +990,12 @@ VIDEO_START( afega ) memset(spriteram_old2,0,0x1000); - tilemap_0 = tilemap_create( get_tile_info_0_4bit, afega_tilemap_scan_pages, + tilemap_0 = tilemap_create( machine, get_tile_info_0_4bit, afega_tilemap_scan_pages, 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_cols, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_cols, 8,8, 32,32); @@ -1012,12 +1012,12 @@ VIDEO_START( grdnstrm ) memset(spriteram_old2,0,0x1000); - tilemap_0 = tilemap_create( get_tile_info_0_8bit, afega_tilemap_scan_pages, + tilemap_0 = tilemap_create( machine, get_tile_info_0_8bit, afega_tilemap_scan_pages, 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_cols, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_cols, 8,8, 32,32); @@ -1034,12 +1034,12 @@ VIDEO_START( firehawk ) memset(spriteram_old2,0,0x1000); - tilemap_0 = tilemap_create( get_tile_info_0_8bit, firehawk_tilemap_scan_pages, + tilemap_0 = tilemap_create( machine, get_tile_info_0_8bit, firehawk_tilemap_scan_pages, 16,16, TILES_PER_PAGE_X*FIREHAWK_PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*FIREHAWK_PAGES_PER_TMAP_Y); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_cols, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_cols, 8,8, 32,32); diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index 604f6a32069..43204d187a5 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -157,30 +157,30 @@ static TILE_GET_INFO( raiders5_get_fg_tile_info ) VIDEO_START( nova2001 ) { - bg_tilemap = tilemap_create(nova2001_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(nova2001_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, nova2001_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, nova2001_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); tilemap_set_scrolldx(bg_tilemap, 0, -7); } VIDEO_START( pkunwar ) { - bg_tilemap = tilemap_create(pkunwar_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, pkunwar_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 0); } VIDEO_START( ninjakun ) { - bg_tilemap = tilemap_create(ninjakun_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(ninjakun_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, ninjakun_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, ninjakun_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); tilemap_set_scrolldx(bg_tilemap, 7, 0); } VIDEO_START( raiders5 ) { - bg_tilemap = tilemap_create(raiders5_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(raiders5_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, raiders5_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, raiders5_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); tilemap_set_scrolldx(bg_tilemap, 7, 0); } diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index 2a640ca9154..2df095bea7a 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -71,7 +71,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( nycaptor ) { nycaptor_spriteram = auto_malloc (160); - bg_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,32,32 ); + bg_tilemap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,32,32 ); tilemap_set_transmask(bg_tilemap,0,0xf800,0x7ff); //split 0 tilemap_set_transmask(bg_tilemap,1,0xfe00,0x01ff);//split 1 diff --git a/src/mame/video/offtwall.c b/src/mame/video/offtwall.c index 33091abf819..158a457586d 100644 --- a/src/mame/video/offtwall.c +++ b/src/mame/video/offtwall.c @@ -73,7 +73,7 @@ VIDEO_START( offtwall ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index 575bb377583..748093295ab 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -35,7 +35,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( ohmygod ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,64,64); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,64,64); } diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index 4df42244752..edccc283d36 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -278,7 +278,7 @@ WRITE8_HANDLER( ojankoc_videoram_w ) VIDEO_START( ojankohs ) { - ojankohs_tilemap = tilemap_create(ojankohs_get_tile_info, tilemap_scan_rows, 8, 4, 64, 64); + ojankohs_tilemap = tilemap_create(machine, ojankohs_get_tile_info, tilemap_scan_rows, 8, 4, 64, 64); ojankohs_videoram = auto_malloc(0x2000); ojankohs_colorram = auto_malloc(0x1000); ojankohs_paletteram = auto_malloc(0x800); @@ -286,7 +286,7 @@ VIDEO_START( ojankohs ) VIDEO_START( ojankoy ) { - ojankohs_tilemap = tilemap_create(ojankoy_get_tile_info, tilemap_scan_rows, 8, 4, 64, 64); + ojankohs_tilemap = tilemap_create(machine, ojankoy_get_tile_info, tilemap_scan_rows, 8, 4, 64, 64); ojankohs_videoram = auto_malloc(0x2000); ojankohs_colorram = auto_malloc(0x1000); ojankohs_paletteram = auto_malloc(0x800); diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 98e0f8a3853..db6baa6f4bf 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -58,9 +58,9 @@ WRITE16_HANDLER( oneshot_fg_videoram_w ) VIDEO_START( oneshot ) { - oneshot_bg_tilemap = tilemap_create(get_oneshot_bg_tile_info,tilemap_scan_rows, 16, 16,32,32); - oneshot_mid_tilemap = tilemap_create(get_oneshot_mid_tile_info,tilemap_scan_rows, 16, 16,32,32); - oneshot_fg_tilemap = tilemap_create(get_oneshot_fg_tile_info,tilemap_scan_rows, 16, 16,32,32); + oneshot_bg_tilemap = tilemap_create(machine, get_oneshot_bg_tile_info,tilemap_scan_rows, 16, 16,32,32); + oneshot_mid_tilemap = tilemap_create(machine, get_oneshot_mid_tile_info,tilemap_scan_rows, 16, 16,32,32); + oneshot_fg_tilemap = tilemap_create(machine, get_oneshot_fg_tile_info,tilemap_scan_rows, 16, 16,32,32); tilemap_set_transparent_pen(oneshot_bg_tilemap,0); tilemap_set_transparent_pen(oneshot_mid_tilemap,0); diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index de0dc799e2b..c98fbb8064a 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -39,7 +39,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( orbit ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 16, 16, 32, 30); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 16, 32, 30); } diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c index ad0f9fb28e7..681e182221f 100644 --- a/src/mame/video/othldrby.c +++ b/src/mame/video/othldrby.c @@ -59,9 +59,9 @@ static TILE_GET_INFO( get_tile_info2 ) VIDEO_START( othldrby ) { - bg_tilemap[0] = tilemap_create(get_tile_info0,tilemap_scan_rows,16,16,32,32); - bg_tilemap[1] = tilemap_create(get_tile_info1,tilemap_scan_rows,16,16,32,32); - bg_tilemap[2] = tilemap_create(get_tile_info2,tilemap_scan_rows,16,16,32,32); + bg_tilemap[0] = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,16,16,32,32); + bg_tilemap[1] = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,16,16,32,32); + bg_tilemap[2] = tilemap_create(machine, get_tile_info2,tilemap_scan_rows,16,16,32,32); vram = auto_malloc(VIDEORAM_SIZE * sizeof(vram[0])); buf_spriteram = auto_malloc(2*SPRITERAM_SIZE * sizeof(buf_spriteram[0])); diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index 69c7187865e..a85ce04e668 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -205,8 +205,8 @@ VIDEO_START( pacland ) fg_bitmap = video_screen_auto_bitmap_alloc(machine->primary_screen); bitmap_fill(fg_bitmap, NULL, 0xffff); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_scroll_rows(fg_tilemap, 32); diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index ee5da1c3b13..e9304bdc0b9 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -190,7 +190,7 @@ VIDEO_START( pacman ) /* one pixel to the left to get a more correct placement */ xoffsethack = 1; - bg_tilemap = tilemap_create( pacman_get_tile_info, pacman_scan_rows, 8, 8, 36, 28 ); + bg_tilemap = tilemap_create( machine, pacman_get_tile_info, pacman_scan_rows, 8, 8, 36, 28 ); tilemap_set_scrolldx( bg_tilemap, 0, 384 - 288 ); tilemap_set_scrolldy( bg_tilemap, 0, 264 - 224 ); @@ -312,7 +312,7 @@ VIDEO_START( pengo ) xoffsethack = 0; - bg_tilemap = tilemap_create( pacman_get_tile_info, pacman_scan_rows, 8, 8, 36, 28 ); + bg_tilemap = tilemap_create( machine, pacman_get_tile_info, pacman_scan_rows, 8, 8, 36, 28 ); } WRITE8_HANDLER( pengo_palettebank_w ) @@ -388,7 +388,7 @@ VIDEO_START( s2650games ) xoffsethack = 1; - bg_tilemap = tilemap_create( s2650_get_tile_info,tilemap_scan_rows,8,8,32,32 ); + bg_tilemap = tilemap_create( machine, s2650_get_tile_info,tilemap_scan_rows,8,8,32,32 ); tilemap_set_scroll_cols(bg_tilemap, 32); } @@ -561,7 +561,7 @@ VIDEO_START( jrpacman ) xoffsethack = 1; - bg_tilemap = tilemap_create( jrpacman_get_tile_info,jrpacman_scan_rows,8,8,36,54 ); + bg_tilemap = tilemap_create( machine, jrpacman_get_tile_info,jrpacman_scan_rows,8,8,36,54 ); tilemap_set_transparent_pen( bg_tilemap, 0 ); tilemap_set_scroll_cols( bg_tilemap, 36 ); diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index d13d7dfb90b..5ae7f7ff54f 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -107,7 +107,7 @@ static TILE_GET_INFO( get_tile_info0 ) VIDEO_START( pandoras ) { - layer0 = tilemap_create(get_tile_info0,tilemap_scan_rows,8,8,32,32); + layer0 = tilemap_create(machine, get_tile_info0,tilemap_scan_rows,8,8,32,32); } /*************************************************************************** diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index 092933e70ea..5fc2c301c67 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -154,9 +154,9 @@ WRITE8_HANDLER( paradise_pixmap_w ) VIDEO_START( paradise ) { - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, 8,8, 0x20,0x20 ); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, 8,8, 0x20,0x20 ); - tilemap_2 = tilemap_create( get_tile_info_2, tilemap_scan_rows, 8,8, 0x20,0x20 ); + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 8,8, 0x20,0x20 ); + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 8,8, 0x20,0x20 ); + tilemap_2 = tilemap_create( machine, get_tile_info_2, tilemap_scan_rows, 8,8, 0x20,0x20 ); /* pixmap */ tmpbitmap = video_screen_auto_bitmap_alloc(machine->primary_screen); diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c index 1fee10fd725..11041a70ecb 100644 --- a/src/mame/video/pass.c +++ b/src/mame/video/pass.c @@ -59,8 +59,8 @@ VIDEO_UPDATE( pass ) VIDEO_START( pass ) { - pass_bg_tilemap = tilemap_create(get_pass_bg_tile_info,tilemap_scan_rows, 8, 8,64,32); - pass_fg_tilemap = tilemap_create(get_pass_fg_tile_info,tilemap_scan_rows, 4, 4,128,64); + pass_bg_tilemap = tilemap_create(machine, get_pass_bg_tile_info,tilemap_scan_rows, 8, 8,64,32); + pass_fg_tilemap = tilemap_create(machine, get_pass_fg_tile_info,tilemap_scan_rows, 4, 4,128,64); tilemap_set_transparent_pen(pass_fg_tilemap,255); } diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index 0747b3e49bd..d96a944906c 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -73,10 +73,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( pbaction ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c index 447d4b98d05..94366da688a 100644 --- a/src/mame/video/pcktgal.c +++ b/src/mame/video/pcktgal.c @@ -55,7 +55,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( pcktgal ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c index 9610c9f1524..8a3be1ba220 100644 --- a/src/mame/video/pgm.c +++ b/src/mame/video/pgm.c @@ -304,10 +304,10 @@ static TILE_GET_INFO( get_pgm_bg_tilemap_tile_info ) VIDEO_START( pgm ) { - pgm_tx_tilemap= tilemap_create(get_pgm_tx_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); + pgm_tx_tilemap= tilemap_create(machine, get_pgm_tx_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(pgm_tx_tilemap,15); - pgm_bg_tilemap = tilemap_create(get_pgm_bg_tilemap_tile_info,tilemap_scan_rows, 32, 32,64,64); + pgm_bg_tilemap = tilemap_create(machine, get_pgm_bg_tilemap_tile_info,tilemap_scan_rows, 32, 32,64,64); tilemap_set_transparent_pen(pgm_bg_tilemap,31); tilemap_set_scroll_rows(pgm_bg_tilemap,64*32); diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c index b77bc337cce..5096ca2e3c3 100644 --- a/src/mame/video/phoenix.c +++ b/src/mame/video/phoenix.c @@ -189,8 +189,8 @@ VIDEO_START( phoenix ) palette_bank = 0; cocktail_mode = 0; - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c index c93f7889327..0739d961d4f 100644 --- a/src/mame/video/pingpong.c +++ b/src/mame/video/pingpong.c @@ -117,7 +117,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( pingpong ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c index 23132ef289b..0eb5a680572 100644 --- a/src/mame/video/pirates.c +++ b/src/mame/video/pirates.c @@ -40,11 +40,11 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START(pirates) { - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,8,8,36,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_cols,8,8,36,32); /* Not sure how big they can be, Pirates uses only 32 columns, Genix 44 */ - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_cols,8,8,64,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols, 8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols, 8,8,64,32); tilemap_set_transparent_pen(tx_tilemap,0); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index e87134f9bb4..d1b10205bba 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -178,8 +178,8 @@ PALETTE_INIT (pitnrun) VIDEO_START(pitnrun) { - fg = tilemap_create( get_tile_info1,tilemap_scan_rows,8,8,32,32 ); - bg = tilemap_create( get_tile_info2,tilemap_scan_rows,8,8,32*4,32 ); + fg = tilemap_create( machine, get_tile_info1,tilemap_scan_rows,8,8,32,32 ); + bg = tilemap_create( machine, get_tile_info2,tilemap_scan_rows,8,8,32*4,32 ); tilemap_set_transparent_pen( fg, 0 ); tmp_bitmap[0] = auto_bitmap_alloc(128,128,video_screen_get_format(machine->primary_screen)); tmp_bitmap[1] = auto_bitmap_alloc(128,128,video_screen_get_format(machine->primary_screen)); diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index 6b29d1ff0d2..872e589f316 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -106,7 +106,7 @@ VIDEO_START( playch10 ) const UINT8 *bios = memory_region(machine, "main"); pc10_bios = (bios[3] == 0x2a) ? 1 : 2; - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); ppu2c0x_init(machine, &ppu_interface ); @@ -117,7 +117,7 @@ VIDEO_START( playch10_hboard ) const UINT8 *bios = memory_region(machine, "main"); pc10_bios = (bios[3] == 0x2a) ? 1 : 2; - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); ppu2c0x_init(machine, &ppu_interface_hboard ); diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index 37aedce2fe7..91251f20f59 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -113,8 +113,8 @@ static TILE_GET_INFO( hrdtimes_get_bg_tile_info ) VIDEO_START( bigtwin ) { - tx_tilemap = tilemap_create(bigtwin_get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); - fg_tilemap = tilemap_create(bigtwin_get_fg_tile_info,tilemap_scan_rows, 16,16,32,32); + tx_tilemap = tilemap_create(machine, bigtwin_get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); + fg_tilemap = tilemap_create(machine, bigtwin_get_fg_tile_info,tilemap_scan_rows, 16,16,32,32); tilemap_set_transparent_pen(tx_tilemap,0); @@ -126,9 +126,9 @@ VIDEO_START( bigtwin ) VIDEO_START( wbeachvl ) { - tx_tilemap = tilemap_create(wbeachvl_get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); - fg_tilemap = tilemap_create(wbeachvl_get_fg_tile_info,tilemap_scan_rows,16,16,64,32); - bg_tilemap = tilemap_create(wbeachvl_get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); + tx_tilemap = tilemap_create(machine, wbeachvl_get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); + fg_tilemap = tilemap_create(machine, wbeachvl_get_fg_tile_info,tilemap_scan_rows,16,16,64,32); + bg_tilemap = tilemap_create(machine, wbeachvl_get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); tilemap_set_transparent_pen(tx_tilemap,0); tilemap_set_transparent_pen(fg_tilemap,0); @@ -140,8 +140,8 @@ VIDEO_START( wbeachvl ) VIDEO_START( excelsr ) { - tx_tilemap = tilemap_create(bigtwin_get_tx_tile_info,tilemap_scan_rows,16,16,32,32); - fg_tilemap = tilemap_create(bigtwin_get_fg_tile_info,tilemap_scan_rows, 16,16,32,32); + tx_tilemap = tilemap_create(machine, bigtwin_get_tx_tile_info,tilemap_scan_rows,16,16,32,32); + fg_tilemap = tilemap_create(machine, bigtwin_get_fg_tile_info,tilemap_scan_rows, 16,16,32,32); tilemap_set_transparent_pen(tx_tilemap,0); @@ -152,9 +152,9 @@ VIDEO_START( excelsr ) VIDEO_START( hotmind ) { - tx_tilemap = tilemap_create(hrdtimes_get_tx_tile_info,tilemap_scan_rows, 8, 8,64,64); - fg_tilemap = tilemap_create(hrdtimes_get_fg_tile_info,tilemap_scan_rows,16,16,32,32); - bg_tilemap = tilemap_create(hrdtimes_get_bg_tile_info,tilemap_scan_rows, 16,16,32,32); + tx_tilemap = tilemap_create(machine, hrdtimes_get_tx_tile_info,tilemap_scan_rows, 8, 8,64,64); + fg_tilemap = tilemap_create(machine, hrdtimes_get_fg_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap = tilemap_create(machine, hrdtimes_get_bg_tile_info,tilemap_scan_rows, 16,16,32,32); tilemap_set_transparent_pen(tx_tilemap,0); tilemap_set_transparent_pen(fg_tilemap,0); @@ -174,9 +174,9 @@ VIDEO_START( hotmind ) VIDEO_START( hrdtimes ) { - tx_tilemap = tilemap_create(hrdtimes_get_tx_tile_info,tilemap_scan_rows, 8, 8,64,64); - fg_tilemap = tilemap_create(hrdtimes_get_fg_tile_info,tilemap_scan_rows,16,16,32,32); - bg_tilemap = tilemap_create(hrdtimes_get_bg_tile_info,tilemap_scan_rows, 16,16,32,32); + tx_tilemap = tilemap_create(machine, hrdtimes_get_tx_tile_info,tilemap_scan_rows, 8, 8,64,64); + fg_tilemap = tilemap_create(machine, hrdtimes_get_fg_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap = tilemap_create(machine, hrdtimes_get_bg_tile_info,tilemap_scan_rows, 16,16,32,32); tilemap_set_transparent_pen(tx_tilemap,0); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c index 43c6abdfd09..ad2fff51fb1 100644 --- a/src/mame/video/plygonet.c +++ b/src/mame/video/plygonet.c @@ -78,7 +78,7 @@ VIDEO_START( polygonet ) machine->gfx[ttl_gfx_index]->total_colors = machine->config->total_colors / 16; // create the tilemap - ttl_tilemap = tilemap_create(ttl_get_tile_info, plygonet_scan, 8, 8, 64, 32); + ttl_tilemap = tilemap_create(machine, ttl_get_tile_info, plygonet_scan, 8, 8, 64, 32); tilemap_set_transparent_pen(ttl_tilemap, 0); diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c index 5f49e354d55..e51a812f51a 100644 --- a/src/mame/video/pokechmp.c +++ b/src/mame/video/pokechmp.c @@ -29,7 +29,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( pokechmp ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c index f6fad3fdf49..607214a25a5 100644 --- a/src/mame/video/polepos.c +++ b/src/mame/video/polepos.c @@ -202,8 +202,8 @@ static TILE_GET_INFO( tx_get_tile_info ) VIDEO_START( polepos ) { - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_cols,8,8,64,16); - tx_tilemap = tilemap_create(tx_get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_cols,8,8,64,16); + tx_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan_rows,8,8,32,32); colortable_configure_tilemap_groups(machine->colortable, tx_tilemap, machine->gfx[0], 0x2f); } diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c index fc531ed8b38..737c8651fd8 100644 --- a/src/mame/video/poolshrk.c +++ b/src/mame/video/poolshrk.c @@ -22,7 +22,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( poolshrk ) { - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 0); diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c index 0be863297d0..bab14dd7ff4 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -120,7 +120,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( pooyan ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8,8, 32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8,8, 32,32); } diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index 8dcd4936530..b9a99592b31 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -248,7 +248,7 @@ VIDEO_START( skyskipr ) bitmap_type = TYPE_SKYSKIPR; - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } @@ -259,7 +259,7 @@ VIDEO_START( popeye ) bitmap_type = TYPE_POPEYE; - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index 5481754dffa..e493273de10 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -173,10 +173,10 @@ static TILE_GET_INFO( get_popper_ol_p0_tile_info ) VIDEO_START( popper ) { - popper_p123_tilemap = tilemap_create( get_popper_p123_tile_info, tilemap_scan_cols,8,8,33,32 ); - popper_p0_tilemap = tilemap_create( get_popper_p0_tile_info, tilemap_scan_cols,8,8,33,32 ); - popper_ol_p123_tilemap = tilemap_create( get_popper_ol_p123_tile_info,tilemap_scan_cols,8,8,2 ,32 ); - popper_ol_p0_tilemap = tilemap_create( get_popper_ol_p0_tile_info, tilemap_scan_cols,8,8,2 ,32 ); + popper_p123_tilemap = tilemap_create( machine, get_popper_p123_tile_info, tilemap_scan_cols,8,8,33,32 ); + popper_p0_tilemap = tilemap_create( machine, get_popper_p0_tile_info, tilemap_scan_cols,8,8,33,32 ); + popper_ol_p123_tilemap = tilemap_create( machine, get_popper_ol_p123_tile_info,tilemap_scan_cols,8,8,2 ,32 ); + popper_ol_p0_tilemap = tilemap_create( machine, get_popper_ol_p0_tile_info, tilemap_scan_cols,8,8,2 ,32 ); tilemap_set_transmask(popper_p123_tilemap, 0,0x0f,0x01); tilemap_set_transmask(popper_p123_tilemap, 1,0x01,0x0f); diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c index 9fab8f5c800..4cd1351c004 100644 --- a/src/mame/video/portrait.c +++ b/src/mame/video/portrait.c @@ -61,8 +61,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( portrait ) { - background = tilemap_create( get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32 ); - foreground = tilemap_create( get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32 ); + background = tilemap_create( machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32 ); + foreground = tilemap_create( machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32 ); tilemap_set_transparent_pen( foreground, 0 ); } diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index 00ec316fe6c..808235ea5d5 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -197,13 +197,13 @@ WRITE16_HANDLER( powerins_vram_1_w ) VIDEO_START( powerins ) { - tilemap_0 = tilemap_create( get_tile_info_0, + tilemap_0 = tilemap_create( machine, get_tile_info_0, powerins_get_memory_offset_0, 16,16, DIM_NX_0, DIM_NY_0 ); - tilemap_1 = tilemap_create( get_tile_info_1, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_cols, 8,8, diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index 1360f5a0ada..4e1d964d36c 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -94,13 +94,13 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( prehisle ) { - bg2_tilemap = tilemap_create(get_bg2_tile_info, tilemap_scan_cols, + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_cols, 16, 16, 1024, 32); - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 256, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 15); diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index 82bb93f71c6..1ef3a40784c 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -168,48 +168,48 @@ VIDEO_START( psikyo ) /* The Hardware is Capable of Changing the Dimensions of the Tilemaps, its safer to create the various sized tilemaps now as opposed to later */ - tilemap_0_size0 = tilemap_create( get_tile_info_0, + tilemap_0_size0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x20, 0x80 ); - tilemap_0_size1 = tilemap_create( get_tile_info_0, + tilemap_0_size1 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x40, 0x40 ); - tilemap_0_size2 = tilemap_create( get_tile_info_0, + tilemap_0_size2 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x80, 0x20 ); - tilemap_0_size3 = tilemap_create( get_tile_info_0, + tilemap_0_size3 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x100, 0x10 ); - tilemap_1_size0 = tilemap_create( get_tile_info_1, + tilemap_1_size0 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 0x20, 0x80 ); - tilemap_1_size1 = tilemap_create( get_tile_info_1, + tilemap_1_size1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 0x40, 0x40 ); - tilemap_1_size2 = tilemap_create( get_tile_info_1, + tilemap_1_size2 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 0x80, 0x20 ); - tilemap_1_size3 = tilemap_create( get_tile_info_1, + tilemap_1_size3 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c index 710870d45a6..6092ef80848 100644 --- a/src/mame/video/psychic5.c +++ b/src/mame/video/psychic5.c @@ -249,8 +249,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( psychic5 ) { /* info offset w h col row */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, 16, 16, 64, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 64, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 15); @@ -272,8 +272,8 @@ VIDEO_START( psychic5 ) VIDEO_START( bombsa ) { /* info offset w h col row */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, 16, 16, 128, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 128, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 15); diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index a45c74c1ffe..759dd5267e5 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -143,12 +143,12 @@ static TILEMAP_MAPPER( armwrest_bs1_scan_flipx ) VIDEO_START( punchout ) { - bg_top_tilemap = tilemap_create(top_get_info, tilemap_scan_rows, 8,8, 32,32); - bg_bot_tilemap = tilemap_create(bot_get_info, tilemap_scan_rows, 8,8, 64,32); + bg_top_tilemap = tilemap_create(machine, top_get_info, tilemap_scan_rows, 8,8, 32,32); + bg_bot_tilemap = tilemap_create(machine, bot_get_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_scroll_rows(bg_bot_tilemap, 32); - spr1_tilemap = tilemap_create(bs1_get_info, tilemap_scan_rows, 8,8, 16,32); - spr2_tilemap = tilemap_create(bs2_get_info, tilemap_scan_rows, 8,8, 16,32); + spr1_tilemap = tilemap_create(machine, bs1_get_info, tilemap_scan_rows, 8,8, 16,32); + spr2_tilemap = tilemap_create(machine, bs2_get_info, tilemap_scan_rows, 8,8, 16,32); fg_tilemap = NULL; @@ -159,13 +159,13 @@ VIDEO_START( punchout ) VIDEO_START( armwrest ) { - bg_top_tilemap = tilemap_create(armwrest_top_get_info, tilemap_scan_rows, 8,8, 32,32); - bg_bot_tilemap = tilemap_create(armwrest_bot_get_info, tilemap_scan_rows, 8,8, 32,32); + bg_top_tilemap = tilemap_create(machine, armwrest_top_get_info, tilemap_scan_rows, 8,8, 32,32); + bg_bot_tilemap = tilemap_create(machine, armwrest_bot_get_info, tilemap_scan_rows, 8,8, 32,32); - spr1_tilemap = tilemap_create(bs1_get_info, armwrest_bs1_scan, 8,8, 32,16); - spr1_tilemap_flipx = tilemap_create(bs1_get_info, armwrest_bs1_scan_flipx, 8,8, 32,16); - spr2_tilemap = tilemap_create(bs2_get_info, tilemap_scan_rows, 8,8, 16,32); - fg_tilemap = tilemap_create(armwrest_fg_get_info, tilemap_scan_rows, 8,8, 32,32); + spr1_tilemap = tilemap_create(machine, bs1_get_info, armwrest_bs1_scan, 8,8, 32,16); + spr1_tilemap_flipx = tilemap_create(machine, bs1_get_info, armwrest_bs1_scan_flipx, 8,8, 32,16); + spr2_tilemap = tilemap_create(machine, bs2_get_info, tilemap_scan_rows, 8,8, 16,32); + fg_tilemap = tilemap_create(machine, armwrest_fg_get_info, tilemap_scan_rows, 8,8, 32,32); tilemap_set_transparent_pen(spr1_tilemap, 0x07); tilemap_set_transparent_pen(spr1_tilemap_flipx, 0x07); diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index 59df4328e46..39de2af84a2 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -49,8 +49,8 @@ static TILE_GET_INFO( get_text_tile_info ) VIDEO_START( pushman ) { - bg_tilemap = tilemap_create(get_back_tile_info,background_scan_rows, 32,32,128,64); - tx_tilemap = tilemap_create(get_text_tile_info,tilemap_scan_rows, 8, 8, 32,32); + bg_tilemap = tilemap_create(machine, get_back_tile_info,background_scan_rows, 32,32,128,64); + tx_tilemap = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8, 8, 32,32); tilemap_set_transparent_pen(tx_tilemap,3); } diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index 32ac485e30a..0853cf3f8d9 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -64,8 +64,8 @@ VIDEO_START( quizdna ) quizdna_bg_ram = auto_malloc(0x2000); quizdna_fg_ram = auto_malloc(0x1000); - quizdna_bg_tilemap = tilemap_create( get_bg_tile_info,tilemap_scan_rows,8,8,64,32 ); - quizdna_fg_tilemap = tilemap_create( get_fg_tile_info,tilemap_scan_rows,16,8,32,32 ); + quizdna_bg_tilemap = tilemap_create( machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32 ); + quizdna_fg_tilemap = tilemap_create( machine, get_fg_tile_info,tilemap_scan_rows,16,8,32,32 ); tilemap_set_transparent_pen( quizdna_fg_tilemap,0 ); } diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c index 8d0301b5744..4b43fbd4429 100644 --- a/src/mame/video/quizpani.c +++ b/src/mame/video/quizpani.c @@ -73,8 +73,8 @@ WRITE16_HANDLER( quizpani_tilesbank_w ) VIDEO_START( quizpani ) { - bg_tilemap = tilemap_create(bg_tile_info, bg_scan,16,16,256,32); - txt_tilemap = tilemap_create(txt_tile_info,bg_scan,16,16,256,32); + bg_tilemap = tilemap_create(machine, bg_tile_info, bg_scan,16,16,256,32); + txt_tilemap = tilemap_create(machine, txt_tile_info,bg_scan,16,16,256,32); tilemap_set_transparent_pen(txt_tilemap,15); } diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index bbf6bfd5153..faa2e1d02ed 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -69,9 +69,9 @@ static TILE_GET_INFO( get_text_tile_info ) VIDEO_START( raiden ) { - bg_layer = tilemap_create(get_back_tile_info,tilemap_scan_cols, 16,16,32,32); - fg_layer = tilemap_create(get_fore_tile_info,tilemap_scan_cols,16,16,32,32); - tx_layer = tilemap_create(get_text_tile_info,tilemap_scan_cols,8,8,32,32); + bg_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_cols, 16,16,32,32); + fg_layer = tilemap_create(machine, get_fore_tile_info,tilemap_scan_cols,16,16,32,32); + tx_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_cols,8,8,32,32); alternate=0; tilemap_set_transparent_pen(fg_layer,15); @@ -80,9 +80,9 @@ VIDEO_START( raiden ) VIDEO_START( raidena ) { - bg_layer = tilemap_create(get_back_tile_info,tilemap_scan_cols, 16,16,32,32); - fg_layer = tilemap_create(get_fore_tile_info,tilemap_scan_cols,16,16,32,32); - tx_layer = tilemap_create(get_text_tile_info,tilemap_scan_rows,8,8,32,32); + bg_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_cols, 16,16,32,32); + fg_layer = tilemap_create(machine, get_fore_tile_info,tilemap_scan_cols,16,16,32,32); + tx_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows,8,8,32,32); alternate=1; tilemap_set_transparent_pen(fg_layer,15); diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index 4a96b06964e..41407021419 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -336,8 +336,8 @@ VIDEO_START( rallyx ) { int i; - bg_tilemap = tilemap_create(rallyx_bg_get_tile_info,tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(rallyx_fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); + bg_tilemap = tilemap_create(machine, rallyx_bg_get_tile_info,tilemap_scan_rows,8,8,32,32); + 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(bg_tilemap,3,3); @@ -366,8 +366,8 @@ VIDEO_START( jungler ) { int i; - bg_tilemap = tilemap_create(rallyx_bg_get_tile_info,tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(rallyx_fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); + bg_tilemap = tilemap_create(machine, rallyx_bg_get_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, rallyx_fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); spriteram_base = 0x14; @@ -395,8 +395,8 @@ VIDEO_START( locomotn ) { int i; - bg_tilemap = tilemap_create(locomotn_bg_get_tile_info,tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(locomotn_fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); + bg_tilemap = tilemap_create(machine, locomotn_bg_get_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, locomotn_fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); /* handle reduced visible area in some games */ if (video_screen_get_visible_area(machine->primary_screen)->max_x == 32*8-1) @@ -431,8 +431,8 @@ VIDEO_START( commsega ) { int i; - bg_tilemap = tilemap_create(locomotn_bg_get_tile_info,tilemap_scan_rows,8,8,32,32); - fg_tilemap = tilemap_create(locomotn_fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); + bg_tilemap = tilemap_create(machine, locomotn_bg_get_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, locomotn_fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); /* handle reduced visible area in some games */ if (video_screen_get_visible_area(machine->primary_screen)->max_x == 32*8-1) diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index ae62d3a18c8..b0374b02845 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -153,11 +153,11 @@ WRITE16_HANDLER( realbrk_vram_2_w ) VIDEO_START(realbrk) { /* Backgrounds */ - tilemap_0 = tilemap_create(get_tile_info_0, tilemap_scan_rows, 16, 16, 0x40, 0x20); - tilemap_1 = tilemap_create(get_tile_info_1, tilemap_scan_rows, 16, 16, 0x40, 0x20); + tilemap_0 = tilemap_create(machine, get_tile_info_0, tilemap_scan_rows, 16, 16, 0x40, 0x20); + tilemap_1 = tilemap_create(machine, get_tile_info_1, tilemap_scan_rows, 16, 16, 0x40, 0x20); /* Text */ - tilemap_2 = tilemap_create(get_tile_info_2, tilemap_scan_rows, 8, 8, 0x40, 0x20); + tilemap_2 = tilemap_create(machine, get_tile_info_2, tilemap_scan_rows, 8, 8, 0x40, 0x20); tilemap_set_transparent_pen(tilemap_0,0); tilemap_set_transparent_pen(tilemap_1,0); diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index b3e72c15d3e..dc6fd57bb18 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -167,7 +167,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( redclash ) { - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c index b1fa8fc7032..2574347c52d 100644 --- a/src/mame/video/relief.c +++ b/src/mame/video/relief.c @@ -86,10 +86,10 @@ VIDEO_START( relief ) atarigen_blend_gfx(machine, 1, 2, 0x0f, 0x10); /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the second playfield */ - atarigen_playfield2_tilemap = tilemap_create(get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); tilemap_set_transparent_pen(atarigen_playfield2_tilemap, 0); /* initialize the motion objects */ diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c index 66454fed254..0e69e3eb24e 100644 --- a/src/mame/video/renegade.c +++ b/src/mame/video/renegade.c @@ -64,8 +64,8 @@ static TILE_GET_INFO( get_fg_tilemap_info ) VIDEO_START( renegade ) { - bg_tilemap = tilemap_create(get_bg_tilemap_info, tilemap_scan_rows, 16, 16, 64, 16); - fg_tilemap = tilemap_create(get_fg_tilemap_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tilemap_info, tilemap_scan_rows, 16, 16, 64, 16); + fg_tilemap = tilemap_create(machine, get_fg_tilemap_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); tilemap_set_scrolldx(bg_tilemap, 256, 0); diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c index 8ea3758add9..529d1b9c025 100644 --- a/src/mame/video/retofinv.c +++ b/src/mame/video/retofinv.c @@ -112,8 +112,8 @@ static TILE_GET_INFO( fg_get_tile_info ) VIDEO_START( retofinv ) { - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan,8,8,36,28); - fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan,8,8,36,28); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan,8,8,36,28); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan,8,8,36,28); colortable_configure_tilemap_groups(machine->colortable, fg_tilemap, machine->gfx[0], 0); diff --git a/src/mame/video/rockola.c b/src/mame/video/rockola.c index 3e1f076523a..a275b2e4fd2 100644 --- a/src/mame/video/rockola.c +++ b/src/mame/video/rockola.c @@ -178,8 +178,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( rockola ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } @@ -298,8 +298,8 @@ static TILE_GET_INFO( satansat_get_fg_tile_info ) VIDEO_START( satansat ) { - bg_tilemap = tilemap_create(satansat_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(satansat_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, satansat_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, satansat_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index bdebd8e96a6..4680b301e07 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -115,7 +115,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( rocnrope ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index 1832712a00b..829d83926a8 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -85,8 +85,8 @@ static TIMER_CALLBACK( crtc_interrupt_gen ) VIDEO_START( rpunch ) { /* allocate tilemaps for the backgrounds */ - background[0] = tilemap_create(get_bg0_tile_info,tilemap_scan_cols, 8,8,64,64); - background[1] = tilemap_create(get_bg1_tile_info,tilemap_scan_cols,8,8,64,64); + background[0] = tilemap_create(machine, get_bg0_tile_info,tilemap_scan_cols, 8,8,64,64); + background[1] = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_cols,8,8,64,64); /* configure the tilemaps */ tilemap_set_transparent_pen(background[1],15); diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c index 93eccba7732..963286d1385 100644 --- a/src/mame/video/runaway.c +++ b/src/mame/video/runaway.c @@ -76,13 +76,13 @@ static TILE_GET_INFO( qwak_get_tile_info ) VIDEO_START( runaway ) { - bg_tilemap = tilemap_create(runaway_get_tile_info, tilemap_scan_rows, 8, 8, 32, 30); + bg_tilemap = tilemap_create(machine, runaway_get_tile_info, tilemap_scan_rows, 8, 8, 32, 30); } VIDEO_START( qwak ) { - bg_tilemap = tilemap_create(qwak_get_tile_info, tilemap_scan_rows, 8, 8, 32, 30); + bg_tilemap = tilemap_create(machine, qwak_get_tile_info, tilemap_scan_rows, 8, 8, 32, 30); } diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index 6cdbb77d60f..4cd71a8fb72 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -86,7 +86,7 @@ VIDEO_START(rng) K053936_wraparound_enable(0, 0); K053936_set_offset(0, 34, 9); - rng_936_tilemap = tilemap_create(get_rng_936_tile_info, tilemap_scan_rows, 16, 16, 128, 128); + rng_936_tilemap = tilemap_create(machine, get_rng_936_tile_info, tilemap_scan_rows, 16, 16, 128, 128); tilemap_set_transparent_pen(rng_936_tilemap, 0); /* find first empty slot to decode gfx */ @@ -103,7 +103,7 @@ VIDEO_START(rng) machine->gfx[ttl_gfx_index]->total_colors = machine->config->total_colors / 16; // create the tilemap - ttl_tilemap = tilemap_create(ttl_get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + ttl_tilemap = tilemap_create(machine, ttl_get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(ttl_tilemap, 0); diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index de3e827fe7f..ee10994eaf4 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -86,10 +86,10 @@ WRITE8_HANDLER( sauro_scroll_fg_w ) VIDEO_START( sauro ) { - bg_tilemap = tilemap_create(get_tile_info_bg, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_tile_info_bg, tilemap_scan_cols, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_tile_info_fg, tilemap_scan_cols, + fg_tilemap = tilemap_create(machine, get_tile_info_fg, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); @@ -159,7 +159,7 @@ WRITE8_HANDLER ( trckydoc_spriteram_mirror_w ) VIDEO_START( trckydoc ) { - bg_tilemap = tilemap_create(get_tile_info_bg, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_tile_info_bg, tilemap_scan_cols, 8, 8, 32, 32); } diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index a06328f8422..d8228e74dce 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -130,7 +130,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( sbasketb ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(bg_tilemap, 32); } diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c index c4958fb0595..3f1540dcda2 100644 --- a/src/mame/video/sbugger.c +++ b/src/mame/video/sbugger.c @@ -30,7 +30,7 @@ WRITE8_HANDLER( sbugger_videoram_attr_w ) VIDEO_START(sbugger) { - sbugger_tilemap = tilemap_create(get_sbugger_tile_info,tilemap_scan_rows, 8, 16,64,16); + sbugger_tilemap = tilemap_create(machine, get_sbugger_tile_info,tilemap_scan_rows, 8, 16,64,16); } VIDEO_UPDATE(sbugger) diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index 7c06c15d56b..404a67f68ab 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -124,7 +124,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_START( scotrsht ) { - bg_tilemap = tilemap_create(scotrsht_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + bg_tilemap = tilemap_create(machine, scotrsht_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scroll_cols(bg_tilemap, 64); } diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index ded57765138..da4cc0158be 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -95,12 +95,12 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_START( sderby ) { - sderby_tilemap = tilemap_create(get_sderby_tile_info,tilemap_scan_rows, 16, 16,32,32); - sderby_md_tilemap = tilemap_create(get_sderby_md_tile_info,tilemap_scan_rows, 16, 16,32,32); + sderby_tilemap = tilemap_create(machine, get_sderby_tile_info,tilemap_scan_rows, 16, 16,32,32); + sderby_md_tilemap = tilemap_create(machine, get_sderby_md_tile_info,tilemap_scan_rows, 16, 16,32,32); tilemap_set_transparent_pen(sderby_md_tilemap,0); - sderby_fg_tilemap = tilemap_create(get_sderby_fg_tile_info,tilemap_scan_rows, 8, 8,64,32); + sderby_fg_tilemap = tilemap_create(machine, get_sderby_fg_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(sderby_fg_tilemap,0); } diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index 860aca5fada..9861664cd5e 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -227,19 +227,19 @@ VIDEO_START( segag80r ) /* and one vertically scrolling */ case G80_BACKGROUND_SPACEOD: spaceod_bg_init_palette(machine); - spaceod_bg_htilemap = tilemap_create(spaceod_get_tile_info, spaceod_scan_rows, 8,8, 128,32); - spaceod_bg_vtilemap = tilemap_create(spaceod_get_tile_info, spaceod_scan_rows, 8,8, 32,128); + spaceod_bg_htilemap = tilemap_create(machine, spaceod_get_tile_info, spaceod_scan_rows, 8,8, 128,32); + spaceod_bg_vtilemap = tilemap_create(machine, spaceod_get_tile_info, spaceod_scan_rows, 8,8, 32,128); break; /* background tilemap is effectively 1 screen x n screens */ case G80_BACKGROUND_MONSTERB: - bg_tilemap = tilemap_create(bg_get_tile_info, tilemap_scan_rows, 8,8, 32,memory_region_length(machine, "gfx2") / 32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8,8, 32,memory_region_length(machine, "gfx2") / 32); break; /* background tilemap is effectively 4 screens x n screens */ case G80_BACKGROUND_PIGNEWT: case G80_BACKGROUND_SINDBADM: - bg_tilemap = tilemap_create(bg_get_tile_info, tilemap_scan_rows, 8,8, 128,memory_region_length(machine, "gfx2") / 128); + bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8,8, 128,memory_region_length(machine, "gfx2") / 128); break; } diff --git a/src/mame/video/segahang.c b/src/mame/video/segahang.c index cc04f423395..ef449ac6871 100644 --- a/src/mame/video/segahang.c +++ b/src/mame/video/segahang.c @@ -22,7 +22,7 @@ VIDEO_START( hangon ) segaic16_palette_init(0x800); /* initialize the tile/text layers */ - segaic16_tilemap_init(0, SEGAIC16_TILEMAP_HANGON, 0x000, 0, 2); + segaic16_tilemap_init(machine, 0, SEGAIC16_TILEMAP_HANGON, 0x000, 0, 2); /* initialize the sprites */ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_HANGON, 0x400, 0); @@ -38,7 +38,7 @@ VIDEO_START( sharrier ) segaic16_palette_init(0x800); /* initialize the tile/text layers */ - segaic16_tilemap_init(0, SEGAIC16_TILEMAP_HANGON, 0x000, 0, 2); + segaic16_tilemap_init(machine, 0, SEGAIC16_TILEMAP_HANGON, 0x000, 0, 2); /* initialize the sprites */ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_SHARRIER, 0x400, 0); diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c index 5a9a00db716..235f1eee4bb 100644 --- a/src/mame/video/segaic16.c +++ b/src/mame/video/segaic16.c @@ -1199,7 +1199,7 @@ static void segaic16_tilemap_16b_reset(running_machine *machine, struct tilemap_ * *************************************/ -void segaic16_tilemap_init(int which, int type, int colorbase, int xoffs, int numbanks) +void segaic16_tilemap_init(running_machine *machine, int which, int type, int colorbase, int xoffs, int numbanks) { struct tilemap_info *info = &bg_tilemap[which]; tile_get_info_func get_text_info; @@ -1268,7 +1268,7 @@ void segaic16_tilemap_init(int which, int type, int colorbase, int xoffs, int nu } /* create the tilemap for the text layer */ - info->textmap = tilemap_create(get_text_info, tilemap_scan_rows, 8,8, 64,28); + info->textmap = tilemap_create(machine, get_text_info, tilemap_scan_rows, 8,8, 64,28); /* configure it */ info->textmap_info.rambase = info->textram; @@ -1284,7 +1284,7 @@ void segaic16_tilemap_init(int which, int type, int colorbase, int xoffs, int nu for (pagenum = 0; pagenum < info->numpages; pagenum++) { /* each page is 64x32 */ - info->tilemaps[pagenum] = tilemap_create(get_tile_info, tilemap_scan_rows, 8,8, 64,32); + info->tilemaps[pagenum] = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 64,32); /* configure the tilemap */ info->tilemap_info[pagenum].rambase = info->tileram + pagenum * 64*32; diff --git a/src/mame/video/segaic16.h b/src/mame/video/segaic16.h index e2b8c28f972..0900214906f 100644 --- a/src/mame/video/segaic16.h +++ b/src/mame/video/segaic16.h @@ -32,7 +32,7 @@ WRITE16_HANDLER( segaic16_paletteram_w ); #define SEGAIC16_TILEMAP_BACKGROUND 1 #define SEGAIC16_TILEMAP_TEXT 2 -void segaic16_tilemap_init(int which, int type, int colorbase, int xoffs, int numbanks); +void segaic16_tilemap_init(running_machine *machine, int which, int type, int colorbase, int xoffs, int numbanks); void segaic16_tilemap_reset(running_machine *machine, int which); void segaic16_tilemap_draw(const device_config *screen, bitmap_t *bitmap, const rectangle *cliprect, int which, int map, int priority, int priority_mark); void segaic16_tilemap_set_bank(running_machine *machine, int which, int banknum, int offset); diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c index 189d71d4125..5b68971aea8 100644 --- a/src/mame/video/segaic24.c +++ b/src/mame/video/segaic24.c @@ -156,10 +156,10 @@ void sys24_tile_vh_start(running_machine *machine, UINT16 tile_mask) sys24_char_dirtymap = auto_malloc(SYS24_TILES); - sys24_tile_layer[0] = tilemap_create(sys24_tile_info_0s, tilemap_scan_rows, 8, 8, 64, 64); - sys24_tile_layer[1] = tilemap_create(sys24_tile_info_0w, tilemap_scan_rows, 8, 8, 64, 64); - sys24_tile_layer[2] = tilemap_create(sys24_tile_info_1s, tilemap_scan_rows, 8, 8, 64, 64); - sys24_tile_layer[3] = tilemap_create(sys24_tile_info_1w, tilemap_scan_rows, 8, 8, 64, 64); + sys24_tile_layer[0] = tilemap_create(machine, sys24_tile_info_0s, tilemap_scan_rows, 8, 8, 64, 64); + sys24_tile_layer[1] = tilemap_create(machine, sys24_tile_info_0w, tilemap_scan_rows, 8, 8, 64, 64); + sys24_tile_layer[2] = tilemap_create(machine, sys24_tile_info_1s, tilemap_scan_rows, 8, 8, 64, 64); + sys24_tile_layer[3] = tilemap_create(machine, sys24_tile_info_1w, tilemap_scan_rows, 8, 8, 64, 64); tilemap_set_transparent_pen(sys24_tile_layer[0], 0); tilemap_set_transparent_pen(sys24_tile_layer[1], 0); diff --git a/src/mame/video/segaorun.c b/src/mame/video/segaorun.c index ea886403924..e740e13ea42 100644 --- a/src/mame/video/segaorun.c +++ b/src/mame/video/segaorun.c @@ -22,7 +22,7 @@ VIDEO_START( shangon ) segaic16_palette_init(0x1000); /* initialize the tile/text layers */ - segaic16_tilemap_init(0, SEGAIC16_TILEMAP_16B_ALT, 0x000, 0, 2); + segaic16_tilemap_init(machine, 0, SEGAIC16_TILEMAP_16B_ALT, 0x000, 0, 2); /* initialize the sprites */ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16B, 0x400, 0); @@ -38,7 +38,7 @@ VIDEO_START( outrun ) segaic16_palette_init(0x1000); /* initialize the tile/text layers */ - segaic16_tilemap_init(0, SEGAIC16_TILEMAP_16B, 0x000, 0, 2); + segaic16_tilemap_init(machine, 0, SEGAIC16_TILEMAP_16B, 0x000, 0, 2); /* initialize the sprites */ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_OUTRUN, 0x800, 0); diff --git a/src/mame/video/segas16a.c b/src/mame/video/segas16a.c index 9766ffba82f..ffbf785ba08 100644 --- a/src/mame/video/segas16a.c +++ b/src/mame/video/segas16a.c @@ -22,7 +22,7 @@ VIDEO_START( system16a ) segaic16_palette_init(0x800); /* initialize the tile/text layers */ - segaic16_tilemap_init(0, SEGAIC16_TILEMAP_16A, 0x000, 0, 1); + segaic16_tilemap_init(machine, 0, SEGAIC16_TILEMAP_16A, 0x000, 0, 1); /* initialize the sprites */ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16A, 0x400, 0); diff --git a/src/mame/video/segas16b.c b/src/mame/video/segas16b.c index 34ff6924ac5..a2b3d1e84c3 100644 --- a/src/mame/video/segas16b.c +++ b/src/mame/video/segas16b.c @@ -22,7 +22,7 @@ static void video_start_common(running_machine *machine, int type) segaic16_palette_init(0x800); /* initialize the tile/text layers */ - segaic16_tilemap_init(0, type, 0x000, 0, 2); + segaic16_tilemap_init(machine, 0, type, 0x000, 0, 2); /* initialize the sprites */ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16B, 0x400, 0); diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c index 577884dacbc..6bcdf270a63 100644 --- a/src/mame/video/segas18.c +++ b/src/mame/video/segas18.c @@ -54,7 +54,7 @@ VIDEO_START( system18 ) segaic16_palette_init(0x800); /* initialize the tile/text layers */ - segaic16_tilemap_init(0, SEGAIC16_TILEMAP_16B, 0x000, 0, 8); + segaic16_tilemap_init(machine, 0, SEGAIC16_TILEMAP_16B, 0x000, 0, 8); /* initialize the sprites */ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16B, 0x400, 0); diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index a9a2f2bb53d..315d3924394 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -286,7 +286,7 @@ static void sprite_render_list(running_machine *machine); * *************************************/ -static void common_start(int multi32) +static void common_start(running_machine *machine, int multi32) { int tmap; @@ -302,7 +302,7 @@ static void common_start(int multi32) { struct cache_entry *entry = auto_malloc(sizeof(struct cache_entry)); - entry->tmap = tilemap_create(get_tile_info, tilemap_scan_rows, 16,16, 32,16); + entry->tmap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16,16, 32,16); entry->page = 0xff; entry->bank = 0; entry->next = cache_head; @@ -332,13 +332,13 @@ static void common_start(int multi32) VIDEO_START( system32 ) { - common_start(0); + common_start(machine, 0); } VIDEO_START( multi32 ) { - common_start(1); + common_start(machine, 1); } diff --git a/src/mame/video/segaxbd.c b/src/mame/video/segaxbd.c index 4224c9a93a1..62bb4847cd9 100644 --- a/src/mame/video/segaxbd.c +++ b/src/mame/video/segaxbd.c @@ -32,7 +32,7 @@ VIDEO_START( xboard ) segaic16_palette_init(0x2000); /* initialize the tile/text layers */ - segaic16_tilemap_init(0, SEGAIC16_TILEMAP_16B, 0x1c00, 0, 2); + segaic16_tilemap_init(machine, 0, SEGAIC16_TILEMAP_16B, 0x1c00, 0, 2); /* initialize the sprites */ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_XBOARD, 0x000, 0); diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c index 9f23b46aee7..f805831ba38 100644 --- a/src/mame/video/seibuspi.c +++ b/src/mame/video/seibuspi.c @@ -482,10 +482,10 @@ VIDEO_START( spi ) int i; int region_length; - text_layer = tilemap_create( get_text_tile_info, tilemap_scan_rows, 8,8,64,32 ); - back_layer = tilemap_create( get_back_tile_info, tilemap_scan_cols, 16,16,32,32 ); - mid_layer = tilemap_create( get_mid_tile_info, tilemap_scan_cols, 16,16,32,32 ); - fore_layer = tilemap_create( get_fore_tile_info, tilemap_scan_cols, 16,16,32,32 ); + text_layer = tilemap_create( machine, get_text_tile_info, tilemap_scan_rows, 8,8,64,32 ); + back_layer = tilemap_create( machine, get_back_tile_info, tilemap_scan_cols, 16,16,32,32 ); + mid_layer = tilemap_create( machine, get_mid_tile_info, tilemap_scan_cols, 16,16,32,32 ); + fore_layer = tilemap_create( machine, get_fore_tile_info, tilemap_scan_cols, 16,16,32,32 ); tilemap_set_transparent_pen(text_layer, 31); tilemap_set_transparent_pen(mid_layer, 63); diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c index 93c2ddba16f..4bbb7d08dbd 100644 --- a/src/mame/video/seicross.c +++ b/src/mame/video/seicross.c @@ -87,7 +87,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( seicross ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(bg_tilemap, 32); diff --git a/src/mame/video/sengokmj.c b/src/mame/video/sengokmj.c index c961e98c77b..4a0bf264058 100644 --- a/src/mame/video/sengokmj.c +++ b/src/mame/video/sengokmj.c @@ -113,10 +113,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_START( sengokmj ) { - bg_tilemap = tilemap_create(sengoku_bg_tile_info,tilemap_scan_rows,16,16,32,16); - md_tilemap = tilemap_create(sengoku_md_tile_info,tilemap_scan_rows,16,16,32,16); - fg_tilemap = tilemap_create(sengoku_fg_tile_info,tilemap_scan_rows,16,16,32,16); - tx_tilemap = tilemap_create(sengoku_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); + bg_tilemap = tilemap_create(machine, sengoku_bg_tile_info,tilemap_scan_rows,16,16,32,16); + md_tilemap = tilemap_create(machine, sengoku_md_tile_info,tilemap_scan_rows,16,16,32,16); + fg_tilemap = tilemap_create(machine, sengoku_fg_tile_info,tilemap_scan_rows,16,16,32,16); + tx_tilemap = tilemap_create(machine, sengoku_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(md_tilemap,15); tilemap_set_transparent_pen(fg_tilemap,15); diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c index f8c607496a1..b91aa5898e5 100644 --- a/src/mame/video/senjyo.c +++ b/src/mame/video/senjyo.c @@ -101,19 +101,19 @@ static TILE_GET_INFO( get_bg3_tile_info ) VIDEO_START( senjyo ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); if (is_senjyo) { - bg1_tilemap = tilemap_create(senjyo_bg1_tile_info,tilemap_scan_rows,16,16,16,32); - bg2_tilemap = tilemap_create(get_bg2_tile_info, tilemap_scan_rows,16,16,16,48); /* only 16x32 used by Star Force */ - bg3_tilemap = tilemap_create(get_bg3_tile_info, tilemap_scan_rows,16,16,16,56); /* only 16x32 used by Star Force */ + bg1_tilemap = tilemap_create(machine, senjyo_bg1_tile_info,tilemap_scan_rows,16,16,16,32); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows,16,16,16,48); /* only 16x32 used by Star Force */ + bg3_tilemap = tilemap_create(machine, get_bg3_tile_info, tilemap_scan_rows,16,16,16,56); /* only 16x32 used by Star Force */ } else { - bg1_tilemap = tilemap_create(starforc_bg1_tile_info,tilemap_scan_rows,16,16,16,32); - bg2_tilemap = tilemap_create(get_bg2_tile_info, tilemap_scan_rows,16,16,16,32); /* only 16x32 used by Star Force */ - bg3_tilemap = tilemap_create(get_bg3_tile_info, tilemap_scan_rows,16,16,16,32); /* only 16x32 used by Star Force */ + bg1_tilemap = tilemap_create(machine, starforc_bg1_tile_info,tilemap_scan_rows,16,16,16,32); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows,16,16,16,32); /* only 16x32 used by Star Force */ + 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(fg_tilemap,0); diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 5fda7267494..36e014ff6a2 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -446,18 +446,18 @@ VIDEO_START( seta_2_layers ) at any given time */ /* layer 0 */ - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 64,32 ); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 64,32 ); /* layer 1 */ - tilemap_2 = tilemap_create( get_tile_info_2, tilemap_scan_rows, + tilemap_2 = tilemap_create( machine, get_tile_info_2, tilemap_scan_rows, 16,16, 64,32 ); - tilemap_3 = tilemap_create( get_tile_info_3, tilemap_scan_rows, + tilemap_3 = tilemap_create( machine, get_tile_info_3, tilemap_scan_rows, 16,16, 64,32 ); tilemaps_flip = 0; @@ -479,10 +479,10 @@ VIDEO_START( seta_1_layer ) at any given time */ /* layer 0 */ - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 64,32 ); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 16,16, 64,32 ); @@ -505,10 +505,10 @@ VIDEO_START( twineagl_1_layer ) at any given time */ /* layer 0 */ - tilemap_0 = tilemap_create( twineagl_get_tile_info_0, tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, twineagl_get_tile_info_0, tilemap_scan_rows, 16,16, 64,32 ); - tilemap_1 = tilemap_create( twineagl_get_tile_info_1, tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, twineagl_get_tile_info_1, tilemap_scan_rows, 16,16, 64,32 ); diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index b96f25915a5..758e33822d1 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -60,9 +60,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( sf ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols, 16,16,2048,16); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_cols,16,16,2048,16); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8, 64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols, 16,16,2048,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,16,16,2048,16); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8, 64,32); tilemap_set_transparent_pen(fg_tilemap,15); tilemap_set_transparent_pen(tx_tilemap,3); diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index 2d5ba6b6ceb..c294ca8654c 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -67,13 +67,13 @@ WRITE16_HANDLER( shadfrce_bg1videoram_w ) VIDEO_START( shadfrce ) { - shadfrce_fgtilemap = tilemap_create(get_shadfrce_fgtile_info,tilemap_scan_rows, 8, 8,64,32); + shadfrce_fgtilemap = tilemap_create(machine, get_shadfrce_fgtile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(shadfrce_fgtilemap,0); - shadfrce_bg0tilemap = tilemap_create(get_shadfrce_bg0tile_info,tilemap_scan_rows, 16, 16,32,32); + shadfrce_bg0tilemap = tilemap_create(machine, get_shadfrce_bg0tile_info,tilemap_scan_rows, 16, 16,32,32); tilemap_set_transparent_pen(shadfrce_bg0tilemap,0); - shadfrce_bg1tilemap = tilemap_create(get_shadfrce_bg1tile_info,tilemap_scan_rows, 16, 16,32,32); + shadfrce_bg1tilemap = tilemap_create(machine, get_shadfrce_bg1tile_info,tilemap_scan_rows, 16, 16,32,32); shadfrce_spvideoram_old = auto_malloc(spriteram_size); } diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index a479bb885b7..8e235d608d3 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -50,7 +50,7 @@ static TILE_GET_INFO( get_bg_tile_info ){ VIDEO_START( shangkid ) { - background = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,64,32); + background = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32); } WRITE8_HANDLER( shangkid_videoram_w ) diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index f612753e218..2a6410ab4f6 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -143,7 +143,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( shaolins ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(bg_tilemap, 32); diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index b453c8ae744..18ec47ce182 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( sichuan2 ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index 2e07a650ef5..5ce58b3dc54 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -72,8 +72,8 @@ WRITE8_HANDLER( shootout_textram_w ){ } VIDEO_START( shootout ){ - background = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,32,32); - foreground = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + background = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,32,32); + foreground = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen( foreground, 0 ); } diff --git a/src/mame/video/shuuz.c b/src/mame/video/shuuz.c index f47c8738b9a..d40aa6c54f9 100644 --- a/src/mame/video/shuuz.c +++ b/src/mame/video/shuuz.c @@ -73,7 +73,7 @@ VIDEO_START( shuuz ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 5388633c2a6..ef1126aee87 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -150,17 +150,17 @@ VIDEO_START( sidearms ) if (!sidearms_gameid) { - bg_tilemap = tilemap_create(get_sidearms_bg_tile_info, sidearms_tilemap_scan, + bg_tilemap = tilemap_create(machine, get_sidearms_bg_tile_info, sidearms_tilemap_scan, 32, 32, 128, 128); tilemap_set_transparent_pen(bg_tilemap, 15); } else { - bg_tilemap = tilemap_create(get_philko_bg_tile_info, sidearms_tilemap_scan, 32, 32, 128, 128); + bg_tilemap = tilemap_create(machine, get_philko_bg_tile_info, sidearms_tilemap_scan, 32, 32, 128, 128); } - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 64); tilemap_set_transparent_pen(fg_tilemap, 3); diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 886c2d75caf..de1caca8b19 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -65,7 +65,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( sidepckt ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transmask(bg_tilemap,0,0xff,0x00); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(bg_tilemap,1,0x01,0xfe); /* split type 1 has pen 0 transparent in front half */ diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index 893fc094e5f..0ae1752cbfe 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -141,13 +141,13 @@ VIDEO_START(silkroad) { enable1 = enable2 = enable3 = 1; - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,16,16,64, 64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,64, 64); tilemap_set_transparent_pen(fg_tilemap,0); - fg2_tilemap = tilemap_create(get_fg2_tile_info,tilemap_scan_rows,16,16,64, 64); + fg2_tilemap = tilemap_create(machine, get_fg2_tile_info,tilemap_scan_rows,16,16,64, 64); tilemap_set_transparent_pen(fg2_tilemap,0); - fg3_tilemap = tilemap_create(get_fg3_tile_info,tilemap_scan_rows,16,16,64, 64); + fg3_tilemap = tilemap_create(machine, get_fg3_tile_info,tilemap_scan_rows,16,16,64, 64); tilemap_set_transparent_pen(fg3_tilemap,0); } diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c index 3959849f088..8bec85fc24d 100644 --- a/src/mame/video/skullxbo.c +++ b/src/mame/video/skullxbo.c @@ -83,13 +83,13 @@ VIDEO_START( skullxbo ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 16,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 16,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); } diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c index 7d8b70bdfaf..b20cbee1d5b 100644 --- a/src/mame/video/skydiver.c +++ b/src/mame/video/skydiver.c @@ -57,7 +57,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( skydiver ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); } diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c index 7d0f6e92088..ccf864f82dc 100644 --- a/src/mame/video/skykid.c +++ b/src/mame/video/skykid.c @@ -111,8 +111,8 @@ static TILE_GET_INFO( bg_get_tile_info ) VIDEO_START( skykid ) { - tx_tilemap = tilemap_create(tx_get_tile_info,tx_tilemap_scan, 8,8,36,28); - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows, 8,8,64,32); + tx_tilemap = tilemap_create(machine, tx_get_tile_info,tx_tilemap_scan, 8,8,36,28); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows, 8,8,64,32); tilemap_set_transparent_pen(tx_tilemap, 0); diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index bf23573b7dc..d8dcb9f4089 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -76,15 +76,15 @@ static TILE_GET_INFO( get_fix_tile_info ) VIDEO_START( perfrman ) { - pf1_tilemap = tilemap_create(get_pf_tile_info,tilemap_scan_rows,8,8,64,32); + pf1_tilemap = tilemap_create(machine, get_pf_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(pf1_tilemap,0); } VIDEO_START( slapfight ) { - pf1_tilemap = tilemap_create(get_pf1_tile_info,tilemap_scan_rows,8,8,64,32); - fix_tilemap = tilemap_create(get_fix_tile_info,tilemap_scan_rows,8,8,64,32); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_rows,8,8,64,32); + fix_tilemap = tilemap_create(machine, get_fix_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(fix_tilemap,0); } diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c index cc46c213362..564b311e82f 100644 --- a/src/mame/video/snk.c +++ b/src/mame/video/snk.c @@ -222,9 +222,9 @@ VIDEO_START( marvins ) { VIDEO_START_CALL(snk_3bpp_shadow); - tx_tilemap = tilemap_create(marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); - fg_tilemap = tilemap_create(marvins_get_fg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); - bg_tilemap = tilemap_create(marvins_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); + tx_tilemap = tilemap_create(machine, marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); + fg_tilemap = tilemap_create(machine, marvins_get_fg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); + bg_tilemap = tilemap_create(machine, marvins_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); tilemap_set_transparent_pen(tx_tilemap,15); tilemap_set_scrolldy(tx_tilemap, 8, 8); @@ -241,8 +241,8 @@ VIDEO_START( jcross ) { VIDEO_START_CALL(snk_3bpp_shadow); - tx_tilemap = tilemap_create(marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); - bg_tilemap = tilemap_create(aso_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 64); + tx_tilemap = tilemap_create(machine, marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); + bg_tilemap = tilemap_create(machine, aso_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 64); tilemap_set_transparent_pen(tx_tilemap, 15); tilemap_set_scrolldy(tx_tilemap, 8, 8); @@ -258,8 +258,8 @@ VIDEO_START( sgladiat ) { VIDEO_START_CALL(snk_3bpp_shadow); - tx_tilemap = tilemap_create(marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); - bg_tilemap = tilemap_create(aso_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); + tx_tilemap = tilemap_create(machine, marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); + bg_tilemap = tilemap_create(machine, aso_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 32); tilemap_set_transparent_pen(tx_tilemap, 15); tilemap_set_scrolldy(tx_tilemap, 8, 8); @@ -296,8 +296,8 @@ VIDEO_START( tnk3 ) { VIDEO_START_CALL(snk_3bpp_shadow); - tx_tilemap = tilemap_create(marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); - bg_tilemap = tilemap_create(tnk3_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 64); + tx_tilemap = tilemap_create(machine, marvins_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); + bg_tilemap = tilemap_create(machine, tnk3_get_bg_tile_info, tilemap_scan_cols, 8, 8, 64, 64); tilemap_set_transparent_pen(tx_tilemap, 15); tilemap_set_scrolldy(tx_tilemap, 8, 8); @@ -313,8 +313,8 @@ VIDEO_START( ikari ) { VIDEO_START_CALL(snk_3bpp_shadow); - tx_tilemap = tilemap_create(ikari_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); - bg_tilemap = tilemap_create(ikari_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); + tx_tilemap = tilemap_create(machine, ikari_get_tx_tile_info, marvins_tx_scan_cols, 8, 8, 36, 28); + bg_tilemap = tilemap_create(machine, ikari_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); tilemap_set_transparent_pen(tx_tilemap, 15); tilemap_set_scrolldy(tx_tilemap, 8, 8); @@ -327,8 +327,8 @@ VIDEO_START( gwar ) { memset(empty_tile,0xf,sizeof(empty_tile)); - tx_tilemap = tilemap_create(gwar_get_tx_tile_info, tilemap_scan_cols, 8, 8, 50, 32); - bg_tilemap = tilemap_create(gwar_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); + tx_tilemap = tilemap_create(machine, gwar_get_tx_tile_info, tilemap_scan_cols, 8, 8, 50, 32); + bg_tilemap = tilemap_create(machine, gwar_get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); tilemap_set_transparent_pen(tx_tilemap, 15); diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index ca684e2b35d..1617a21926b 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -62,14 +62,14 @@ static void common_video_start(running_machine *machine) VIDEO_START( pow ) { - fg_tilemap = tilemap_create(get_pow_tile_info,tilemap_scan_cols,8,8,32,32); + fg_tilemap = tilemap_create(machine, get_pow_tile_info,tilemap_scan_cols,8,8,32,32); common_video_start(machine); } VIDEO_START( searchar ) { - fg_tilemap = tilemap_create(get_searchar_tile_info,tilemap_scan_cols,8,8,32,32); + fg_tilemap = tilemap_create(machine, get_searchar_tile_info,tilemap_scan_cols,8,8,32,32); common_video_start(machine); } diff --git a/src/mame/video/snookr10.c b/src/mame/video/snookr10.c index f7cd76898de..78428ae6531 100644 --- a/src/mame/video/snookr10.c +++ b/src/mame/video/snookr10.c @@ -174,12 +174,12 @@ static TILE_GET_INFO( apple10_get_bg_tile_info ) VIDEO_START( snookr10 ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 4, 8, 128, 30); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 4, 8, 128, 30); } VIDEO_START( apple10 ) { - bg_tilemap = tilemap_create(apple10_get_bg_tile_info, tilemap_scan_rows, 4, 8, 128, 30); + bg_tilemap = tilemap_create(machine, apple10_get_bg_tile_info, tilemap_scan_rows, 4, 8, 128, 30); } VIDEO_UPDATE( snookr10 ) diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index 0a019916c5d..5594b987049 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -59,10 +59,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( solomon ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index 8a02090a2d5..c01510fc4ed 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -130,7 +130,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( sonson ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(bg_tilemap, 32); } diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index 97aad47fefb..72471ecd96d 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -79,7 +79,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( spdodgeb ) { - bg_tilemap = tilemap_create(get_bg_tile_info,background_scan,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,background_scan,8,8,64,32); } diff --git a/src/mame/video/speedatk.c b/src/mame/video/speedatk.c index 3c4281558d8..ed4f0178ceb 100644 --- a/src/mame/video/speedatk.c +++ b/src/mame/video/speedatk.c @@ -119,7 +119,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( speedatk ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,34,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,34,32); } VIDEO_UPDATE( speedatk ) diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c index 16dbb2035e7..4fb19d6e66f 100644 --- a/src/mame/video/speedbal.c +++ b/src/mame/video/speedbal.c @@ -39,8 +39,8 @@ static TILE_GET_INFO( get_tile_info_fg ) VIDEO_START( speedbal ) { - bg_tilemap = tilemap_create(get_tile_info_bg, tilemap_scan_cols_flip_x, 16, 16, 16, 16); - fg_tilemap = tilemap_create(get_tile_info_fg, tilemap_scan_cols_flip_x, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_tile_info_bg, tilemap_scan_cols_flip_x, 16, 16, 16, 16); + fg_tilemap = tilemap_create(machine, get_tile_info_fg, tilemap_scan_cols_flip_x, 8, 8, 32, 32); tilemap_set_transmask(bg_tilemap,0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(bg_tilemap,1,0x00f7,0x0000); /* split type 1 has pen 0-2, 4-7 transparent in front half */ diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c index 61e5a3ae084..758ede58cea 100644 --- a/src/mame/video/speedspn.c +++ b/src/mame/video/speedspn.c @@ -21,7 +21,7 @@ static TILE_GET_INFO( get_speedspn_tile_info ) VIDEO_START(speedspn) { speedspn_vidram = auto_malloc(0x1000 * 2); - speedspn_tilemap = tilemap_create(get_speedspn_tile_info,tilemap_scan_cols, 8, 8,64,32); + speedspn_tilemap = tilemap_create(machine, get_speedspn_tile_info,tilemap_scan_cols, 8, 8,64,32); } WRITE8_HANDLER( speedspn_vidram_w ) diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c index 1a550ab8b00..ecbd7ae7d45 100644 --- a/src/mame/video/splash.c +++ b/src/mame/video/splash.c @@ -178,8 +178,8 @@ static void draw_bitmap(bitmap_t *bitmap,const rectangle *cliprect) VIDEO_START( splash ) { - bg_tilemap[0] = tilemap_create(get_tile_info_splash_tilemap0,tilemap_scan_rows, 8, 8,64,32); - bg_tilemap[1] = tilemap_create(get_tile_info_splash_tilemap1,tilemap_scan_rows,16,16,32,32); + bg_tilemap[0] = tilemap_create(machine, get_tile_info_splash_tilemap0,tilemap_scan_rows, 8, 8,64,32); + bg_tilemap[1] = tilemap_create(machine, get_tile_info_splash_tilemap1,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(bg_tilemap[0],0); tilemap_set_transparent_pen(bg_tilemap[1],0); diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c index 7b748ea511a..c5e8a582058 100644 --- a/src/mame/video/sprcros2.c +++ b/src/mame/video/sprcros2.c @@ -131,8 +131,8 @@ static TILE_GET_INFO( get_sprcros2_fgtile_info ) VIDEO_START( sprcros2 ) { - sprcros2_bgtilemap = tilemap_create( get_sprcros2_bgtile_info,tilemap_scan_rows,8,8,32,32 ); - sprcros2_fgtilemap = tilemap_create( get_sprcros2_fgtile_info,tilemap_scan_rows,8,8,32,32 ); + sprcros2_bgtilemap = tilemap_create( machine, get_sprcros2_bgtile_info,tilemap_scan_rows,8,8,32,32 ); + sprcros2_fgtilemap = tilemap_create( machine, get_sprcros2_fgtile_info,tilemap_scan_rows,8,8,32,32 ); colortable_configure_tilemap_groups(machine->colortable, sprcros2_fgtilemap, machine->gfx[2], 0); } diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c index 4bd3fe74a88..ee3ec74c788 100644 --- a/src/mame/video/sprint2.c +++ b/src/mame/video/sprint2.c @@ -53,7 +53,7 @@ VIDEO_START( sprint2 ) { helper = video_screen_auto_bitmap_alloc(machine->primary_screen); - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 16, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 8, 32, 32); } diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c index 42274189e20..6fd03fdcbab 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -55,7 +55,7 @@ VIDEO_START( sprint4 ) { helper = video_screen_auto_bitmap_alloc(machine->primary_screen); - playfield = tilemap_create(sprint4_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + playfield = tilemap_create(machine, sprint4_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c index d3b12533b4d..a3435f04e12 100644 --- a/src/mame/video/sprint8.c +++ b/src/mame/video/sprint8.c @@ -128,8 +128,8 @@ VIDEO_START( sprint8 ) helper1 = video_screen_auto_bitmap_alloc(machine->primary_screen); helper2 = video_screen_auto_bitmap_alloc(machine->primary_screen); - tilemap1 = tilemap_create(get_tile_info1, tilemap_scan_rows, 16, 8, 32, 32); - tilemap2 = tilemap_create(get_tile_info2, tilemap_scan_rows, 16, 8, 32, 32); + tilemap1 = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 16, 8, 32, 32); + tilemap2 = tilemap_create(machine, get_tile_info2, tilemap_scan_rows, 16, 8, 32, 32); tilemap_set_scrolly(tilemap1, 0, +24); tilemap_set_scrolly(tilemap2, 0, +24); diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index f815564a318..c6c34ecadbf 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -51,8 +51,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( srumbler ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_cols,8,8,64,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols, 16,16,64,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols, 16,16,64,64); tilemap_set_transparent_pen(fg_tilemap,3); diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index 5519cd81281..b26acd3e140 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -172,9 +172,9 @@ static TILE_GET_INFO( get_pf1_8x8_tile_info ) VIDEO_START( sshangha ) { - pf1_8x8_tilemap = tilemap_create(get_pf1_8x8_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf1_16x16_tilemap = tilemap_create(get_pf1_16x16_tile_info,tilemap_scan_rows,16,16,32,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_rows, 16,16,32,32); + pf1_8x8_tilemap = tilemap_create(machine, get_pf1_8x8_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf1_16x16_tilemap = tilemap_create(machine, get_pf1_16x16_tile_info,tilemap_scan_rows,16,16,32,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,tilemap_scan_rows, 16,16,32,32); tilemap_set_transparent_pen(pf1_8x8_tilemap,0); tilemap_set_transparent_pen(pf1_16x16_tilemap,0); diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index d31e7ad0a32..bd2081b8d8b 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -142,9 +142,9 @@ WRITE16_HANDLER( powerbls_bg_tileram_w ) VIDEO_START(sslam) { - sslam_bg_tilemap = tilemap_create(get_sslam_bg_tile_info,tilemap_scan_rows,16,16,32,32); - sslam_md_tilemap = tilemap_create(get_sslam_md_tile_info,tilemap_scan_rows,16,16,32,32); - sslam_tx_tilemap = tilemap_create(get_sslam_tx_tile_info,tilemap_scan_rows,8,8,64,64); + sslam_bg_tilemap = tilemap_create(machine, get_sslam_bg_tile_info,tilemap_scan_rows,16,16,32,32); + sslam_md_tilemap = tilemap_create(machine, get_sslam_md_tile_info,tilemap_scan_rows,16,16,32,32); + sslam_tx_tilemap = tilemap_create(machine, get_sslam_tx_tile_info,tilemap_scan_rows,8,8,64,64); tilemap_set_transparent_pen(sslam_md_tilemap,0); tilemap_set_transparent_pen(sslam_tx_tilemap,0); @@ -155,7 +155,7 @@ VIDEO_START(sslam) VIDEO_START(powerbls) { - sslam_bg_tilemap = tilemap_create(get_powerbls_bg_tile_info,tilemap_scan_rows,8,8,64,64); + sslam_bg_tilemap = tilemap_create(machine, get_powerbls_bg_tile_info,tilemap_scan_rows,8,8,64,64); sprites_x_offset = -21; state_save_register_global(machine, sprites_x_offset); diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index 07619b000ac..9e78b0907df 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -130,10 +130,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( ssozumo ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols_flip_x, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_x, 16, 16, 16, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols_flip_x, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_x, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c index 494066c8235..474c9895bef 100644 --- a/src/mame/video/ssrj.c +++ b/src/mame/video/ssrj.c @@ -232,9 +232,9 @@ static const int fakecols[4*4][8][3]= VIDEO_START( ssrj ) { - tilemap1 = tilemap_create( get_tile_info1,tilemap_scan_rows,8,8,32,32 ); - tilemap2 = tilemap_create( get_tile_info2,tilemap_scan_rows,8,8,32,32 ); - tilemap4 = tilemap_create( get_tile_info4,tilemap_scan_rows,8,8,32,32 ); + tilemap1 = tilemap_create( machine, get_tile_info1,tilemap_scan_rows,8,8,32,32 ); + tilemap2 = tilemap_create( machine, get_tile_info2,tilemap_scan_rows,8,8,32,32 ); + tilemap4 = tilemap_create( machine, get_tile_info4,tilemap_scan_rows,8,8,32,32 ); tilemap_set_transparent_pen(tilemap2,0); tilemap_set_transparent_pen(tilemap4,0); } diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 94adf903e4d..232f2ddd38f 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -228,7 +228,7 @@ VIDEO_START( gdfs ) eaglshot_gfxram = (UINT16*)auto_malloc(4 * 0x100000); eaglshot_dirty_tile = (char*)auto_malloc(4 * 0x100000 / (16*8)); - gdfs_tmap = tilemap_create( get_tile_info_0, tilemap_scan_rows, + gdfs_tmap = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 16,16, 0x100,0x100 ); tilemap_set_transparent_pen(gdfs_tmap, 0); diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index 42e8a7d828e..a17a53d93c5 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -156,8 +156,8 @@ static TILE_GET_INFO( get_pf1_tile_info ) VIDEO_START( stadhero ) { - pf1_tilemap = tilemap_create(get_pf1_tile_info,tilemap_scan_rows, 8, 8,32,32); - pf2_tilemap = tilemap_create(get_pf2_tile_info,stadhero_scan, 16,16,64,64); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_rows, 8, 8,32,32); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,stadhero_scan, 16,16,64,64); stadhero_pf2_data = auto_malloc(0x2000 * 2); diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index 6068bc98baa..9b2522cf35a 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -88,7 +88,7 @@ VIDEO_START( starshp1 ) int i; - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 16, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 8, 32, 32); tilemap_set_transparent_pen(bg_tilemap, 0); diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c index 75d29f3ae20..9ac541efb95 100644 --- a/src/mame/video/stfight.c +++ b/src/mame/video/stfight.c @@ -163,9 +163,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( stfight ) { - bg_tilemap = tilemap_create(get_bg_tile_info,bg_scan, 16,16,128,256); - fg_tilemap = tilemap_create(get_fg_tile_info,fg_scan,16,16,128,256); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,bg_scan, 16,16,128,256); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,fg_scan,16,16,128,256); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8,8,32,32); tilemap_set_transparent_pen(fg_tilemap,0x0f); colortable_configure_tilemap_groups(machine->colortable, tx_tilemap, machine->gfx[0], 0xcf); diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index 2ec0f3ebb18..94d32d1399f 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -181,10 +181,10 @@ VIDEO_UPDATE( stlforce ) VIDEO_START( stlforce ) { - stlforce_bg_tilemap = tilemap_create(get_stlforce_bg_tile_info, tilemap_scan_cols, 16,16,64,16); - stlforce_mlow_tilemap = tilemap_create(get_stlforce_mlow_tile_info, tilemap_scan_cols, 16,16,64,16); - stlforce_mhigh_tilemap = tilemap_create(get_stlforce_mhigh_tile_info,tilemap_scan_cols, 16,16,64,16); - stlforce_tx_tilemap = tilemap_create(get_stlforce_tx_tile_info, tilemap_scan_rows, 8, 8,64,32); + stlforce_bg_tilemap = tilemap_create(machine, get_stlforce_bg_tile_info, tilemap_scan_cols, 16,16,64,16); + stlforce_mlow_tilemap = tilemap_create(machine, get_stlforce_mlow_tile_info, tilemap_scan_cols, 16,16,64,16); + stlforce_mhigh_tilemap = tilemap_create(machine, get_stlforce_mhigh_tile_info,tilemap_scan_cols, 16,16,64,16); + stlforce_tx_tilemap = tilemap_create(machine, get_stlforce_tx_tile_info, tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(stlforce_mlow_tilemap,0); tilemap_set_transparent_pen(stlforce_mhigh_tilemap,0); diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index 1829cd51189..57b1b1ddd8a 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -74,7 +74,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( strnskil ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_scroll_rows(bg_tilemap, 32); diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index 11acd959927..f6c54333dde 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -183,7 +183,7 @@ static void suna8_vh_start_common(int dim) } #if TILEMAPS - bg_tilemap = tilemap_create( get_tile_info, tilemap_scan_cols, + bg_tilemap = tilemap_create( machine, get_tile_info, tilemap_scan_cols, 8,8,0x20*((suna8_text_dim > 0)?4:8),0x20); diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index 11f5fdd6154..647931a5d2a 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -56,7 +56,7 @@ static TILE_GET_INFO( sqix_get_bg_tile_info ) VIDEO_START( pbillian ) { - bg_tilemap = tilemap_create(pb_get_bg_tile_info, tilemap_scan_rows, 8, 8,32,32); + bg_tilemap = tilemap_create(machine, pb_get_bg_tile_info, tilemap_scan_rows, 8, 8,32,32); /* Need to do save state here */ state_save_register_global(machine, last_power[0]); @@ -68,7 +68,7 @@ VIDEO_START( superqix ) { fg_bitmap[0] = auto_bitmap_alloc(256, 256, video_screen_get_format(machine->primary_screen)); fg_bitmap[1] = auto_bitmap_alloc(256, 256, video_screen_get_format(machine->primary_screen)); - bg_tilemap = tilemap_create(sqix_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, sqix_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transmask(bg_tilemap,0,0xffff,0x0000); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(bg_tilemap,1,0x0001,0xfffe); /* split type 1 has pen 0 transparent in front half */ diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c index e5833809a28..e33af8a9433 100644 --- a/src/mame/video/suprloco.c +++ b/src/mame/video/suprloco.c @@ -98,7 +98,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( suprloco ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_scroll_rows(bg_tilemap,32); } diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index a02b151b033..46c3e734782 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -905,10 +905,10 @@ WRITE32_HANDLER ( skns_v3_regs_w ) VIDEO_START(skns) { - skns_tilemap_A = tilemap_create(get_tilemap_A_tile_info,tilemap_scan_rows,16,16,64, 64); + skns_tilemap_A = tilemap_create(machine, get_tilemap_A_tile_info,tilemap_scan_rows,16,16,64, 64); tilemap_set_transparent_pen(skns_tilemap_A,0); - skns_tilemap_B = tilemap_create(get_tilemap_B_tile_info,tilemap_scan_rows,16,16,64, 64); + skns_tilemap_B = tilemap_create(machine, get_tilemap_B_tile_info,tilemap_scan_rows,16,16,64, 64); tilemap_set_transparent_pen(skns_tilemap_B,0); sprite_bitmap = auto_bitmap_alloc(1024,1024,BITMAP_FORMAT_INDEXED16); diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c index 1e72a9f8759..13840c01914 100644 --- a/src/mame/video/suprridr.c +++ b/src/mame/video/suprridr.c @@ -47,9 +47,9 @@ static TILE_GET_INFO( get_tile_info2 ) VIDEO_START( suprridr ) { - fg_tilemap = tilemap_create(get_tile_info2, tilemap_scan_rows, 8,8, 32,32); - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8,8, 32,32); - bg_tilemap_noscroll = tilemap_create(get_tile_info, tilemap_scan_rows, 8,8, 32,32); + fg_tilemap = tilemap_create(machine, get_tile_info2, tilemap_scan_rows, 8,8, 32,32); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 32,32); + bg_tilemap_noscroll = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 32,32); tilemap_set_transparent_pen(fg_tilemap, 0); } diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c index 45b2bab513c..edfbc538687 100644 --- a/src/mame/video/suprslam.c +++ b/src/mame/video/suprslam.c @@ -139,8 +139,8 @@ static TILE_GET_INFO( get_suprslam_bg_tile_info ) VIDEO_START( suprslam ) { - suprslam_bg_tilemap = tilemap_create(get_suprslam_bg_tile_info,tilemap_scan_rows, 16, 16,64,64); - suprslam_screen_tilemap = tilemap_create(get_suprslam_tile_info,tilemap_scan_rows, 8, 8,64,32); + suprslam_bg_tilemap = tilemap_create(machine, get_suprslam_bg_tile_info,tilemap_scan_rows, 16, 16,64,64); + suprslam_screen_tilemap = tilemap_create(machine, get_suprslam_tile_info,tilemap_scan_rows, 8, 8,64,32); K053936_wraparound_enable(0, 1); K053936_set_offset(0, -45, -21); diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index 09eb0fc7a27..8def0b4ab79 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -777,28 +777,28 @@ VIDEO_START( system16 ){ ); if( !sys16_bg1_trans ) - background = tilemap_create( + background = tilemap_create(machine, get_bg_tile_info, sys16_bg_map, 8,8, 64*2,32*2 ); else - background = tilemap_create( + background = tilemap_create(machine, get_bg_tile_info, sys16_bg_map, 8,8, 64*2,32*2 ); - foreground = tilemap_create( + foreground = tilemap_create(machine, get_fg_tile_info, sys16_bg_map, 8,8, 64*2,32*2 ); - text_layer = tilemap_create( + text_layer = tilemap_create(machine, get_text_tile_info, sys16_text_map, @@ -864,14 +864,14 @@ VIDEO_START( system18old ){ sys18_ddcrew_bankregs[i]=-1; } - background2 = tilemap_create( + background2 = tilemap_create(machine, get_bg2_tile_info, sys16_bg_map, 8,8, 64*2,32*2 ); - foreground2 = tilemap_create( + foreground2 = tilemap_create(machine, get_fg2_tile_info, sys16_bg_map, diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index a2c3914f207..86bcb4974e4 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -129,7 +129,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( tagteam ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows_flip_x, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows_flip_x, 8, 8, 32, 32); } diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index 1102d10dbf9..e59b09f05c7 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -52,7 +52,7 @@ static void zoom_callback(int *code,int *color,int *flags) VIDEO_START( tail2nos ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,64,32); K051316_vh_start_0(machine,"gfx3",-4,TRUE,0,zoom_callback); diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c index d3a0979a45d..becb11767d7 100644 --- a/src/mame/video/taito_b.c +++ b/src/mame/video/taito_b.c @@ -209,9 +209,9 @@ static VIDEO_START( taitob_core ) framebuffer[1] = auto_bitmap_alloc(512,256, video_screen_get_format(machine->primary_screen)); pixel_bitmap = NULL; /* only hitice needs this */ - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16,16,64,64); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,16,16,64,64); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16,16,64,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,64,64); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(tx_tilemap,0); diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index 8a9e534b66c..c7640dd7adb 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -639,10 +639,10 @@ VIDEO_START( f3 ) f3_game_config=pCFG; if (f3_game_config->extend) { - pf1_tilemap = tilemap_create(get_tile_info1,tilemap_scan_rows,16,16,64,32); - pf2_tilemap = tilemap_create(get_tile_info2,tilemap_scan_rows,16,16,64,32); - pf3_tilemap = tilemap_create(get_tile_info3,tilemap_scan_rows,16,16,64,32); - pf4_tilemap = tilemap_create(get_tile_info4,tilemap_scan_rows,16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,16,16,64,32); + pf2_tilemap = tilemap_create(machine, get_tile_info2,tilemap_scan_rows,16,16,64,32); + pf3_tilemap = tilemap_create(machine, get_tile_info3,tilemap_scan_rows,16,16,64,32); + pf4_tilemap = tilemap_create(machine, get_tile_info4,tilemap_scan_rows,16,16,64,32); f3_pf_data_1=f3_pf_data+0x0000; f3_pf_data_2=f3_pf_data+0x0800; @@ -654,10 +654,10 @@ VIDEO_START( f3 ) twidth_mask_bit=6; } else { - pf1_tilemap = tilemap_create(get_tile_info1,tilemap_scan_rows,16,16,32,32); - pf2_tilemap = tilemap_create(get_tile_info2,tilemap_scan_rows,16,16,32,32); - pf3_tilemap = tilemap_create(get_tile_info3,tilemap_scan_rows,16,16,32,32); - pf4_tilemap = tilemap_create(get_tile_info4,tilemap_scan_rows,16,16,32,32); + pf1_tilemap = tilemap_create(machine, get_tile_info1,tilemap_scan_rows,16,16,32,32); + pf2_tilemap = tilemap_create(machine, get_tile_info2,tilemap_scan_rows,16,16,32,32); + pf3_tilemap = tilemap_create(machine, get_tile_info3,tilemap_scan_rows,16,16,32,32); + pf4_tilemap = tilemap_create(machine, get_tile_info4,tilemap_scan_rows,16,16,32,32); f3_pf_data_1=f3_pf_data+0x0000; f3_pf_data_2=f3_pf_data+0x0400; @@ -672,8 +672,8 @@ VIDEO_START( f3 ) spriteram32_buffered = (UINT32 *)auto_malloc(0x10000); spritelist = auto_malloc(0x400 * sizeof(*spritelist)); sprite_end = spritelist; - vram_layer = tilemap_create(get_tile_info_vram,tilemap_scan_rows,8,8,64,64); - pixel_layer = tilemap_create(get_tile_info_pixel,tilemap_scan_cols,8,8,64,32); + vram_layer = tilemap_create(machine, get_tile_info_vram,tilemap_scan_rows,8,8,64,64); + pixel_layer = tilemap_create(machine, get_tile_info_pixel,tilemap_scan_cols,8,8,64,32); pivot_dirty = (UINT8 *)auto_malloc(2048); pf_line_inf = auto_malloc(5 * sizeof(struct f3_playfield_line_inf)); sa_line_inf = auto_malloc(1 * sizeof(struct f3_spritealpha_line_inf)); diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index e65c98c643a..55be6dc8410 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -76,9 +76,9 @@ VIDEO_START( taitol ) { int i; - bg18_tilemap = tilemap_create(get_bg18_tile_info,tilemap_scan_rows,8,8,64,32); - bg19_tilemap = tilemap_create(get_bg19_tile_info,tilemap_scan_rows, 8,8,64,32); - ch1a_tilemap = tilemap_create(get_ch1a_tile_info,tilemap_scan_rows,8,8,64,32); + bg18_tilemap = tilemap_create(machine, get_bg18_tile_info,tilemap_scan_rows,8,8,64,32); + bg19_tilemap = tilemap_create(machine, get_bg19_tile_info,tilemap_scan_rows, 8,8,64,32); + ch1a_tilemap = tilemap_create(machine, get_ch1a_tile_info,tilemap_scan_rows,8,8,64,32); bankc[0] = bankc[1] = bankc[2] = bankc[3] = 0; horshoes_gfxbank = 0; diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index f6f80aaa5a8..f894ed6e265 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -782,13 +782,13 @@ void PC080SN_vh_start(running_machine *machine,int chips,int gfxnum,int x_offset if (!PC080SN_dblwidth) /* standard tilemaps */ { - PC080SN_tilemap[i][0] = tilemap_create(PC080SN_get_tile_info[i][0],tilemap_scan_rows,8,8,64,64); - PC080SN_tilemap[i][1] = tilemap_create(PC080SN_get_tile_info[i][1],tilemap_scan_rows,8,8,64,64); + PC080SN_tilemap[i][0] = tilemap_create(machine, PC080SN_get_tile_info[i][0],tilemap_scan_rows,8,8,64,64); + PC080SN_tilemap[i][1] = tilemap_create(machine, PC080SN_get_tile_info[i][1],tilemap_scan_rows,8,8,64,64); } else /* double width tilemaps */ { - PC080SN_tilemap[i][0] = tilemap_create(PC080SN_get_tile_info[i][0],tilemap_scan_rows,8,8,128,64); - PC080SN_tilemap[i][1] = tilemap_create(PC080SN_get_tile_info[i][1],tilemap_scan_rows,8,8,128,64); + PC080SN_tilemap[i][0] = tilemap_create(machine, PC080SN_get_tile_info[i][0],tilemap_scan_rows,8,8,128,64); + PC080SN_tilemap[i][1] = tilemap_create(machine, PC080SN_get_tile_info[i][1],tilemap_scan_rows,8,8,128,64); } PC080SN_ram[i] = auto_malloc(PC080SN_RAM_SIZE); @@ -1517,8 +1517,8 @@ void TC0080VCO_vh_start(running_machine *machine, int gfxnum,int has_fg0,int bg_ TC0080VCO_bg_flip_yoffs = bg_flip_yoffs; /* usually -2 */ TC0080VCO_has_tx = has_fg0; /* for debugging only */ - TC0080VCO_tilemap[0] = tilemap_create(TC0080VCO_get_bg0_tile_info_0,tilemap_scan_rows,16,16,64,64); - TC0080VCO_tilemap[1] = tilemap_create(TC0080VCO_get_bg1_tile_info_0,tilemap_scan_rows,16,16,64,64); + TC0080VCO_tilemap[0] = tilemap_create(machine, TC0080VCO_get_bg0_tile_info_0,tilemap_scan_rows,16,16,64,64); + TC0080VCO_tilemap[1] = tilemap_create(machine, TC0080VCO_get_bg1_tile_info_0,tilemap_scan_rows,16,16,64,64); TC0080VCO_ram = auto_malloc(TC0080VCO_RAM_SIZE); memset( TC0080VCO_ram,0,TC0080VCO_RAM_SIZE ); @@ -1540,7 +1540,7 @@ void TC0080VCO_vh_start(running_machine *machine, int gfxnum,int has_fg0,int bg_ /* Perform extra initialisations for text layer */ { - TC0080VCO_tilemap[2] = tilemap_create(TC0080VCO_get_tx_tile_info,tilemap_scan_rows,8,8,64,64); + TC0080VCO_tilemap[2] = tilemap_create(machine, TC0080VCO_get_tx_tile_info,tilemap_scan_rows,8,8,64,64); TC0080VCO_char_dirty = auto_malloc(TC0080VCO_TOTAL_CHARS); TC0080VCO_dirty_chars(); @@ -2286,14 +2286,14 @@ void TC0100SCN_vh_start(running_machine *machine, int chips,int gfxnum,int x_off screen = machine->primary_screen; /* Single width versions */ - TC0100SCN_tilemap[i][0][0] = tilemap_create(TC0100SCN_get_tile_info[i][0],tilemap_scan_rows,8,8,64,64); - TC0100SCN_tilemap[i][1][0] = tilemap_create(TC0100SCN_get_tile_info[i][1],tilemap_scan_rows,8,8,64,64); - TC0100SCN_tilemap[i][2][0] = tilemap_create(TC0100SCN_get_tile_info[i][2],tilemap_scan_rows,8,8,64,64); + TC0100SCN_tilemap[i][0][0] = tilemap_create(machine, TC0100SCN_get_tile_info[i][0],tilemap_scan_rows,8,8,64,64); + TC0100SCN_tilemap[i][1][0] = tilemap_create(machine, TC0100SCN_get_tile_info[i][1],tilemap_scan_rows,8,8,64,64); + TC0100SCN_tilemap[i][2][0] = tilemap_create(machine, TC0100SCN_get_tile_info[i][2],tilemap_scan_rows,8,8,64,64); /* Double width versions */ - TC0100SCN_tilemap[i][0][1] = tilemap_create(TC0100SCN_get_tile_info[i][0],tilemap_scan_rows,8,8,128,64); - TC0100SCN_tilemap[i][1][1] = tilemap_create(TC0100SCN_get_tile_info[i][1],tilemap_scan_rows,8,8,128,64); - TC0100SCN_tilemap[i][2][1] = tilemap_create(TC0100SCN_get_tile_info[i][2],tilemap_scan_rows,8,8,128,32); + TC0100SCN_tilemap[i][0][1] = tilemap_create(machine, TC0100SCN_get_tile_info[i][0],tilemap_scan_rows,8,8,128,64); + TC0100SCN_tilemap[i][1][1] = tilemap_create(machine, TC0100SCN_get_tile_info[i][1],tilemap_scan_rows,8,8,128,64); + TC0100SCN_tilemap[i][2][1] = tilemap_create(machine, TC0100SCN_get_tile_info[i][2],tilemap_scan_rows,8,8,128,32); /* Set up clipping for multi-TC0100SCN games. We assume this code won't ever affect single screen games: @@ -2778,7 +2778,7 @@ static TILE_GET_INFO( TC0280GRD_get_tile_info ) void TC0280GRD_vh_start(running_machine *machine, int gfxnum) { TC0280GRD_ram = auto_malloc(TC0280GRD_RAM_SIZE); - TC0280GRD_tilemap = tilemap_create(TC0280GRD_get_tile_info,tilemap_scan_rows,8,8,64,64); + TC0280GRD_tilemap = tilemap_create(machine, TC0280GRD_get_tile_info,tilemap_scan_rows,8,8,64,64); state_save_register_global_pointer(machine, TC0280GRD_ram, TC0280GRD_RAM_SIZE/2); state_save_register_global_array(machine, TC0280GRD_ctrl); @@ -3163,18 +3163,18 @@ void TC0480SCP_vh_start(running_machine *machine, int gfxnum,int pixels,int x_of TC0480SCP_dblwidth=0; /* Single width versions */ - TC0480SCP_tilemap[0][0] = tilemap_create(tc480_get_tile_info[0],tilemap_scan_rows,16,16,32,32); - TC0480SCP_tilemap[1][0] = tilemap_create(tc480_get_tile_info[1],tilemap_scan_rows,16,16,32,32); - TC0480SCP_tilemap[2][0] = tilemap_create(tc480_get_tile_info[2],tilemap_scan_rows,16,16,32,32); - TC0480SCP_tilemap[3][0] = tilemap_create(tc480_get_tile_info[3],tilemap_scan_rows,16,16,32,32); - TC0480SCP_tilemap[4][0] = tilemap_create(tc480_get_tile_info[4],tilemap_scan_rows,8,8,64,64); + TC0480SCP_tilemap[0][0] = tilemap_create(machine, tc480_get_tile_info[0],tilemap_scan_rows,16,16,32,32); + TC0480SCP_tilemap[1][0] = tilemap_create(machine, tc480_get_tile_info[1],tilemap_scan_rows,16,16,32,32); + TC0480SCP_tilemap[2][0] = tilemap_create(machine, tc480_get_tile_info[2],tilemap_scan_rows,16,16,32,32); + TC0480SCP_tilemap[3][0] = tilemap_create(machine, tc480_get_tile_info[3],tilemap_scan_rows,16,16,32,32); + TC0480SCP_tilemap[4][0] = tilemap_create(machine, tc480_get_tile_info[4],tilemap_scan_rows,8,8,64,64); /* Double width versions */ - TC0480SCP_tilemap[0][1] = tilemap_create(tc480_get_tile_info[0],tilemap_scan_rows,16,16,64,32); - TC0480SCP_tilemap[1][1] = tilemap_create(tc480_get_tile_info[1],tilemap_scan_rows,16,16,64,32); - TC0480SCP_tilemap[2][1] = tilemap_create(tc480_get_tile_info[2],tilemap_scan_rows,16,16,64,32); - TC0480SCP_tilemap[3][1] = tilemap_create(tc480_get_tile_info[3],tilemap_scan_rows,16,16,64,32); - TC0480SCP_tilemap[4][1] = tilemap_create(tc480_get_tile_info[4],tilemap_scan_rows,8,8,64,64); + TC0480SCP_tilemap[0][1] = tilemap_create(machine, tc480_get_tile_info[0],tilemap_scan_rows,16,16,64,32); + TC0480SCP_tilemap[1][1] = tilemap_create(machine, tc480_get_tile_info[1],tilemap_scan_rows,16,16,64,32); + TC0480SCP_tilemap[2][1] = tilemap_create(machine, tc480_get_tile_info[2],tilemap_scan_rows,16,16,64,32); + TC0480SCP_tilemap[3][1] = tilemap_create(machine, tc480_get_tile_info[3],tilemap_scan_rows,16,16,64,32); + TC0480SCP_tilemap[4][1] = tilemap_create(machine, tc480_get_tile_info[4],tilemap_scan_rows,8,8,64,64); TC0480SCP_ram = auto_malloc(TC0480SCP_RAM_SIZE); TC0480SCP_char_dirty = auto_malloc(TC0480SCP_TOTAL_CHARS); diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index fdd496cc490..37d75e0ff52 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -208,7 +208,7 @@ VIDEO_START( taitojc ) assert(taitojc_gfx_index != MAX_GFX_ELEMENTS); - taitojc_tilemap = tilemap_create(taitojc_tile_info, tilemap_scan_rows, 16, 16, 64, 64); + taitojc_tilemap = tilemap_create(machine, taitojc_tile_info, tilemap_scan_rows, 16, 16, 64, 64); taitojc_dirty_map = auto_malloc(TAITOJC_NUM_TILES); tilemap_set_transparent_pen(taitojc_tilemap, 0); diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c index 19c98893ce2..54b96793f65 100644 --- a/src/mame/video/tank8.c +++ b/src/mame/video/tank8.c @@ -119,7 +119,7 @@ VIDEO_START( tank8 ) helper2 = video_screen_auto_bitmap_alloc(machine->primary_screen); helper3 = video_screen_auto_bitmap_alloc(machine->primary_screen); - tank8_tilemap = tilemap_create(tank8_get_tile_info, tilemap_scan_rows, 16, 16, 32, 32); + tank8_tilemap = tilemap_create(machine, tank8_get_tile_info, tilemap_scan_rows, 16, 16, 32, 32); /* VBLANK starts on scanline #256 and ends on scanline #24 */ diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c index fe72118f913..940bd90caac 100644 --- a/src/mame/video/tankbatt.c +++ b/src/mame/video/tankbatt.c @@ -77,7 +77,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( tankbatt ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_bullets(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 6adc6bd0280..48dab689f3e 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -83,10 +83,10 @@ static TILE_GET_INFO( get_txt_tile_info ) VIDEO_START( tankbust ) { /* not scrollable */ - txt_tilemap = tilemap_create(get_txt_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + txt_tilemap = tilemap_create(machine, get_txt_tile_info, tilemap_scan_rows, 8, 8, 64, 32); /* scrollable */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(txt_tilemap, 0); diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c index af9515f6147..c985873c3d4 100644 --- a/src/mame/video/taotaido.c +++ b/src/mame/video/taotaido.c @@ -192,7 +192,7 @@ static TILEMAP_MAPPER( taotaido_tilemap_scan_rows ) VIDEO_START(taotaido) { - bg_tilemap = tilemap_create(taotaido_bg_tile_info,taotaido_tilemap_scan_rows, 16,16,128,64); + bg_tilemap = tilemap_create(machine, taotaido_bg_tile_info,taotaido_tilemap_scan_rows, 16,16,128,64); taotaido_spriteram_old = auto_malloc(0x2000); taotaido_spriteram_older = auto_malloc(0x2000); diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c index 63b0fcda987..5a15a6cde40 100644 --- a/src/mame/video/targeth.c +++ b/src/mame/video/targeth.c @@ -76,8 +76,8 @@ WRITE16_HANDLER( targeth_vram_w ) VIDEO_START( targeth ) { - pant[0] = tilemap_create(get_tile_info_targeth_screen0,tilemap_scan_rows,16,16,64,32); - pant[1] = tilemap_create(get_tile_info_targeth_screen1,tilemap_scan_rows,16,16,64,32); + pant[0] = tilemap_create(machine, get_tile_info_targeth_screen0,tilemap_scan_rows,16,16,64,32); + pant[1] = tilemap_create(machine, get_tile_info_targeth_screen1,tilemap_scan_rows,16,16,64,32); tilemap_set_transparent_pen(pant[0],0); } diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index dde3a257fd4..dfc5346a6ae 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -191,7 +191,7 @@ static TILE_GET_INFO( get_tile_info_bigfight_1 ) VIDEO_START( apache3 ) { - tx_layer = tilemap_create(get_text_tile_info,tilemap_scan_rows,8,8,64,64); + tx_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows,8,8,64,64); shadow_pen_array = auto_malloc(8192); temp_bitmap = auto_bitmap_alloc(512, 512, BITMAP_FORMAT_RGB32); @@ -201,7 +201,7 @@ VIDEO_START( apache3 ) VIDEO_START( roundup5 ) { - tx_layer = tilemap_create(get_text_tile_info,tilemap_scan_rows,8,8,128,64); + tx_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows,8,8,128,64); shadow_pen_array = auto_malloc(8192); roundup5_vram = auto_malloc(0x48000 * 4); @@ -211,11 +211,11 @@ VIDEO_START( roundup5 ) VIDEO_START( cyclwarr ) { - layer0 = tilemap_create(get_tile_info_bigfight_0,tilemap_scan_rows,8,8,64,512); - //layer1 = tilemap_create(get_tile_info_bigfight_0,tilemap_scan_rows,8,8,64,512); - layer1 = tilemap_create(get_tile_info_bigfight_0,tilemap_scan_rows,8,8,128,256); - layer2 = tilemap_create(get_tile_info_bigfight_1,tilemap_scan_rows,8,8,64,512); - layer3 = tilemap_create(get_tile_info_bigfight_1,tilemap_scan_rows,8,8,64,512); + layer0 = tilemap_create(machine, get_tile_info_bigfight_0,tilemap_scan_rows,8,8,64,512); + //layer1 = tilemap_create(machine, get_tile_info_bigfight_0,tilemap_scan_rows,8,8,64,512); + layer1 = tilemap_create(machine, get_tile_info_bigfight_0,tilemap_scan_rows,8,8,128,256); + layer2 = tilemap_create(machine, get_tile_info_bigfight_1,tilemap_scan_rows,8,8,64,512); + layer3 = tilemap_create(machine, get_tile_info_bigfight_1,tilemap_scan_rows,8,8,64,512); shadow_pen_array = auto_malloc(8192); memset(shadow_pen_array, 0, 8192); @@ -223,10 +223,10 @@ VIDEO_START( cyclwarr ) VIDEO_START( bigfight ) { - layer0 = tilemap_create(get_tile_info_bigfight_0,tilemap_scan_rows,8,8,128,256); - layer1 = tilemap_create(get_tile_info_bigfight_0,tilemap_scan_rows,8,8,128,256); - layer2 = tilemap_create(get_tile_info_bigfight_1,tilemap_scan_rows,8,8,128,256); - layer3 = tilemap_create(get_tile_info_bigfight_1,tilemap_scan_rows,8,8,128,256); + layer0 = tilemap_create(machine, get_tile_info_bigfight_0,tilemap_scan_rows,8,8,128,256); + layer1 = tilemap_create(machine, get_tile_info_bigfight_0,tilemap_scan_rows,8,8,128,256); + layer2 = tilemap_create(machine, get_tile_info_bigfight_1,tilemap_scan_rows,8,8,128,256); + layer3 = tilemap_create(machine, get_tile_info_bigfight_1,tilemap_scan_rows,8,8,128,256); shadow_pen_array = auto_malloc(8192); memset(shadow_pen_array, 0, 8192); diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index 0e2c2527c65..34175294854 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -204,9 +204,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_START( tbowl ) { - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16, 16,128,32); - bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows, 16, 16,128,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16, 16,128,32); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows, 16, 16,128,32); tilemap_set_transparent_pen(tx_tilemap,0); tilemap_set_transparent_pen(bg_tilemap,0); diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index ac018fd98f4..a450104c102 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -424,14 +424,14 @@ VIDEO_START( tceptor ) namco_road_set_transparent_color(colortable_entry_get_value(machine->colortable, 0xfff)); - tx_tilemap = tilemap_create(get_tx_tile_info, tilemap_scan_cols, 8, 8, 34, 28); + tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 34, 28); tilemap_set_scrollx(tx_tilemap, 0, -2*8); tilemap_set_scrolly(tx_tilemap, 0, 0); colortable_configure_tilemap_groups(machine->colortable, tx_tilemap, machine->gfx[0], 7); - bg1_tilemap = tilemap_create(get_bg1_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - bg2_tilemap = tilemap_create(get_bg2_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + bg1_tilemap = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state_save_register_global_pointer(machine, tceptor_sprite_ram_buffered, 0x200 / 2); state_save_register_global(machine, bg1_scroll_x); diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c index 09091b2e08d..d42c5979bac 100644 --- a/src/mame/video/tecmo.c +++ b/src/mame/video/tecmo.c @@ -85,15 +85,15 @@ VIDEO_START( tecmo ) { if (tecmo_video_type == 2) /* gemini */ { - bg_tilemap = tilemap_create(gemini_get_bg_tile_info,tilemap_scan_rows,16,16,32,16); - fg_tilemap = tilemap_create(gemini_get_fg_tile_info,tilemap_scan_rows,16,16,32,16); + bg_tilemap = tilemap_create(machine, gemini_get_bg_tile_info,tilemap_scan_rows,16,16,32,16); + fg_tilemap = tilemap_create(machine, gemini_get_fg_tile_info,tilemap_scan_rows,16,16,32,16); } else /* rygar, silkworm */ { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,16,16,32,16); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,16,16,32,16); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,16,16,32,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,32,16); } - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(bg_tilemap,0); tilemap_set_transparent_pen(fg_tilemap,0); diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c index d801857d126..3e3e9067eb3 100644 --- a/src/mame/video/tecmo16.c +++ b/src/mame/video/tecmo16.c @@ -74,9 +74,9 @@ VIDEO_START( fstarfrc ) /* set up sprites */ sprite_bitmap = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16); - fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan_rows,16,16,32,32); - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,16,16,32,32); - tx_tilemap = tilemap_create(tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,16,16,32,32); + tx_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(bg_tilemap,0); @@ -99,9 +99,9 @@ VIDEO_START( ginkun ) /* set up sprites */ sprite_bitmap = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16); - fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan_rows,16,16,64,32); - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,16,16,64,32); - tx_tilemap = tilemap_create(tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan_rows,16,16,64,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,16,16,64,32); + tx_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(bg_tilemap,0); @@ -122,9 +122,9 @@ VIDEO_START( riot ) /* set up sprites */ sprite_bitmap = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16); - fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan_rows,16,16,64,32); - bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,16,16,64,32); - tx_tilemap = tilemap_create(tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); + fg_tilemap = tilemap_create(machine, fg_get_tile_info,tilemap_scan_rows,16,16,64,32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,16,16,64,32); + tx_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(bg_tilemap,0); diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c index f1093a0b58b..fb8515cd4a7 100644 --- a/src/mame/video/tehkanwc.c +++ b/src/mame/video/tehkanwc.c @@ -91,10 +91,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( tehkanwc ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c index 5bb29149cf6..bfefb1dfe7f 100644 --- a/src/mame/video/terracre.c +++ b/src/mame/video/terracre.c @@ -187,8 +187,8 @@ WRITE16_HANDLER( amazon_scrollx_w ) VIDEO_START( amazon ) { - background = tilemap_create(get_bg_tile_info,tilemap_scan_cols,16,16,64,32); - foreground = tilemap_create(get_fg_tile_info,tilemap_scan_cols,8,8,64,32); + background = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,64,32); + foreground = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,8,8,64,32); tilemap_set_transparent_pen(foreground,0xf); /* register for saving */ diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index b6d98a8f50d..478ea6e2aa9 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -272,15 +272,15 @@ VIDEO_START( tetrisp2 ) { flipscreen_old = -1; - tilemap_bg = tilemap_create( get_tile_info_bg,tilemap_scan_rows, + tilemap_bg = tilemap_create( machine, get_tile_info_bg,tilemap_scan_rows, 16,16,NX_0,NY_0); - tilemap_fg = tilemap_create( get_tile_info_fg,tilemap_scan_rows, + tilemap_fg = tilemap_create( machine, get_tile_info_fg,tilemap_scan_rows, 8,8,NX_1,NY_1); - tilemap_rot = tilemap_create( get_tile_info_rot,tilemap_scan_rows, + tilemap_rot = tilemap_create( machine, get_tile_info_rot,tilemap_scan_rows, 16,16,NX_0*2,NY_0*2); @@ -299,15 +299,15 @@ VIDEO_START( rockntread ) { flipscreen_old = -1; - tilemap_bg = tilemap_create( get_tile_info_bg,tilemap_scan_rows, + tilemap_bg = tilemap_create( machine, get_tile_info_bg,tilemap_scan_rows, 16, 16, 256, 16); // rockn ms(main),1,2,3,4 - tilemap_fg = tilemap_create( get_tile_info_fg,tilemap_scan_rows, + tilemap_fg = tilemap_create( machine, get_tile_info_fg,tilemap_scan_rows, 8, 8, 64, 64); - tilemap_rot = tilemap_create( get_tile_info_rot,tilemap_scan_rows, + tilemap_rot = tilemap_create( machine, get_tile_info_rot,tilemap_scan_rows, 16, 16, 128, 128); @@ -321,15 +321,15 @@ VIDEO_START( rocknms ) { VIDEO_START_CALL( rockntread ); - tilemap_sub_bg = tilemap_create(get_tile_info_rocknms_sub_bg,tilemap_scan_rows, + tilemap_sub_bg = tilemap_create(machine, get_tile_info_rocknms_sub_bg,tilemap_scan_rows, 16, 16, 32, 256); // rockn ms(sub) - tilemap_sub_fg = tilemap_create(get_tile_info_rocknms_sub_fg,tilemap_scan_rows, + tilemap_sub_fg = tilemap_create(machine, get_tile_info_rocknms_sub_fg,tilemap_scan_rows, 8, 8, 64, 64); - tilemap_sub_rot = tilemap_create( get_tile_info_rocknms_sub_rot,tilemap_scan_rows, + tilemap_sub_rot = tilemap_create( machine, get_tile_info_rocknms_sub_rot,tilemap_scan_rows, 16, 16, 128, 128); diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c index f2806d003c2..a8c970d8a13 100644 --- a/src/mame/video/thedeep.c +++ b/src/mame/video/thedeep.c @@ -108,8 +108,8 @@ PALETTE_INIT( thedeep ) VIDEO_START( thedeep ) { - tilemap_0 = tilemap_create(get_tile_info_0,tilemap_scan_rows_back,16,16,0x20,0x20); - tilemap_1 = tilemap_create(get_tile_info_1,tilemap_scan_rows,8,8,0x20,0x20); + tilemap_0 = tilemap_create(machine, get_tile_info_0,tilemap_scan_rows_back,16,16,0x20,0x20); + tilemap_1 = tilemap_create(machine, get_tile_info_1,tilemap_scan_rows,8,8,0x20,0x20); tilemap_set_transparent_pen( tilemap_0, 0 ); tilemap_set_transparent_pen( tilemap_1, 0 ); diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index 23d8ac9b0f6..f9a4f35f656 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -147,9 +147,9 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( thepit ) { - thepit_solid_tilemap = tilemap_create(solid_get_tile_info,tilemap_scan_rows,8,8,32,32); + thepit_solid_tilemap = tilemap_create(machine, solid_get_tile_info,tilemap_scan_rows,8,8,32,32); - thepit_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + thepit_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(thepit_tilemap, 0); tilemap_set_scroll_cols(thepit_solid_tilemap, 32); diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c index 12586cd212d..11768d76918 100644 --- a/src/mame/video/thoop2.c +++ b/src/mame/video/thoop2.c @@ -88,8 +88,8 @@ VIDEO_START( thoop2 ) { int i; - pant[0] = tilemap_create(get_tile_info_thoop2_screen0,tilemap_scan_rows,16,16,32,32); - pant[1] = tilemap_create(get_tile_info_thoop2_screen1,tilemap_scan_rows,16,16,32,32); + pant[0] = tilemap_create(machine, get_tile_info_thoop2_screen0,tilemap_scan_rows,16,16,32,32); + pant[1] = tilemap_create(machine, get_tile_info_thoop2_screen1,tilemap_scan_rows,16,16,32,32); tilemap_set_transmask(pant[0],0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ tilemap_set_transmask(pant[1],0,0xff01,0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c index f6b79f888ac..8e4229afdc4 100644 --- a/src/mame/video/thunderj.c +++ b/src/mame/video/thunderj.c @@ -105,17 +105,17 @@ VIDEO_START( thunderj ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the second playfield */ - atarigen_playfield2_tilemap = tilemap_create(get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); tilemap_set_transparent_pen(atarigen_playfield2_tilemap, 0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); } diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 9f4fa0cc8c6..0b5efc58eff 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -140,10 +140,10 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( tiamc1 ) { - bg_tilemap1 = tilemap_create(get_bg1_tile_info, tilemap_scan_rows, + bg_tilemap1 = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - bg_tilemap2 = tilemap_create(get_bg2_tile_info, tilemap_scan_rows, + bg_tilemap2 = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tiamc1_bg_vshift = 0; diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index d86b7698279..c61a4598e52 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -142,10 +142,10 @@ static TILEMAP_MAPPER( tigeroad_tilemap_scan ) VIDEO_START( tigeroad ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tigeroad_tilemap_scan, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tigeroad_tilemap_scan, 32, 32, 128, 128); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transmask(bg_tilemap, 0, 0xffff, 0); diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c index bf35270eca8..a55a67f5890 100644 --- a/src/mame/video/timelimt.c +++ b/src/mame/video/timelimt.c @@ -72,10 +72,10 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( timelimt ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c index 1ca506c4a10..c45498f1e3b 100644 --- a/src/mame/video/timeplt.c +++ b/src/mame/video/timeplt.c @@ -113,7 +113,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( timeplt ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); } diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 7367fbee4e5..ac0bf01032d 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -280,7 +280,7 @@ VIDEO_START( glfgreat ) K052109_vh_start(machine,"gfx1",NORMAL_PLANE_ORDER,tmnt_tile_callback); K053245_vh_start(machine,0, "gfx2",NORMAL_PLANE_ORDER,lgtnfght_sprite_callback); - roz_tilemap = tilemap_create(glfgreat_get_roz_tile_info,tilemap_scan_rows,16,16,512,512); + roz_tilemap = tilemap_create(machine, glfgreat_get_roz_tile_info,tilemap_scan_rows,16,16,512,512); tilemap_set_transparent_pen(roz_tilemap,0); @@ -301,7 +301,7 @@ VIDEO_START( prmrsocr ) K052109_vh_start(machine,"gfx1",NORMAL_PLANE_ORDER,tmnt_tile_callback); K053245_vh_start(machine,0, "gfx2",NORMAL_PLANE_ORDER,prmrsocr_sprite_callback); - roz_tilemap = tilemap_create(prmrsocr_get_roz_tile_info,tilemap_scan_rows,16,16,512,256); + roz_tilemap = tilemap_create(machine, prmrsocr_get_roz_tile_info,tilemap_scan_rows,16,16,512,256); tilemap_set_transparent_pen(roz_tilemap,0); diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index 1563d4584cf..7201df40cac 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -253,12 +253,12 @@ static TILE_GET_INFO( get_pf4_tile_info ) ***************************************************************************/ -static void toaplan1_create_tilemaps(void) +static void toaplan1_create_tilemaps(running_machine *machine) { - pf1_tilemap = tilemap_create(get_pf1_tile_info,tilemap_scan_rows,8,8,64,64); - pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_rows,8,8,64,64); - pf3_tilemap = tilemap_create(get_pf3_tile_info,tilemap_scan_rows,8,8,64,64); - pf4_tilemap = tilemap_create(get_pf4_tile_info,tilemap_scan_rows,8,8,64,64); + pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_rows,8,8,64,64); + pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,tilemap_scan_rows,8,8,64,64); + pf3_tilemap = tilemap_create(machine, get_pf3_tile_info,tilemap_scan_rows,8,8,64,64); + pf4_tilemap = tilemap_create(machine, get_pf4_tile_info,tilemap_scan_rows,8,8,64,64); tilemap_set_transparent_pen(pf1_tilemap,0); tilemap_set_transparent_pen(pf2_tilemap,0); @@ -331,7 +331,7 @@ static STATE_POSTLOAD( toaplan1_flipscreen ) VIDEO_START( rallybik ) { - toaplan1_create_tilemaps(); + toaplan1_create_tilemaps(machine); toaplan1_paletteram_alloc(); toaplan1_vram_alloc(); @@ -374,7 +374,7 @@ VIDEO_START( rallybik ) VIDEO_START( toaplan1 ) { - toaplan1_create_tilemaps(); + toaplan1_create_tilemaps(machine); toaplan1_paletteram_alloc(); toaplan1_vram_alloc(); toaplan1_spritevram_alloc(); diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 73c950a86cf..22acbc43bfc 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -402,34 +402,34 @@ static TILE_GET_INFO( get_text_tile_info ) Start the video hardware emulation. ***************************************************************************/ -static void create_tilemaps_0(void) +static void create_tilemaps_0(running_machine *machine) { - top_tilemap[0] = tilemap_create(get_top0_tile_info,tilemap_scan_rows,16,16,32,32); - fg_tilemap[0] = tilemap_create(get_fg0_tile_info,tilemap_scan_rows,16,16,32,32); - bg_tilemap[0] = tilemap_create(get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); + top_tilemap[0] = tilemap_create(machine, get_top0_tile_info,tilemap_scan_rows,16,16,32,32); + fg_tilemap[0] = tilemap_create(machine, get_fg0_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap[0] = tilemap_create(machine, get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(top_tilemap[0],0); tilemap_set_transparent_pen(fg_tilemap[0],0); tilemap_set_transparent_pen(bg_tilemap[0],0); } -static void create_tilemaps_1(void) +static void create_tilemaps_1(running_machine *machine) { - top_tilemap[1] = tilemap_create(get_top1_tile_info,tilemap_scan_rows,16,16,32,32); - fg_tilemap[1] = tilemap_create(get_fg1_tile_info,tilemap_scan_rows,16,16,32,32); - bg_tilemap[1] = tilemap_create(get_bg1_tile_info,tilemap_scan_rows,16,16,32,32); + top_tilemap[1] = tilemap_create(machine, get_top1_tile_info,tilemap_scan_rows,16,16,32,32); + fg_tilemap[1] = tilemap_create(machine, get_fg1_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap[1] = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(top_tilemap[1],0); tilemap_set_transparent_pen(fg_tilemap[1],0); tilemap_set_transparent_pen(bg_tilemap[1],0); } -static void truxton2_create_tilemaps_0(void) +static void truxton2_create_tilemaps_0(running_machine *machine) { - tx_tilemap = tilemap_create(get_text_tile_info,tilemap_scan_rows,8,8,64,32); - top_tilemap[0] = tilemap_create(get_top0_tile_info,tilemap_scan_rows,16,16,32,32); - fg_tilemap[0] = tilemap_create(get_fg0_tile_info,tilemap_scan_rows,16,16,32,32); - bg_tilemap[0] = tilemap_create(get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); + tx_tilemap = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows,8,8,64,32); + top_tilemap[0] = tilemap_create(machine, get_top0_tile_info,tilemap_scan_rows,16,16,32,32); + fg_tilemap[0] = tilemap_create(machine, get_fg0_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap[0] = tilemap_create(machine, get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_scroll_rows(tx_tilemap,8*32); /* line scrolling */ tilemap_set_scroll_cols(tx_tilemap,1); @@ -440,12 +440,12 @@ static void truxton2_create_tilemaps_0(void) tilemap_set_transparent_pen(bg_tilemap[0],0); } -static void batrider_create_tilemaps_0(void) +static void batrider_create_tilemaps_0(running_machine *machine) { - tx_tilemap = tilemap_create(get_text_tile_info,tilemap_scan_rows,8,8,64,32); - top_tilemap[0] = tilemap_create(batrider_get_top0_tile_info,tilemap_scan_rows,16,16,32,32); - fg_tilemap[0] = tilemap_create(batrider_get_fg0_tile_info,tilemap_scan_rows,16,16,32,32); - bg_tilemap[0] = tilemap_create(batrider_get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); + tx_tilemap = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows,8,8,64,32); + top_tilemap[0] = tilemap_create(machine, batrider_get_top0_tile_info,tilemap_scan_rows,16,16,32,32); + fg_tilemap[0] = tilemap_create(machine, batrider_get_fg0_tile_info,tilemap_scan_rows,16,16,32,32); + bg_tilemap[0] = tilemap_create(machine, batrider_get_bg0_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_scroll_rows(tx_tilemap,8*32); /* line scrolling */ tilemap_set_scroll_cols(tx_tilemap,1); @@ -477,17 +477,17 @@ static void toaplan2_vram_alloc(int controller) spriteram16_n[controller] = spriteram16_now[controller]; } -static void toaplan2_vh_start(int controller) +static void toaplan2_vh_start(running_machine *machine, int controller) { toaplan2_vram_alloc(controller); if (controller == 0) { - create_tilemaps_0(); + create_tilemaps_0(machine); } if (controller == 1) { - create_tilemaps_1(); + create_tilemaps_1(machine); } } @@ -541,14 +541,14 @@ static void register_state_save(running_machine *machine, int vrams) VIDEO_START( toaplan2_0 ) { defaultOffsets(); - toaplan2_vh_start(0); + toaplan2_vh_start(machine, 0); register_state_save(machine,1); } VIDEO_START( toaplan2_1 ) { - toaplan2_vh_start(0); - toaplan2_vh_start(1); + toaplan2_vh_start(machine, 0); + toaplan2_vh_start(machine, 1); defaultOffsets(); register_state_save(machine,2); } @@ -556,7 +556,7 @@ VIDEO_START( toaplan2_1 ) VIDEO_START( truxton2_0 ) { toaplan2_vram_alloc(0); - truxton2_create_tilemaps_0(); + truxton2_create_tilemaps_0(machine); if(!strcmp(machine->gamedrv->name,"fixeighb")) { @@ -583,7 +583,7 @@ VIDEO_START( truxton2_0 ) VIDEO_START( bgaregga_0 ) { toaplan2_vram_alloc(0); - truxton2_create_tilemaps_0(); + truxton2_create_tilemaps_0(machine); tilemap_set_scrolldx(tx_tilemap, 0x1d4, 0x2a); defaultOffsets(); register_state_save(machine,1); @@ -598,7 +598,7 @@ VIDEO_START( batrider_0 ) toaplan2_vram_alloc(0); spriteram16_n[0] = spriteram16_new[0]; - batrider_create_tilemaps_0(); + batrider_create_tilemaps_0(machine); tilemap_set_scrolldx(tx_tilemap, 0x1d4, 0x2a); defaultOffsets(); diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index c543b9b0942..a6fbc5e13d1 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -97,9 +97,9 @@ static TILE_GET_INFO( get_fore_tile_info ) VIDEO_START( toki ) { - text_layer = tilemap_create(get_text_tile_info,tilemap_scan_rows, 8,8,32,32); - background_layer = tilemap_create(get_back_tile_info,tilemap_scan_rows,16,16,32,32); - foreground_layer = tilemap_create(get_fore_tile_info,tilemap_scan_rows,16,16,32,32); + text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8,8,32,32); + background_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_rows,16,16,32,32); + foreground_layer = tilemap_create(machine, get_fore_tile_info,tilemap_scan_rows,16,16,32,32); tilemap_set_transparent_pen(text_layer,15); tilemap_set_transparent_pen(background_layer,15); diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c index 9129803ec2f..416f1491ac6 100644 --- a/src/mame/video/toobin.c +++ b/src/mame/video/toobin.c @@ -94,13 +94,13 @@ VIDEO_START( toobin ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_rows, 8,8, 128,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 128,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); /* allocate a playfield bitmap for rendering */ diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index 22399421666..1b39748dbaf 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -119,7 +119,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( toypop ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan,8,8,36,28); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan,8,8,36,28); tilemap_set_transparent_pen(bg_tilemap, 0); } diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index bee3e1a8eff..afe959a0549 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -153,8 +153,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( tp84 ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index 2867d4c3b55..0844443af1b 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -182,7 +182,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( trackfld ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scroll_rows(bg_tilemap, 32); diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index 2d5adb074e5..292f7152f75 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -224,7 +224,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( travrusa ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transmask(bg_tilemap,0,0xff,0x00); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(bg_tilemap,1,0x3f,0xc0); /* split type 1 has pens 6 and 7 opaque - tunnels */ diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c index e1e172df451..313c8fe8bde 100644 --- a/src/mame/video/triplhnt.c +++ b/src/mame/video/triplhnt.c @@ -33,7 +33,7 @@ VIDEO_START( triplhnt ) { helper = video_screen_auto_bitmap_alloc(machine->primary_screen); - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 16, 16, 16, 16); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 16, 16, 16); } diff --git a/src/mame/video/trucocl.c b/src/mame/video/trucocl.c index b719ac8a401..7ef1d17c133 100644 --- a/src/mame/video/trucocl.c +++ b/src/mame/video/trucocl.c @@ -72,7 +72,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( trucocl ) { - bg_tilemap = tilemap_create( get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32 ); + bg_tilemap = tilemap_create( machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32 ); } VIDEO_UPDATE( trucocl ) diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c index b8bbc5d9e6d..4f0c3ad80cb 100644 --- a/src/mame/video/tryout.c +++ b/src/mame/video/tryout.c @@ -173,8 +173,8 @@ static TILEMAP_MAPPER( get_bg_memory_offset ) VIDEO_START( tryout ) { - fg_tilemap = tilemap_create(get_fg_tile_info,get_fg_memory_offset,8,8,32,32); - bg_tilemap = tilemap_create(get_bg_tile_info,get_bg_memory_offset,16,16,64,16); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,get_fg_memory_offset,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,get_bg_memory_offset,16,16,64,16); tryout_vram=auto_malloc(8 * 0x800); tryout_vram_gfx=auto_malloc(0x6000); diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c index d9334bc9d24..14fef195268 100644 --- a/src/mame/video/tsamurai.c +++ b/src/mame/video/tsamurai.c @@ -55,8 +55,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( tsamurai ) { - background = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,32,32); - foreground = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32); + background = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,32,32); + foreground = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(background,0); tilemap_set_transparent_pen(foreground,0); @@ -255,7 +255,7 @@ static TILE_GET_INFO( get_vsgongf_tile_info ) VIDEO_START( vsgongf ) { - foreground = tilemap_create(get_vsgongf_tile_info,tilemap_scan_rows,8,8,32,32); + foreground = tilemap_create(machine, get_vsgongf_tile_info,tilemap_scan_rows,8,8,32,32); } VIDEO_UPDATE( vsgongf ) diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index b458a0aeaae..7e8829aaa7e 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -458,9 +458,9 @@ static TILE_GET_INFO( pangpang_get_fg_tile_info ) VIDEO_START( pangpang ) { - pf1_tilemap = tilemap_create(pangpang_get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf1_alt_tilemap = tilemap_create(pangpang_get_bg1_tile_info,tumblep_scan,16,16,64,32); - pf2_tilemap = tilemap_create(pangpang_get_bg2_tile_info,tumblep_scan, 16,16,64,32); + pf1_tilemap = tilemap_create(machine, pangpang_get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf1_alt_tilemap = tilemap_create(machine, pangpang_get_bg1_tile_info,tumblep_scan,16,16,64,32); + pf2_tilemap = tilemap_create(machine, pangpang_get_bg2_tile_info,tumblep_scan, 16,16,64,32); tilemap_set_transparent_pen(pf1_tilemap,0); tilemap_set_transparent_pen(pf1_alt_tilemap,0); @@ -473,9 +473,9 @@ VIDEO_START( pangpang ) VIDEO_START( tumblepb ) { - pf1_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf1_alt_tilemap = tilemap_create(get_bg1_tile_info,tumblep_scan,16,16,64,32); - pf2_tilemap = tilemap_create(get_bg2_tile_info,tumblep_scan, 16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info,tumblep_scan,16,16,64,32); + pf2_tilemap = tilemap_create(machine, get_bg2_tile_info,tumblep_scan, 16,16,64,32); tilemap_set_transparent_pen(pf1_tilemap,0); tilemap_set_transparent_pen(pf1_alt_tilemap,0); @@ -487,9 +487,9 @@ VIDEO_START( tumblepb ) VIDEO_START( sdfight ) { - pf1_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,64,64); // 64*64 to prevent bad tilemap wrapping? - check real behavior - pf1_alt_tilemap = tilemap_create(get_bg1_tile_info,tumblep_scan,16,16,64,32); - pf2_tilemap = tilemap_create(get_bg2_tile_info,tumblep_scan, 16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,64,64); // 64*64 to prevent bad tilemap wrapping? - check real behavior + pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info,tumblep_scan,16,16,64,32); + pf2_tilemap = tilemap_create(machine, get_bg2_tile_info,tumblep_scan, 16,16,64,32); tilemap_set_transparent_pen(pf1_tilemap,0); tilemap_set_transparent_pen(pf1_alt_tilemap,0); @@ -502,9 +502,9 @@ VIDEO_START( sdfight ) VIDEO_START( fncywld ) { - pf1_tilemap = tilemap_create(get_fncywld_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf1_alt_tilemap = tilemap_create(get_fncywld_bg1_tile_info,tumblep_scan,16,16,64,32); - pf2_tilemap = tilemap_create(get_fncywld_bg2_tile_info,tumblep_scan, 16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_fncywld_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf1_alt_tilemap = tilemap_create(machine, get_fncywld_bg1_tile_info,tumblep_scan,16,16,64,32); + pf2_tilemap = tilemap_create(machine, get_fncywld_bg2_tile_info,tumblep_scan, 16,16,64,32); tilemap_set_transparent_pen(pf1_tilemap,15); tilemap_set_transparent_pen(pf1_alt_tilemap,15); @@ -516,10 +516,10 @@ VIDEO_START( fncywld ) VIDEO_START( jumppop ) { - pf1_tilemap = tilemap_create(get_jumppop_fg_tile_info, tilemap_scan_rows, 8, 8,128,64); - pf1_alt_tilemap = tilemap_create(get_jumppop_bg1_tile_info,tilemap_scan_rows,16,16,64,64); - pf2_tilemap = tilemap_create(get_jumppop_bg2_tile_info,tilemap_scan_rows, 16,16,64,64); - pf2_alt_tilemap = tilemap_create(get_jumppop_bg2_alt_tile_info,tilemap_scan_rows, 8,8,128,64); + pf1_tilemap = tilemap_create(machine, get_jumppop_fg_tile_info, tilemap_scan_rows, 8, 8,128,64); + pf1_alt_tilemap = tilemap_create(machine, get_jumppop_bg1_tile_info,tilemap_scan_rows,16,16,64,64); + pf2_tilemap = tilemap_create(machine, get_jumppop_bg2_tile_info,tilemap_scan_rows, 16,16,64,64); + pf2_alt_tilemap = tilemap_create(machine, get_jumppop_bg2_alt_tile_info,tilemap_scan_rows, 8,8,128,64); tilemap_set_transparent_pen(pf1_tilemap,0); tilemap_set_transparent_pen(pf1_alt_tilemap,0); @@ -829,9 +829,9 @@ VIDEO_UPDATE( pangpang ) VIDEO_START( suprtrio ) { - pf1_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); - pf1_alt_tilemap = tilemap_create(get_bg1_tile_info,tumblep_scan,16,16,64,32); - pf2_tilemap = tilemap_create(get_bg2_tile_info,tumblep_scan, 16,16,64,32); + pf1_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8,64,32); + pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info,tumblep_scan,16,16,64,32); + pf2_tilemap = tilemap_create(machine, get_bg2_tile_info,tumblep_scan, 16,16,64,32); tilemap_set_transparent_pen(pf1_alt_tilemap,0); bcstory_tilebank = 0; diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index 6bc1010c265..56e64964ff3 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -74,7 +74,7 @@ VIDEO_START( tunhunt ) */ tmpbitmap = auto_bitmap_alloc(256, 64, video_screen_get_format(machine->primary_screen)); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); tilemap_set_scrollx(fg_tilemap, 0, 64); diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index e40300eedc8..9e5d1c0ed11 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -178,7 +178,7 @@ VIDEO_START( turbo ) turbo_state *state = machine->driver_data; /* initialize the foreground tilemap */ - state->fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8,8, 32,32); + state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8,8, 32,32); } @@ -187,7 +187,7 @@ VIDEO_START( buckrog ) turbo_state *state = machine->driver_data; /* initialize the foreground tilemap */ - state->fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8,8, 32,32); + state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8,8, 32,32); /* allocate the bitmap RAM */ state->buckrog_bitmap_ram = auto_malloc(0xe000); diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c index d7af59e6409..f7445da08fb 100644 --- a/src/mame/video/twin16.c +++ b/src/mame/video/twin16.c @@ -422,14 +422,14 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( twin16 ) { - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows_flip_y, 8, 8, 64, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows_flip_y, 8, 8, 64, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } VIDEO_START( fround ) { - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(fg_tilemap, 0); } diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index ebf4f3907ca..536bf2eb6f0 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -101,11 +101,11 @@ static TILE_GET_INFO( get_tx_tile_info ) Start the video hardware emulation. ***************************************************************************/ -static void twincobr_create_tilemaps(void) +static void twincobr_create_tilemaps(running_machine *machine) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,64,64); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,64); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,64); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,64); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(tx_tilemap,0); @@ -118,7 +118,7 @@ VIDEO_START( toaplan0 ) twincobr_bgvideoram_size = 0x2000; /* banked two times 0x1000 */ twincobr_fgvideoram_size = 0x1000; - twincobr_create_tilemaps(); + twincobr_create_tilemaps(machine); twincobr_txvideoram16 = auto_malloc(twincobr_txvideoram_size*2); memset(twincobr_txvideoram16,0,twincobr_txvideoram_size*2); diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index 6e2ebfdfb1b..c5f45978eca 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -54,7 +54,7 @@ VIDEO_START( ultratnk ) { helper = video_screen_auto_bitmap_alloc(machine->primary_screen); - playfield = tilemap_create(ultratnk_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + playfield = tilemap_create(machine, ultratnk_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c index 52925d9e7af..d832797469d 100644 --- a/src/mame/video/unico.c +++ b/src/mame/video/unico.c @@ -140,13 +140,13 @@ static int sprites_scrolldx, sprites_scrolldy; VIDEO_START( unico ) { - tilemap_0 = tilemap_create( get_tile_info_0,tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info_0,tilemap_scan_rows, 16,16, 0x40, 0x40); - tilemap_1 = tilemap_create( get_tile_info_1,tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info_1,tilemap_scan_rows, 16,16, 0x40, 0x40); - tilemap_2 = tilemap_create( get_tile_info_2,tilemap_scan_rows, + tilemap_2 = tilemap_create( machine, get_tile_info_2,tilemap_scan_rows, 16,16, 0x40, 0x40); sprites_scrolldx = -0x3f; @@ -167,13 +167,13 @@ VIDEO_START( unico ) VIDEO_START( zeropnt2 ) { - tilemap_0 = tilemap_create( get_tile_info32_0,tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info32_0,tilemap_scan_rows, 16,16, 0x40, 0x40); - tilemap_1 = tilemap_create( get_tile_info32_1,tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info32_1,tilemap_scan_rows, 16,16, 0x40, 0x40); - tilemap_2 = tilemap_create( get_tile_info32_2,tilemap_scan_rows, + tilemap_2 = tilemap_create( machine, get_tile_info32_2,tilemap_scan_rows, 16,16, 0x40, 0x40); sprites_scrolldx = -0x3f; diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c index d2b44e4be0b..313179814e8 100644 --- a/src/mame/video/usgames.c +++ b/src/mame/video/usgames.c @@ -48,7 +48,7 @@ static TILE_GET_INFO( get_usgames_tile_info ) VIDEO_START(usgames) { - usgames_tilemap = tilemap_create(get_usgames_tile_info,tilemap_scan_rows, 8, 8,64,32); + usgames_tilemap = tilemap_create(machine, get_usgames_tile_info,tilemap_scan_rows, 8, 8,64,32); } diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c index 0c18c002ae5..8f874337c9c 100644 --- a/src/mame/video/vastar.c +++ b/src/mame/video/vastar.c @@ -72,9 +72,9 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( vastar ) { - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows,8,8,32,32); - bg1_tilemap = tilemap_create(get_bg1_tile_info,tilemap_scan_rows,8,8,32,32); - bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,8,8,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows,8,8,32,32); + bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows,8,8,32,32); + bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(bg1_tilemap,0); diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c index b2b9403f772..b5070c294cf 100644 --- a/src/mame/video/vball.c +++ b/src/mame/video/vball.c @@ -51,7 +51,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( vb ) { - bg_tilemap = tilemap_create(get_bg_tile_info,background_scan, 8, 8,64,64); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,background_scan, 8, 8,64,64); tilemap_set_scroll_rows(bg_tilemap,32); } diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c index d7cbe432a93..4ff5cae5b68 100644 --- a/src/mame/video/videopin.c +++ b/src/mame/video/videopin.c @@ -31,7 +31,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( videopin ) { - bg_tilemap = tilemap_create(get_tile_info, get_memory_offset, 8, 8, 48, 32); + bg_tilemap = tilemap_create(machine, get_tile_info, get_memory_offset, 8, 8, 48, 32); } diff --git a/src/mame/video/vindictr.c b/src/mame/video/vindictr.c index cfdd09b9751..839e04a6526 100644 --- a/src/mame/video/vindictr.c +++ b/src/mame/video/vindictr.c @@ -95,13 +95,13 @@ VIDEO_START( vindictr ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); } diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c index 532a3070ae4..191c64b1919 100644 --- a/src/mame/video/vulgus.c +++ b/src/mame/video/vulgus.c @@ -117,8 +117,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( vulgus ) { - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows, 8, 8,32,32); - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,16,16,32,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows, 8, 8,32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,32,32); colortable_configure_tilemap_groups(machine->colortable, fg_tilemap, machine->gfx[0], 47); } diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c index 36e1cd74585..cef4c985ef2 100644 --- a/src/mame/video/warpwarp.c +++ b/src/mame/video/warpwarp.c @@ -177,17 +177,17 @@ static TILE_GET_INFO( warpwarp_get_tile_info ) VIDEO_START( geebee ) { - bg_tilemap = tilemap_create(geebee_get_tile_info,tilemap_scan,8,8,34,28); + bg_tilemap = tilemap_create(machine, geebee_get_tile_info,tilemap_scan,8,8,34,28); } VIDEO_START( navarone ) { - bg_tilemap = tilemap_create(navarone_get_tile_info,tilemap_scan,8,8,34,28); + bg_tilemap = tilemap_create(machine, navarone_get_tile_info,tilemap_scan,8,8,34,28); } VIDEO_START( warpwarp ) { - bg_tilemap = tilemap_create(warpwarp_get_tile_info,tilemap_scan,8,8,34,28); + bg_tilemap = tilemap_create(machine, warpwarp_get_tile_info,tilemap_scan,8,8,34,28); } diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index 0eb3bc2c55e..8dadc655f83 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -90,9 +90,9 @@ static TILE_GET_INFO( track_get_fg_tile_info ) VIDEO_START( wc90 ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,16,16,64,32); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,64,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(tx_tilemap,0); @@ -100,9 +100,9 @@ VIDEO_START( wc90 ) VIDEO_START( wc90t ) { - bg_tilemap = tilemap_create(track_get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); - fg_tilemap = tilemap_create(track_get_fg_tile_info,tilemap_scan_rows,16,16,64,32); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); + bg_tilemap = tilemap_create(machine, track_get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); + fg_tilemap = tilemap_create(machine, track_get_fg_tile_info,tilemap_scan_rows,16,16,64,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(tx_tilemap,0); diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c index 19779f55b82..5c5c8dd796a 100644 --- a/src/mame/video/wc90b.c +++ b/src/mame/video/wc90b.c @@ -62,9 +62,9 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( wc90b ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,16,16,64,32); - tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 16,16,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,16,16,64,32); + tx_tilemap = tilemap_create(machine, get_tx_tile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(fg_tilemap,15); tilemap_set_transparent_pen(tx_tilemap,15); diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index 7bca2ab7152..7297cb0f889 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -948,19 +948,19 @@ VIDEO_START( wecleman ) sprite_list = sprite_list_create(NUM_SPRITES); - bg_tilemap = tilemap_create(wecleman_get_bg_tile_info, + bg_tilemap = tilemap_create(machine, wecleman_get_bg_tile_info, tilemap_scan_rows, /* We draw part of the road below */ 8,8, PAGE_NX * 2, PAGE_NY * 2 ); - fg_tilemap = tilemap_create(wecleman_get_fg_tile_info, + fg_tilemap = tilemap_create(machine, wecleman_get_fg_tile_info, tilemap_scan_rows, 8,8, PAGE_NX * 2, PAGE_NY * 2); - txt_tilemap = tilemap_create(wecleman_get_txt_tile_info, + txt_tilemap = tilemap_create(machine, wecleman_get_txt_tile_info, tilemap_scan_rows, 8,8, diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c index 8bc6122e3a2..e2746336f5e 100644 --- a/src/mame/video/welltris.c +++ b/src/mame/video/welltris.c @@ -219,7 +219,7 @@ WRITE16_HANDLER( welltris_charvideoram_w ) VIDEO_START( welltris ) { - char_tilemap = tilemap_create(get_welltris_tile_info, tilemap_scan_rows, 8, 8, 64, 32); + char_tilemap = tilemap_create(machine, get_welltris_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(char_tilemap, 15); } diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index 917d8b0e8ac..abc244356e1 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -49,9 +49,9 @@ static TILE_GET_INFO( get_piv2_tile_info ) static void wgp_core_vh_start(running_machine *machine, int x_offs,int y_offs,int piv_xoffs,int piv_yoffs) { - wgp_piv_tilemap[0] = tilemap_create(get_piv0_tile_info,tilemap_scan_rows,16,16,64,64); - wgp_piv_tilemap[1] = tilemap_create(get_piv1_tile_info,tilemap_scan_rows,16,16,64,64); - wgp_piv_tilemap[2] = tilemap_create(get_piv2_tile_info,tilemap_scan_rows,16,16,64,64); + wgp_piv_tilemap[0] = tilemap_create(machine, get_piv0_tile_info,tilemap_scan_rows,16,16,64,64); + wgp_piv_tilemap[1] = tilemap_create(machine, get_piv1_tile_info,tilemap_scan_rows,16,16,64,64); + wgp_piv_tilemap[2] = tilemap_create(machine, get_piv2_tile_info,tilemap_scan_rows,16,16,64,64); TC0100SCN_vh_start(machine,1,TC0100SCN_GFX_NUM,x_offs,y_offs,0,0,0,0,0); diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c index eab09b4aa72..6c5ba7252fc 100644 --- a/src/mame/video/williams.c +++ b/src/mame/video/williams.c @@ -206,7 +206,7 @@ VIDEO_START( williams2 ) state_save_register_global_pointer(machine, paletteram, 0x400 * 2); /* create the tilemap */ - bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_cols, 24,16, 128,16); + bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_cols, 24,16, 128,16); tilemap_set_scrolldx(bg_tilemap, 2, 0); state_save_register(machine); diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c index 30e9402ff18..e2213367301 100644 --- a/src/mame/video/wrally.c +++ b/src/mame/video/wrally.c @@ -69,8 +69,8 @@ static TILE_GET_INFO( get_tile_info_wrally_screen1 ) VIDEO_START( wrally ) { - wrally_pant[0] = tilemap_create(get_tile_info_wrally_screen0,tilemap_scan_rows,16,16,64,32); - wrally_pant[1] = tilemap_create(get_tile_info_wrally_screen1,tilemap_scan_rows,16,16,64,32); + wrally_pant[0] = tilemap_create(machine, get_tile_info_wrally_screen0,tilemap_scan_rows,16,16,64,32); + wrally_pant[1] = tilemap_create(machine, get_tile_info_wrally_screen1,tilemap_scan_rows,16,16,64,32); tilemap_set_transmask(wrally_pant[0],0,0xff01,0x00ff); /* this layer is split in two (pens 1..7, pens 8-15) */ tilemap_set_transparent_pen(wrally_pant[1],0); diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index 6b66d9e0fa9..0fc46bccdd5 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -205,10 +205,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_START( wwfsstar ) { - fg0_tilemap = tilemap_create(get_fg0_tile_info,tilemap_scan_rows, 8, 8,32,32); + fg0_tilemap = tilemap_create(machine, get_fg0_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(fg0_tilemap,0); - bg0_tilemap = tilemap_create(get_bg0_tile_info,bg0_scan, 16, 16,32,32); + bg0_tilemap = tilemap_create(machine, get_bg0_tile_info,bg0_scan, 16, 16,32,32); tilemap_set_transparent_pen(fg0_tilemap,0); } diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c index fa79245cf5a..bdc2c53e5b8 100644 --- a/src/mame/video/wwfwfest.c +++ b/src/mame/video/wwfwfest.c @@ -230,9 +230,9 @@ VIDEO_START( wwfwfest ) state_save_register_global(machine, wwfwfest_bg1_scrollx); state_save_register_global(machine, wwfwfest_bg1_scrolly); - fg0_tilemap = tilemap_create(get_fg0_tile_info,tilemap_scan_rows, 8, 8,64,32); - bg1_tilemap = tilemap_create(get_bg1_tile_info,tilemap_scan_rows, 16, 16,32,32); - bg0_tilemap = tilemap_create(get_bg0_tile_info,tilemap_scan_rows, 16, 16,32,32); + fg0_tilemap = tilemap_create(machine, get_fg0_tile_info,tilemap_scan_rows, 8, 8,64,32); + bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows, 16, 16,32,32); + bg0_tilemap = tilemap_create(machine, get_bg0_tile_info,tilemap_scan_rows, 16, 16,32,32); tilemap_set_transparent_pen(fg0_tilemap,0); tilemap_set_transparent_pen(bg1_tilemap,0); diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c index 2fe0426bfcf..14c90bfa098 100644 --- a/src/mame/video/xain.c +++ b/src/mame/video/xain.c @@ -88,9 +88,9 @@ static TILE_GET_INFO( get_char_tile_info ) VIDEO_START( xain ) { - bgram0_tilemap = tilemap_create(get_bgram0_tile_info,back_scan, 16,16,32,32); - bgram1_tilemap = tilemap_create(get_bgram1_tile_info,back_scan, 16,16,32,32); - char_tilemap = tilemap_create(get_char_tile_info,tilemap_scan_rows, 8, 8,32,32); + bgram0_tilemap = tilemap_create(machine, get_bgram0_tile_info,back_scan, 16,16,32,32); + bgram1_tilemap = tilemap_create(machine, get_bgram1_tile_info,back_scan, 16,16,32,32); + char_tilemap = tilemap_create(machine, get_char_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(bgram0_tilemap,0); tilemap_set_transparent_pen(bgram1_tilemap,0); diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index ee7a2485cf0..71c40869a21 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -221,8 +221,8 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( xevious ) { - bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8,8,64,32); - fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,64,32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); tilemap_set_scrolldx(bg_tilemap,-20,288+27); tilemap_set_scrolldy(bg_tilemap,-16,-16); diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c index c9a2cd11c22..02a639fae04 100644 --- a/src/mame/video/xorworld.c +++ b/src/mame/video/xorworld.c @@ -74,7 +74,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( xorworld ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c index fd59741d8df..804b232f858 100644 --- a/src/mame/video/xxmissio.c +++ b/src/mame/video/xxmissio.c @@ -75,8 +75,8 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( xxmissio ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 8, 32, 32); tilemap_set_scroll_cols(bg_tilemap, 1); tilemap_set_scroll_rows(bg_tilemap, 1); diff --git a/src/mame/video/xybots.c b/src/mame/video/xybots.c index 20a1f8c8227..11f9bb76434 100644 --- a/src/mame/video/xybots.c +++ b/src/mame/video/xybots.c @@ -82,13 +82,13 @@ VIDEO_START( xybots ) }; /* initialize the playfield */ - atarigen_playfield_tilemap = tilemap_create(get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,32); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + atarigen_alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0); } diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c index 6d2256654e6..e70257bc9c9 100644 --- a/src/mame/video/xyonix.c +++ b/src/mame/video/xyonix.c @@ -53,7 +53,7 @@ WRITE8_HANDLER( xyonix_vidram_w ) VIDEO_START(xyonix) { - xyonix_tilemap = tilemap_create(get_xyonix_tile_info,tilemap_scan_rows, 4, 8,80,32); + xyonix_tilemap = tilemap_create(machine, get_xyonix_tile_info,tilemap_scan_rows, 4, 8,80,32); } VIDEO_UPDATE(xyonix) diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 4b330f05e4c..53ceeffd9eb 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -515,21 +515,21 @@ VIDEO_START( ygv608 ) namcond1_gfxbank = 0; /* create tilemaps of all sizes and combinations */ - tilemap_A_cache_8[0] = tilemap_create(get_tile_info_A_8, get_tile_offset, 8,8, 32,32); - tilemap_A_cache_8[1] = tilemap_create(get_tile_info_A_8, get_tile_offset, 8,8, 64,32); - tilemap_A_cache_8[2] = tilemap_create(get_tile_info_A_8, get_tile_offset, 8,8, 32,64); + tilemap_A_cache_8[0] = tilemap_create(machine, get_tile_info_A_8, get_tile_offset, 8,8, 32,32); + tilemap_A_cache_8[1] = tilemap_create(machine, get_tile_info_A_8, get_tile_offset, 8,8, 64,32); + tilemap_A_cache_8[2] = tilemap_create(machine, get_tile_info_A_8, get_tile_offset, 8,8, 32,64); - tilemap_A_cache_16[0] = tilemap_create(get_tile_info_A_16, get_tile_offset, 16,16, 32,32); - tilemap_A_cache_16[1] = tilemap_create(get_tile_info_A_16, get_tile_offset, 16,16, 64,32); - tilemap_A_cache_16[2] = tilemap_create(get_tile_info_A_16, get_tile_offset, 16,16, 32,64); + tilemap_A_cache_16[0] = tilemap_create(machine, get_tile_info_A_16, get_tile_offset, 16,16, 32,32); + tilemap_A_cache_16[1] = tilemap_create(machine, get_tile_info_A_16, get_tile_offset, 16,16, 64,32); + tilemap_A_cache_16[2] = tilemap_create(machine, get_tile_info_A_16, get_tile_offset, 16,16, 32,64); - tilemap_B_cache_8[0] = tilemap_create(get_tile_info_B_8, get_tile_offset, 8,8, 32,32); - tilemap_B_cache_8[1] = tilemap_create(get_tile_info_B_8, get_tile_offset, 8,8, 64,32); - tilemap_B_cache_8[2] = tilemap_create(get_tile_info_B_8, get_tile_offset, 8,8, 32,64); + tilemap_B_cache_8[0] = tilemap_create(machine, get_tile_info_B_8, get_tile_offset, 8,8, 32,32); + tilemap_B_cache_8[1] = tilemap_create(machine, get_tile_info_B_8, get_tile_offset, 8,8, 64,32); + tilemap_B_cache_8[2] = tilemap_create(machine, get_tile_info_B_8, get_tile_offset, 8,8, 32,64); - tilemap_B_cache_16[0] = tilemap_create(get_tile_info_B_16, get_tile_offset, 16,16, 32,32); - tilemap_B_cache_16[1] = tilemap_create(get_tile_info_B_16, get_tile_offset, 16,16, 64,32); - tilemap_B_cache_16[2] = tilemap_create(get_tile_info_B_16, get_tile_offset, 16,16, 32,64); + tilemap_B_cache_16[0] = tilemap_create(machine, get_tile_info_B_16, get_tile_offset, 16,16, 32,32); + tilemap_B_cache_16[1] = tilemap_create(machine, get_tile_info_B_16, get_tile_offset, 16,16, 64,32); + tilemap_B_cache_16[2] = tilemap_create(machine, get_tile_info_B_16, get_tile_offset, 16,16, 32,64); tilemap_A = NULL; tilemap_B = NULL; diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index f574a2becff..46868984d8c 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -104,7 +104,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( yiear ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c index e90dfc90191..2aa816e02f0 100644 --- a/src/mame/video/yunsun16.c +++ b/src/mame/video/yunsun16.c @@ -101,12 +101,12 @@ static int sprites_scrolldx, sprites_scrolldy; VIDEO_START( yunsun16 ) { - tilemap_0 = tilemap_create( get_tile_info_0,yunsun16_tilemap_scan_pages, + tilemap_0 = tilemap_create( machine, get_tile_info_0,yunsun16_tilemap_scan_pages, 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); - tilemap_1 = tilemap_create( get_tile_info_1,yunsun16_tilemap_scan_pages, + 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); diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index 68086f727af..d01e73d875e 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -165,10 +165,10 @@ static TILE_GET_INFO( get_tile_info_1 ) VIDEO_START( yunsung8 ) { - tilemap_0 = tilemap_create( get_tile_info_0, tilemap_scan_rows, + tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 8,8, DIM_NX_0, DIM_NY_0 ); - tilemap_1 = tilemap_create( get_tile_info_1, tilemap_scan_rows, + tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 8,8, DIM_NX_1, DIM_NY_1 ); tilemap_set_transparent_pen(tilemap_1,0); diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c index 1ae874ab0a0..7c3eb92afc2 100644 --- a/src/mame/video/zac2650.c +++ b/src/mame/video/zac2650.c @@ -132,7 +132,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( tinvader ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 24, 24, 32, 32); spritebitmap = video_screen_auto_bitmap_alloc(machine->primary_screen); diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c index 1957051371e..16447c6e90c 100644 --- a/src/mame/video/zaccaria.c +++ b/src/mame/video/zaccaria.c @@ -149,7 +149,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( zaccaria ) { - bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32); + bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_scroll_cols(bg_tilemap,32); } diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index 89db9284cb2..c8b922f3fa8 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -136,8 +136,8 @@ static void video_start_common(running_machine *machine, tile_get_info_func fg_t memset(congo_custom, 0, sizeof(congo_custom)); /* create a background and foreground tilemap */ - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8,8, 32,512); - fg_tilemap = tilemap_create(fg_tile_info, tilemap_scan_rows, 8,8, 32,32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8,8, 32,512); + fg_tilemap = tilemap_create(machine, fg_tile_info, tilemap_scan_rows, 8,8, 32,32); /* configure the foreground tilemap */ tilemap_set_transparent_pen(fg_tilemap, 0); diff --git a/src/mame/video/zerozone.c b/src/mame/video/zerozone.c index b2f9f173e64..37e8872454a 100644 --- a/src/mame/video/zerozone.c +++ b/src/mame/video/zerozone.c @@ -40,7 +40,7 @@ VIDEO_START( zerozone ) { // i'm not 100% sure it should be opaque, pink title screen looks strange in las vegas girls // but if its transparent other things look incorrect - zerozone_tilemap = tilemap_create(get_zerozone_tile_info,tilemap_scan_cols, 8, 8, 64,32); + zerozone_tilemap = tilemap_create(machine, get_zerozone_tile_info,tilemap_scan_cols, 8, 8, 64,32); } VIDEO_UPDATE( zerozone ) diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index c2c061b69ca..0acd20341ae 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -123,9 +123,9 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( zodiack ) { - bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); - fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(fg_tilemap, 0); tilemap_set_scroll_cols(fg_tilemap, 32);