From: Atari Ace [mailto:atari_ace@verizon.net]

Sent: Saturday, December 13, 2008 1:34 PM
To: submit@mamedev.org
Cc: atariace@hotmail.com
Subject: [patch] Add machine parameter to tilemap_create()

Hi mamdev,

This set of patches eliminates the #include "deprecat.h" from
tilemap.c.  The main change is to require callers of tilemap_create to
provide a machine pointer.  This pointer is then attached to the
tilemap and used when needed inside tilemap.c.

The first patch simply adds running_machine *machine to some driver
functions that will soon need them.  The second patch makes the needed
changes to tilemap.[ch].  The (large) third patch adds machine to all
the tilemap_create calls, and was generated entirely by the attached
script.

~aa
This commit is contained in:
Aaron Giles 2008-12-14 08:34:41 +00:00
parent 98b3cf37e7
commit 9830575ad0
549 changed files with 1681 additions and 1677 deletions

View File

@ -12,7 +12,6 @@
#include "driver.h" #include "driver.h"
#include "tilemap.h" #include "tilemap.h"
#include "profiler.h" #include "profiler.h"
#include "deprecat.h"
/*************************************************************************** /***************************************************************************
@ -47,8 +46,8 @@ typedef enum
/* internal blitting callbacks */ /* 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 (*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, 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 */ /* blitting parameters for rendering */
@ -69,6 +68,7 @@ struct _blit_parameters
struct _tilemap struct _tilemap
{ {
tilemap * next; /* pointer to next tilemap */ tilemap * next; /* pointer to next tilemap */
running_machine * machine; /* pointer back to the owning machine */
/* basic tilemap metrics */ /* basic tilemap metrics */
UINT32 rows; /* number of tile rows */ UINT32 rows; /* number of tile rows */
@ -79,14 +79,14 @@ struct _tilemap
UINT32 height; /* height of the full tilemap in pixels */ UINT32 height; /* height of the full tilemap in pixels */
/* logical <-> memory mappings */ /* 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 * memory_to_logical; /* map from memory index to logical index */
tilemap_logical_index max_logical_index; /* maximum valid 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 * logical_to_memory; /* map from logical index to memory index */
tilemap_memory_index max_memory_index; /* maximum valid memory index */ tilemap_memory_index max_memory_index; /* maximum valid memory index */
/* callback to interpret video RAM for the tilemap */ /* 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 */ tile_data tileinfo; /* structure to hold the data for a tile */
void * user_data; /* user data value passed to the callback */ void * user_data; /* user data value passed to the callback */
@ -129,8 +129,6 @@ static tilemap * tilemap_list;
static tilemap ** tilemap_tailptr; static tilemap ** tilemap_tailptr;
static int tilemap_instance; 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); UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound);
/* scanline rasterizers for drawing to the pixmap */ /* 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_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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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 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; INT32 value;
@ -213,7 +211,7 @@ INLINE INT32 effective_rowscroll(tilemap *tmap, int index)
account tilemap flip states 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; INT32 value;
@ -264,6 +262,8 @@ INLINE tilemap *indexed_tilemap(int index)
void tilemap_init(running_machine *machine) void tilemap_init(running_machine *machine)
{ {
UINT32 screen_width, screen_height;
if (machine->primary_screen == NULL) if (machine->primary_screen == NULL)
return; return;
@ -291,9 +291,8 @@ void tilemap_init(running_machine *machine)
tilemap_create - allocate a new tilemap 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; tilemap *tmap;
int group; 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)); memset(tmap, 0, sizeof(tilemap));
/* fill in the basic metrics */ /* fill in the basic metrics */
tmap->machine = machine;
tmap->rows = rows; tmap->rows = rows;
tmap->cols = cols; tmap->cols = cols;
tmap->tilewidth = tilewidth; 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) 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; rectangle original_cliprect;
blit_parameters blit; blit_parameters blit;
int xpos, ypos; int xpos, ypos;
@ -780,11 +781,14 @@ profiler_mark(PROFILER_TILEMAP_DRAW);
tmap->all_tiles_dirty = FALSE; 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 */ /* XY scrolling playfield */
if (tmap->scrollrows == 1 && tmap->scrollcols == 1) if (tmap->scrollrows == 1 && tmap->scrollcols == 1)
{ {
int scrollx = effective_rowscroll(tmap, 0); int scrollx = effective_rowscroll(tmap, 0, width);
int scrolly = effective_colscroll(tmap, 0); int scrolly = effective_colscroll(tmap, 0, height);
/* iterate to handle wraparound */ /* iterate to handle wraparound */
for (ypos = scrolly - tmap->height; ypos <= blit.cliprect.max_y; ypos += tmap->height) 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; const rectangle original_cliprect = blit.cliprect;
int rowheight = tmap->height / tmap->scrollrows; int rowheight = tmap->height / tmap->scrollrows;
int scrolly = effective_colscroll(tmap, 0); int scrolly = effective_colscroll(tmap, 0, height);
int currow, nextrow; int currow, nextrow;
/* iterate over Y to handle wraparound */ /* iterate over Y to handle wraparound */
@ -809,11 +813,11 @@ profiler_mark(PROFILER_TILEMAP_DRAW);
/* iterate over rows in the tilemap */ /* iterate over rows in the tilemap */
for (currow = firstrow; currow <= lastrow; currow = nextrow) 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 */ /* scan forward until we find a non-matching row */
for (nextrow = currow + 1; nextrow <= lastrow; nextrow++) for (nextrow = currow + 1; nextrow <= lastrow; nextrow++)
if (effective_rowscroll(tmap, nextrow) != scrollx) if (effective_rowscroll(tmap, nextrow, width) != scrollx)
break; break;
/* skip if disabled */ /* skip if disabled */
@ -837,17 +841,17 @@ profiler_mark(PROFILER_TILEMAP_DRAW);
{ {
const rectangle original_cliprect = blit.cliprect; const rectangle original_cliprect = blit.cliprect;
int colwidth = tmap->width / tmap->scrollcols; int colwidth = tmap->width / tmap->scrollcols;
int scrollx = effective_rowscroll(tmap, 0); int scrollx = effective_rowscroll(tmap, 0, width);
int curcol, nextcol; int curcol, nextcol;
/* iterate over columns in the tilemap */ /* iterate over columns in the tilemap */
for (curcol = 0; curcol < tmap->scrollcols; curcol = nextcol) 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 */ /* scan forward until we find a non-matching column */
for (nextcol = curcol + 1; nextcol < tmap->scrollcols; nextcol++) for (nextcol = curcol + 1; nextcol < tmap->scrollcols; nextcol++)
if (effective_colscroll(tmap, nextcol) != scrolly) if (effective_colscroll(tmap, nextcol, height) != scrolly)
break; break;
/* skip if disabled */ /* skip if disabled */
@ -1263,7 +1267,7 @@ profiler_mark(PROFILER_TILEMAP_UPDATE);
/* call the get info callback for the associated memory index */ /* call the get info callback for the associated memory index */
memindex = tmap->logical_to_memory[logindex]; 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 */ /* apply the global tilemap flip to the returned flip flags */
flags = tmap->tileinfo.flags ^ (tmap->attributes & 0x03); 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++) 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; dest0 = (UINT8 *)dest0 + dest_line_pitch_bytes;
source0 += tmap->pixmap->rowpixels; 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; const UINT8 *mask0 = mask_baseaddr + x_start;
for (cury = y; cury < nexty; cury++) 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; dest0 = (UINT8 *)dest0 + dest_line_pitch_bytes;
source0 += tmap->pixmap->rowpixels; source0 += tmap->pixmap->rowpixels;
@ -1715,7 +1719,7 @@ do { \
static void tilemap_draw_roz_core(tilemap *tmap, const blit_parameters *blit, 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) 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 *destbitmap = blit->bitmap;
bitmap_t *srcbitmap = tmap->pixmap; bitmap_t *srcbitmap = tmap->pixmap;
bitmap_t *flagsmap = tmap->flagsmap; 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 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; 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 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; int i;
@ -1935,7 +1939,7 @@ static void scanline_draw_masked_null(void *dest, const UINT16 *source, const UI
indexed bitmap 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; UINT16 *dest = _dest;
int pal = pcode >> 16; 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 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; UINT16 *dest = _dest;
int pal = pcode >> 16; int pal = pcode >> 16;
@ -2011,9 +2015,9 @@ static void scanline_draw_masked_ind16(void *_dest, const UINT16 *source, const
RGB bitmap 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; UINT16 *dest = _dest;
int i; int i;
@ -2041,9 +2045,9 @@ static void scanline_draw_opaque_rgb16(void *_dest, const UINT16 *source, int co
RGB bitmap using a mask 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; UINT16 *dest = _dest;
int i; int i;
@ -2073,9 +2077,9 @@ static void scanline_draw_masked_rgb16(void *_dest, const UINT16 *source, const
16bpp RGB bitmap with alpha blending 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; UINT16 *dest = _dest;
int i; int i;
@ -2104,9 +2108,9 @@ static void scanline_draw_opaque_rgb16_alpha(void *_dest, const UINT16 *source,
blending 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; UINT16 *dest = _dest;
int i; int i;
@ -2136,9 +2140,9 @@ static void scanline_draw_masked_rgb16_alpha(void *_dest, const UINT16 *source,
RGB bitmap 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; UINT32 *dest = _dest;
int i; int i;
@ -2166,9 +2170,9 @@ static void scanline_draw_opaque_rgb32(void *_dest, const UINT16 *source, int co
RGB bitmap using a mask 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; UINT32 *dest = _dest;
int i; int i;
@ -2198,9 +2202,9 @@ static void scanline_draw_masked_rgb32(void *_dest, const UINT16 *source, const
32bpp RGB bitmap with alpha blending 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; UINT32 *dest = _dest;
int i; int i;
@ -2229,9 +2233,9 @@ static void scanline_draw_opaque_rgb32_alpha(void *_dest, const UINT16 *source,
blending 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; UINT32 *dest = _dest;
int i; int i;

View File

@ -191,7 +191,7 @@
VIDEO_START( mydriver ) VIDEO_START( mydriver )
{ {
// first create the tilemap // first create the tilemap
tmap = tilemap_create( tmap = tilemap_create(machine,
my_get_info, // pointer to your get_info my_get_info, // pointer to your get_info
tilemap_scan_rows, // standard row-major mapper tilemap_scan_rows, // standard row-major mapper
8,8, // 8x8 tiles 8,8, // 8x8 tiles
@ -431,7 +431,7 @@ void tilemap_init(running_machine *machine);
/* ----- tilemap creation and configuration ----- */ /* ----- tilemap creation and configuration ----- */
/* create a new tilemap; note that tilemaps are tracked by the core so there is no dispose */ /* 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 */ /* specify a parameter to be passed into the tile_get_info callback */
void tilemap_set_user_data(tilemap *tmap, void *user_data); void tilemap_set_user_data(tilemap *tmap, void *user_data);

View File

@ -76,7 +76,7 @@ static TILE_GET_INFO( get_k3_bg_tile_info )
static VIDEO_START(k3) 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) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)

View File

@ -151,8 +151,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
static VIDEO_START( acommand ) static VIDEO_START( acommand )
{ {
tx_tilemap = tilemap_create(ac_get_tx_tile_info,tilemap_scan_cols,8,8,512,32); tx_tilemap = tilemap_create(machine, 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); bg_tilemap = tilemap_create(machine, ac_get_bg_tile_info,bg_scan,16,16,256,16);
ac_vregs = auto_malloc(0x80); ac_vregs = auto_malloc(0x80);

View File

@ -73,9 +73,9 @@ static TILEMAP_MAPPER( bsb_bg_scan )
static VIDEO_START(bestleag) static VIDEO_START(bestleag)
{ {
tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,8,8,256, 32); tx_tilemap = tilemap_create(machine, 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); bg_tilemap = tilemap_create(machine, 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); 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(tx_tilemap,15);
tilemap_set_transparent_pen(fg_tilemap,15); tilemap_set_transparent_pen(fg_tilemap,15);

View File

@ -162,9 +162,9 @@ static TILE_GET_INFO( get_tx_tile_info )
static VIDEO_START( bigfghtr ) static VIDEO_START( bigfghtr )
{ {
bg_tilemap = tilemap_create(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(get_fg_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(get_tx_tile_info,tilemap_scan_cols,8,8,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(fg_tilemap,0xf);
tilemap_set_transparent_pen(tx_tilemap,0xf); tilemap_set_transparent_pen(tx_tilemap,0xf);

View File

@ -67,10 +67,10 @@ static TILE_GET_INFO( get_tile_info2 ) { SET_TILE_INFO(0, bishjan_videoram2[ til
static VIDEO_START(bishjan) 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 ); 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 ); 8,8, 0x80,0x40 );
tilemap_set_transparent_pen(tmap1, 0); tilemap_set_transparent_pen(tmap1, 0);

View File

@ -466,18 +466,18 @@ static WRITE32_HANDLER( ms32_spramx_w )
static VIDEO_START(bnstars) 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[0] = tilemap_create(machine, 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[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[0],0);
tilemap_set_transparent_pen(ms32_tx_tilemap[1],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[0] = tilemap_create(machine, 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[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[0],0);
tilemap_set_transparent_pen(ms32_bg_tilemap[1],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[0] = tilemap_create(machine, 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[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[0],0);
tilemap_set_transparent_pen(ms32_roz_tilemap[1],0); tilemap_set_transparent_pen(ms32_roz_tilemap[1],0);

View File

@ -109,8 +109,8 @@ static TILE_GET_INFO( get_fg_tile_info )
static VIDEO_START( calorie ) static VIDEO_START( calorie )
{ {
bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,16,16,16,16); 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,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_transparent_pen(fg_tilemap,0);
} }

View File

@ -28,7 +28,7 @@ static WRITE8_HANDLER( cball_vram_w )
static VIDEO_START( cball ) 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);
} }

View File

@ -111,8 +111,8 @@ static TILE_GET_INFO( get_bg2_tile_info )
static VIDEO_START(chanbara ) static VIDEO_START(chanbara )
{ {
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);
bg2_tilemap = tilemap_create(get_bg2_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);
tilemap_set_transparent_pen(bg_tilemap,0); tilemap_set_transparent_pen(bg_tilemap,0);
} }

View File

@ -97,7 +97,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
static VIDEO_START(cm) 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); 8, 8, 64, 32);
} }

View File

@ -53,7 +53,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START(cm2) 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); 8, 8, 32, 32);
} }

View File

@ -82,8 +82,8 @@ static TILE_GET_INFO( get_fg_tile_info )
static VIDEO_START( zerotrgt ) static VIDEO_START( zerotrgt )
{ {
bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16,16,64,64); bg_tilemap = tilemap_create(machine, 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); 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); tilemap_set_transparent_pen(fg_tilemap,0);

View File

@ -535,7 +535,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( coinmstr ) 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 ) static VIDEO_UPDATE( coinmstr )

View File

@ -32,7 +32,7 @@ static TILE_GET_INFO( get_tile_info )
static VIDEO_START( cowrace ) 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 ); 8,8, 0x20,0x20 );
tilemap_set_transparent_pen(tmap, 0); tilemap_set_transparent_pen(tmap, 0);

View File

@ -139,7 +139,7 @@ static WRITE8_HANDLER(cshooter_txram_w)
static VIDEO_START(cshooter) 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); tilemap_set_transparent_pen(cshooter_txtilemap, 3);
} }

View File

@ -44,9 +44,9 @@ static TILE_GET_INFO( get_bg0_tile_info )
static VIDEO_START( cultures ) static VIDEO_START( cultures )
{ {
bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,8,8,512,512); bg2_tilemap = tilemap_create(machine, 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); bg1_tilemap = tilemap_create(machine, 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); 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(bg1_tilemap,0);
tilemap_set_transparent_pen(bg0_tilemap,0); tilemap_set_transparent_pen(bg0_tilemap,0);

View File

@ -193,7 +193,7 @@ static TILE_GET_INFO( get_tx_tile_info )
static VIDEO_START( cybertnk ) 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 ) static VIDEO_UPDATE( cybertnk )

View File

@ -295,8 +295,8 @@ static TILE_GET_INFO( get_fg_tile_info )
static VIDEO_START( dacholer ) static VIDEO_START( dacholer )
{ {
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_transparent_pen(fg_tilemap,0);
} }

View File

@ -138,10 +138,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
static VIDEO_START( darkhors ) 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 ); 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 ); 16,16, 0x40,0x40 );
tilemap_set_transparent_pen(darkhors_tmap, 0); tilemap_set_transparent_pen(darkhors_tmap, 0);

View File

@ -340,7 +340,7 @@ static TILE_GET_INFO( get_tile_info_bg )
static VIDEO_START( ddayjlc ) 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 ) static VIDEO_UPDATE( ddayjlc )

View File

@ -138,7 +138,7 @@ static TILE_GET_INFO( get_back_tile_info )
static VIDEO_START( ddealer ) static VIDEO_START( ddealer )
{ {
ddealer_flipscreen = 0; 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) static void ddealer_draw_video_layer( running_machine *machine, UINT16* vreg_base, UINT16* top, UINT16* bottom, bitmap_t* bitmap, const rectangle *cliprect, int flipy)

View File

@ -187,8 +187,8 @@ static TILE_GET_INFO( get_dreamwld_bg2_tile_info )
static VIDEO_START( dreamwld ) static VIDEO_START( dreamwld )
{ {
dreamwld_bg_tilemap = tilemap_create(get_dreamwld_bg_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(get_dreamwld_bg2_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); tilemap_set_transparent_pen(dreamwld_bg2_tilemap,0);
dreamwld_tilebankold[0] = dreamwld_tilebankold[1] = -1; dreamwld_tilebankold[0] = dreamwld_tilebankold[1] = -1;
dreamwld_tilebank[0] = dreamwld_tilebank[1] = 0; dreamwld_tilebank[0] = dreamwld_tilebank[1] = 0;

View File

@ -91,8 +91,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
static VIDEO_START( drtomy ) static VIDEO_START( drtomy )
{ {
tilemap_bg = tilemap_create(get_tile_info_bg,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(get_tile_info_fg,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); tilemap_set_transparent_pen(tilemap_fg,0);
} }

View File

@ -107,7 +107,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( drw80pkr ) 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 ) static VIDEO_UPDATE( drw80pkr )

View File

@ -93,10 +93,10 @@ static TILE_GET_INFO( get_tile_info2 )
static VIDEO_START(dunhuang) 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 ); 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 ); 8,32, 0x40,0x8 );
tilemap_set_transparent_pen(tmap, 0); tilemap_set_transparent_pen(tmap, 0);

View File

@ -171,8 +171,8 @@ static TILE_GET_INFO( get_tile_info )
static VIDEO_START( dynadice ) static VIDEO_START( dynadice )
{ {
/* pacman - style videoram layout */ /* pacman - style videoram layout */
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);
top_tilemap = tilemap_create(get_tile_info,tilemap_scan_cols,8,8,2,32); top_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_cols,8,8,2,32);
tilemap_set_scrollx(bg_tilemap, 0, -16 ); tilemap_set_scrollx(bg_tilemap, 0, -16 );
} }

View File

@ -144,7 +144,7 @@ static WRITE8_HANDLER( egghunt_atram_w )
static VIDEO_START(egghunt) 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_bgram = auto_malloc(0x1000);
egghunt_spram = auto_malloc(0x1000); egghunt_spram = auto_malloc(0x1000);
} }

View File

@ -194,8 +194,8 @@ static TILE_GET_INFO( get_tile_info_fg )
static VIDEO_START( ettrivia ) static VIDEO_START( ettrivia )
{ {
bg_tilemap = tilemap_create( get_tile_info_bg,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( get_tile_info_fg,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); tilemap_set_transparent_pen(fg_tilemap,0);
} }

View File

@ -157,7 +157,7 @@ static WRITE8_HANDLER( tileram_w )
static VIDEO_START( firefox ) 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_transparent_pen(bgtiles, 0);
tilemap_set_scrolldy(bgtiles, video_screen_get_visible_area(machine->primary_screen)->min_y, 0); tilemap_set_scrolldy(bgtiles, video_screen_get_visible_area(machine->primary_screen)->min_y, 0);
} }

View File

@ -108,12 +108,12 @@ static WRITE16_HANDLER( galaxi_fg_w )
static VIDEO_START(galaxi) static VIDEO_START(galaxi)
{ {
bg1_tmap = tilemap_create( get_bg1_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( get_bg2_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( get_bg3_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( get_bg4_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(bg1_tmap, 0);
tilemap_set_transparent_pen(bg2_tmap, 0); tilemap_set_transparent_pen(bg2_tmap, 0);

View File

@ -640,7 +640,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( goldnpkr ) 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 ) static VIDEO_UPDATE( goldnpkr )

View File

@ -70,8 +70,8 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( good ) static VIDEO_START( good )
{ {
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);
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,0xf); tilemap_set_transparent_pen(fg_tilemap,0xf);
} }

View File

@ -349,9 +349,9 @@ static TILE_GET_INFO( get_gs3_tile_info )
static VIDEO_START(gstream) static VIDEO_START(gstream)
{ {
gstream_tilemap1 = tilemap_create(get_gs1_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(get_gs2_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(get_gs3_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_tilemap1,0);
tilemap_set_transparent_pen(gstream_tilemap2,0); tilemap_set_transparent_pen(gstream_tilemap2,0);

View File

@ -57,13 +57,13 @@ static WRITE8_HANDLER( hitme_vidram_w )
static VIDEO_START(hitme) 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) 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);
} }

View File

@ -435,13 +435,13 @@ static int K037122_vh_start(running_machine *machine, int chip)
if (chip == 0) if (chip == 0)
{ {
K037122_layer[chip][0] = tilemap_create(K037122_0_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 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(K037122_0_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64); K037122_layer[chip][1] = tilemap_create(machine, K037122_0_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64);
} }
else else
{ {
K037122_layer[chip][0] = tilemap_create(K037122_1_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 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(K037122_1_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 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); tilemap_set_transparent_pen(K037122_layer[chip][0], 0);

View File

@ -75,8 +75,8 @@ static WRITE8_HANDLER( fg_color_w )
static VIDEO_START(jingbell) static VIDEO_START(jingbell)
{ {
bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 32, 0x80,0x20); bg_tilemap = tilemap_create(machine, 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); 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(bg_tilemap, 0);
tilemap_set_transparent_pen(fg_tilemap, 0); tilemap_set_transparent_pen(fg_tilemap, 0);

View File

@ -64,8 +64,8 @@ static WRITE8_HANDLER( bg_w )
static VIDEO_START(igs_180) static VIDEO_START(igs_180)
{ {
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);
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(fg_tilemap,0xf); tilemap_set_transparent_pen(fg_tilemap,0xf);
tilemap_set_transparent_pen(bg_tilemap,0xf); tilemap_set_transparent_pen(bg_tilemap,0xf);

View File

@ -132,10 +132,10 @@ static WRITE32_HANDLER( igs_pallete32_w )
static VIDEO_START(igs_majhong) 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); 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(machine, 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);
//tilemap_set_transparent_pen(igs_bg_tilemap,15); //tilemap_set_transparent_pen(igs_bg_tilemap,15);
logerror("Video START OK!\n"); logerror("Video START OK!\n");
} }

View File

@ -142,9 +142,9 @@ static const gfx_layout tiles8x8_layout =
static VIDEO_START(jackpool) static VIDEO_START(jackpool)
{ {
jackpool_layer0_tilemap = tilemap_create(get_jackpool_layer0_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(get_jackpool_layer1_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(get_jackpool_layer2_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_layer0_tilemap,0);
tilemap_set_transparent_pen(jackpool_layer2_tilemap,0); tilemap_set_transparent_pen(jackpool_layer2_tilemap,0);

View File

@ -203,25 +203,25 @@ static TILE_GET_INFO( get_sc3_tile_info )
static VIDEO_START( jalmah ) static VIDEO_START( jalmah )
{ {
sc0_tilemap_0 = tilemap_create(get_sc0_tile_info,range0_16x16,16,16,256,32); sc0_tilemap_0 = tilemap_create(machine, 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_1 = tilemap_create(machine, 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_2 = tilemap_create(machine, 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_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_0 = tilemap_create(machine, 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_1 = tilemap_create(machine, 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_2 = tilemap_create(machine, 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_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_0 = tilemap_create(machine, 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_1 = tilemap_create(machine, 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_2 = tilemap_create(machine, 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_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_0 = tilemap_create(machine, 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_1 = tilemap_create(machine, 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_2 = tilemap_create(machine, 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_3 = tilemap_create(machine, get_sc3_tile_info,range3_8x8,8,8,64,128);
jm_scrollram = auto_malloc(0x80); jm_scrollram = auto_malloc(0x80);
jm_vregs = auto_malloc(0x40); jm_vregs = auto_malloc(0x40);
@ -248,8 +248,8 @@ static VIDEO_START( jalmah )
static VIDEO_START( urashima ) static VIDEO_START( urashima )
{ {
sc0_tilemap_0 = tilemap_create(get_sc0_tile_info,range0_16x16,16,16,256,32); sc0_tilemap_0 = tilemap_create(machine, 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); sc3_tilemap_0 = tilemap_create(machine, get_sc3_tile_info,range2_8x8,8,8,128,64);
jm_scrollram = auto_malloc(0x80); jm_scrollram = auto_malloc(0x80);
jm_vregs = auto_malloc(0x40); jm_vregs = auto_malloc(0x40);

View File

@ -135,7 +135,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( jokrwild ) 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);
} }

View File

@ -273,7 +273,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( jollyjgr ) 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_transparent_pen(bg_tilemap, 0);
tilemap_set_scroll_cols(bg_tilemap, 32); tilemap_set_scroll_cols(bg_tilemap, 32);

View File

@ -60,8 +60,8 @@ static TILE_GET_INFO( get_t2_tile_info )
static VIDEO_START( koftball ) static VIDEO_START( koftball )
{ {
tilemap_1 = tilemap_create(get_t1_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(get_t2_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); tilemap_set_transparent_pen(tilemap_1,0);
} }

View File

@ -218,7 +218,7 @@ static PALETTE_INIT( koikoi ) //wrong
static VIDEO_START(koikoi) 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) static VIDEO_UPDATE(koikoi)

View File

@ -505,7 +505,7 @@ static VIDEO_START( laserbat )
int screen_width = video_screen_get_width(machine->primary_screen); int screen_width = video_screen_get_width(machine->primary_screen);
int screen_height = video_screen_get_height(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); videoram = (UINT8 *)auto_malloc(0x400);
colorram = (UINT8 *)auto_malloc(0x400); colorram = (UINT8 *)auto_malloc(0x400);

View File

@ -434,9 +434,9 @@ static void copy_sprites(running_machine *machine, bitmap_t *bitmap, bitmap_t *s
static VIDEO_START( limenko ) static VIDEO_START( limenko )
{ {
bg_tilemap = tilemap_create(get_bg_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(get_md_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(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);
tilemap_set_transparent_pen(md_tilemap,0); tilemap_set_transparent_pen(md_tilemap,0);
tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(fg_tilemap,0);

View File

@ -176,7 +176,7 @@ static VIDEO_START( looping )
{ {
looping_state *state = machine->driver_data; 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); tilemap_set_scroll_cols(state->bg_tilemap, 0x20);
} }

View File

@ -36,7 +36,7 @@ static TILE_GET_INFO( get_ltcasino_tile_info )
static VIDEO_START(ltcasino) 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);
} }

View File

@ -85,7 +85,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START(lucky8) 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); 8, 8, 64, 32);
} }

View File

@ -247,10 +247,10 @@ static TILE_GET_INFO( get_fg_tile_info )
static VIDEO_START( m63 ) 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); 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); 8, 8, 32, 32);
tilemap_set_scroll_cols(bg_tilemap, 32); tilemap_set_scroll_cols(bg_tilemap, 32);

View File

@ -144,9 +144,9 @@ static TILE_GET_INFO( get_layer2_tile_info )
static VIDEO_START( magic10 ) static VIDEO_START( magic10 )
{ {
layer0_tilemap = tilemap_create(get_layer0_tile_info, tilemap_scan_rows, 16, 16, 32, 32); layer0_tilemap = tilemap_create(machine, 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); layer1_tilemap = tilemap_create(machine, 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); 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(layer1_tilemap, 0);
tilemap_set_transparent_pen(layer2_tilemap, 0); tilemap_set_transparent_pen(layer2_tilemap, 0);

View File

@ -445,7 +445,7 @@ static TILE_GET_INFO( get_magicfly_tile_info )
static VIDEO_START(magicfly) 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 ) static TILE_GET_INFO( get_7mezzo_tile_info )
@ -475,7 +475,7 @@ static TILE_GET_INFO( get_7mezzo_tile_info )
static VIDEO_START( 7mezzo ) 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 ) static VIDEO_UPDATE( magicfly )

View File

@ -441,7 +441,7 @@ static TILE_GET_INFO( get_tile_info )
static VIDEO_START( marinedt ) 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_transparent_pen(tx_tilemap, 0);
tilemap_set_scrolldx(tx_tilemap, 0, 4*8); tilemap_set_scrolldx(tx_tilemap, 0, 4*8);

View File

@ -34,7 +34,7 @@ static WRITE8_HANDLER( mgolf_vram_w )
static VIDEO_START( mgolf ) 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);
} }

View File

@ -66,7 +66,7 @@ static TILE_GET_INFO( get_tile_info )
static VIDEO_START( livequiz ) 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 ); 8,8, 0x80,0x20 );
tilemap_set_transparent_pen(tmap, 0); tilemap_set_transparent_pen(tmap, 0);

View File

@ -142,10 +142,10 @@ VIDEO_START(mil4000)
for (i=0;i<0x800;i++) for (i=0;i<0x800;i++)
palette_set_color(space->machine, i, MAKE_RGB(0, 0, 0)); 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); sc0_tilemap = tilemap_create(machine, 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); sc1_tilemap = tilemap_create(machine, 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); sc2_tilemap = tilemap_create(machine, 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); 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(sc1_tilemap,0);
tilemap_set_transparent_pen(sc2_tilemap,0); tilemap_set_transparent_pen(sc2_tilemap,0);

View File

@ -166,7 +166,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( miniboy7 ) 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 ) static VIDEO_UPDATE( miniboy7 )

View File

@ -54,7 +54,7 @@ static TILE_GET_INFO( get_mogura_tile_info )
static VIDEO_START( mogura ) 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 ) static VIDEO_UPDATE( mogura )

View File

@ -309,10 +309,10 @@ static TILE_GET_INFO( get_tx_tile_info )
static VIDEO_START( mwarr ) static VIDEO_START( mwarr )
{ {
bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols, 16, 16,64,16); bg_tilemap = tilemap_create(machine, 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); mlow_tilemap = tilemap_create(machine, 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); mhigh_tilemap = tilemap_create(machine, 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); tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8,64,32);
sprites_buffer = auto_malloc(sizeof(UINT16) * 0x800); sprites_buffer = auto_malloc(sizeof(UINT16) * 0x800);

View File

@ -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]); } static TILE_GET_INFO( get_tile_info5 ) { get_tile_info(machine,tileinfo,tile_index,&mTilemapInfo.videoram[0x4408]); }
void 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) ) void (*cb)( UINT16 code, int *gfx, int *mask) )
{ {
int i; int i;
@ -62,14 +62,14 @@ namco_tilemap_init( int gfxbank, void *maskBaseAddr,
mTilemapInfo.videoram = auto_malloc( 0x10000*2 ); mTilemapInfo.videoram = auto_malloc( 0x10000*2 );
/* four scrolling tilemaps */ /* four scrolling tilemaps */
mTilemapInfo.tmap[0] = tilemap_create(get_tile_info0,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(get_tile_info1,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(get_tile_info2,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(get_tile_info3,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 */ /* two non-scrolling tilemaps */
mTilemapInfo.tmap[4] = tilemap_create(get_tile_info4,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(get_tile_info5,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 */ /* define offsets for scrolling */
for( i=0; i<4; i++ ) for( i=0; i<4; i++ )
@ -1119,7 +1119,7 @@ TILEMAP_MAPPER( namco_roz_scan )
} /* namco_roz_scan*/ } /* namco_roz_scan*/
void void
namco_roz_init( int gfxbank, const char * maskregion ) namco_roz_init( running_machine *machine, int gfxbank, const char * maskregion )
{ {
int i; int i;
static const tile_get_info_func roz_info[ROZ_TILEMAP_COUNT] = 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; i<ROZ_TILEMAP_COUNT; i++ ) for( i=0; i<ROZ_TILEMAP_COUNT; i++ )
{ {
mRozTilemap[i] = tilemap_create( mRozTilemap[i] = tilemap_create(machine,
roz_info[i], roz_info[i],
namco_roz_scan, namco_roz_scan,
16,16, 16,16,
@ -1624,7 +1624,7 @@ namco_road_init(running_machine *machine, int gfxbank )
pGfx->total_colors = 0x3f; pGfx->total_colors = 0x3f;
machine->gfx[gfxbank] = pGfx; machine->gfx[gfxbank] = pGfx;
mpRoadTilemap = tilemap_create( mpRoadTilemap = tilemap_create(machine,
get_road_info,tilemap_scan_rows, get_road_info,tilemap_scan_rows,
ROAD_TILE_SIZE,ROAD_TILE_SIZE, ROAD_TILE_SIZE,ROAD_TILE_SIZE,
ROAD_COLS,ROAD_ROWS); ROAD_COLS,ROAD_ROWS);

View File

@ -775,7 +775,7 @@ static WRITE32_HANDLER( namcos23_textram_w )
static VIDEO_START( ss23 ) 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); tilemap_set_transparent_pen(bgtilemap, 0xf);
} }

View File

@ -798,8 +798,8 @@ static TILE_GET_INFO( bg_get_tile_info ) { get_tile_info(machine,tileinfo,tile_i
static VIDEO_START( nmg5 ) static VIDEO_START( nmg5 )
{ {
bg_tilemap = tilemap_create(bg_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(fg_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); tilemap_set_transparent_pen(fg_tilemap,0);
} }

View File

@ -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_tile_size = K001604_roz_size[chip] ? 16 : 8;
int roz_width = K001604_layer_size ? 64 : 128; 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][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(K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_1, 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][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(K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_1, roz_tile_size, roz_tile_size, 64, 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 else
{ {
int roz_tile_size = K001604_roz_size[chip] ? 16 : 8; int roz_tile_size = K001604_roz_size[chip] ? 16 : 8;
int roz_width = K001604_layer_size ? 64 : 128; 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][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(K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_1, 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][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(K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_1, roz_tile_size, roz_tile_size, 64, 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); tilemap_set_transparent_pen(K001604_layer_8x8[chip][0], 0);

View File

@ -88,7 +88,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( olibochu ) 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); 8, 8, 32, 32);
} }

View File

@ -254,7 +254,7 @@ GFXDECODE_END
static VIDEO_START( onetwo ) 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 ) static VIDEO_UPDATE( onetwo )

View File

@ -188,9 +188,9 @@ ADDRESS_MAP_END
static VIDEO_START( panicr ) 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); colortable_configure_tilemap_groups(machine->colortable, txttilemap, machine->gfx[0], 0);
} }

View File

@ -614,7 +614,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( peplus ) 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); palette_ram = auto_malloc(0x3000);
memset(palette_ram, 0, 0x3000); memset(palette_ram, 0, 0x3000);
} }

View File

@ -90,8 +90,8 @@ static TILE_GET_INFO( get_tile_info2 )
static VIDEO_START ( pipeline ) static VIDEO_START ( pipeline )
{ {
palram=auto_malloc(0x1000); palram=auto_malloc(0x1000);
tilemap1 = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,64,32 ); tilemap1 = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,64,32 );
tilemap2 = tilemap_create( get_tile_info2,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); tilemap_set_transparent_pen(tilemap2,0);
} }

View File

@ -225,9 +225,9 @@ static TIMER_CALLBACK( scanline_callback )
static VIDEO_START( pkscramble ) static VIDEO_START( pkscramble )
{ {
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);
md_tilemap = tilemap_create(get_md_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(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(md_tilemap,15); tilemap_set_transparent_pen(md_tilemap,15);
tilemap_set_transparent_pen(fg_tilemap,15); tilemap_set_transparent_pen(fg_tilemap,15);

View File

@ -439,7 +439,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
static VIDEO_START( powerbal ) 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; xoffset = -20;

View File

@ -325,8 +325,8 @@ static TILE_GET_INFO( get_ppmast93_fg_tile_info )
static VIDEO_START( ppmast93 ) static VIDEO_START( ppmast93 )
{ {
ppmast93_bg_tilemap = tilemap_create(get_ppmast93_bg_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(get_ppmast93_fg_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); tilemap_set_transparent_pen(ppmast93_fg_tilemap,0);
} }

View File

@ -120,9 +120,9 @@ static TILE_GET_INFO( get_pturn_bg_tile_info )
static VIDEO_START(pturn) 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); 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); tilemap_set_transparent_pen(pturn_bgmap,0);
} }

View File

@ -77,8 +77,8 @@ static WRITE8_HANDLER( fg_ram_w )
static VIDEO_START(quizpun2) static VIDEO_START(quizpun2)
{ {
bg_tmap = tilemap_create( get_bg_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( get_fg_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(bg_tmap, 0);
tilemap_set_transparent_pen(fg_tmap, 0); tilemap_set_transparent_pen(fg_tmap, 0);

View File

@ -347,10 +347,10 @@ static VIDEO_START(rabbit)
memset(rabbit_tilemap_ram[2], 0, 0x20000); memset(rabbit_tilemap_ram[2], 0, 0x20000);
memset(rabbit_tilemap_ram[3], 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[0] = tilemap_create(machine, 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[1] = tilemap_create(machine, 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[2] = tilemap_create(machine, 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[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[0],0x0);
tilemap_set_transparent_pen(rabbit_tilemap[1],0x0); tilemap_set_transparent_pen(rabbit_tilemap[1],0x0);
tilemap_set_transparent_pen(rabbit_tilemap[2],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[2], 0, 0x20000);
memset(rabbit_tilemap_ram[3], 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[0] = tilemap_create(machine, 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[1] = tilemap_create(machine, 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[2] = tilemap_create(machine, 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[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[0],0x0);
tilemap_set_transparent_pen(rabbit_tilemap[1],0x0); tilemap_set_transparent_pen(rabbit_tilemap[1],0x0);
tilemap_set_transparent_pen(rabbit_tilemap[2],0x0); tilemap_set_transparent_pen(rabbit_tilemap[2],0x0);

View File

@ -341,10 +341,10 @@ static void set_scroll(tilemap *tm, int plane)
static VIDEO_START( raiden2 ) static VIDEO_START( raiden2 )
{ {
text_layer = tilemap_create(get_text_tile_info, tilemap_scan_rows, 8, 8, 64,32 ); text_layer = tilemap_create(machine, 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 ); background_layer = tilemap_create(machine, 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 ); midground_layer = tilemap_create(machine, 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 ); 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(midground_layer, 15);
tilemap_set_transparent_pen(foreground_layer, 15); tilemap_set_transparent_pen(foreground_layer, 15);

View File

@ -102,7 +102,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START(rcasino) 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); 8, 8, 32, 32);
} }

View File

@ -58,7 +58,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( rmhaihai ) 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); 8, 8, 64, 32);
} }

View File

@ -158,8 +158,8 @@ static TILE_GET_INFO( get_fg_tile_info )
static VIDEO_START( safarir ) static VIDEO_START( safarir )
{ {
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_transparent_pen(fg_tilemap, 0);
} }

View File

@ -103,7 +103,7 @@ static VIDEO_UPDATE(sbowling)
static VIDEO_START(sbowling) static VIDEO_START(sbowling)
{ {
tmpbitmap = auto_bitmap_alloc(32*8,32*8,video_screen_get_format(machine->primary_screen)); 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 ) static WRITE8_HANDLER( pix_shift_w )

View File

@ -285,7 +285,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( sbrkout ) 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);
} }

View File

@ -99,7 +99,7 @@ static PALETTE_INIT( skyarmy )
static VIDEO_START( 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); tilemap_set_scroll_cols(skyarmy_tilemap,32);
} }

View File

@ -70,10 +70,10 @@ static TILEMAP_MAPPER( skylncr_tilemap_scan_pages )
static VIDEO_START( skylncr ) 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 ); 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, 8,32,
TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y ); TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y );

View File

@ -108,7 +108,7 @@ static TILE_GET_INFO( get_spool99_tile_info )
VIDEO_START(spool99) 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) VIDEO_UPDATE(spool99)

View File

@ -126,12 +126,12 @@ static WRITE8_HANDLER( statriv2_videoram_w )
static VIDEO_START (statriv2) 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) 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);
} }

View File

@ -61,7 +61,7 @@ static TILE_GET_INFO( get_tile_info )
static VIDEO_START( subsino ) 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 ); tilemap_set_transparent_pen( tmap, 0 );
tiles_offset = 0; tiles_offset = 0;
} }

View File

@ -249,7 +249,7 @@ static TILE_GET_INFO( get_tile_info )
static VIDEO_START( supdrapo ) 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 ) static VIDEO_UPDATE( supdrapo )

View File

@ -43,7 +43,7 @@ static TILE_GET_INFO( get_tile_info )
static VIDEO_START( superdq ) 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 ) static VIDEO_UPDATE( superdq )

View File

@ -62,7 +62,7 @@ static MACHINE_RESET( suprgolf )
static VIDEO_START( 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 ) static VIDEO_UPDATE( suprgolf )

View File

@ -49,7 +49,7 @@ static VIDEO_UPDATE( tattack )
static VIDEO_START( 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 ) static ADDRESS_MAP_START( mem, ADDRESS_SPACE_PROGRAM, 8 )

View File

@ -591,16 +591,16 @@ static VIDEO_START(deroon)
bitmap_fill(tmp_tilemap_renderbitmap, NULL, 0x0000); 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); 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); 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); 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); tilemap_set_transparent_pen(bg2tilemap,0);
} }

View File

@ -264,7 +264,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( trvmadns ) 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); tilemap_set_transparent_pen(bg_tilemap,1);
} }

View File

@ -404,12 +404,12 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( videopkr ) 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 ) 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);
} }

View File

@ -395,9 +395,9 @@ static TILE_GET_INFO( get_vmetal_mid2tilemap_tile_info )
static VIDEO_START(varia) static VIDEO_START(varia)
{ {
vmetal_texttilemap = tilemap_create(get_vmetal_texttilemap_tile_info,tilemap_scan_rows, 8, 8, 256,256); vmetal_texttilemap = tilemap_create(machine, 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_mid1tilemap = tilemap_create(machine, 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_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_texttilemap,15);
tilemap_set_transparent_pen(vmetal_mid1tilemap,15); tilemap_set_transparent_pen(vmetal_mid1tilemap,15);
tilemap_set_transparent_pen(vmetal_mid2tilemap,15); tilemap_set_transparent_pen(vmetal_mid2tilemap,15);

View File

@ -86,7 +86,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START(vroulet) 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); 8, 8, 32, 32);
} }

View File

@ -127,7 +127,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( wallc ) 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 ) static VIDEO_UPDATE( wallc )

View File

@ -269,7 +269,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static VIDEO_START( wink ) 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 ) static VIDEO_UPDATE( wink )

View File

@ -680,9 +680,9 @@ GFXDECODE_END
static VIDEO_START(witch) static VIDEO_START(witch)
{ {
gfx0a_tilemap = tilemap_create(get_gfx0a_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(get_gfx0b_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(get_gfx1_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(gfx0a_tilemap,0);
tilemap_set_transparent_pen(gfx0b_tilemap,0); tilemap_set_transparent_pen(gfx0b_tilemap,0);

View File

@ -78,7 +78,7 @@ static TILE_GET_INFO( y_get_bg_tile_info )
static VIDEO_START( yumefuda ) 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 ) static VIDEO_UPDATE( yumefuda )

Some files were not shown because too many files have changed in this diff Show More