diff --git a/src/emu/emupal.c b/src/emu/emupal.c index 5cb9f9762f7..06d90641d80 100644 --- a/src/emu/emupal.c +++ b/src/emu/emupal.c @@ -465,7 +465,7 @@ UINT32 colortable_get_transpen_mask(colortable_t *ctable, const gfx_element *gfx (each group maps to a gfx color) -------------------------------------------------*/ -void colortable_configure_tilemap_groups(colortable_t *ctable, tilemap *tmap, const gfx_element *gfx, int transcolor) +void colortable_configure_tilemap_groups(colortable_t *ctable, tilemap_t *tmap, const gfx_element *gfx, int transcolor) { int color; diff --git a/src/emu/emupal.h b/src/emu/emupal.h index de843b4933c..ec9b9ffa3cd 100644 --- a/src/emu/emupal.h +++ b/src/emu/emupal.h @@ -169,7 +169,7 @@ rgb_t colortable_palette_get_color(colortable_t *ctable, UINT32 entry); UINT32 colortable_get_transpen_mask(colortable_t *ctable, const gfx_element *gfx, int color, int transcolor); /* configure groups in a tilemap to represent transparency based on colortable entries (each group maps to a gfx color) */ -void colortable_configure_tilemap_groups(colortable_t *ctable, tilemap *tmap, const gfx_element *gfx, int transcolor); +void colortable_configure_tilemap_groups(colortable_t *ctable, tilemap_t *tmap, const gfx_element *gfx, int transcolor); /* return the number of entries in a colortable */ UINT32 colortable_palette_get_size(colortable_t *ctable); diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index dbafd80414b..568f9cb4bef 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -66,9 +66,9 @@ struct _blit_parameters /* core tilemap structure */ -struct _tilemap +struct _tilemap_t { - tilemap * next; /* pointer to next tilemap */ + tilemap_t * next; /* pointer to next tilemap */ running_machine * machine; /* pointer back to the owning machine */ /* basic tilemap metrics */ @@ -124,8 +124,8 @@ struct _tilemap struct _tilemap_private { - tilemap * list; - tilemap ** tailptr; + tilemap_t * list; + tilemap_t ** tailptr; int instance; }; @@ -136,25 +136,25 @@ struct _tilemap_private ***************************************************************************/ /* system management helpers */ -static tilemap *tilemap_create_common(running_machine *machine, void *get_info_object, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows); +static tilemap_t *tilemap_create_common(running_machine *machine, void *get_info_object, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows); static void tilemap_exit(running_machine *machine); static STATE_POSTLOAD( tilemap_postload ); -static void tilemap_dispose(tilemap *tmap); +static void tilemap_dispose(tilemap_t *tmap); /* logical <-> memory index mapping */ -static void mappings_create(tilemap *tmap); -static void mappings_update(tilemap *tmap); +static void mappings_create(tilemap_t *tmap); +static void mappings_update(tilemap_t *tmap); /* tile rendering */ -static void pixmap_update(tilemap *tmap, const rectangle *cliprect); -static void tile_update(tilemap *tmap, tilemap_logical_index logindex, UINT32 cached_col, UINT32 cached_row); -static UINT8 tile_draw(tilemap *tmap, const UINT8 *pendata, UINT32 x0, UINT32 y0, UINT32 palette_base, UINT8 category, UINT8 group, UINT8 flags, UINT8 pen_mask); -static UINT8 tile_apply_bitmask(tilemap *tmap, const UINT8 *maskdata, UINT32 x0, UINT32 y0, UINT8 category, UINT8 flags); +static void pixmap_update(tilemap_t *tmap, const rectangle *cliprect); +static void tile_update(tilemap_t *tmap, tilemap_logical_index logindex, UINT32 cached_col, UINT32 cached_row); +static UINT8 tile_draw(tilemap_t *tmap, const UINT8 *pendata, UINT32 x0, UINT32 y0, UINT32 palette_base, UINT8 category, UINT8 group, UINT8 flags, UINT8 pen_mask); +static UINT8 tile_apply_bitmask(tilemap_t *tmap, const UINT8 *maskdata, UINT32 x0, UINT32 y0, UINT8 category, UINT8 flags); /* drawing helpers */ -static void configure_blit_parameters(blit_parameters *blit, tilemap *tmap, bitmap_t *dest, const rectangle *cliprect, UINT32 flags, UINT8 priority, UINT8 priority_mask); -static void tilemap_draw_instance(tilemap *tmap, const blit_parameters *blit, int xpos, int ypos); -static void tilemap_draw_roz_core(tilemap *tmap, const blit_parameters *blit, +static void configure_blit_parameters(blit_parameters *blit, tilemap_t *tmap, bitmap_t *dest, const rectangle *cliprect, UINT32 flags, UINT8 priority, UINT8 priority_mask); +static void tilemap_draw_instance(tilemap_t *tmap, const blit_parameters *blit, int xpos, int ypos); +static void tilemap_draw_roz_core(tilemap_t *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 */ @@ -183,7 +183,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, UINT32 screen_width) +INLINE INT32 effective_rowscroll(tilemap_t *tmap, int index, UINT32 screen_width) { INT32 value; @@ -212,7 +212,7 @@ INLINE INT32 effective_rowscroll(tilemap *tmap, int index, UINT32 screen_width) account tilemap flip states -------------------------------------------------*/ -INLINE INT32 effective_colscroll(tilemap *tmap, int index, UINT32 screen_height) +INLINE INT32 effective_colscroll(tilemap_t *tmap, int index, UINT32 screen_height) { INT32 value; @@ -239,9 +239,9 @@ INLINE INT32 effective_colscroll(tilemap *tmap, int index, UINT32 screen_height) indexed_tilemap - return a tilemap by index -------------------------------------------------*/ -INLINE tilemap *indexed_tilemap(running_machine *machine, int index) +INLINE tilemap_t *indexed_tilemap(running_machine *machine, int index) { - tilemap *tmap; + tilemap_t *tmap; /* find by the tilemap index */ for (tmap = machine->tilemap_data->list; tmap != NULL; tmap = tmap->next) @@ -258,7 +258,7 @@ INLINE tilemap *indexed_tilemap(running_machine *machine, int index) changed -------------------------------------------------*/ -INLINE int gfx_elements_changed(tilemap *tmap) +INLINE int gfx_elements_changed(tilemap_t *tmap) { UINT32 usedmask = tmap->gfx_used; int isdirty = FALSE; @@ -312,7 +312,7 @@ void tilemap_init(running_machine *machine) tilemap_create - create a new tilemap -------------------------------------------------*/ -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) +tilemap_t *tilemap_create(running_machine *machine, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) { return tilemap_create_common(machine, (void *)machine, tile_get_info, mapper, tilewidth, tileheight, cols, rows); } @@ -323,7 +323,7 @@ tilemap *tilemap_create(running_machine *machine, tile_get_info_func tile_get_in is owned by a device -------------------------------------------------*/ -tilemap *tilemap_create_device(const device_config *device, tile_get_info_device_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) +tilemap_t *tilemap_create_device(const device_config *device, tile_get_info_device_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) { return tilemap_create_common(device->machine, (void *)device, (tile_get_info_func)tile_get_info, mapper, tilewidth, tileheight, cols, rows); } @@ -334,9 +334,9 @@ tilemap *tilemap_create_device(const device_config *device, tile_get_info_device function -------------------------------------------------*/ -static tilemap *tilemap_create_common(running_machine *machine, void *get_info_object, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) +static tilemap_t *tilemap_create_common(running_machine *machine, void *get_info_object, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) { - tilemap *tmap; + tilemap_t *tmap; int tilemap_instance; int group; @@ -349,7 +349,7 @@ static tilemap *tilemap_create_common(running_machine *machine, void *get_info_o tilemap_instance = machine->tilemap_data->instance; /* allocate the tilemap itself */ - tmap = alloc_clear_or_die(tilemap); + tmap = alloc_clear_or_die(tilemap_t); /* fill in the basic metrics */ tmap->machine = machine; @@ -422,7 +422,7 @@ static tilemap *tilemap_create_common(running_machine *machine, void *get_info_o 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_t *tmap, void *user_data) { tmap->user_data = user_data; } @@ -434,7 +434,7 @@ void tilemap_set_user_data(tilemap *tmap, void *user_data) the palette -------------------------------------------------*/ -void tilemap_set_palette_offset(tilemap *tmap, UINT32 offset) +void tilemap_set_palette_offset(tilemap_t *tmap, UINT32 offset) { tmap->palette_offset = offset; } @@ -446,7 +446,7 @@ void tilemap_set_palette_offset(tilemap *tmap, UINT32 offset) tilemap are ignored -------------------------------------------------*/ -void tilemap_set_enable(tilemap *tmap, int enable) +void tilemap_set_enable(tilemap_t *tmap, int enable) { tmap->enable = (enable != 0); } @@ -457,7 +457,7 @@ void tilemap_set_enable(tilemap *tmap, int enable) tilemap -------------------------------------------------*/ -void tilemap_set_flip(tilemap *tmap, UINT32 attributes) +void tilemap_set_flip(tilemap_t *tmap, UINT32 attributes) { /* if we're changing things, force a refresh of the mappings and mark it all dirty */ if (tmap->attributes != attributes) @@ -475,7 +475,7 @@ void tilemap_set_flip(tilemap *tmap, UINT32 attributes) void tilemap_set_flip_all(running_machine *machine, UINT32 attributes) { - tilemap *tmap; + tilemap_t *tmap; if (machine->tilemap_data == NULL) return; @@ -495,7 +495,7 @@ void tilemap_set_flip_all(running_machine *machine, UINT32 attributes) dirty based on its memory index -------------------------------------------------*/ -void tilemap_mark_tile_dirty(tilemap *tmap, tilemap_memory_index memindex) +void tilemap_mark_tile_dirty(tilemap_t *tmap, tilemap_memory_index memindex) { /* only mark if within range */ if (memindex < tmap->max_memory_index) @@ -517,7 +517,7 @@ void tilemap_mark_tile_dirty(tilemap *tmap, tilemap_memory_index memindex) tiles in a tilemap dirty -------------------------------------------------*/ -void tilemap_mark_all_tiles_dirty(tilemap *tmap) +void tilemap_mark_all_tiles_dirty(tilemap_t *tmap) { /* mark all tiles dirty and clear the clean flag */ tmap->all_tiles_dirty = TRUE; @@ -532,7 +532,7 @@ void tilemap_mark_all_tiles_dirty(tilemap *tmap) void tilemap_mark_all_tiles_dirty_all(running_machine *machine) { - tilemap *tmap; + tilemap_t *tmap; for (tmap = machine->tilemap_data->list; tmap != NULL; tmap = tmap->next) tilemap_mark_all_tiles_dirty(tmap); } @@ -548,7 +548,7 @@ void tilemap_mark_all_tiles_dirty_all(running_machine *machine) ( & mask) == pen) to a layer -------------------------------------------------*/ -void tilemap_map_pens_to_layer(tilemap *tmap, int group, pen_t pen, pen_t mask, UINT8 layermask) +void tilemap_map_pens_to_layer(tilemap_t *tmap, int group, pen_t pen, pen_t mask, UINT8 layermask) { UINT8 *array = tmap->pen_to_flags + group * MAX_PEN_TO_FLAGS; pen_t start, stop, cur; @@ -586,7 +586,7 @@ void tilemap_map_pens_to_layer(tilemap *tmap, int group, pen_t pen, pen_t mask, all other pens to layer 0 -------------------------------------------------*/ -void tilemap_set_transparent_pen(tilemap *tmap, pen_t pen) +void tilemap_set_transparent_pen(tilemap_t *tmap, pen_t pen) { /* reset the whole pen map to opaque */ tilemap_map_pens_to_layer(tmap, 0, 0, 0, TILEMAP_PIXEL_LAYER0); @@ -603,7 +603,7 @@ void tilemap_set_transparent_pen(tilemap *tmap, pen_t pen) layer 1) -------------------------------------------------*/ -void tilemap_set_transmask(tilemap *tmap, int group, UINT32 fgmask, UINT32 bgmask) +void tilemap_set_transmask(tilemap_t *tmap, int group, UINT32 fgmask, UINT32 bgmask) { pen_t pen; @@ -628,7 +628,7 @@ void tilemap_set_transmask(tilemap *tmap, int group, UINT32 fgmask, UINT32 bgmas covers height/scroll_rows pixels -------------------------------------------------*/ -void tilemap_set_scroll_rows(tilemap *tmap, UINT32 scroll_rows) +void tilemap_set_scroll_rows(tilemap_t *tmap, UINT32 scroll_rows) { assert(scroll_rows <= tmap->height); tmap->scrollrows = scroll_rows; @@ -641,7 +641,7 @@ void tilemap_set_scroll_rows(tilemap *tmap, UINT32 scroll_rows) unit covers width/scroll_cols pixels -------------------------------------------------*/ -void tilemap_set_scroll_cols(tilemap *tmap, UINT32 scroll_cols) +void tilemap_set_scroll_cols(tilemap_t *tmap, UINT32 scroll_cols) { assert(scroll_cols <= tmap->width); tmap->scrollcols = scroll_cols; @@ -654,7 +654,7 @@ void tilemap_set_scroll_cols(tilemap *tmap, UINT32 scroll_cols) flipped cases -------------------------------------------------*/ -void tilemap_set_scrolldx(tilemap *tmap, int dx, int dx_flipped) +void tilemap_set_scrolldx(tilemap_t *tmap, int dx, int dx_flipped) { tmap->dx = dx; tmap->dx_flipped = dx_flipped; @@ -667,7 +667,7 @@ void tilemap_set_scrolldx(tilemap *tmap, int dx, int dx_flipped) flipped cases -------------------------------------------------*/ -void tilemap_set_scrolldy(tilemap *tmap, int dy, int dy_flipped) +void tilemap_set_scrolldy(tilemap_t *tmap, int dy, int dy_flipped) { tmap->dy = dy; tmap->dy_flipped = dy_flipped; @@ -680,7 +680,7 @@ void tilemap_set_scrolldy(tilemap *tmap, int dy, int dy_flipped) flip state -------------------------------------------------*/ -int tilemap_get_scrolldx(tilemap *tmap) +int tilemap_get_scrolldx(tilemap_t *tmap) { return (tmap->attributes & TILEMAP_FLIPX) ? tmap->dx_flipped : tmap->dx; } @@ -692,7 +692,7 @@ int tilemap_get_scrolldx(tilemap *tmap) flip state -------------------------------------------------*/ -int tilemap_get_scrolldy(tilemap *tmap) +int tilemap_get_scrolldy(tilemap_t *tmap) { return (tmap->attributes & TILEMAP_FLIPY) ? tmap->dy_flipped : tmap->dy; } @@ -703,7 +703,7 @@ int tilemap_get_scrolldy(tilemap *tmap) for a row unit -------------------------------------------------*/ -void tilemap_set_scrollx(tilemap *tmap, int which, int value) +void tilemap_set_scrollx(tilemap_t *tmap, int which, int value) { if (which < tmap->scrollrows) tmap->rowscroll[which] = value; @@ -715,7 +715,7 @@ void tilemap_set_scrollx(tilemap *tmap, int which, int value) for a column unit -------------------------------------------------*/ -void tilemap_set_scrolly(tilemap *tmap, int which, int value) +void tilemap_set_scrolly(tilemap_t *tmap, int which, int value) { if (which < tmap->scrollcols) tmap->colscroll[which] = value; @@ -727,7 +727,7 @@ void tilemap_set_scrolly(tilemap *tmap, int which, int value) for a row unit -------------------------------------------------*/ -int tilemap_get_scrollx(tilemap *tmap, int which) +int tilemap_get_scrollx(tilemap_t *tmap, int which) { if (which < tmap->scrollrows) return tmap->rowscroll[which]; @@ -741,7 +741,7 @@ int tilemap_get_scrollx(tilemap *tmap, int which) for a column unit -------------------------------------------------*/ -int tilemap_get_scrolly(tilemap *tmap, int which) +int tilemap_get_scrolly(tilemap_t *tmap, int which) { if (which < tmap->scrollcols) return tmap->colscroll[which]; @@ -760,7 +760,7 @@ int tilemap_get_scrolly(tilemap *tmap, int which) (updated) internal pixmap for a tilemap -------------------------------------------------*/ -bitmap_t *tilemap_get_pixmap(tilemap *tmap) +bitmap_t *tilemap_get_pixmap(tilemap_t *tmap) { /* ensure all the tiles are up-to-date and then return the pixmap */ pixmap_update(tmap, NULL); @@ -773,7 +773,7 @@ bitmap_t *tilemap_get_pixmap(tilemap *tmap) (updated) internal flagsmap for a tilemap -------------------------------------------------*/ -bitmap_t *tilemap_get_flagsmap(tilemap *tmap) +bitmap_t *tilemap_get_flagsmap(tilemap_t *tmap) { /* ensure all the tiles are up-to-date and then return the pixmap */ pixmap_update(tmap, NULL); @@ -786,7 +786,7 @@ bitmap_t *tilemap_get_flagsmap(tilemap *tmap) (updated) internal per-tile flags for a tilemap -------------------------------------------------*/ -UINT8 *tilemap_get_tile_flags(tilemap *tmap) +UINT8 *tilemap_get_tile_flags(tilemap_t *tmap) { /* ensure all the tiles are up-to-date and then return the pixmap */ pixmap_update(tmap, NULL); @@ -805,7 +805,7 @@ UINT8 *tilemap_get_tile_flags(tilemap *tmap) priority/priority_mask to the priority bitmap -------------------------------------------------*/ -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_t *tmap, UINT32 flags, UINT8 priority, UINT8 priority_mask) { UINT32 width, height; blit_parameters blit; @@ -929,7 +929,7 @@ profiler_mark_end(); priority_mask to the priority bitmap -------------------------------------------------*/ -void tilemap_draw_roz_primask(bitmap_t *dest, const rectangle *cliprect, tilemap *tmap, +void tilemap_draw_roz_primask(bitmap_t *dest, const rectangle *cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, UINT32 flags, UINT8 priority, UINT8 priority_mask) { @@ -977,7 +977,7 @@ profiler_mark_end(); int tilemap_count(running_machine *machine) { - tilemap *tmap; + tilemap_t *tmap; int count = 0; if (machine->tilemap_data == NULL) @@ -997,7 +997,7 @@ int tilemap_count(running_machine *machine) void tilemap_size_by_index(running_machine *machine, int number, UINT32 *width, UINT32 *height) { - tilemap *tmap = indexed_tilemap(machine, number); + tilemap_t *tmap = indexed_tilemap(machine, number); *width = tmap->width; *height = tmap->height; } @@ -1011,7 +1011,7 @@ void tilemap_size_by_index(running_machine *machine, int number, UINT32 *width, void tilemap_draw_by_index(running_machine *machine, bitmap_t *dest, int number, UINT32 scrollx, UINT32 scrolly) { - tilemap *tmap = indexed_tilemap(machine, number); + tilemap_t *tmap = indexed_tilemap(machine, number); blit_parameters blit; int xpos,ypos; @@ -1118,7 +1118,7 @@ static void tilemap_exit(running_machine *machine) if (tilemap_data != NULL) while (tilemap_data->list != NULL) { - tilemap *next = tilemap_data->list->next; + tilemap_t *next = tilemap_data->list->next; tilemap_dispose(tilemap_data->list); tilemap_data->list = next; } @@ -1133,7 +1133,7 @@ static void tilemap_exit(running_machine *machine) static STATE_POSTLOAD( tilemap_postload ) { /* recompute the mappings for this tilemap */ - tilemap *tmap = (tilemap *)param; + tilemap_t *tmap = (tilemap_t *)param; mappings_update(tmap); } @@ -1142,9 +1142,9 @@ static STATE_POSTLOAD( tilemap_postload ) tilemap_dispose - dispose of a tilemap -------------------------------------------------*/ -static void tilemap_dispose(tilemap *tmap) +static void tilemap_dispose(tilemap_t *tmap) { - tilemap **tmapptr; + tilemap_t **tmapptr; /* walk the list of tilemaps; when we find ourself, remove it */ for (tmapptr = &tmap->machine->tilemap_data->list; *tmapptr != NULL; tmapptr = &(*tmapptr)->next) @@ -1177,7 +1177,7 @@ static void tilemap_dispose(tilemap *tmap) mapping tables and compute their extents -------------------------------------------------*/ -static void mappings_create(tilemap *tmap) +static void mappings_create(tilemap_t *tmap) { UINT32 col, row; @@ -1208,7 +1208,7 @@ static void mappings_create(tilemap *tmap) a major change (flip x/y changes) -------------------------------------------------*/ -static void mappings_update(tilemap *tmap) +static void mappings_update(tilemap_t *tmap) { tilemap_logical_index logindex; tilemap_memory_index memindex; @@ -1252,7 +1252,7 @@ static void mappings_update(tilemap *tmap) pixmap described by the cliprect -------------------------------------------------*/ -static void pixmap_update(tilemap *tmap, const rectangle *cliprect) +static void pixmap_update(tilemap_t *tmap, const rectangle *cliprect) { int mincol, maxcol, minrow, maxrow; int row, col; @@ -1313,7 +1313,7 @@ profiler_mark_end(); tile_update - update a single dirty tile -------------------------------------------------*/ -static void tile_update(tilemap *tmap, tilemap_logical_index logindex, UINT32 col, UINT32 row) +static void tile_update(tilemap_t *tmap, tilemap_logical_index logindex, UINT32 col, UINT32 row) { UINT32 x0 = tmap->tilewidth * col; UINT32 y0 = tmap->tileheight * row; @@ -1355,7 +1355,7 @@ profiler_mark_end(); the palette_base -------------------------------------------------*/ -static UINT8 tile_draw(tilemap *tmap, const UINT8 *pendata, UINT32 x0, UINT32 y0, UINT32 palette_base, UINT8 category, UINT8 group, UINT8 flags, UINT8 pen_mask) +static UINT8 tile_draw(tilemap_t *tmap, const UINT8 *pendata, UINT32 x0, UINT32 y0, UINT32 palette_base, UINT8 category, UINT8 group, UINT8 flags, UINT8 pen_mask) { const UINT8 *penmap = tmap->pen_to_flags + group * MAX_PEN_TO_FLAGS; bitmap_t *flagsmap = tmap->flagsmap; @@ -1451,7 +1451,7 @@ static UINT8 tile_draw(tilemap *tmap, const UINT8 *pendata, UINT32 x0, UINT32 y0 flagsmap appropriately -------------------------------------------------*/ -static UINT8 tile_apply_bitmask(tilemap *tmap, const UINT8 *maskdata, UINT32 x0, UINT32 y0, UINT8 category, UINT8 flags) +static UINT8 tile_apply_bitmask(tilemap_t *tmap, const UINT8 *maskdata, UINT32 x0, UINT32 y0, UINT8 category, UINT8 flags) { bitmap_t *flagsmap = tmap->flagsmap; int height = tmap->tileheight; @@ -1513,7 +1513,7 @@ static UINT8 tile_apply_bitmask(tilemap *tmap, const UINT8 *maskdata, UINT32 x0, and indexed drawing code -------------------------------------------------*/ -static void configure_blit_parameters(blit_parameters *blit, tilemap *tmap, bitmap_t *dest, const rectangle *cliprect, UINT32 flags, UINT8 priority, UINT8 priority_mask) +static void configure_blit_parameters(blit_parameters *blit, tilemap_t *tmap, bitmap_t *dest, const rectangle *cliprect, UINT32 flags, UINT8 priority, UINT8 priority_mask) { /* start with nothing */ memset(blit, 0, sizeof(*blit)); @@ -1604,7 +1604,7 @@ static void configure_blit_parameters(blit_parameters *blit, tilemap *tmap, bitm pixmap at the given xpos,ypos -------------------------------------------------*/ -static void tilemap_draw_instance(tilemap *tmap, const blit_parameters *blit, int xpos, int ypos) +static void tilemap_draw_instance(tilemap_t *tmap, const blit_parameters *blit, int xpos, int ypos) { bitmap_t *priority_bitmap = tmap->machine->priority_bitmap; bitmap_t *dest = blit->bitmap; @@ -1782,7 +1782,7 @@ do { \ *(UINT16 *)dest = alpha_blend_r16(*(UINT16 *)dest, clut[INPUT_VAL], alpha); \ } while (0) -static void tilemap_draw_roz_core(tilemap *tmap, const blit_parameters *blit, +static void tilemap_draw_roz_core(tilemap_t *tmap, const blit_parameters *blit, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound) { const pen_t *clut = &tmap->machine->pens[blit->tilemap_priority_code >> 16]; diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index ea38222942f..1df7a88df13 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -159,7 +159,7 @@ order. Based on bits in the tile memory, tiles can be drawn either behind or in front of sprites. - tilemap *tmap; + tilemap_t *tmap; UINT16 *my_tmap_memory; TILE_GET_INFO( my_get_info ) @@ -379,7 +379,7 @@ typedef UINT32 tilemap_memory_index; /* opaque tilemap definition */ -typedef struct _tilemap tilemap; +typedef struct _tilemap_t tilemap_t; /* tile_data is filled in by the get_tile_info callback */ @@ -421,25 +421,25 @@ 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(running_machine *machine, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows); +tilemap_t *tilemap_create(running_machine *machine, tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows); /* create a new tilemap that is owned by a device */ -tilemap *tilemap_create_device(const device_config *device, tile_get_info_device_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows); +tilemap_t *tilemap_create_device(const device_config *device, tile_get_info_device_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); +void tilemap_set_user_data(tilemap_t *tmap, void *user_data); /* specify an offset to be added to each pixel before looking up the palette. * The offset only applies at final rendering time (e.g., tilemap_draw()) * It does not apply to the cached pixmap, which is provided by tilemap_get_pixmap(). */ -void tilemap_set_palette_offset(tilemap *tmap, UINT32 offset); +void tilemap_set_palette_offset(tilemap_t *tmap, UINT32 offset); /* set an enable flag for the tilemap; if 0, requests to draw the tilemap are ignored */ -void tilemap_set_enable(tilemap *tmap, int enable); +void tilemap_set_enable(tilemap_t *tmap, int enable); /* set a global flip for the tilemap */ -void tilemap_set_flip(tilemap *tmap, UINT32 attributes); +void tilemap_set_flip(tilemap_t *tmap, UINT32 attributes); /* set a global flip for all tilemaps */ void tilemap_set_flip_all(running_machine *machine, UINT32 attributes); @@ -449,10 +449,10 @@ void tilemap_set_flip_all(running_machine *machine, UINT32 attributes); /* ----- dirty tile marking ----- */ /* mark a single tile dirty based on its memory index */ -void tilemap_mark_tile_dirty(tilemap *tmap, tilemap_memory_index memory_index); +void tilemap_mark_tile_dirty(tilemap_t *tmap, tilemap_memory_index memory_index); /* mark all the tiles dirty in a tilemap */ -void tilemap_mark_all_tiles_dirty(tilemap *tmap); +void tilemap_mark_all_tiles_dirty(tilemap_t *tmap); /* mark all the tiles dirty in all tilemaps */ void tilemap_mark_all_tiles_dirty_all(running_machine *machine); @@ -462,63 +462,63 @@ void tilemap_mark_all_tiles_dirty_all(running_machine *machine); /* ----- pen-to-layer mapping ----- */ /* specify the mapping of one or more pens (where ( & mask == pen) to a layer */ -void tilemap_map_pens_to_layer(tilemap *tmap, int group, pen_t pen, pen_t mask, UINT8 layermask); +void tilemap_map_pens_to_layer(tilemap_t *tmap, int group, pen_t pen, pen_t mask, UINT8 layermask); /* set a single transparent pen into the tilemap, mapping all other pens to layer 0 */ -void tilemap_set_transparent_pen(tilemap *tmap, pen_t pen); +void tilemap_set_transparent_pen(tilemap_t *tmap, pen_t pen); /* set up the first 32 pens using a foreground (layer 0) mask and a background (layer 1) mask */ -void tilemap_set_transmask(tilemap *tmap, int group, UINT32 fgmask, UINT32 bgmask); +void tilemap_set_transmask(tilemap_t *tmap, int group, UINT32 fgmask, UINT32 bgmask); /* ----- tilemap scrolling ----- */ /* specify the number of independently scrollable row units; each unit covers height/scroll_rows pixels */ -void tilemap_set_scroll_rows(tilemap *tmap, UINT32 scroll_rows); +void tilemap_set_scroll_rows(tilemap_t *tmap, UINT32 scroll_rows); /* specify the number of independently scrollable column units; each unit covers width/scroll_cols pixels */ -void tilemap_set_scroll_cols(tilemap *tmap, UINT32 scroll_cols); +void tilemap_set_scroll_cols(tilemap_t *tmap, UINT32 scroll_cols); /* specify global horizontal and vertical scroll offsets, for non-flipped and flipped cases */ -void tilemap_set_scrolldx(tilemap *tmap, int dx, int dx_if_flipped); -void tilemap_set_scrolldy(tilemap *tmap, int dy, int dy_if_flipped); +void tilemap_set_scrolldx(tilemap_t *tmap, int dx, int dx_if_flipped); +void tilemap_set_scrolldy(tilemap_t *tmap, int dy, int dy_if_flipped); /* return the global horizontal or vertical scroll offset, based on current flip state */ -int tilemap_get_scrolldx(tilemap *tmap); -int tilemap_get_scrolldy(tilemap *tmap); +int tilemap_get_scrolldx(tilemap_t *tmap); +int tilemap_get_scrolldy(tilemap_t *tmap); /* specify the scroll value for a row/column unit */ -void tilemap_set_scrollx(tilemap *tmap, int row, int value); -void tilemap_set_scrolly(tilemap *tmap, int col, int value); +void tilemap_set_scrollx(tilemap_t *tmap, int row, int value); +void tilemap_set_scrolly(tilemap_t *tmap, int col, int value); /* return the scroll value for a row/column unit */ -int tilemap_get_scrollx(tilemap *tmap, int row); -int tilemap_get_scrolly(tilemap *tmap, int col); +int tilemap_get_scrollx(tilemap_t *tmap, int row); +int tilemap_get_scrolly(tilemap_t *tmap, int col); /* ----- internal map access ----- */ /* return a pointer to the (updated) internal pixmap for a tilemap */ -bitmap_t *tilemap_get_pixmap(tilemap *tmap); +bitmap_t *tilemap_get_pixmap(tilemap_t *tmap); /* return a pointer to the (updated) internal flagsmap for a tilemap */ -bitmap_t *tilemap_get_flagsmap(tilemap *tmap); +bitmap_t *tilemap_get_flagsmap(tilemap_t *tmap); /* return a pointer to the (updated) internal per-tile flags for a tilemap */ -UINT8 *tilemap_get_tile_flags(tilemap *tmap); +UINT8 *tilemap_get_tile_flags(tilemap_t *tmap); /* ----- tilemap rendering ----- */ /* draw a tilemap to the destination with clipping; pixels apply priority/priority_mask to the priority bitmap */ -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_t *tmap, UINT32 flags, UINT8 priority, UINT8 priority_mask); /* draw a tilemap to the destination with clipping and arbitrary rotate/zoom; */ /* pixels apply priority/priority_mask to the priority bitmap */ -void tilemap_draw_roz_primask(bitmap_t *dest, const rectangle *cliprect, tilemap *tmap, +void tilemap_draw_roz_primask(bitmap_t *dest, const rectangle *cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, UINT32 flags, UINT8 priority, UINT8 priority_mask); @@ -580,7 +580,7 @@ INLINE void tileinfo_set(running_machine *machine, tile_data *tileinfo, int gfxn to a layer -------------------------------------------------*/ -INLINE void tilemap_map_pen_to_layer(tilemap *tmap, int group, pen_t pen, UINT8 layermask) +INLINE void tilemap_map_pen_to_layer(tilemap_t *tmap, int group, pen_t pen, UINT8 layermask) { tilemap_map_pens_to_layer(tmap, group, pen, ~0, layermask); } @@ -591,7 +591,7 @@ INLINE void tilemap_map_pen_to_layer(tilemap *tmap, int group, pen_t pen, UINT8 tilemap_draw_primask -------------------------------------------------*/ -INLINE void tilemap_draw(bitmap_t *dest, const rectangle *cliprect, tilemap *tmap, UINT32 flags, UINT8 priority) +INLINE void tilemap_draw(bitmap_t *dest, const rectangle *cliprect, tilemap_t *tmap, UINT32 flags, UINT8 priority) { tilemap_draw_primask(dest, cliprect, tmap, flags, priority, 0xff); } @@ -602,7 +602,7 @@ INLINE void tilemap_draw(bitmap_t *dest, const rectangle *cliprect, tilemap *tma tilemap_draw_roz_primask -------------------------------------------------*/ -INLINE void tilemap_draw_roz(bitmap_t *dest, const rectangle *cliprect, tilemap *tmap, +INLINE void tilemap_draw_roz(bitmap_t *dest, const rectangle *cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, UINT32 flags, UINT8 priority) { diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 15d319dafec..7a0ff0742f3 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -47,7 +47,7 @@ The rationale for saving/not saving are as follows: static UINT16* k3_spriteram_1; Saved via reference to AM_BASE static UINT16* k3_spriteram_2; Saved via reference to AM_BASE static UINT16* k3_bgram; Saved via reference to AM_BASE -static tilemap *k3_bg_tilemap; Saved due to tilemap supporting save +static tilemap_t *k3_bg_tilemap; Saved due to tilemap supporting save There are no static local variables. @@ -70,7 +70,7 @@ struct _k3_state // UINT16 * paletteram16; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* devices */ const device_config *oki1; diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index c7614a70e1b..98efdd7efc8 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -60,7 +60,7 @@ JALCF1 BIN 1,048,576 02-07-99 1:11a JALCF1.BIN #include "deprecat.h" #include "sound/okim6295.h" -static tilemap *tx_tilemap,*bg_tilemap; +static tilemap_t *tx_tilemap,*bg_tilemap; static UINT16 *ac_txvram,*ac_bgvram; static UINT16 *ac_vregs; diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 5f1c16f7722..9c02d161437 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -72,7 +72,7 @@ struct _albazg_state // UINT8 * paletteram_2; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ UINT8 mux_data; diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 060179bcebe..33526d0e8c8 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -26,7 +26,7 @@ Dip Locations added according to Service Mode /* Video Handling */ static UINT16 *bestleag_txram,*bestleag_bgram,*bestleag_fgram,*bestleag_vregs; -static tilemap *tx_tilemap,*bg_tilemap,*fg_tilemap; +static tilemap_t *tx_tilemap,*bg_tilemap,*fg_tilemap; static TILE_GET_INFO( get_tx_tile_info ) { diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 1137827ba3f..75c3b46e2fd 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -129,7 +129,7 @@ struct _bigfghtr_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; UINT16 fg_scrollx, fg_scrolly; UINT16 vreg; UINT16 scroll_x, scroll_y; diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 0d64f0d0454..eb2722c9610 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -46,8 +46,8 @@ static UINT8 *bishjan_colorram; static UINT8 *bishjan_videoram_1_lo, *bishjan_videoram_1_hi; static UINT8 *bishjan_videoram_2_lo, *bishjan_videoram_2_hi; -static tilemap *tmap_1; -static tilemap *tmap_2; +static tilemap_t *tmap_1; +static tilemap_t *tmap_2; static TILE_GET_INFO( get_tile_info_1 ) { SET_TILE_INFO(0, (bishjan_videoram_1_hi[ tile_index ] << 8) + bishjan_videoram_1_lo[ tile_index ], 0, 0); } static TILE_GET_INFO( get_tile_info_2 ) { SET_TILE_INFO(0, (bishjan_videoram_2_hi[ tile_index ] << 8) + bishjan_videoram_2_lo[ tile_index ], 0, 0); } diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 94c500853c0..f0215f99d7d 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -100,9 +100,9 @@ ROMs : MR96004-10.1 [125661cd] (IC5 - Samples) #define ms32_bg_tilemap bnstars_bg_tilemap #define ms32_roz_tilemap bnstars_tx_tilemap -static tilemap *ms32_tx_tilemap[2]; -static tilemap *ms32_bg_tilemap[2]; -static tilemap *ms32_roz_tilemap[2]; +static tilemap_t *ms32_tx_tilemap[2]; +static tilemap_t *ms32_bg_tilemap[2]; +static tilemap_t *ms32_roz_tilemap[2]; static UINT32 *ms32_tx0_ram, *ms32_tx1_ram; static UINT32 *ms32_bg0_ram, *ms32_bg1_ram; diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index 89b2bb6feb6..f9950601971 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -32,11 +32,11 @@ are the same of IGS. AMT may be previous IGS name. static UINT8 *bg_tile_ram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 *bg_scroll; static UINT8 *fg_tile_ram, *fg_color_ram; -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; static WRITE8_HANDLER( bg_scroll_w ) { diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index e65bec1fd8c..2d0e2cd8819 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -92,7 +92,7 @@ struct _calorie_state // UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap,*fg_tilemap; + tilemap_t *bg_tilemap,*fg_tilemap; UINT8 bg_bank; }; diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c index 8003a39ab94..198f1b1ec68 100644 --- a/src/mame/drivers/caswin.c +++ b/src/mame/drivers/caswin.c @@ -46,7 +46,7 @@ TODO: #include "sound/ay8910.h" static UINT8 *sc0_vram,*sc0_attr; -static tilemap *sc0_tilemap; +static tilemap_t *sc0_tilemap; static TILE_GET_INFO( get_sc0_tile_info ) { diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index cbd1970f210..a12a79c4bbb 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -15,7 +15,7 @@ struct _cball_state UINT8 * video_ram; /* video-related */ - tilemap* bg_tilemap; + tilemap_t* bg_tilemap; /* devices */ const device_config *maincpu; diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index ae62a701a20..81e11156fd3 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -62,7 +62,7 @@ struct _chanbara_state UINT8 * spriteram; /* video-related */ - tilemap *bg_tilemap,*bg2_tilemap; + tilemap_t *bg_tilemap,*bg2_tilemap; UINT8 scroll, scrollhi; /* devices */ diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 64c08e3e5af..3d1bd5c5584 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -40,7 +40,7 @@ struct _cntsteer_state UINT8 * spriteram; /* video-related */ - tilemap *bg_tilemap,*fg_tilemap; + tilemap_t *bg_tilemap,*fg_tilemap; int bg_bank, bg_color_bank; int flipscreen; int scrolly, scrolly_hi; diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index f644f979e07..bef3a085d36 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -30,7 +30,7 @@ x static UINT8 *attr_ram1, *attr_ram2, *attr_ram3; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 question_adr[4]; diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index 11ba3192390..02dc012e31e 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -11,7 +11,7 @@ #include "sound/okim6295.h" #include "sound/2203intf.h" -static tilemap *tmap; +static tilemap_t *tmap; static UINT8 *colorram; static UINT8 *videoram; diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index f8f94544f33..e4bfa809a2d 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -89,7 +89,7 @@ Stephh's notes (based on the game Z80 code and some tests) : #include "audio/seibu.h" static UINT8* cshooter_txram; -static tilemap *cshooter_txtilemap; +static tilemap_t *cshooter_txtilemap; static int coin_stat=0; static UINT8 *mainram; diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 706c193579b..c8ada52fadc 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -28,7 +28,7 @@ struct _cultures_state UINT8 * bg2_regs_y; /* video-related */ - tilemap *bg0_tilemap, *bg1_tilemap, *bg2_tilemap; + tilemap_t *bg0_tilemap, *bg1_tilemap, *bg2_tilemap; int video_bank; int irq_enable; int bg1_bank, bg2_bank; diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index b31b2a32082..1349e7823ce 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -175,7 +175,7 @@ lev 7 : 0x7c : 0000 07e0 - input device clear? #include "deprecat.h" #include "sound/8950intf.h" -static tilemap *tx_tilemap; +static tilemap_t *tx_tilemap; static UINT16 *tx_vram; static UINT16 *shared_ram; static UINT16 *io_ram; diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index d633bc4e267..1a0cacc6585 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -24,7 +24,7 @@ #include "sound/2413intf.h" static UINT8 *lo_vram,*hi_vram,*cram; -static tilemap *sc0_tilemap; +static tilemap_t *sc0_tilemap; static TILE_GET_INFO( get_sc0_tile_info ) { diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index f84292d6f4b..aa76af5ce16 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -34,7 +34,7 @@ struct _dacholer_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap,*fg_tilemap; + tilemap_t *bg_tilemap,*fg_tilemap; int bg_bank; /* sound-related */ diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 2447ecdcb0d..6c84029fb20 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -76,7 +76,7 @@ To do: static VIDEO_START( darkhors ); static VIDEO_UPDATE( darkhors ); -static tilemap *darkhors_tmap, *darkhors_tmap2; +static tilemap_t *darkhors_tmap, *darkhors_tmap2; static UINT32 *darkhors_tmapram, *darkhors_tmapscroll; static UINT32 *darkhors_tmapram2, *darkhors_tmapscroll2; diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index c1a62a2812e..b202a2d2756 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -66,7 +66,7 @@ struct _ddayjlc_state UINT8 * spriteram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; INT32 char_bank; INT32 bgadr; diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 234161c3795..0ecabc85d1f 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -128,7 +128,7 @@ struct _ddealer_state // UINT16 * paletteram16; // currently this uses generic palette handling /* video-related */ - tilemap *back_tilemap; + tilemap_t *back_tilemap; int respcount; int flipscreen; diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index bb3407791d3..6f1acf01a1f 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -62,7 +62,7 @@ static UINT8* sprite_ram; static UINT8 *nvram; static size_t nvram_size; static UINT8 *racetrack_tilemap_rom; -static tilemap *racetrack_tilemap; +static tilemap_t *racetrack_tilemap; static NVRAM_HANDLER( dderby ) { diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index d95c698e026..b9dd14d49c4 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -101,7 +101,7 @@ struct _dreamwld_state UINT32 * spriteram; /* video-related */ - tilemap *bg_tilemap,*bg2_tilemap; + tilemap_t *bg_tilemap,*bg2_tilemap; int tilebank[2], tilebankold[2]; /* misc */ diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 7d622f3e24f..92a1bd56341 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -21,7 +21,7 @@ struct _drtomy_state // UINT16 * paletteram16; // currently this uses generic palette handling /* video-related */ - tilemap *tilemap_bg,*tilemap_fg; + tilemap_t *tilemap_bg,*tilemap_fg; /* misc */ int oki_bank; diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 87fc7a42aa4..b5ebbddb75f 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -32,7 +32,7 @@ #define CPU_CLOCK XTAL_8MHz #define DATA_NVRAM_SIZE 0x100 -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 t0, t1, p0, p1, p2, prog, bus; static UINT8 attract_mode = 0; diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 43b4f69e254..ee1c160e9bc 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -69,7 +69,7 @@ struct _dunhuang_state UINT8 * paldata; /* video-related */ - tilemap *tmap,*tmap2; + tilemap_t *tmap,*tmap2; int written, written2; UINT8 pos_x, pos_y, clear_y; UINT8 block_x, block_y, block_w, block_h; diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index f0c463088c2..c3e3f754028 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -46,7 +46,7 @@ struct _dynadice_state // UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap,*top_tilemap; + tilemap_t *bg_tilemap,*top_tilemap; /* misc */ int ay_data; diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 3cc08079f1b..f4e85758fd6 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -55,7 +55,7 @@ struct _egghunt_state // UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; UINT8 vidram_bank; /* misc */ diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 7758b616055..b9cc6290e6d 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -40,7 +40,7 @@ static int b000_ret = 0; static int b800_prev = 0; static UINT8 *bg_videoram, *fg_videoram; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; static WRITE8_HANDLER( ettrivia_fg_w ) { diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index c608d0e82e6..603fa67e46a 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -128,7 +128,7 @@ static unsigned char *tile_palette; static unsigned char *sprite_palette; static const device_config *nvram_1c; static const device_config *nvram_1d; -static tilemap *bgtiles; +static tilemap_t *bgtiles; static int control_num; static UINT8 sound_to_main_flag; diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 6baa76d302b..704b5d15b6c 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -19,7 +19,7 @@ struct _flyball_state UINT8 * playfield_ram; /* video-related */ - tilemap *tmap; + tilemap_t *tmap; UINT8 pitcher_vert; UINT8 pitcher_horz; UINT8 pitcher_pic; diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index 8fc63fb8308..5f4de06e46e 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -57,7 +57,7 @@ struct _galaxi_state // UINT16 * nvram; // currently this uses generic nvram handling /* video-related */ - tilemap *bg1_tmap, *bg2_tmap, *bg3_tmap, *bg4_tmap, *fg_tmap; + tilemap_t *bg1_tmap, *bg2_tmap, *bg3_tmap, *bg4_tmap, *fg_tmap; /* misc */ int hopper, ticket; diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 158ebab14fa..be92e8f2334 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -632,7 +632,7 @@ static UINT8 *videoram; static UINT8 *colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static WRITE8_HANDLER( goldnpkr_videoram_w ) { diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index fd848b446c1..872456a20e3 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -45,7 +45,7 @@ struct _good_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap,*fg_tilemap; + tilemap_t *bg_tilemap,*fg_tilemap; }; diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 79973aebc95..efcf60c417b 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -136,7 +136,7 @@ struct _gstream_state // UINT32 * nvram; // currently this uses generic nvram handling /* video-related */ - tilemap *tilemap1, *tilemap2, *tilemap3; + tilemap_t *tilemap1, *tilemap2, *tilemap3; UINT32 tmap1_scrollx, tmap2_scrollx, tmap3_scrollx; UINT32 tmap1_scrolly, tmap2_scrolly, tmap3_scrolly; diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index f77948cc336..2248ff61e5e 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -335,7 +335,7 @@ static UINT32 jvs_sdata_ptr = 0; static UINT32 *K037122_tile_ram[MAX_K037122_CHIPS]; static UINT32 *K037122_char_ram[MAX_K037122_CHIPS]; static int K037122_gfx_index[MAX_K037122_CHIPS]; -static tilemap *K037122_layer[MAX_K037122_CHIPS][2]; +static tilemap_t *K037122_layer[MAX_K037122_CHIPS][2]; static UINT32 *K037122_reg[MAX_K037122_CHIPS]; #define K037122_NUM_TILES 16384 diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index cac5ae13a83..df652a36073 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -62,7 +62,7 @@ Notes: static UINT8 *videoram; static UINT8 *colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT16 hu_scrollx, hu_scrolly; static UINT16 port0_data; diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index e4c756cba1e..be689f49bec 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -26,7 +26,7 @@ NVRAM : Battery for main RAM ***************************************************************************/ -static tilemap *gp98_reel1_tilemap; +static tilemap_t *gp98_reel1_tilemap; static UINT8 *gp98_reel1_ram; static WRITE8_HANDLER( gp98_reel1_ram_w ) @@ -58,7 +58,7 @@ static TILE_GET_INFO( get_gp98_reel1_tile_info ) 0); } -static tilemap *gp98_reel2_tilemap; +static tilemap_t *gp98_reel2_tilemap; static UINT8 *gp98_reel2_ram; static WRITE8_HANDLER( gp98_reel2_ram_w ) @@ -90,7 +90,7 @@ static TILE_GET_INFO( get_gp98_reel2_tile_info ) } -static tilemap *gp98_reel3_tilemap; +static tilemap_t *gp98_reel3_tilemap; static UINT8 *gp98_reel3_ram; static WRITE8_HANDLER( gp98_reel3_ram_w ) @@ -122,7 +122,7 @@ static TILE_GET_INFO( get_gp98_reel3_tile_info ) } -static tilemap *gp98_reel4_tilemap; +static tilemap_t *gp98_reel4_tilemap; static UINT8 *gp98_reel4_ram; static WRITE8_HANDLER( gp98_reel4_ram_w ) @@ -159,7 +159,7 @@ static TILE_GET_INFO( get_gp98_reel4_tile_info ) static UINT8 *fg_tile_ram, *fg_color_ram; static UINT8 *bg_scroll, *bg_scroll2; -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; static int video_enable; diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 4b68b9f0da5..ad280cd1be2 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -75,7 +75,7 @@ static VIDEO_RESET( igs017 ) } static UINT8 *fg_videoram, *bg_videoram; -static tilemap *fg_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *bg_tilemap; #define COLOR(_X) (((_X)>>2)&7) diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index e081fb8ab6f..69721e244cc 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -32,7 +32,7 @@ ***************************************************************************/ static UINT32 *igs_mainram,*igs_cg_videoram,*igs_tx_videoram,*igs_bg_videoram; static UINT32 *igs_pallete32; -static tilemap *igs_tx_tilemap,*igs_bg_tilemap; +static tilemap_t *igs_tx_tilemap,*igs_bg_tilemap; diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index 4942e4e0883..b9c9202729a 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -107,7 +107,7 @@ static WRITE8_HANDLER( igs_irqack_w ) static UINT8 *fg_tile_ram, *fg_color_ram, *bg_tile_ram; -static tilemap *fg_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *bg_tilemap; static TILE_GET_INFO( get_bg_tile_info ) { diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index 8e03703e2b1..0ba0224fd90 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -6,7 +6,7 @@ static int exp_bank = 0; static UINT8 *fg_tile_ram, *fg_color_ram; -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; static TILE_GET_INFO( get_fg_tile_info ) { @@ -36,7 +36,7 @@ static WRITE8_HANDLER( bg_scroll_w ) bg_scroll[offset] = data; } -static tilemap *jackie_reel1_tilemap; +static tilemap_t *jackie_reel1_tilemap; static UINT8 *jackie_reel1_ram; static WRITE8_HANDLER( jackie_reel1_ram_w ) @@ -52,7 +52,7 @@ static TILE_GET_INFO( get_jackie_reel1_tile_info ) } -static tilemap *jackie_reel2_tilemap; +static tilemap_t *jackie_reel2_tilemap; static UINT8 *jackie_reel2_ram; static WRITE8_HANDLER( jackie_reel2_ram_w ) @@ -67,7 +67,7 @@ static TILE_GET_INFO( get_jackie_reel2_tile_info ) SET_TILE_INFO(1, code, 0, 0); } -static tilemap *jackie_reel3_tilemap; +static tilemap_t *jackie_reel3_tilemap; static UINT8 *jackie_reel3_ram; static WRITE8_HANDLER( jackie_reel3_ram_w ) diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index 435ec05cfe0..c754c3eb62c 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -119,7 +119,7 @@ Video Hardware start ******************************************************************************************/ -static tilemap *sc3_tilemap_0,*sc3_tilemap_2,*sc3_tilemap_3, +static tilemap_t *sc3_tilemap_0,*sc3_tilemap_2,*sc3_tilemap_3, *sc0_tilemap_0,*sc0_tilemap_1,*sc0_tilemap_2,*sc0_tilemap_3, *sc1_tilemap_0,*sc1_tilemap_1,*sc1_tilemap_2,*sc1_tilemap_3, *sc2_tilemap_0,*sc2_tilemap_1,*sc2_tilemap_2,*sc2_tilemap_3; diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index 97944ee918b..9f387491888 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -102,7 +102,7 @@ static UINT8 *videoram; static UINT8 *colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static WRITE8_HANDLER( jokrwild_videoram_w ) diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 4428565f4be..19b70ed310b 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -112,7 +112,7 @@ struct _jollyjgr_state UINT8 * bitmap; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ int nmi_enable, flip_x, flip_y; diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index 5616d6cab03..cceeb5c77f2 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -78,7 +78,7 @@ static UINT8 sound_cmd; *************************************/ static UINT8 *kingdrby_vram,*kingdrby_attr; -static tilemap *sc0_tilemap,*sc0w_tilemap,*sc1_tilemap; +static tilemap_t *sc0_tilemap,*sc0w_tilemap,*sc1_tilemap; /* tile diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index 6caf10c2dd1..bf440a29d0d 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -35,7 +35,7 @@ ft5_v6_c4.u58 / static UINT16 *bmc_1_videoram, *bmc_2_videoram,*main_ram; -static tilemap *tilemap_1,*tilemap_2; +static tilemap_t *tilemap_1,*tilemap_2; static UINT8 *bmc_colorram; static int clr_offset=0; diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 623d5889001..9149ff05382 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -52,7 +52,7 @@ struct _koikoi_state UINT8 * videoram; /* video-related */ - tilemap *tmap; + tilemap_t *tmap; /* misc */ int inputcnt; diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 6fcd4f6dee8..9f1ad8ad07f 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -29,7 +29,7 @@ #include "sound/okim6295.h" #include "cpu/mcs51/mcs51.h" -static tilemap *bg_tilemap, *md_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *md_tilemap, *fg_tilemap; static UINT32 *bg_videoram, *md_videoram, *fg_videoram, *limenko_videoreg; static UINT32 *mainram; diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 6c64b1667c3..31c124adead 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -104,7 +104,7 @@ struct _looping_state UINT8 * spriteram; /* tilemaps */ - tilemap * bg_tilemap; + tilemap_t * bg_tilemap; /* sound state */ UINT8 sound[8]; diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 368ab380669..f4d0d417ce5 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -19,7 +19,7 @@ etc. static UINT8 *ltcasino_tile_num_ram, *ltcasino_tile_atr_ram; -static tilemap *ltcasino_tilemap; +static tilemap_t *ltcasino_tilemap; /* Video */ diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index 16fbca89358..d128ea9ecf6 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -58,7 +58,7 @@ typedef struct _m14_state m14_state; struct _m14_state { /* video-related */ - tilemap *m14_tilemap; + tilemap_t *m14_tilemap; UINT8 * video_ram; UINT8 * color_ram; diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 209b516288e..32966ead71b 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -132,7 +132,7 @@ struct _m63_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; int pal_bank, fg_flag, sy_offset; /* sound-related */ diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 91eb650e376..375bc88423a 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -80,7 +80,7 @@ #include "sound/okim6295.h" #include "sgsafari.lh" -static tilemap *layer0_tilemap, *layer1_tilemap, *layer2_tilemap; +static tilemap_t *layer0_tilemap, *layer1_tilemap, *layer2_tilemap; static UINT16 *layer0_videoram, *layer1_videoram, *layer2_videoram; static int layer2_offset[2]; static UINT16 *magic10_vregs; diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index eafce7b87bb..2b6b39fbb75 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -407,7 +407,7 @@ static UINT8 *videoram; static UINT8 *colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static WRITE8_HANDLER( magicfly_videoram_w ) { diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 676f7ae3aed..08fa178ae72 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -98,7 +98,7 @@ p2 ink doesn't always light up in test mode #include "cpu/z80/z80.h" static bitmap_t *tile, *obj1, *obj2; -static tilemap *tx_tilemap; +static tilemap_t *tx_tilemap; static UINT8 *tx_tileram; diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 087d5ea5506..9270f829de1 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -15,7 +15,7 @@ static attotime time_released; static UINT8 prev = 0; static UINT8 mask = 0; -static tilemap* bg_tilemap; +static tilemap_t* bg_tilemap; static TILE_GET_INFO( get_tile_info ) diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 6d4396b3fc5..f4b03a7cb57 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -57,7 +57,7 @@ static UINT16 *livequiz_gfxram, *livequiz_gfxregs; static VIDEO_START( livequiz ); static VIDEO_UPDATE( livequiz ); -static tilemap *tmap; +static tilemap_t *tmap; static TILE_GET_INFO( get_tile_info ) { diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index db40c81e75b..4b17dcc9a5d 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -91,7 +91,7 @@ Changes (2008-12-10, Roberto Fresca): static UINT16 *sc0_vram,*sc1_vram,*sc2_vram,*sc3_vram; -static tilemap *sc0_tilemap,*sc1_tilemap,*sc2_tilemap,*sc3_tilemap; +static tilemap_t *sc0_tilemap,*sc1_tilemap,*sc2_tilemap,*sc3_tilemap; static TILE_GET_INFO( get_sc0_tile_info ) { diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index cc1bfd2ff37..0d8620cdf1b 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -134,7 +134,7 @@ static UINT8 *videoram; static UINT8 *colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static WRITE8_HANDLER( miniboy7_videoram_w ) { diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 065b634f7ce..e7d4ceeb2cf 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -7,7 +7,7 @@ static UINT8 *mogura_tileram; static UINT8* mogura_gfxram; -static tilemap *mogura_tilemap; +static tilemap_t *mogura_tilemap; static PALETTE_INIT( mogura ) { diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index 7fae2c016ee..65838dc02e3 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -140,8 +140,8 @@ static int multfish_disp_enable; /* Video Part */ -static tilemap *multfish_tilemap; -static tilemap *multfish_reel_tilemap; +static tilemap_t *multfish_tilemap; +static tilemap_t *multfish_reel_tilemap; static TILE_GET_INFO( get_multfish_tile_info ) diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 92d0c88a418..1e3ee33969e 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -45,7 +45,7 @@ Notes: #define MASTER_CLOCK XTAL_12MHz #define SOUND_CLOCK XTAL_45MHz -static tilemap *bg_tilemap, *mlow_tilemap, *mhigh_tilemap, *tx_tilemap; +static tilemap_t *bg_tilemap, *mlow_tilemap, *mhigh_tilemap, *tx_tilemap; static UINT16 *bg_videoram, *mlow_videoram, *mhigh_videoram, *tx_videoram, *sprites_buffer; static UINT16 *bg_scrollram, *mlow_scrollram, *mhigh_scrollram, *vidattrram; static UINT16 *mwarr_ram; diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c index 31cc271a23e..35a3091bf35 100644 --- a/src/mame/drivers/namcoic.c +++ b/src/mame/drivers/namcoic.c @@ -20,7 +20,7 @@ static struct * 0x20/2 priority * 0x30/2 color */ - tilemap *tmap[6]; + tilemap_t *tmap[6]; UINT16 *videoram; int gfxbank; UINT8 *maskBaseAddr; @@ -1019,7 +1019,7 @@ READ32_HANDLER( namco_obj32_le_r ) * Namco System FL - Final Lap R, Speed Racer */ #define ROZ_TILEMAP_COUNT 2 -static tilemap *mRozTilemap[ROZ_TILEMAP_COUNT]; +static tilemap_t *mRozTilemap[ROZ_TILEMAP_COUNT]; static UINT16 *rozbank16; static UINT16 *rozvideoram16; static UINT16 *rozcontrol16; @@ -1214,7 +1214,7 @@ UnpackRozParam( const UINT16 *pSource, struct RozParam *pRozParam ) static void DrawRozHelper( bitmap_t *bitmap, - tilemap *tmap, + tilemap_t *tmap, const rectangle *clip, const struct RozParam *rozInfo ) { @@ -1509,7 +1509,7 @@ WRITE32_HANDLER( namco_rozvideoram32_le_w ) */ static UINT16 *mpRoadRAM; /* at 0x880000 in Final Lap; at 0xa00000 in Lucky&Wild */ static int mRoadGfxBank; -static tilemap *mpRoadTilemap; +static tilemap_t *mpRoadTilemap; static pen_t mRoadTransparentColor; static int mbRoadNeedTransparent; diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index f0c720103fd..70c143b872c 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -743,7 +743,7 @@ Notes: #include "sound/c352.h" static int ss23_vstat = 0, hstat = 0, vstate = 0; -static tilemap *bgtilemap; +static tilemap_t *bgtilemap; static UINT32 *namcos23_textram, *namcos23_shared_ram; static UINT32 *namcos23_charram; static UINT8 namcos23_jvssense; diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 1f24d07398d..0fc56749e24 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -225,7 +225,7 @@ Stephh's notes (based on the games M68000 code and some tests) : #include "sound/okim6295.h" #include "sound/3812intf.h" -static tilemap *fg_tilemap,*bg_tilemap; +static tilemap_t *fg_tilemap,*bg_tilemap; static UINT16 *nmg5_bitmap; static UINT16 *fg_videoram,*bg_videoram,*scroll_ram; static UINT8 prot_val, input_data, priority_reg, gfx_bank; diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 3365908c151..4abfb9df4e3 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -245,9 +245,9 @@ static WRITE32_HANDLER( paletteram32_w ) static UINT32 *K001604_tile_ram[MAX_K001604_CHIPS]; static UINT32 *K001604_char_ram[MAX_K001604_CHIPS]; static int K001604_gfx_index[MAX_K001604_CHIPS][2]; -static tilemap *K001604_layer_8x8[MAX_K001604_CHIPS][2]; +static tilemap_t *K001604_layer_8x8[MAX_K001604_CHIPS][2]; static int K001604_tilemap_offset; -static tilemap *K001604_layer_roz[MAX_K001604_CHIPS][2]; +static tilemap_t *K001604_layer_roz[MAX_K001604_CHIPS][2]; static int K001604_roz_size[MAX_K001604_CHIPS]; static UINT32 *K001604_reg[MAX_K001604_CHIPS]; diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 98024b9d5b1..cca5b61cd1f 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -58,7 +58,7 @@ $7004 writes, related to $7000 reads static UINT8 *videoram; static UINT8 *colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static PALETTE_INIT( olibochu ) { diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 086471e2c02..b372dea2126 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -44,7 +44,7 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat #include "sound/okim6295.h" #include "sound/3812intf.h" -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; static UINT8 *fgram; #define MASTER_CLOCK (XTAL_4MHz) diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 32b7f64993c..d9d5c191208 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -69,7 +69,7 @@ D.9B [f99cac4b] / #define SOUND_CLOCK XTAL_14_31818MHz #define TC15_CLOCK XTAL_12MHz -static tilemap *bgtilemap, *txttilemap; +static tilemap_t *bgtilemap, *txttilemap; static UINT8 *scrollram; static UINT8 *mainram; diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index ea128f82083..b630af46c27 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -180,7 +180,7 @@ Stephh's log (2007.11.28) : static UINT16 autohold_addr; /* address to patch in program RAM to enable autohold feature */ -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 wingboard; static UINT8 jumper_e16_e17; /* Set this to TRUE when CG chips are 27c512 instead of 27c256 */ diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 67de4b08b28..308c650ef0d 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -55,8 +55,8 @@ Notes: #include "cpu/z80/z80daisy.h" #include "cpu/m6805/m6805.h" -static tilemap *tilemap1; -static tilemap *tilemap2; +static tilemap_t *tilemap1; +static tilemap_t *tilemap2; static UINT8 *vram1; static UINT8 *vram2; diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 26872770338..65f2d5505d3 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -24,7 +24,7 @@ static UINT16* pkscramble_fgtilemap_ram; static UINT16* pkscramble_mdtilemap_ram; static UINT16* pkscramble_bgtilemap_ram; -static tilemap *fg_tilemap, *md_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *md_tilemap, *bg_tilemap; static const device_config *scanline_timer; static WRITE16_HANDLER( pkscramble_fgtilemap_w ) diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 08dfecd8ca1..7f15e72ab86 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -19,7 +19,7 @@ Magic Sticks: #include "sound/okim6295.h" #include "includes/playmark.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT16 *magicstk_videoram; static int magicstk_tilebank; diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 79bdee80b65..f8d1f0718c2 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -136,7 +136,7 @@ Dip locations added based on the notes above. #include "sound/dac.h" -static tilemap *ppmast93_fg_tilemap, *ppmast93_bg_tilemap; +static tilemap_t *ppmast93_fg_tilemap, *ppmast93_bg_tilemap; static UINT8 *ppmast93_fgram, *ppmast93_bgram; static WRITE8_HANDLER( ppmast93_fgram_w ) diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index cceb81f6099..55f1489a5cf 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -79,7 +79,7 @@ ROMS: All ROM labels say only "PROM" and a number. #include "deprecat.h" #include "sound/ay8910.h" -static tilemap *pturn_fgmap,*pturn_bgmap; +static tilemap_t *pturn_fgmap,*pturn_bgmap; static int bgbank=0; static int fgbank=0; static int bgpalette=0; diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index e065ef50d8a..cc7f53d47dd 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -20,7 +20,7 @@ #include "machine/eeprom.h" static UINT16 *bg_videoram, *mid_videoram, *txt_videoram, *tilemap_regs, *video_regs; -static tilemap *mid_tilemap, *txt_tilemap; +static tilemap_t *mid_tilemap, *txt_tilemap; static int ticket = 0; static TILE_GET_INFO( get_mid_tile_info ) diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index e1e11311a8e..9d68fea52de 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -49,7 +49,7 @@ Notes: ***************************************************************************/ static UINT8 *bg_ram, *fg_ram; -static tilemap *bg_tmap, *fg_tmap; +static tilemap_t *bg_tmap, *fg_tmap; static TILE_GET_INFO( get_bg_tile_info ) { diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 3746340d884..684a41cdde9 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -101,7 +101,7 @@ static int rabbit_vblirqlevel, rabbit_bltirqlevel, rabbit_banking; static UINT32 *rabbit_tilemap_ram[4]; static UINT32 *rabbit_spriteram; -static tilemap *rabbit_tilemap[4]; +static tilemap_t *rabbit_tilemap[4]; /* call with tilesize = 0 for 8x8 or 1 for 16x16 */ INLINE void get_rabbit_tilemap_info(running_machine *machine, tile_data *tileinfo, int tile_index, int whichtilemap, int tilesize) diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index cee045a149a..c4bc8b78829 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -145,7 +145,7 @@ Current Problem(s) - in order of priority #include "includes/raiden2.h" -static tilemap *background_layer,*midground_layer,*foreground_layer,*text_layer; +static tilemap_t *background_layer,*midground_layer,*foreground_layer,*text_layer; static UINT16 *back_data,*fore_data,*mid_data, *w1ram; static int bg_bank, fg_bank, mid_bank; static int bg_col, fg_col, mid_col; @@ -329,7 +329,7 @@ static TILE_GET_INFO( get_text_tile_info ) } #if 0 -static void set_scroll(tilemap *tm, int plane) +static void set_scroll(tilemap_t *tm, int plane) { int x = mainram[0x620/2+plane*2+0]; int y = mainram[0x620/2+plane*2+1]; diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index cd48668cfdc..5763a9cd95b 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -36,7 +36,7 @@ TODO: static int gfxbank; static UINT8 *videoram; static UINT8 *colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static WRITE8_HANDLER( rmhaihai_videoram_w ) { diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index d57841e3d86..8780258f9c6 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -54,7 +54,7 @@ modified by Hau static UINT8 *ram_1, *ram_2; static size_t ram_size; static UINT8 ram_bank; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; static UINT8 *bg_scroll; diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index 4286e9f8cf8..14a4781241f 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -48,7 +48,7 @@ PROMs : NEC B406 (1kx4) x2 static int bgmap = 0; static int sbw_system = 0; -static tilemap *sb_tilemap; +static tilemap_t *sb_tilemap; static UINT32 color_prom_address = 0; static UINT8 pix_sh = 0; static UINT8 pix[2] = {0, 0}; diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index 3d40fb02a1a..19bbd3d6bbc 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -58,7 +58,7 @@ static emu_timer *scanline_timer; static emu_timer *pot_timer; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 sync2_value; static UINT8 pot_mask[2]; diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index b06b02d2c6f..326ef228a4e 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -56,11 +56,11 @@ In a couple of cases, due to too many older revisions, I used: parent + version static bitmap_t *temp_reel_bitmap; -static tilemap *sfbonus_tilemap; -static tilemap *sfbonus_reel_tilemap; -static tilemap *sfbonus_reel2_tilemap; -static tilemap *sfbonus_reel3_tilemap; -static tilemap *sfbonus_reel4_tilemap; +static tilemap_t *sfbonus_tilemap; +static tilemap_t *sfbonus_reel_tilemap; +static tilemap_t *sfbonus_reel2_tilemap; +static tilemap_t *sfbonus_reel3_tilemap; +static tilemap_t *sfbonus_reel4_tilemap; static UINT8 *sfbonus_tilemap_ram; static UINT8 *sfbonus_reel_ram; static UINT8 *sfbonus_reel2_ram; diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index a8a7d7e5923..26652e47093 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -27,7 +27,7 @@ static UINT8 *skyarmy_videoram; static UINT8 *skyarmy_colorram; static UINT8 *skyarmy_scrollram; -static tilemap* skyarmy_tilemap; +static tilemap_t* skyarmy_tilemap; static TILE_GET_INFO( get_skyarmy_tile_info ) { diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 56b87e816fa..34857011db9 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -37,7 +37,7 @@ #include "sound/ay8910.h" #include "machine/8255ppi.h" -static tilemap *tmap; +static tilemap_t *tmap; static UINT8 *skylncr_videoram,*skylncr_colorram; @@ -49,10 +49,10 @@ static UINT8* reeltileshigh_1_ram; static UINT8* reeltileshigh_2_ram; static UINT8* reeltileshigh_3_ram; static UINT8* reeltileshigh_4_ram; -static tilemap *reel_1_tilemap; -static tilemap *reel_2_tilemap; -static tilemap *reel_3_tilemap; -static tilemap *reel_4_tilemap; +static tilemap_t *reel_1_tilemap; +static tilemap_t *reel_2_tilemap; +static tilemap_t *reel_3_tilemap; +static tilemap_t *reel_4_tilemap; static UINT8* reelscroll1; static UINT8* reelscroll2; static UINT8* reelscroll3; diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index 29ea589873e..78fe8f66893 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -20,10 +20,10 @@ TODO: static UINT8 *bg_tile_ram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 *fg_tile_ram, *fg_color_ram; -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; static int video_enable; diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index 45d84546757..7b6cf9960fd 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -93,7 +93,7 @@ Note #include "machine/eeprom.h" static UINT8 *spool99_main; -static tilemap *sc0_tilemap; +static tilemap_t *sc0_tilemap; static UINT8 *spool99_cram; static UINT8 *spool99_vram; diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index d650bc0210d..e41a69290db 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -73,7 +73,7 @@ quaquiz2 - no inputs, needs NVRAM #define MASTER_CLOCK 12440000 -static tilemap *statriv2_tilemap; +static tilemap_t *statriv2_tilemap; static UINT8 *question_offset; static UINT8 question_offset_low; diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index f36b89438e9..f6200673a60 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -28,7 +28,7 @@ To enter test mode in smoto, keep F2 pressed during boot. static UINT8 *videoram; static UINT8 *colorram; -static tilemap *tmap; +static tilemap_t *tmap; static int tiles_offset; static WRITE8_HANDLER( subsino_tiles_offset_w ) diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 0ea64d8244e..ac657cb0333 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -31,7 +31,7 @@ static const device_config *laserdisc; static UINT8 superdq_ld_in_latch; static UINT8 superdq_ld_out_latch; -static tilemap *superdq_tilemap; +static tilemap_t *superdq_tilemap; static int superdq_color_bank = 0; static TILE_GET_INFO( get_tile_info ) diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 0204ea49c6e..cedb97e5ecf 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -24,7 +24,7 @@ #include "sound/2203intf.h" #include "sound/msm5205.h" -static tilemap *suprgolf_tilemap; +static tilemap_t *suprgolf_tilemap; static UINT8 *suprgolf_bg_vram; static UINT16 *suprgolf_bg_fb,*suprgolf_fg_fb; static int suprgolf_rom_bank; diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index 461217f4871..7db80ede82d 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -24,7 +24,7 @@ static UINT8 *videoram; static UINT8 *colorram; -static tilemap *tmap; +static tilemap_t *tmap; static TILE_GET_INFO( get_tile_info ) { diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index d054e80d20c..271ec8cd742 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -213,7 +213,7 @@ static bitmap_t *tmp_tilemap_composebitmap; static bitmap_t *tmp_tilemap_renderbitmap; -static tilemap *bg0tilemap; +static tilemap_t *bg0tilemap; static TILE_GET_INFO( get_bg0tile_info ) { @@ -230,7 +230,7 @@ static WRITE16_HANDLER( bg0_tilemap_w ) tilemap_mark_tile_dirty(bg0tilemap,offset/2); } -static tilemap *bg1tilemap; +static tilemap_t *bg1tilemap; static TILE_GET_INFO( get_bg1tile_info ) { @@ -247,7 +247,7 @@ static WRITE16_HANDLER( bg1_tilemap_w ) tilemap_mark_tile_dirty(bg1tilemap,offset/2); } -static tilemap *bg2tilemap; +static tilemap_t *bg2tilemap; static TILE_GET_INFO( get_bg2tile_info ) { @@ -264,7 +264,7 @@ static WRITE16_HANDLER( bg2_tilemap_w ) tilemap_mark_tile_dirty(bg2tilemap,offset/2); } -static tilemap *txt_tilemap; +static tilemap_t *txt_tilemap; static TILE_GET_INFO( get_tile_info ) { diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 85389df40bf..7e04224f5c1 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -64,7 +64,7 @@ Technology = NMOS #include "cpu/z80/z80.h" #include "sound/ay8910.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 *trvmadns_gfxram; static UINT8 *trvmadns_tileram; static int old_data; diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index 5146c58992f..baf2b7dfef9 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -298,7 +298,7 @@ static UINT8 sbp0, sbp2, sbp3; * Video Hardware * *************************/ -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /* BCD to Seven Segment Decoder */ static UINT8 dec_7seg(int data) diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index 89c885ede8c..68093df0874 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -87,9 +87,9 @@ static UINT16 *vmetal_tlookup; static UINT16 *vmetal_videoregs; -static tilemap *vmetal_texttilemap; -static tilemap *vmetal_mid1tilemap; -static tilemap *vmetal_mid2tilemap; +static tilemap_t *vmetal_texttilemap; +static tilemap_t *vmetal_mid1tilemap; +static tilemap_t *vmetal_mid2tilemap; /* video/metro.c */ extern UINT16 *metro_videoregs; diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index b67d3076d20..edeb4820ad3 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -44,7 +44,7 @@ Tomasz Slanina 20050225 static UINT8 *vroulet_ball; static UINT8 *videoram; static UINT8 *colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static WRITE8_HANDLER(vroulet_paletteram_w) { diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index c57af3a612e..0e642c4b3fa 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -52,7 +52,7 @@ Thanks to HIGHWAYMAN for providing info on how to get to these epoxies #include "video/resnet.h" #include "sound/ay8910.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index d8ec39124be..8094a53e907 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -15,7 +15,7 @@ #include "cpu/z80/z80.h" #include "sound/ay8910.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 sound_flag; static UINT8 tile_bank = 0; //static UINT8 player_mux = 0; diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 6dba641052f..5da52382a06 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -196,9 +196,9 @@ TODO : #define UNBANKED_SIZE 0x800 -static tilemap *gfx0a_tilemap; -static tilemap *gfx0b_tilemap; -static tilemap *gfx1_tilemap; +static tilemap_t *gfx0a_tilemap; +static tilemap_t *gfx0b_tilemap; +static tilemap_t *gfx1_tilemap; static UINT8 *gfx0_cram; static UINT8 *gfx0_vram; diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 8470869d90f..f3956f5c295 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -14,7 +14,7 @@ struct __1942_state size_t spriteram_size; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; int palette_bank; UINT8 scroll[2]; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 797eaf0a468..a712400e762 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -17,7 +17,7 @@ struct __1943_state size_t spriteram_size; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap, *bg2_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap, *bg2_tilemap; int char_on, obj_on, bg1_on, bg2_on; }; diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index e8ef4951f11..96de7d0ccb2 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -12,7 +12,7 @@ struct __4enraya_state size_t videoram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* sound-related */ int soundlatch; diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 3392f7e2514..be0e106d464 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -16,7 +16,7 @@ struct _actfancr_state // UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *pf1_tilemap, *pf1_alt_tilemap, *pf2_tilemap; + tilemap_t *pf1_tilemap, *pf1_alt_tilemap, *pf2_tilemap; UINT8 control_1[0x20], control_2[0x20]; int flipscreen; diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index abebbd27beb..0435b9de30d 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -24,7 +24,7 @@ struct _aeroboto_state int stars_length; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int charbank, starsoff; int sx, sy; UINT8 ox, oy; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index c84bbdc2458..0bb1b413e99 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -17,7 +17,7 @@ struct _aerofgt_state size_t spriteram3_size; /* video-related */ - tilemap *bg1_tilemap, *bg2_tilemap; + tilemap_t *bg1_tilemap, *bg2_tilemap; UINT8 gfxbank[8]; UINT16 bank[4]; UINT16 bg1scrollx, bg1scrolly, bg2scrollx, bg2scrolly, wbbc97_bitmap_enable; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 415e4d21726..113d44a6777 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -16,7 +16,7 @@ struct _airbustr_state UINT8 * devram; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; bitmap_t *sprites_bitmap; int bg_scrollx, bg_scrolly, fg_scrollx, fg_scrolly, highbits; diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 6c2e78a080f..0aceac7a709 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -14,7 +14,7 @@ struct _alpha68k_state UINT16 * paletteram; /* video-related */ - tilemap *fix_tilemap; + tilemap_t *fix_tilemap; int bank_base, flipscreen, last_bank; int buffer_28, buffer_60, buffer_68; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index ea99c601d6a..5f33af04383 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -15,7 +15,7 @@ struct _amspdwy_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int flipscreen; /* misc */ diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index df5813f1339..460956c1174 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -14,7 +14,7 @@ struct _angelkds_state UINT8 * bgtopvideoram; UINT8 * bgbotvideoram; - tilemap *tx_tilemap, *bgbot_tilemap, *bgtop_tilemap; + tilemap_t *tx_tilemap, *bgbot_tilemap, *bgtop_tilemap; int txbank; int bgbotbank; int bgtopbank; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 0360bd18391..9d49224aeb9 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -12,7 +12,7 @@ struct _appoooh_state UINT8 * spriteram_2; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; int scroll_x; int priority; diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index fe14385db05..2e3ec265271 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -14,7 +14,7 @@ struct _aquarium_state size_t spriteram_size; /* video-related */ - tilemap *txt_tilemap, *mid_tilemap, *bak_tilemap; + tilemap_t *txt_tilemap, *mid_tilemap, *bak_tilemap; /* misc */ int aquarium_snd_ack; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 3c10e99e112..efa4c993ffb 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -19,7 +19,7 @@ struct _arkanoid_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; UINT8 gfxbank, palettebank; /* input-related */ diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index e72a62a1db0..5961bcde7fc 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -14,7 +14,7 @@ struct _armedf_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap,*fg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap,*fg_tilemap, *tx_tilemap; UINT16 scroll_msb; UINT16 vreg; UINT16 fg_scrollx, fg_scrolly; diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 6df033914a8..6132fc14736 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -20,7 +20,7 @@ struct _ashnojoe_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *joetilemap, *joetilemap2, *joetilemap3, *joetilemap4, *joetilemap5, *joetilemap6, *joetilemap7; + tilemap_t *joetilemap, *joetilemap2, *joetilemap3, *joetilemap4, *joetilemap5, *joetilemap6, *joetilemap7; /* sound-related */ UINT8 adpcm_byte; diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index ffd825dbb13..c62382bb8a4 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -26,9 +26,9 @@ struct _atarifb_state UINT8 * scroll_register; size_t spriteram_size; - tilemap *alpha1_tilemap; - tilemap *alpha2_tilemap; - tilemap *field_tilemap; + tilemap_t *alpha1_tilemap; + tilemap_t *alpha2_tilemap; + tilemap_t *field_tilemap; /* sound-related */ int CTRLD; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 8baebca0dba..e0ef304b7a9 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -19,7 +19,7 @@ struct _bankp_state UINT8 * colorram2; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; int scroll_x, priority; }; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index a726defe830..ef8c571874b 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -12,7 +12,7 @@ struct _battlane_state UINT8 * spriteram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; bitmap_t *screen_bitmap; int video_ctrl; int cpu_control; /* CPU interrupt control register */ diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 1f994ad9c91..65cbe9c6270 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -12,7 +12,7 @@ struct _battlex_state UINT8 * spriteram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int scroll_lsb, scroll_msb; }; diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index b21279c4a30..bef66410876 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -15,7 +15,7 @@ struct _bionicc_state // UINT16 * spriteram; // needed for EOF, but currently handled through buffer_spriteram16 /* video-related */ - tilemap *tx_tilemap, *bg_tilemap, *fg_tilemap; + tilemap_t *tx_tilemap, *bg_tilemap, *fg_tilemap; UINT16 scroll[4]; UINT16 inp[3]; diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index d8170c0dda6..2e3b24821e2 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -14,7 +14,7 @@ struct _blktiger_state // UINT8 * paletteram2; // currently this uses generic palette handling /* video-related */ - tilemap *tx_tilemap, *bg_tilemap8x4, *bg_tilemap4x8; + tilemap_t *tx_tilemap, *bg_tilemap8x4, *bg_tilemap4x8; UINT32 scroll_bank; UINT8 scroll_x[2]; UINT8 scroll_y[2]; diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 671a6e995fe..61f377ce076 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -17,7 +17,7 @@ struct _blmbycar_state size_t spriteram_size; /* video-related */ - tilemap *tilemap_0, *tilemap_1; + tilemap_t *tilemap_0, *tilemap_1; /* input-related */ UINT8 pot_wheel; // blmbycar diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index bdc6ba3b6b4..3e9873fde54 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -7,7 +7,7 @@ struct _blockade_state UINT8 * videoram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* input-related */ UINT8 coin_latch; /* Active Low */ diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index e9c3443ab6e..f038597ded1 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -15,7 +15,7 @@ struct _blueprnt_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int gfx_bank; /* misc */ diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index a2e6d01fbb7..4d9cca7ca6b 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -17,7 +17,7 @@ struct _bogeyman_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; /* misc */ int psg_latch; diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index 536a4f4d9f2..f331894ff1d 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -15,7 +15,7 @@ struct _bombjack_state size_t spriteram_size; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; UINT8 background_image; /* sound-related */ diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index d304a41db37..6ded5f5d466 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -16,7 +16,7 @@ struct _brkthru_state size_t fg_videoram_size; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; int bgscroll; int bgbasecolor; int flipscreen; diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index 1b574fbe9e0..04252a41a03 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -21,7 +21,7 @@ struct _bsktball_state UINT8 * motion; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ UINT32 nmi_on; diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 8d23a407c0d..61e83ffcb91 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -26,8 +26,8 @@ struct _buggychl_state /* video-related */ bitmap_t *tmp_bitmap1, *tmp_bitmap2; - tilemap *bg_tilemap; - tilemap *fg_tilemap, *bg2_tilemap; // msisaac + tilemap_t *bg_tilemap; + tilemap_t *fg_tilemap, *bg2_tilemap; // msisaac // buggychl int sl_bank, bg_on, sky_on, sprite_color_base, bg_scrollx; UINT8 sprite_lookup[0x2000]; @@ -38,7 +38,7 @@ struct _buggychl_state UINT8 *pixram2; bitmap_t *pixel_bitmap1; bitmap_t *pixel_bitmap2; - tilemap *background; + tilemap_t *background; int pixram_sel; // bking int pc3259_output[4]; diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 370d282d94c..d27859d24e8 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -20,7 +20,7 @@ struct _bwing_state size_t bwp3_romsize; /* video-related */ - tilemap *charmap, *fgmap, *bgmap; + tilemap_t *charmap, *fgmap, *bgmap; UINT8 *srbase[4], *fgdata, *bgdata; int *srxlat; unsigned sreg[8], palatch, srbank, mapmask, mapflip; diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index d9d32ca2d1b..647b928fa74 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -5,8 +5,8 @@ struct _cabal_state UINT16 *colorram; UINT16 *videoram; size_t spriteram_size; - tilemap *background_layer; - tilemap *text_layer; + tilemap_t *background_layer; + tilemap_t *text_layer; int sound_command1; int sound_command2; int last[4]; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 3956c87630c..2271ad5445d 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -24,7 +24,7 @@ struct _canyon_state UINT8 * videoram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; }; diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 46fcbd4d2ce..08a1a96fc9d 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -13,7 +13,7 @@ struct _carjmbre_state size_t spriteram_size; /* video-related */ - tilemap *cj_tilemap; + tilemap_t *cj_tilemap; UINT8 flipscreen; UINT16 bgcolor; }; diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index 7950308e1d0..2698dbd5e15 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -13,7 +13,7 @@ struct _cbasebal_state size_t spriteram_size; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; UINT8 *textram, *scrollram; UINT8 scroll_x[2], scroll_y[2]; int tilebank, spritebank; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index a12bf1b5fa8..e11a3d07c3d 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -20,7 +20,7 @@ struct _chaknpop_state /* video-related */ - tilemap *tx_tilemap; + tilemap_t *tx_tilemap; UINT8 *vram1, *vram2, *vram3, *vram4; UINT8 gfxmode; UINT8 flip_x, flip_y; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index 9e90719c88d..98cdac61eea 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -18,7 +18,7 @@ struct _champbas_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; UINT8 gfx_bank; UINT8 palette_bank; diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index e79bb989982..12c274ea41a 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -14,7 +14,7 @@ struct _cheekyms_state UINT8 * port_80; /* video-related */ - tilemap *cm_tilemap; + tilemap_t *cm_tilemap; bitmap_t *bitmap_buffer; /* devices */ diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index 0071a02eb58..bdc3d4356a8 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -13,7 +13,7 @@ struct _circus_state UINT8 * videoram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int clown_x, clown_y, clown_z; /* devices */ diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 3234bdbf211..8751a0bfb17 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -17,7 +17,7 @@ struct _circusc_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* sound-related */ UINT8 sn_latch; diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 139dabe3177..8ba772b5fd0 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -16,7 +16,7 @@ struct _citycon_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap,*fg_tilemap; + tilemap_t *bg_tilemap,*fg_tilemap; int bg_image; /* devices */ diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index d98a6cedc4f..72612fe4610 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -15,7 +15,7 @@ struct _combatsc_state UINT8 * spriteram[2]; /* video-related */ - tilemap *bg_tilemap[2], *textlayer; + tilemap_t *bg_tilemap[2], *textlayer; UINT8 scrollram0[0x40]; UINT8 scrollram1[0x40]; int priority; diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 69daf0df6ce..7361cedfabc 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -15,7 +15,7 @@ struct _commando_state // UINT8 * spriteram; // currently this uses generic buffered_spriteram /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; UINT8 scroll_x[2]; UINT8 scroll_y[2]; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index a66b147a77b..11811bfac6e 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -13,7 +13,7 @@ struct _compgolf_state UINT8 * spriteram; /* video-related */ - tilemap *text_tilemap, *bg_tilemap; + tilemap_t *text_tilemap, *bg_tilemap; int scrollx_lo, scrollx_hi; int scrolly_lo, scrolly_hi; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 5fc8d1df62b..dcc280e18de 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -20,7 +20,7 @@ struct _contra_state // this driver also uses a large generic spriteram region... /* video-related */ - tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; rectangle bg_clip, fg_clip, tx_clip; /* devices */ diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 516fbd58b3a..7dc18c4d3a5 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -14,7 +14,7 @@ struct _cop01_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; UINT8 vreg[4]; /* sound-related */ diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index f8b51fbdcd8..b16a044f9ac 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -84,7 +84,7 @@ struct _cps_state UINT16 * gigamn2_dummyqsound_ram; /* video-related */ - tilemap *bg_tilemap[3]; + tilemap_t *bg_tilemap[3]; int scanline1; int scanline2; int scancalls; diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index ff16937793b..074ee16c8fe 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -15,7 +15,7 @@ struct _crospang_state size_t spriteram_size; /* video-related */ - tilemap *bg_layer,*fg_layer; + tilemap_t *bg_layer,*fg_layer; int xsproff, ysproff; int bestri_tilebank; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index c7998954d9f..ec562941c54 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -10,7 +10,7 @@ struct _crshrace_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *tilemap1, *tilemap2; + tilemap_t *tilemap1, *tilemap2; int roz_bank, gfxctrl, flipscreen; /* misc */ diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index af709507770..783ff2393d8 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -15,7 +15,7 @@ struct _dday_state UINT8 * colorram; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap, *text_tilemap, *sl_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap, *text_tilemap, *sl_tilemap; bitmap_t *main_bitmap; int control; int sl_image; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index d5d9237a03a..771d7ea1f1a 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -21,7 +21,7 @@ struct _ddragon_state size_t spriteram_size; // FIXME: this appears in chinagat.c, but is it really used? /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; UINT8 technos_video_hw; UINT8 scrollx_hi; UINT8 scrolly_hi; diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index d98a4d1f7d2..781fc9ebe0a 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -15,7 +15,7 @@ struct _ddragon3_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; UINT16 vreg; UINT16 bg_scrollx; UINT16 bg_scrolly; diff --git a/src/mame/includes/ddrible.h b/src/mame/includes/ddrible.h index f4ea217997a..2c9528907c3 100644 --- a/src/mame/includes/ddrible.h +++ b/src/mame/includes/ddrible.h @@ -17,7 +17,7 @@ struct _ddrible_state UINT8 * paletteram; /* video-related */ - tilemap *fg_tilemap,*bg_tilemap; + tilemap_t *fg_tilemap,*bg_tilemap; int vregs[2][5]; int charbank[2]; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 8149383ace7..4f6afc30fe2 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -13,7 +13,7 @@ struct _dec8_state size_t videoram_size; /* video-related */ - tilemap *pf0_tilemap, *pf1_tilemap, *fix_tilemap; + tilemap_t *pf0_tilemap, *pf1_tilemap, *fix_tilemap; //int scroll1[4]; int scroll2[4]; int pf0_control[0x20], pf1_control[0x20]; diff --git a/src/mame/includes/deco16ic.h b/src/mame/includes/deco16ic.h index 58589814d24..88f092ab10e 100644 --- a/src/mame/includes/deco16ic.h +++ b/src/mame/includes/deco16ic.h @@ -42,7 +42,7 @@ void deco16_pdrawgfx( UINT32 code,UINT32 color,int flipx,int flipy,int sx,int sy, int transparent_color,UINT32 pri_mask,UINT32 sprite_mask,UINT8 write_pri,UINT8 alpha); -tilemap *deco16_get_tilemap(int pf, int size); +tilemap_t *deco16_get_tilemap(int pf, int size); WRITE16_HANDLER( deco16_pf1_data_w ); WRITE16_HANDLER( deco16_pf2_data_w ); diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 58c6b6ab233..030a73fef4d 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -16,7 +16,7 @@ struct _deniam_state size_t spriteram_size; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap, *tx_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap, *tx_tilemap; int display_enable; int bg_scrollx_offs, bg_scrolly_offs; int fg_scrollx_offs, fg_scrolly_offs; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index de48cf25bdf..6068a182fbd 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -14,7 +14,7 @@ struct _djboy_state UINT8 * paletteram; /* video-related */ - tilemap *background; + tilemap_t *background; UINT8 videoreg, scrollx, scrolly; /* Kaneko BEAST state */ diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 9deefd1f042..62e4e28b266 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -91,7 +91,7 @@ struct _dkong_state const UINT8 * snd_rom; /* video state */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; bitmap_t * bg_bits; const UINT8 * color_codes; @@ -139,7 +139,7 @@ struct _dkong_state const UINT8 *snd_rom; /* video state */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; bitmap_t *bg_bits; const UINT8 * color_codes; diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 868f3375579..00b525ee965 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -10,7 +10,7 @@ struct _docastle_state size_t spriteram_size; /* video-related */ - tilemap *do_tilemap; + tilemap_t *do_tilemap; /* misc */ int adpcm_pos, adpcm_idle; diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index bd5a349127f..a78e59ad7a3 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -15,7 +15,7 @@ struct _dogfgt_state /* video-related */ bitmap_t *pixbitmap; - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; UINT8 *bitmapram; int bm_plane, pixcolor; int scroll[4]; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index ecb660509da..7b5d50bf2bc 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -30,7 +30,7 @@ struct _dragrace_state UINT8 * position_ram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ unsigned misc_flags; diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index d1ceaa47acf..1ba967d77c2 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -14,7 +14,7 @@ struct _drgnmst_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap,*fg_tilemap, *md_tilemap; + tilemap_t *bg_tilemap,*fg_tilemap, *md_tilemap; /* misc */ UINT16 snd_command; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index bca14d27eed..763003632b7 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -12,7 +12,7 @@ struct _drmicro_state UINT8 * videoram; /* video-related */ - tilemap *bg1, *bg2; + tilemap_t *bg1, *bg2; int flipscreen; /* misc */ diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 057819ac9ec..96f1b8406ab 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -15,7 +15,7 @@ struct _equites_state // UINT16 * nvram; // currently this uses generic nvram handling /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; int fg_char_bank; UINT8 bgcolor; UINT16 splndrbt_bg_scrollx, splndrbt_bg_scrolly; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 9676d067660..913721efc16 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -20,8 +20,8 @@ struct _esd16_state size_t spriteram_size; /* video-related */ - tilemap *tilemap_0_16x16, *tilemap_1_16x16; - tilemap *tilemap_0, *tilemap_1; + tilemap_t *tilemap_0_16x16, *tilemap_1_16x16; + tilemap_t *tilemap_0, *tilemap_1; int tilemap0_color; /* devices */ diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 981a7e4a208..4e1c60cb493 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -22,7 +22,7 @@ struct _espial_state size_t bulletsram_size; // zodiack /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; int flipscreen; // espial UINT8 palette_bank; // marineb UINT8 column_scroll; // marineb diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 75dad062a33..8b82e51e624 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -17,7 +17,7 @@ struct _exedexes_state // UINT8 * spriteram; // currently this uses generic buffered_spriteram /* video-related */ - tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; int chon, objon, sc1on, sc2on; }; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 81068896839..b6b602c0614 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -16,7 +16,7 @@ struct _exprraid_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; int bg_index[4]; /* misc */ diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 4cf97116760..f876a60554b 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -21,7 +21,7 @@ struct _f1gp_state size_t spriteram_size; /* video-related */ - tilemap *fg_tilemap, *roz_tilemap; + tilemap_t *fg_tilemap, *roz_tilemap; int roz_bank, flipscreen, gfxctrl; int scroll[2]; diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index 76514cbc5f2..3a137ea3a30 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -15,7 +15,7 @@ struct _fastlane_state UINT8 * k007121_regs; /* video-related */ - tilemap *layer0, *layer1; + tilemap_t *layer0, *layer1; rectangle clip0, clip1; /* devices */ diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index 0e42a3fdddc..adada83c942 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -32,7 +32,7 @@ struct _fcombat_state size_t spriteram_size; /* video-related */ - tilemap *bgmap; + tilemap_t *bgmap; UINT8 cocktail_flip; UINT8 char_palette, sprite_palette; UINT8 char_bank; diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 4381ae38959..584fcfe0354 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -19,7 +19,7 @@ struct _finalizr_state size_t spriteram_size; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; int spriterambank, charbank; /* misc */ diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 841daaf0ab4..ba08613d065 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -15,7 +15,7 @@ struct _firetrap_state size_t spriteram_size; /* video-related */ - tilemap *fg_tilemap, *bg1_tilemap, *bg2_tilemap; + tilemap_t *fg_tilemap, *bg1_tilemap, *bg2_tilemap; UINT8 scroll1_x[2], scroll1_y[2]; UINT8 scroll2_x[2], scroll2_y[2]; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 0814ba5ea7d..69edcca3ec6 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -16,7 +16,7 @@ struct _fitfight_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *fof_bak_tilemap, *fof_mid_tilemap, *fof_txt_tilemap; + tilemap_t *fof_bak_tilemap, *fof_mid_tilemap, *fof_txt_tilemap; /* misc */ int bbprot_kludge; diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index d1eda8ba78d..77b53599694 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -12,7 +12,7 @@ struct _flkatck_state // UINT8 * paletteram; // this currently uses generic palette handling /* video-related */ - tilemap *k007121_tilemap[2]; + tilemap_t *k007121_tilemap[2]; int flipscreen; /* misc */ diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 9bf61e51d7e..b9183a51e9f 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -13,7 +13,7 @@ struct _flstory_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int char_bank, palette_bank, flipscreen, gfxctrl; /* sound-related */ diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index b4c46f93259..4205a03e16b 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -9,7 +9,7 @@ struct _freekick_state size_t spriteram_size; /* video-related */ - tilemap *freek_tilemap; + tilemap_t *freek_tilemap; /* misc */ int inval, outval, cnt; // used by oigas diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 82d15170487..babeaaa601f 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -7,7 +7,7 @@ struct _fromanc2_state UINT16 *videoram[2][4]; /* video-related */ - tilemap *tilemap[2][4]; + tilemap_t *tilemap[2][4]; int scrollx[2][4], scrolly[2][4]; int gfxbank[2][4]; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 09c42186e80..90f39032795 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -18,7 +18,7 @@ struct _fromance_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap,*fg_tilemap; + tilemap_t *bg_tilemap,*fg_tilemap; UINT8 *local_videoram[2]; UINT8 *local_paletteram; UINT8 selected_videoram, selected_paletteram; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 951b9a29b5a..408eccad2de 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -8,7 +8,7 @@ struct _funkybee_state UINT8 * colorram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int gfx_bank; }; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index f4a76dbd839..9fc9559af4b 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -16,7 +16,7 @@ struct _fuuki16_state size_t spriteram_size; /* video-related */ - tilemap *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; + tilemap_t *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; /* misc */ emu_timer *raster_interrupt_timer; diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index ec73bde58cb..4f0c783eed4 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -27,7 +27,7 @@ struct _fuuki32_state size_t spriteram_size; /* video-related */ - tilemap *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; + tilemap_t *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; UINT32 spr_buffered_tilebank[2]; /* misc */ diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 8877d2d8ecc..e268f419413 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -15,7 +15,7 @@ struct _gaelco_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *tilemap[2]; + tilemap_t *tilemap[2]; /* devices */ const device_config *audiocpu; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index c3a3252bc25..8007f1092ee 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -15,7 +15,7 @@ struct _gaiden_state size_t spriteram_size; /* video-related */ - tilemap *text_layer,*foreground,*background; + tilemap_t *text_layer,*foreground,*background; bitmap_t *sprite_bitmap, *tile_bitmap_bg, *tile_bitmap_fg; UINT16 tx_scroll_x, tx_scroll_y; UINT16 bg_scroll_x, bg_scroll_y; diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 02ec2a45cd1..3059db26205 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -15,7 +15,7 @@ struct _galivan_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap, *tx_tilemap; UINT8 scrollx[2], scrolly[2]; UINT8 flipscreen; UINT8 write_layers, layers; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 76a486a5a16..7c459420a4c 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -16,7 +16,7 @@ struct _gberet_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; UINT8 spritebank; /* misc */ diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 8c2bfd6083e..b50e21a6e99 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -10,7 +10,7 @@ struct _gcpinbal_state size_t spriteram_size; /* video-related */ - tilemap *tilemap[3]; + tilemap_t *tilemap[3]; UINT16 scrollx[3], scrolly[3]; UINT16 bg0_gfxset, bg1_gfxset; #ifdef MAME_DEBUG diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 8140acfddd6..1a68fdfc47c 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -16,7 +16,7 @@ struct _ginganin_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; int layers_ctrl, flipscreen; #ifdef MAME_DEBUG int posx, posy; diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index c140b913303..76f5d06dd71 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -14,7 +14,7 @@ struct _glass_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *pant[2]; + tilemap_t *pant[2]; bitmap_t *screen_bitmap; /* misc */ diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 9ac729ae5ce..94bfa78c5d4 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -15,7 +15,7 @@ struct _gng_state // UINT8 * spriteram; // currently this uses generic buffered spriteram /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; UINT8 scrollx[2]; UINT8 scrolly[2]; }; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 85eb22fed6d..08e850abc05 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -16,7 +16,7 @@ struct _goal92_state // UINT16 * spriteram; // this currently use generic buffered spriteram /* video-related */ - tilemap *bg_layer, *fg_layer, *tx_layer; + tilemap_t *bg_layer, *fg_layer, *tx_layer; UINT16 fg_bank; /* misc */ diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 5edf6cdb14d..9d4324e37f2 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -20,7 +20,7 @@ struct _goindol_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; UINT16 char_bank; /* misc */ diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index 1babb9bdd45..a6bcf415084 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -15,7 +15,7 @@ struct _gotcha_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; int banksel, gfxbank[4]; UINT16 scroll[4]; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index 65534c1025c..f8e586283fe 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -10,7 +10,7 @@ struct _gotya_state UINT8 * scroll; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int scroll_bit_8; /* sound-related */ diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index e2286e3819f..28c0e089e2b 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -30,10 +30,10 @@ struct _grchamp_state UINT8 * spriteram; bitmap_t * work_bitmap; - tilemap * text_tilemap; - tilemap * left_tilemap; - tilemap * center_tilemap; - tilemap * right_tilemap; + tilemap_t * text_tilemap; + tilemap_t * left_tilemap; + tilemap_t * center_tilemap; + tilemap_t * right_tilemap; rgb_t bgcolor[0x20]; }; diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 9e0721bd1bf..008dfdfddf0 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -11,7 +11,7 @@ extern UINT16 *gstriker_lineram; typedef struct { - tilemap* tmap; + tilemap_t* tmap; UINT16* vram; UINT16 pal_base; UINT8 gfx_region; @@ -33,7 +33,7 @@ extern WRITE16_HANDLER( VS920A_1_vram_w ); typedef struct { - tilemap* tmap; + tilemap_t* tmap; UINT16* vram; UINT16 regs[8]; UINT8 bank[8]; diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index a672e6a337f..20d856e42ed 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -13,8 +13,8 @@ struct _gumbo_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap; - tilemap *fg_tilemap; + tilemap_t *bg_tilemap; + tilemap_t *fg_tilemap; }; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index 74fdf681103..c13f84ce202 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -14,8 +14,8 @@ struct _gundealr_state UINT8 * paletteram; /* video-related */ - tilemap *bg_tilemap; - tilemap *fg_tilemap; + tilemap_t *bg_tilemap; + tilemap_t *fg_tilemap; int flipscreen; UINT8 scroll[4]; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 2614b9835d3..d95fc655d82 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -16,7 +16,7 @@ struct _gunsmoke_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; UINT8 chon, objon, bgon; UINT8 sprite3bank; }; diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index 8a0b1be6e58..9b04b7bc574 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -14,7 +14,7 @@ struct _gyruss_state UINT8 * flipscreen; /* video-related */ - tilemap *tilemap; + tilemap_t *tilemap; /* devices */ const device_config *audiocpu; diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 521643c93ef..428390037ad 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -12,7 +12,7 @@ struct _hanaawas_state UINT8 * colorram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ int mux; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 55ea9ea732f..ab5bd16f90b 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -15,7 +15,7 @@ struct _hcastle_state // UINT8 * spriteram2; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap; + tilemap_t *fg_tilemap, *bg_tilemap; int pf2_bankbase, pf1_bankbase; int old_pf1, old_pf2; int gfx_bank; diff --git a/src/mame/includes/hexa.h b/src/mame/includes/hexa.h index fc549e3309f..0ad45f7f522 100644 --- a/src/mame/includes/hexa.h +++ b/src/mame/includes/hexa.h @@ -8,7 +8,7 @@ struct _hexa_state size_t videoram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int charbank; }; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 72847be90fc..20f6a99a731 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -14,7 +14,7 @@ struct _higemaru_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; }; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 0f5ffef8b63..b9048bb9197 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -13,7 +13,7 @@ struct _himesiki_state // UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int scrollx[2]; int flipscreen; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index 788777b9b0e..d424224b976 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -19,7 +19,7 @@ struct _hitme_state UINT8 * videoram; /* video-related */ - tilemap *tilemap; + tilemap_t *tilemap; /* misc */ attotime timeout_time; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index e2f0cfb17d1..423c40a329d 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -15,7 +15,7 @@ struct _holeland_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int palette_offset; int po[2]; }; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index c8329096e50..281f33d2af1 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -7,7 +7,7 @@ struct _homedata_state UINT8 * videoram; /* video-related */ - tilemap *bg_tilemap[2][4]; + tilemap_t *bg_tilemap[2][4]; int visible_page; int priority; UINT8 reikaids_which; diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 161068d3baf..8d628cb0482 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -13,7 +13,7 @@ struct _homerun_state size_t spriteram_size; /* video-related */ - tilemap *tilemap; + tilemap_t *tilemap; int gfx_ctrl; /* misc */ diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 1e395197335..12baaf51739 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -26,7 +26,7 @@ struct _hyprduel_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap[3]; + tilemap_t *bg_tilemap[3]; UINT8 *empty_tiles; UINT8 *dirtyindex; int sprite_xoffs, sprite_yoffs, sprite_yoffs_sub; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index c88942ee686..a119f421a23 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -12,7 +12,7 @@ struct _inufuku_state size_t spriteram1_size; /* video-related */ - tilemap *bg_tilemap,*tx_tilemap; + tilemap_t *bg_tilemap,*tx_tilemap; int bg_scrollx, bg_scrolly; int tx_scrollx, tx_scrolly; int bg_raster; diff --git a/src/mame/includes/iremz80.h b/src/mame/includes/iremz80.h index 1cc8b328cd2..f65a05bb60c 100644 --- a/src/mame/includes/iremz80.h +++ b/src/mame/includes/iremz80.h @@ -24,8 +24,8 @@ struct _irem_z80_state UINT8 port1, port2; /* video-related */ - tilemap* bg_tilemap; // m52, m57, m58, m62 - tilemap* fg_tilemap; // m62 + tilemap_t* bg_tilemap; // m52, m57, m58, m62 + tilemap_t* fg_tilemap; // m62 int flipscreen; // m57, m62 /* driver specific (video-related) */ diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index d36ed4567be..c40c706ff67 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -17,7 +17,7 @@ struct _ironhors_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int palettebank, charbank, spriterambank; /* devices */ diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index f66ee828e1e..7ac92ac33b2 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -15,7 +15,7 @@ struct _jack_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ int timer_rate; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 948c12e671a..a2994fe9c65 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -13,7 +13,7 @@ struct _jackal_state UINT8 * paletteram; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ int irq_enable; diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 2b30e7fca0d..f975779317d 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -19,7 +19,7 @@ struct _jailbrek_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ UINT8 irq_enable, nmi_enable; diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 5475cb75feb..ee53429eed0 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -15,7 +15,7 @@ struct _karnov_state /* video-related */ bitmap_t *bitmap_f; - tilemap *fix_tilemap; + tilemap_t *fix_tilemap; int flipscreen; UINT16 scroll[2]; diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 74026ba3c61..3b3afa03cb2 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -14,7 +14,7 @@ struct _kchamp_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ int nmi_enable; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 89e3d346f7f..75738545b80 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -17,7 +17,7 @@ struct _kickgoal_state size_t spriteram_size; /* video-related */ - tilemap *fgtm, *bgtm, *bg2tm; + tilemap_t *fgtm, *bgtm, *bg2tm; /* misc */ int melody_loop; diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 186a0c12c09..fa9ea456e7c 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -17,7 +17,7 @@ struct _kingofb_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; int palette_bank; /* misc */ diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index fead3bfb588..b622fac2139 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -14,7 +14,7 @@ struct _kncljoe_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int tile_bank, sprite_bank; int flipscreen; diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 333f5a0449f..10dd9028fe8 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -6,8 +6,8 @@ void K053247GP_set_SpriteOffset(int offsx, int offsy); void K053936GP_set_offset(int chip, int xoffs, int yoffs); void K053936GP_clip_enable(int chip, int status); void K053936GP_set_cliprect(int chip, int minx, int maxx, int miny, int maxy); -void K053936GP_0_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap *tmap, int tilebpp, int blend, int alpha); -void K053936GP_1_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap *tmap, int tilebpp, int blend, int alpha); +void K053936GP_0_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int tilebpp, int blend, int alpha); +void K053936GP_1_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int tilebpp, int blend, int alpha); @@ -69,8 +69,8 @@ void konamigx_le2_sprite_callback(int *code, int *color, int *priority); #define GXSUB_8BPP 0x08 // 256 colors void konamigx_mixer(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, - tilemap *sub1, int sub1flags, - tilemap *sub2, int sub2flags, + tilemap_t *sub1, int sub1flags, + tilemap_t *sub2, int sub2flags, int mixerflags, bitmap_t* extra_bitmap, int rushingheroes_hack); void konamigx_mixer_init(running_machine *machine, int objdma); diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 4e37435dd52..6f5d6b05e0a 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -15,7 +15,7 @@ struct _kopunch_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; int gfxbank; /* devices */ diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 8a689221c30..3bbbe670e3d 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -13,7 +13,7 @@ struct _ksayakyu_state size_t spriteram_size; /* video-related */ - tilemap *tilemap, *textmap; + tilemap_t *tilemap, *textmap; int video_ctrl, flipscreen; /* misc */ diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index d90b644de96..2ff9ef32b49 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -16,7 +16,7 @@ struct _kyugo_state UINT8 * shared_ram; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap; UINT8 scroll_x_lo, scroll_x_hi, scroll_y; int bgpalbank, fgcolor; int flipscreen; diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 39592cec37b..4595a7ce453 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -15,7 +15,7 @@ struct _labyrunr_state UINT8 * paletteram; /* video-related */ - tilemap *layer0, *layer1; + tilemap_t *layer0, *layer1; rectangle clip0, clip1; /* devices */ diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 3329b3be8a7..7dd462e315d 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -17,8 +17,8 @@ struct _ladybug_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *grid_tilemap; // ladybug - tilemap *fg_tilemap; // redclash + tilemap_t *bg_tilemap, *grid_tilemap; // ladybug + tilemap_t *fg_tilemap; // redclash UINT8 grid_color; int star_speed; int gfxbank; // redclash only diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 4698526dc1a..49acf0ecfcf 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -16,7 +16,7 @@ struct _ladyfrog_state size_t videoram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int tilebank, palette_bank; int spritetilebase; diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index fbb4f2bb070..9dccd2d44b0 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -8,7 +8,7 @@ typedef struct _laserbat_state laserbat_state; struct _laserbat_state { /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; UINT8 *videoram; UINT8 *colorram; int video_page; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index dc995728d0d..7b15d057d58 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -19,7 +19,7 @@ struct _lasso_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap, *track_tilemap; + tilemap_t *bg_tilemap, *track_tilemap; UINT8 gfxbank; /* used by lasso, chameleo, wwjgtin and pinbo */ UINT8 track_enable; /* used by wwjgtin */ diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index b850132b925..0df7c986543 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -15,7 +15,7 @@ struct _lastduel_state UINT16 * paletteram; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; UINT16 scroll[8]; int sprite_flipy_mask, sprite_pri_mask, tilemap_priority; diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 0102218af8b..7a2183cb407 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -13,7 +13,7 @@ struct _lemmings_state /* video-related */ bitmap_t *bitmap0; - tilemap *vram_tilemap; + tilemap_t *vram_tilemap; UINT16 *sprite_triple_buffer_0,*sprite_triple_buffer_1; UINT8 *vram_buffer; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 12aea8b7b34..057041afb27 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -11,7 +11,7 @@ struct _lwings_state // UINT8 * paletteram2; // currently this uses generic palette handling /* video-related */ - tilemap *fg_tilemap, *bg1_tilemap, *bg2_tilemap; + tilemap_t *fg_tilemap, *bg1_tilemap, *bg2_tilemap; UINT8 bg2_image; int bg2_avenger_hw; UINT8 scroll_x[2], scroll_y[2]; diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 530c9a70e4d..621c8679216 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -39,7 +39,7 @@ struct _m10_state size_t videoram_size; /* video-related */ - tilemap * tx_tilemap; + tilemap_t * tx_tilemap; gfx_element * back_gfx; /* this is currently unused, because it is needed by gfx_layout (which has no machine) */ diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 0e83c557cbd..765bad21b73 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -3,7 +3,7 @@ struct _mappy_state { UINT8 *videoram; UINT8 *spriteram; - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; bitmap_t *sprite_bitmap; UINT8 scroll; diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index bb165af5597..4f43c3dfcdf 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -53,7 +53,7 @@ struct _mario_state UINT8 *spriteram; UINT8 *videoram; size_t spriteram_size; - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int monitor; }; diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index f22d52f50aa..66661bf50e7 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -23,7 +23,7 @@ /*----------- defined in video/megasys1.c -----------*/ /* Variables */ -extern tilemap *megasys1_tmap[3]; +extern tilemap_t *megasys1_tmap[3]; extern UINT16 *megasys1_scrollram[3]; extern UINT16 *megasys1_objectram, *megasys1_vregs, *megasys1_ram; diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 18e80762464..8ca91c46be0 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -13,7 +13,7 @@ struct _mitchell_state size_t videoram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; UINT8 *objram; /* Sprite RAM */ int flipscreen; int video_bank; diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index f9631b999d1..e9219e22d16 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -7,7 +7,7 @@ extern void decrypt_ms32_bg(running_machine *machine, int addr_xor,int data_xor, /*----------- defined in video/ms32.c -----------*/ -extern tilemap *ms32_tx_tilemap, *ms32_roz_tilemap, *ms32_bg_tilemap, *ms32_bg_tilemap_alt; +extern tilemap_t *ms32_tx_tilemap, *ms32_roz_tilemap, *ms32_bg_tilemap, *ms32_bg_tilemap_alt; extern UINT8* ms32_priram_8; extern UINT16* ms32_palram_16; extern UINT16* ms32_rozram_16; @@ -18,7 +18,7 @@ extern UINT16* ms32_bgram_16; extern UINT32 ms32_tilemaplayoutcontrol; extern UINT16* f1superb_extraram_16; -extern tilemap* ms32_extra_tilemap; +extern tilemap_t* ms32_extra_tilemap; //extern UINT32 *ms32_fce00000; extern UINT32 *ms32_roz_ctrl; diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 0afe1e2a18a..9a57fca9911 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -18,8 +18,8 @@ struct _mystston_state UINT8 *ay8910_select; /* video state */ - tilemap *fg_tilemap; - tilemap *bg_tilemap; + tilemap_t *fg_tilemap; + tilemap_t *bg_tilemap; emu_timer *interrupt_timer; UINT8 *bg_videoram; UINT8 *fg_videoram; diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index d6f8be3d287..8ef0c99b238 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -13,7 +13,7 @@ struct _pandoras_state UINT8 * spriteram; /* video-related */ - tilemap *layer0; + tilemap_t *layer0; int flipscreen; int irq_enable_a, irq_enable_b; diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index a06858776a4..8b47da914f7 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -19,7 +19,7 @@ struct _pgm_state // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap *bg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap, *tx_tilemap; UINT16 *sprite_temp_render; bitmap_t *tmppgmbitmap; diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index 0ce84ada17a..a80d3bc7ffd 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -16,8 +16,8 @@ struct _popper_state size_t spriteram_size; /* video-related */ - tilemap *p123_tilemap, *p0_tilemap; - tilemap *ol_p123_tilemap, *ol_p0_tilemap; + tilemap_t *p123_tilemap, *p0_tilemap; + tilemap_t *ol_p123_tilemap, *ol_p0_tilemap; INT32 flipscreen, e002, gfx_bank; rectangle tilemap_clip; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index fec8268722f..f1dc1df8b05 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -19,8 +19,8 @@ struct _psikyo_state // size_t spriteram_size; /* video-related */ - tilemap *tilemap_0_size0, *tilemap_0_size1, *tilemap_0_size2, *tilemap_0_size3; - tilemap *tilemap_1_size0, *tilemap_1_size1, *tilemap_1_size2, *tilemap_1_size3; + tilemap_t *tilemap_0_size0, *tilemap_0_size1, *tilemap_0_size2, *tilemap_0_size3; + tilemap_t *tilemap_1_size0, *tilemap_1_size1, *tilemap_1_size2, *tilemap_1_size3; int tilemap_0_bank, tilemap_1_bank; int ka302c_banking; diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index 124f7fbb023..591248b5bb1 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -14,7 +14,7 @@ struct _sf_state size_t videoram_size; /* video-related */ - tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; + tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; int sf_active; UINT16 bgscroll, fgscroll; diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 748a2ecbf12..397c055232d 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -15,7 +15,7 @@ struct _sonson_state size_t spriteram_size; /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; /* misc */ int last_irq; diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index cd2cbb81bda..39903977955 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -15,7 +15,7 @@ struct _suprslam_state // UINT16 * paletteram; // this currently uses generic palette handling /* video-related */ - tilemap *screen_tilemap, *bg_tilemap; + tilemap_t *screen_tilemap, *bg_tilemap; UINT16 screen_bank, bg_bank; UINT16 *spr_ctrl; UINT16 *screen_vregs; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 3962048d25e..a97d58f2174 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -37,8 +37,8 @@ struct _timeplt_state size_t spriteram_size; // rocnrope /* video-related */ - tilemap *bg_tilemap; - tilemap *fg_tilemap; // jungler + tilemap_t *bg_tilemap; + tilemap_t *fg_tilemap; // jungler UINT8 blitterdata[4]; // junofrst UINT8 flip_x, flip_y; // tutankham, junofrst diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index d67cfae0737..9fb874a163f 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -5,7 +5,7 @@ struct _toypop_state UINT8 *spriteram; UINT16 *bg_image; UINT8 *m68000_sharedram; - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int bitmapflip; int palettebank; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 1306bf8b7ef..70189bf023d 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -24,7 +24,7 @@ struct _trackfld_state UINT8 * spriteram_select; // sbasketb /* video-related */ - tilemap *bg_tilemap; + tilemap_t *bg_tilemap; int bg_bank, sprite_bank1, sprite_bank2; // trackfld int old_gfx_bank; // needed by atlantol diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index b42c7536e7c..908c46ead02 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -40,7 +40,7 @@ struct _turbo_state UINT8 sound_state[3]; /* video state */ - tilemap * fg_tilemap; + tilemap_t * fg_tilemap; /* Turbo-specific states */ UINT8 turbo_opa, turbo_opb, turbo_opc; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index d23e780e12c..27bab0c37d6 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -12,9 +12,9 @@ struct _vastar_state UINT8 *bg2_scroll; UINT8 *sprite_priority; - tilemap *fg_tilemap; - tilemap *bg1_tilemap; - tilemap *bg2_tilemap; + tilemap_t *fg_tilemap; + tilemap_t *bg1_tilemap; + tilemap_t *bg2_tilemap; UINT8 *sharedram; }; diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 601c9d33199..ccb64170391 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -8,7 +8,7 @@ WRITE16_HANDLER( wrally_coin_lockout_w ); /*----------- defined in video/wrally.c -----------*/ -extern tilemap *wrally_pant[2]; +extern tilemap_t *wrally_pant[2]; extern UINT16 *wrally_vregs; extern UINT16 *wrally_videoram; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index abeb160a55a..d701c826cf7 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -18,7 +18,7 @@ struct _yunsun16_state size_t spriteram_size; /* other video-related elements */ - tilemap *tilemap_0, *tilemap_1; + tilemap_t *tilemap_0, *tilemap_1; int sprites_scrolldx, sprites_scrolldy; /* devices */ diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index be5a1d70817..da18a3d4908 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -11,7 +11,7 @@ struct _yunsung8_state UINT8 * videoram; /* video-related */ - tilemap *tilemap_0, *tilemap_1; + tilemap_t *tilemap_0, *tilemap_1; UINT8 *videoram_0, *videoram_1; int layers_ctrl; int videobank; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index f53ec943a00..9beb2c38518 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -29,8 +29,8 @@ struct _zaxxon_state UINT8 congo_custom[4]; const UINT8 *color_codes; - tilemap *fg_tilemap; - tilemap *bg_tilemap; + tilemap_t *fg_tilemap; + tilemap_t *bg_tilemap; }; diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index 515fe97a16c..e914e1c54f5 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -14,7 +14,7 @@ struct _zerozone_state /* video-related */ UINT16 tilebank; - tilemap *zz_tilemap; + tilemap_t *zz_tilemap; /* devices */ const device_config *audiocpu; diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 9bedc2b6b7b..9ceede12b58 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -85,10 +85,10 @@ struct _atarigen_state UINT32 * playfield32; UINT32 * alpha32; - tilemap * playfield_tilemap; - tilemap * playfield2_tilemap; - tilemap * alpha_tilemap; - tilemap * alpha2_tilemap; + tilemap_t * playfield_tilemap; + tilemap_t * playfield2_tilemap; + tilemap_t * alpha_tilemap; + tilemap_t * alpha2_tilemap; UINT16 * atarivc_data; UINT16 * atarivc_eof_data; diff --git a/src/mame/machine/decocass.h b/src/mame/machine/decocass.h index 8b7553aa6f3..fde54b28753 100644 --- a/src/mame/machine/decocass.h +++ b/src/mame/machine/decocass.h @@ -34,7 +34,7 @@ struct _decocass_state size_t objectram_size; /* video-related */ - tilemap *fg_tilemap, *bg_tilemap_l, *bg_tilemap_r; + tilemap_t *fg_tilemap, *bg_tilemap_l, *bg_tilemap_r; INT32 watchdog_count; INT32 watchdog_flip; INT32 color_missiles; diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index 67bc7236f3f..2f8eb364c36 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -204,7 +204,7 @@ WRITE16_HANDLER( aerofgt_bg2videoram_w ) } -static void setbank( running_machine *machine, tilemap *tmap, int num, int bank ) +static void setbank( running_machine *machine, tilemap_t *tmap, int num, int bank ) { aerofgt_state *state = (aerofgt_state *)machine->driver_data; if (state->gfxbank[num] != bank) @@ -262,7 +262,7 @@ WRITE16_HANDLER( spinlbrk_gfxbank_w ) WRITE16_HANDLER( turbofrc_gfxbank_w ) { aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; - tilemap *tmap = (offset == 0) ? state->bg1_tilemap : state->bg2_tilemap; + tilemap_t *tmap = (offset == 0) ? state->bg1_tilemap : state->bg2_tilemap; data = COMBINE_DATA(&state->bank[offset]); @@ -275,7 +275,7 @@ WRITE16_HANDLER( turbofrc_gfxbank_w ) WRITE16_HANDLER( aerofgt_gfxbank_w ) { aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; - tilemap *tmap = (offset < 2) ? state->bg1_tilemap : state->bg2_tilemap; + tilemap_t *tmap = (offset < 2) ? state->bg1_tilemap : state->bg2_tilemap; data = COMBINE_DATA(&state->bank[offset]); diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c index fc13331cdb9..389bcd07481 100644 --- a/src/mame/video/ampoker2.c +++ b/src/mame/video/ampoker2.c @@ -69,7 +69,7 @@ #include "driver.h" #include "video/resnet.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; PALETTE_INIT( ampoker2 ) diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index 50f0e753d7d..5757cc18470 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -138,9 +138,9 @@ static UINT8 *butasan_txbackram; static UINT8 *butasan_pagedram[2]; static UINT8 butasan_page_latch; -static tilemap *tx_tilemap = NULL; -static tilemap *bg0_tilemap = NULL; -static tilemap *bg1_tilemap = NULL; +static tilemap_t *tx_tilemap = NULL; +static tilemap_t *bg0_tilemap = NULL; +static tilemap_t *bg1_tilemap = NULL; static UINT8 argus_bg_status; static UINT8 butasan_bg1_status; diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c index f67c9d9c7ae..78d27f706f2 100644 --- a/src/mame/video/atetris.c +++ b/src/mame/video/atetris.c @@ -8,7 +8,7 @@ #include "includes/atetris.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /************************************* diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c index f008ffe96e4..84bc2dbbd6a 100644 --- a/src/mame/video/bagman.c +++ b/src/mame/video/bagman.c @@ -15,7 +15,7 @@ UINT8 *bagman_video_enable; UINT8 *bagman_videoram; UINT8 *bagman_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; WRITE8_HANDLER( bagman_videoram_w ) diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index da1837b95b9..52a0aea3f56 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -2,7 +2,7 @@ UINT8 *baraduke_textram, *baraduke_videoram, *baraduke_spriteram; -static tilemap *tx_tilemap, *bg_tilemap[2]; +static tilemap_t *tx_tilemap, *bg_tilemap[2]; static int xscroll[2], yscroll[2]; diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index edeeca0a11f..a280cea77e5 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -23,7 +23,7 @@ #include "driver.h" -static tilemap *fix_tilemap,*pf1_tilemap,*pf2_tilemap; +static tilemap_t *fix_tilemap,*pf1_tilemap,*pf2_tilemap; static const UINT8 *scale_table_ptr; static UINT8 scale_line_count; diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index 8d85fe247d2..355b28cb4e5 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -118,8 +118,8 @@ int adder2_acia_triggered; // flag <>0, ACIA receive IRQ static UINT8 adder_ram[0xE80]; // normal RAM static UINT8 adder_screen_ram[2][0x1180]; // paged display RAM -static tilemap *tilemap0; // tilemap screen0 -static tilemap *tilemap1; // timemap screen1 +static tilemap_t *tilemap0; // tilemap screen0 +static tilemap_t *tilemap1; // timemap screen1 UINT8 adder2_data_from_sc2; UINT8 adder2_data_to_sc2; diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index 1945aea6668..89061c79eb1 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -2,7 +2,7 @@ #include "driver.h" -static tilemap *bsb_tilemap, *bsb_tilemap2, *bsb_tilemap3; +static tilemap_t *bsb_tilemap, *bsb_tilemap2, *bsb_tilemap3; extern UINT16 *bsb_videoram, *bsb_videoram2, *bsb_videoram3; extern UINT16 *bsb_vidreg1, *bsb_vidreg2; diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c index ac03927ea40..67eb394a00c 100644 --- a/src/mame/video/bloodbro.c +++ b/src/mame/video/bloodbro.c @@ -10,7 +10,7 @@ UINT16 *bloodbro_txvideoram; UINT16 *bloodbro_bgvideoram,*bloodbro_fgvideoram; UINT16 *bloodbro_scroll; -static tilemap *bg_tilemap,*fg_tilemap,*tx_tilemap; +static tilemap_t *bg_tilemap,*fg_tilemap,*tx_tilemap; /*************************************************************************** diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index df2ca2e767b..42f86de73c1 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -18,7 +18,7 @@ static UINT32 stars_scrolly; static INT32 bosco_starcontrol,bosco_starblink[2]; -static tilemap *bg_tilemap,*fg_tilemap; +static tilemap_t *bg_tilemap,*fg_tilemap; #define VIDEO_RAM_SIZE 0x400 diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c index 2dbbe3e8ff2..0dfe4381dbf 100644 --- a/src/mame/video/calomega.c +++ b/src/mame/video/calomega.c @@ -17,7 +17,7 @@ UINT8 *calomega_videoram; UINT8 *calomega_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; WRITE8_HANDLER( calomega_videoram_w ) { diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index 79fe2f0ff97..f24a7c2b747 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -64,13 +64,13 @@ size_t cave_paletteram_size; /* Variables only used here: */ -static tilemap *tilemap_0; +static tilemap_t *tilemap_0; static int tiledim_0, old_tiledim_0; -static tilemap *tilemap_1; +static tilemap_t *tilemap_1; static int tiledim_1, old_tiledim_1; -static tilemap *tilemap_2; +static tilemap_t *tilemap_2; static int tiledim_2, old_tiledim_2; -static tilemap *tilemap_3; +static tilemap_t *tilemap_3; static int tiledim_3, old_tiledim_3; @@ -368,7 +368,7 @@ static TILE_GET_INFO( sailormn_get_tile_info_2 ) } -INLINE void vram_w(UINT16 *VRAM, tilemap *TILEMAP, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask) +INLINE void vram_w(UINT16 *VRAM, tilemap_t *TILEMAP, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask) { if ((VRAM[offset] & mem_mask)==(data & mem_mask)) return; COMBINE_DATA(&VRAM[offset]); @@ -390,7 +390,7 @@ INLINE void vram_w(UINT16 *VRAM, tilemap *TILEMAP, ATTR_UNUSED offs_t offset, AT and 408000-407fff both go to the 8x8 tilemap ram. Use this function in this cases. Note that the get_tile_info function looks in the 4000-7fff range for tiles, so we have to write the data there. */ -INLINE void vram_8x8_w(UINT16 *VRAM, tilemap *TILEMAP,ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask) +INLINE void vram_8x8_w(UINT16 *VRAM, tilemap_t *TILEMAP,ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask) { offset %= 0x4000/2; if ((VRAM[offset] & mem_mask)==(data & mem_mask)) return; @@ -1328,7 +1328,7 @@ static void sprite_draw_donpachi_zbuf( int priority ) INLINE void cave_tilemap_draw( bitmap_t *bitmap, const rectangle *cliprect, - tilemap *TILEMAP, UINT16 *VRAM, UINT16 *VCTRL, + tilemap_t *TILEMAP, UINT16 *VRAM, UINT16 *VCTRL, UINT32 flags, UINT32 priority, UINT32 priority2 ) { int sx, sy, flipx, flipy, offs_x, offs_y, offs_row; diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index 968b0fa0b30..d492aefae46 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -18,8 +18,8 @@ #define SWIMMER_BG_SPLIT (0x18 * 8) #define YAMATO_SKY_PEN_BASE (0x60) -static tilemap *pf_tilemap; -static tilemap *bs_tilemap; +static tilemap_t *pf_tilemap; +static tilemap_t *bs_tilemap; UINT8 *cclimber_videoram; UINT8 *cclimber_colorram; @@ -36,7 +36,7 @@ UINT8 *swimmer_palettebank; UINT8 *toprollr_bg_videoram; UINT8 *toprollr_bg_coloram; -static tilemap *toproller_bg_tilemap; +static tilemap_t *toproller_bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index dd2027b74bc..09a6fa1e8b8 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -8,7 +8,7 @@ #include "includes/centiped.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; UINT8 centiped_flipscreen, *bullsdrt_tiles_bankram; static UINT8 bullsdrt_sprites_bank; static UINT8 penmask[64]; diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index 8fe15257291..d008085de82 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -20,7 +20,7 @@ static UINT8 *current_bitmap_videoram_accessed; static UINT8 *current_bitmap_videoram_displayed; static UINT16 *palette_ram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c index 3e440e28cf7..5e6f1706a7e 100644 --- a/src/mame/video/clshroad.c +++ b/src/mame/video/clshroad.c @@ -34,7 +34,7 @@ /* Variables only used here: */ -static tilemap *tilemap_0a, *tilemap_0b, *tilemap_1; +static tilemap_t *tilemap_0a, *tilemap_0b, *tilemap_1; /* Variables & functions needed by drivers: */ diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index 8bd2bf0aca2..edba6bb0335 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -104,7 +104,7 @@ VIDEO_EOF( cninja ) static void raster_pf3_draw(bitmap_t *bitmap, const rectangle *cliprect, int flags, int pri) { - tilemap *tmap=deco16_get_tilemap(2,0); + tilemap_t *tmap=deco16_get_tilemap(2,0); int ptr=0,start,end=0; rectangle clip; int overflow=deco16_raster_display_position; diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c index 6848379c5e2..fc79715eff5 100644 --- a/src/mame/video/crbaloon.c +++ b/src/mame/video/crbaloon.c @@ -16,7 +16,7 @@ UINT8 *crbaloon_spriteram; static UINT16 crbaloon_collision_address; static UINT8 crbaloon_collision_address_clear; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index 68a0a9d2ed5..0f4b3807e8d 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -2,7 +2,7 @@ #include "video/taitoic.h" -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; UINT16 *darius_fg_ram; struct tempsprite diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index d8f347adb60..5362cb1206f 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -14,7 +14,7 @@ UINT8 *darkmist_spritebank; #define DISPLAY_BG 4 #define DISPLAY_TXT 16 -static tilemap *bgtilemap, *fgtilemap, *txtilemap; +static tilemap_t *bgtilemap, *fgtilemap, *txtilemap; static TILE_GET_INFO( get_bgtile_info ) { diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c index c77e9150e7e..6ca79b414c4 100644 --- a/src/mame/video/darkseal.c +++ b/src/mame/video/darkseal.c @@ -93,7 +93,7 @@ UINT16 *darkseal_pf1_data,*darkseal_pf2_data,*darkseal_pf3_data; static UINT16 darkseal_control_0[8]; static UINT16 darkseal_control_1[8]; -static tilemap *pf1_tilemap,*pf2_tilemap,*pf3_tilemap; +static tilemap_t *pf1_tilemap,*pf2_tilemap,*pf3_tilemap; static int flipscreen; /***************************************************************************/ diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c index ae092882378..2cbfc6477b9 100644 --- a/src/mame/video/dbz.c +++ b/src/mame/video/dbz.c @@ -11,7 +11,7 @@ #include "driver.h" #include "video/konicdev.h" -static tilemap *dbz_bg1_tilemap, *dbz_bg2_tilemap; +static tilemap_t *dbz_bg1_tilemap, *dbz_bg2_tilemap; UINT16 *dbz_bg1_videoram, *dbz_bg2_videoram; static int sprite_colorbase, layer_colorbase[6], layer[5], layerpri[5]; diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c index 22d9303ad57..8cd6d1852ea 100644 --- a/src/mame/video/dcon.c +++ b/src/mame/video/dcon.c @@ -8,7 +8,7 @@ UINT16 *dcon_back_data,*dcon_fore_data,*dcon_mid_data,*dcon_scroll_ram,*dcon_textram; -static tilemap *background_layer,*foreground_layer,*midground_layer,*text_layer; +static tilemap_t *background_layer,*foreground_layer,*midground_layer,*text_layer; static UINT16 dcon_enable; static int dcon_gfx_bank_select; diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c index 8120838abed..fddc1a1c38d 100644 --- a/src/mame/video/deadang.c +++ b/src/mame/video/deadang.c @@ -1,6 +1,6 @@ #include "driver.h" -static tilemap *pf3_layer,*pf2_layer,*pf1_layer,*text_layer; +static tilemap_t *pf3_layer,*pf2_layer,*pf1_layer,*text_layer; static int deadangle_tilebank, deadangle_oldtilebank; UINT16 *deadang_video_data,*deadang_scroll_ram; diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c index 734712e13bb..dce6f5bcb30 100644 --- a/src/mame/video/dec0.c +++ b/src/mame/video/dec0.c @@ -97,9 +97,9 @@ Todo: #include "driver.h" #include "includes/dec0.h" -static tilemap *pf1_tilemap_0,*pf1_tilemap_1,*pf1_tilemap_2; -static tilemap *pf2_tilemap_0,*pf2_tilemap_1,*pf2_tilemap_2; -static tilemap *pf3_tilemap_0,*pf3_tilemap_1,*pf3_tilemap_2; +static tilemap_t *pf1_tilemap_0,*pf1_tilemap_1,*pf1_tilemap_2; +static tilemap_t *pf2_tilemap_0,*pf2_tilemap_1,*pf2_tilemap_2; +static tilemap_t *pf3_tilemap_0,*pf3_tilemap_1,*pf3_tilemap_2; UINT16 *dec0_pf1_data,*dec0_pf2_data,*dec0_pf3_data; UINT16 *dec0_pf1_rowscroll,*dec0_pf2_rowscroll,*dec0_pf3_rowscroll; @@ -217,7 +217,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan static void custom_tilemap_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, - tilemap *tilemap_ptr, + tilemap_t *tilemap_ptr, const UINT16 *rowscroll_ptr, const UINT16 *colscroll_ptr, const UINT16 *control0, diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index 1259f689843..650492fed6e 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -159,8 +159,8 @@ int deco16_raster_display_position; static int use_custom_pf1, use_custom_pf2, use_custom_pf3, use_custom_pf4; -static tilemap *pf1_tilemap_16x16,*pf2_tilemap_16x16,*pf3_tilemap_16x16,*pf4_tilemap_16x16; -static tilemap *pf1_tilemap_8x8,*pf2_tilemap_8x8; +static tilemap_t *pf1_tilemap_16x16,*pf2_tilemap_16x16,*pf3_tilemap_16x16,*pf4_tilemap_16x16; +static tilemap_t *pf1_tilemap_8x8,*pf2_tilemap_8x8; static bitmap_t *sprite_priority_bitmap; @@ -175,8 +175,8 @@ static int (*deco16_bank_callback_2)(const int bank); static int (*deco16_bank_callback_3)(const int bank); static int (*deco16_bank_callback_4)(const int bank); static void custom_tilemap_draw(running_machine *machine, - bitmap_t *bitmap,tilemap *tilemap0_8x8,tilemap *tilemap0_16x16, - tilemap *tilemap1_8x8,tilemap *tilemap1_16x16, const UINT16 *rowscroll_ptr,const UINT16 scrollx, + bitmap_t *bitmap,tilemap_t *tilemap0_8x8,tilemap_t *tilemap0_16x16, + tilemap_t *tilemap1_8x8,tilemap_t *tilemap1_16x16, const UINT16 *rowscroll_ptr,const UINT16 scrollx, const UINT16 scrolly,const UINT16 control0, const UINT16 control1,int combine_mask,int combine_shift,int trans_mask,int flags,UINT32 priority); static int pf12_last_small, pf12_last_big, pf34_last_big; @@ -471,7 +471,7 @@ void deco16_pf34_set_gfxbank(int small, int big) deco16_pf34_16x16_gfx_bank=big; } -tilemap *deco16_get_tilemap(int pf, int size) +tilemap_t *deco16_get_tilemap(int pf, int size) { switch (pf) { case 0: if (size) return pf1_tilemap_8x8; return pf1_tilemap_16x16; @@ -608,8 +608,8 @@ void deco_allocate_sprite_bitmap(running_machine *machine) /*****************************************************************************************/ static int deco16_pf_update( - tilemap *tilemap_8x8, - tilemap *tilemap_16x16, + tilemap_t *tilemap_8x8, + tilemap_t *tilemap_16x16, const UINT16 *rowscroll_ptr, const UINT16 scrollx, const UINT16 scrolly, @@ -960,10 +960,10 @@ void deco16_tilemap_34_combine_draw(const device_config *screen, bitmap_t *bitma static void custom_tilemap_draw( running_machine *machine, bitmap_t *bitmap, - tilemap *tilemap0_8x8, - tilemap *tilemap0_16x16, - tilemap *tilemap1_8x8, - tilemap *tilemap1_16x16, + tilemap_t *tilemap0_8x8, + tilemap_t *tilemap0_16x16, + tilemap_t *tilemap1_8x8, + tilemap_t *tilemap1_16x16, const UINT16 *rowscroll_ptr, const UINT16 scrollx, const UINT16 scrolly, @@ -975,8 +975,8 @@ static void custom_tilemap_draw( int flags, UINT32 priority) { - tilemap *tilemap0 = (control1&0x80) ? tilemap0_8x8 : tilemap0_16x16; - tilemap *tilemap1 = (control1&0x80) ? tilemap1_8x8 : tilemap1_16x16; + tilemap_t *tilemap0 = (control1&0x80) ? tilemap0_8x8 : tilemap0_16x16; + tilemap_t *tilemap1 = (control1&0x80) ? tilemap1_8x8 : tilemap1_16x16; const bitmap_t *src_bitmap0 = tilemap0 ? tilemap_get_pixmap(tilemap0) : NULL; const bitmap_t *src_bitmap1 = tilemap1 ? tilemap_get_pixmap(tilemap1) : NULL; int width_mask, height_mask, x, y, p; diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 3437acca2f4..c98e8e8d831 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -10,7 +10,7 @@ UINT32 *dragngun_sprite_lookup_0_ram, *dragngun_sprite_lookup_1_ram; UINT32 *deco32_ace_ram; static UINT8 *dirty_palette; -static tilemap *pf1_tilemap,*pf1a_tilemap,*pf2_tilemap,*pf3_tilemap,*pf4_tilemap; +static tilemap_t *pf1_tilemap,*pf1a_tilemap,*pf2_tilemap,*pf3_tilemap,*pf4_tilemap; static int deco32_pf1_bank,deco32_pf2_bank,deco32_pf3_bank,deco32_pf4_bank; static int deco32_pf1_flip,deco32_pf2_flip,deco32_pf3_flip,deco32_pf4_flip; static int deco32_pf2_colourbank,deco32_pf4_colourbank,deco32_pri; @@ -1111,7 +1111,7 @@ static void print_debug_info(bitmap_t *bitmap) #endif -static void deco32_setup_scroll(tilemap *pf_tilemap, UINT16 height, UINT8 control0, UINT8 control1, UINT16 sy, UINT16 sx, UINT32 *rowdata, UINT32 *coldata) +static void deco32_setup_scroll(tilemap_t *pf_tilemap, UINT16 height, UINT8 control0, UINT8 control1, UINT16 sy, UINT16 sx, UINT32 *rowdata, UINT32 *coldata) { int rows,offs; diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index 9ae40a63b02..4acf3228928 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -4,7 +4,7 @@ UINT8 *digdug_videoram,*digdug_objram, *digdug_posram, *digdug_flpram; -static tilemap *bg_tilemap,*tx_tilemap; +static tilemap_t *bg_tilemap,*tx_tilemap; static INT32 bg_select, tx_color_mode, bg_disable, bg_color_bank; diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index 3de51db9e5f..6240e96423a 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -10,8 +10,8 @@ static UINT8 tx_pri; /* Used by sadari/gundl94/primella */ static UINT16 rshark_pri; /* Used by rshark/superx/popbingo */ /* Up to four ROM-based and one RAM-based tilemap */ -static tilemap *bg_tilemap, *bg2_tilemap, *fg_tilemap, *fg2_tilemap; -static tilemap *tx_tilemap; +static tilemap_t *bg_tilemap, *bg2_tilemap, *fg_tilemap, *fg2_tilemap; +static tilemap_t *tx_tilemap; /* Tilemap control registers */ static UINT8 bgscroll8[0x10] = {0}, bg2scroll8[0x10] = {0}, fgscroll8[0x10] = {0}, fg2scroll8[0x10] = {0}; @@ -25,7 +25,7 @@ static int tx_tilemap_mode; /* 0 = lastday/gulfstrm/pollux/flytiger; 1 = bluehaw /* All the dooyong games have the same tilemap control registers */ -INLINE void dooyong_scroll8_w(offs_t offset, UINT8 data, UINT8 *scroll, tilemap *map) +INLINE void dooyong_scroll8_w(offs_t offset, UINT8 data, UINT8 *scroll, tilemap_t *map) { UINT8 old = scroll[offset]; if (old != data) diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index 8d57c12a37a..f365478a8c2 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -1,7 +1,7 @@ #include "driver.h" -static tilemap *bg_layer,*fg_layer,*tx_layer; +static tilemap_t *bg_layer,*fg_layer,*tx_layer; UINT16 *dynduke_back_data,*dynduke_fore_data,*dynduke_scroll_ram; static int back_bankbase,fore_bankbase; diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c index 18348b63397..9f88726e359 100644 --- a/src/mame/video/fastfred.c +++ b/src/mame/video/fastfred.c @@ -34,7 +34,7 @@ static const rectangle spritevisibleareaflipx = static UINT16 charbank; static UINT8 colorbank; int fastfred_hardware_type; -static tilemap *bg_tilemap, *fg_tilemap, *web_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap, *web_tilemap; /*************************************************************************** diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index 27c15ce49d9..5cf4b461615 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -31,8 +31,8 @@ static UINT32 color2_mask; static const rectangle playfield_window = { 0x02a, 0x115, 0x000, 0x0ff }; -static tilemap *tilemap1; /* for screen display */ -static tilemap *tilemap2; /* for collision detection */ +static tilemap_t *tilemap1; /* for screen display */ +static tilemap_t *tilemap2; /* for collision detection */ diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c index b79c9ff4185..f7d2e06b0e9 100644 --- a/src/mame/video/flower.c +++ b/src/mame/video/flower.c @@ -3,7 +3,7 @@ #include "driver.h" #include "includes/flower.h" -static tilemap *flower_bg0_tilemap, *flower_bg1_tilemap, *flower_text_tilemap, *flower_text_right_tilemap; +static tilemap_t *flower_bg0_tilemap, *flower_bg1_tilemap, *flower_text_tilemap, *flower_text_right_tilemap; UINT8 *flower_textram, *flower_bg0ram, *flower_bg1ram, *flower_bg0_scroll, *flower_bg1_scroll; diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index 0a68942fa0c..acbed1b66a5 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -553,7 +553,7 @@ VIDEO_UPDATE( fromanc2 ) int i; int *scrollx = NULL; int *scrolly = NULL; - tilemap **tilemaps = NULL; + tilemap_t **tilemaps = NULL; if (screen == state->left_screen) { diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c index ff2072269f1..733fa038996 100644 --- a/src/mame/video/funworld.c +++ b/src/mame/video/funworld.c @@ -60,7 +60,7 @@ #include "driver.h" #include "video/resnet.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; UINT8 *funworld_colorram; UINT8 *funworld_videoram; diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index 9b4a8300fad..dd671fb9b9d 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -83,7 +83,7 @@ UINT16 *gaelco2_vregs; static UINT16 *gaelco2_videoram; /* tilemaps */ -static tilemap *pant[2]; +static tilemap_t *pant[2]; static int dual_monitor; diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index 440eb9f4608..5f004390cb1 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -20,7 +20,7 @@ static UINT32 stars_scrollx,stars_scrolly; static INT32 galaga_gfxbank; // used by catsbee -static tilemap *tx_tilemap; +static tilemap_t *tx_tilemap; /* Galaga star line and pixel locations pulled directly from diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index 2b7edb15e54..6f2e8ed72a7 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -256,7 +256,7 @@ UINT8 galaxian_sprite_clip_end; * *************************************/ -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 flipscreen_x; static UINT8 flipscreen_y; diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index 200762ab807..6dcc06c5142 100644 --- a/src/mame/video/galaxold.c +++ b/src/mame/video/galaxold.c @@ -40,15 +40,15 @@ size_t galaxold_bulletsram_size; static TILE_GET_INFO( get_tile_info ); static TILE_GET_INFO( rockclim_get_tile_info ); -static tilemap *bg_tilemap; -static tilemap *rockclim_tilemap; +static tilemap_t *bg_tilemap; +static tilemap_t *rockclim_tilemap; static int mooncrst_gfxextend; static int spriteram2_present; static UINT8 gfxbank[5]; static UINT8 flipscreen_x; static UINT8 flipscreen_y; static UINT8 color_mask; -static tilemap *dambustr_tilemap2; +static tilemap_t *dambustr_tilemap2; static UINT8 *dambustr_videoram2; static void (*modify_charcode)(running_machine *machine, UINT16 *code,UINT8 x); /* function to call to do character banking */ static void mooncrst_modify_charcode(running_machine *machine, UINT16 *code,UINT8 x); @@ -73,7 +73,7 @@ static void (*modify_ypos)(UINT8*); /* function to call to do modify how vertica static TIMER_CALLBACK( stars_blink_callback ); static TIMER_CALLBACK( stars_scroll_callback ); -static void (*tilemap_set_scroll)( tilemap *, int col, int value ); +static void (*tilemap_set_scroll)( tilemap_t *, int col, int value ); /* star circuit */ #define STAR_COUNT 252 diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c index a92ad830371..5c7c7105170 100644 --- a/src/mame/video/gaplus.c +++ b/src/mame/video/gaplus.c @@ -13,7 +13,7 @@ UINT8 *gaplus_videoram; UINT8 *gaplus_spriteram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/gatron.c b/src/mame/video/gatron.c index 5ff3f0b94d7..ddf9f42723a 100644 --- a/src/mame/video/gatron.c +++ b/src/mame/video/gatron.c @@ -19,7 +19,7 @@ #include "driver.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; WRITE8_HANDLER( gat_videoram_w ) diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c index cf9874950a5..d88f63253cb 100644 --- a/src/mame/video/gladiatr.c +++ b/src/mame/video/gladiatr.c @@ -13,7 +13,7 @@ static int fg_scrollx, fg_scrolly, bg_scrollx, bg_scrolly; static int sprite_bank, sprite_buffer; -static tilemap *fg_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *bg_tilemap; static int fg_tile_bank, bg_tile_bank; diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index 324320c8a60..baead38ec22 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -22,7 +22,7 @@ static int bgcolor; ***************************************************************************/ -static tilemap *goldstar_fg_tilemap; +static tilemap_t *goldstar_fg_tilemap; static UINT8 cmaster_girl_num; static UINT8 cmaster_girl_pal; static UINT8 cm_enable_reg; @@ -94,7 +94,7 @@ static TILE_GET_INFO( get_cherrym_fg_tile_info ) -static tilemap *goldstar_reel1_tilemap; +static tilemap_t *goldstar_reel1_tilemap; UINT8 *goldstar_reel1_ram; WRITE8_HANDLER( goldstar_reel1_ram_w ) @@ -115,7 +115,7 @@ static TILE_GET_INFO( get_goldstar_reel1_tile_info ) } -static tilemap *goldstar_reel2_tilemap; +static tilemap_t *goldstar_reel2_tilemap; UINT8 *goldstar_reel2_ram; WRITE8_HANDLER( goldstar_reel2_ram_w ) @@ -135,7 +135,7 @@ static TILE_GET_INFO( get_goldstar_reel2_tile_info ) 0); } -static tilemap *goldstar_reel3_tilemap; +static tilemap_t *goldstar_reel3_tilemap; UINT8 *goldstar_reel3_ram; WRITE8_HANDLER( goldstar_reel3_ram_w ) diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c index 44c9687e85e..7dcd085a120 100644 --- a/src/mame/video/gomoku.c +++ b/src/mame/video/gomoku.c @@ -14,7 +14,7 @@ static int gomoku_flipscreen; static int gomoku_bg_dispsw; -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; static bitmap_t *gomoku_bg_bitmap; UINT8 *gomoku_videoram; diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index c78b5c89314..6e7c61169ea 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -18,7 +18,7 @@ static UINT8 background_priority = 0; static UINT8 spritebank; static UINT8 transparent0; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static double weights[4]; diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c index ac547810b35..81112d173cf 100644 --- a/src/mame/video/gstriker.c +++ b/src/mame/video/gstriker.c @@ -71,7 +71,7 @@ static void VS920A_init(running_machine *machine, int numchips) } } -static tilemap* VS920A_get_tilemap(int numchip) +static tilemap_t* VS920A_get_tilemap(int numchip) { return VS920A[numchip].tmap; } @@ -281,7 +281,7 @@ static void MB60553_draw(running_machine *machine, int numchip, bitmap_t* screen } -static tilemap* MB60553_get_tilemap(int numchip) +static tilemap_t* MB60553_get_tilemap(int numchip) { return MB60553[numchip].tmap; } diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c index cdeaf792e15..3bac31169e0 100644 --- a/src/mame/video/gsword.c +++ b/src/mame/video/gsword.c @@ -16,7 +16,7 @@ UINT8 *gsword_spriteattrib_ram; static int charbank, charpalbank, flipscreen; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static PALETTE_INIT( common ) diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c index 909746bc88d..25cd310e798 100644 --- a/src/mame/video/hexion.c +++ b/src/mame/video/hexion.c @@ -3,7 +3,7 @@ static UINT8 *vram[2],*unkram; static int bankctrl,rambank,pmcbank,gfxrom_select; -static tilemap *bg_tilemap[2]; +static tilemap_t *bg_tilemap[2]; diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index 7fac6517a95..3cf370f7b6d 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -10,20 +10,20 @@ static UINT8 additive_tilemap_debug; UINT32* hng64_videoram; -static tilemap *hng64_tilemap0_8x8; -static tilemap *hng64_tilemap1_8x8; -static tilemap *hng64_tilemap2_8x8; -static tilemap *hng64_tilemap3_8x8; +static tilemap_t *hng64_tilemap0_8x8; +static tilemap_t *hng64_tilemap1_8x8; +static tilemap_t *hng64_tilemap2_8x8; +static tilemap_t *hng64_tilemap3_8x8; -static tilemap *hng64_tilemap0_16x16; -static tilemap *hng64_tilemap1_16x16; -static tilemap *hng64_tilemap2_16x16; -static tilemap *hng64_tilemap3_16x16; +static tilemap_t *hng64_tilemap0_16x16; +static tilemap_t *hng64_tilemap1_16x16; +static tilemap_t *hng64_tilemap2_16x16; +static tilemap_t *hng64_tilemap3_16x16; -static tilemap *hng64_tilemap0_16x16_alt; -static tilemap *hng64_tilemap1_16x16_alt; -static tilemap *hng64_tilemap2_16x16_alt; -static tilemap *hng64_tilemap3_16x16_alt; +static tilemap_t *hng64_tilemap0_16x16_alt; +static tilemap_t *hng64_tilemap1_16x16_alt; +static tilemap_t *hng64_tilemap2_16x16_alt; +static tilemap_t *hng64_tilemap3_16x16_alt; UINT32 *hng64_spriteram; UINT32 *hng64_videoregs; @@ -728,7 +728,7 @@ struct _blit_parameters -static void hng64_configure_blit_parameters(blit_parameters *blit, tilemap *tmap, bitmap_t *dest, const rectangle *cliprect, UINT32 flags, UINT8 priority, UINT8 priority_mask, hng64trans_t drawformat) +static void hng64_configure_blit_parameters(blit_parameters *blit, tilemap_t *tmap, bitmap_t *dest, const rectangle *cliprect, UINT32 flags, UINT8 priority, UINT8 priority_mask, hng64trans_t drawformat) { /* start with nothing */ memset(blit, 0, sizeof(*blit)); @@ -813,7 +813,7 @@ do { \ *(UINT32 *)dest = alpha_blend_r32(*(UINT32 *)dest, clut[INPUT_VAL], alpha); \ } while (0) -static void hng64_tilemap_draw_roz_core(running_machine* machine, tilemap *tmap, const blit_parameters *blit, +static void hng64_tilemap_draw_roz_core(running_machine* machine, tilemap_t *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]; @@ -991,7 +991,7 @@ static void hng64_tilemap_draw_roz_core(running_machine* machine, tilemap *tmap, -static void hng64_tilemap_draw_roz_primask(running_machine* machine, bitmap_t *dest, const rectangle *cliprect, tilemap *tmap, +static void hng64_tilemap_draw_roz_primask(running_machine* machine, bitmap_t *dest, const rectangle *cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, UINT32 flags, UINT8 priority, UINT8 priority_mask, hng64trans_t drawformat) { @@ -1019,7 +1019,7 @@ profiler_mark_end(); } -INLINE void hng64_tilemap_draw_roz(running_machine* machine, bitmap_t *dest, const rectangle *cliprect, tilemap *tmap, +INLINE void hng64_tilemap_draw_roz(running_machine* machine, bitmap_t *dest, const rectangle *cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, UINT32 flags, UINT8 priority, hng64trans_t drawformat) { @@ -1030,7 +1030,7 @@ INLINE void hng64_tilemap_draw_roz(running_machine* machine, bitmap_t *dest, con static void hng64_drawtilemap(running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect, int tm ) { - tilemap* tilemap = 0; + tilemap_t* tilemap = 0; UINT32 scrollbase = 0; UINT32 tileregs = 0; int transmask; diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c index 028d2ed7d69..93ce9e293ac 100644 --- a/src/mame/video/iqblock.c +++ b/src/mame/video/iqblock.c @@ -8,7 +8,7 @@ UINT8 *iqblock_fgvideoram; int iqblock_videoenable; int iqblock_video_type; -static tilemap *bg_tilemap,*fg_tilemap; +static tilemap_t *bg_tilemap,*fg_tilemap; /*************************************************************************** diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index 065c4f850c8..bf48e767e16 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -38,8 +38,8 @@ static UINT16 kaneko16_disp_enable; -static tilemap *kaneko16_tmap_0, *kaneko16_tmap_1; -static tilemap *kaneko16_tmap_2, *kaneko16_tmap_3; +static tilemap_t *kaneko16_tmap_0, *kaneko16_tmap_1; +static tilemap_t *kaneko16_tmap_2, *kaneko16_tmap_3; UINT16 *kaneko16_vram_0, *kaneko16_vram_1, *kaneko16_layers_0_regs; UINT16 *kaneko16_vscroll_0, *kaneko16_vscroll_1; UINT16 *kaneko16_vram_2, *kaneko16_vram_3, *kaneko16_layers_1_regs; diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 9f5673588b8..d4042d56b15 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -39,10 +39,10 @@ static INT32 gx_tilebanks[8], gx_oldbanks[8]; static int gx_tilemode, gx_rozenable, psac_colorbase, last_psac_colorbase; static int gx_specialrozenable; // type 1 roz, with voxel height-map, rendered from 2 source tilemaps (which include height data) to temp bitmap for further processing static int gx_rushingheroes_hack; -static tilemap *gx_psac_tilemap, *gx_psac_tilemap2; +static tilemap_t *gx_psac_tilemap, *gx_psac_tilemap2; extern UINT32 *gx_psacram, *gx_subpaletteram32; static bitmap_t* type3_roz_temp_bitmap; -static tilemap* gx_psac_tilemap_alt; +static tilemap_t* gx_psac_tilemap_alt; static int konamigx_has_dual_screen; int konamigx_current_frame; @@ -265,7 +265,7 @@ INLINE void K053936GP_copyroz32clip( running_machine *machine, // adapted from generic K053936_zoom_draw() static void K053936GP_zoom_draw(running_machine *machine, int chip, UINT16 *ctrl, UINT16 *linectrl, - bitmap_t *bitmap, const rectangle *cliprect, tilemap *tmap, + bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int tilebpp, int blend, int alpha) { bitmap_t *src_bitmap; @@ -336,13 +336,13 @@ static void K053936GP_zoom_draw(running_machine *machine, } void K053936GP_0_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, - tilemap *tmap, int tilebpp, int blend, int alpha) + tilemap_t *tmap, int tilebpp, int blend, int alpha) { K053936GP_zoom_draw(machine, 0,K053936_0_ctrl,K053936_0_linectrl,bitmap,cliprect,tmap,tilebpp,blend,alpha); } void K053936GP_1_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, - tilemap *tmap, int tilebpp, int blend, int alpha) + tilemap_t *tmap, int tilebpp, int blend, int alpha) { K053936GP_zoom_draw(machine, 1,K053936_1_ctrl,K053936_1_linectrl,bitmap,cliprect,tmap,tilebpp,blend,alpha); } @@ -1140,8 +1140,8 @@ void konamigx_objdma(void) } void konamigx_mixer(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, - tilemap *sub1, int sub1flags, - tilemap *sub2, int sub2flags, + tilemap_t *sub1, int sub1flags, + tilemap_t *sub2, int sub2flags, int mixerflags, bitmap_t *extra_bitmap, int rushingheroes_hack) { static const int xoffset[8] = { 0, 1, 4, 5, 16, 17, 20, 21 }; diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index 5d1a83a02ac..3b0e7705692 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -1459,7 +1459,7 @@ static UINT8 *K007342_videoram_0,*K007342_colorram_0; static UINT8 *K007342_videoram_1,*K007342_colorram_1; static UINT8 K007342_regs[8]; static void (*K007342_callback)(int tmap, int bank, int *code, int *color, int *flags); -static tilemap *K007342_tilemap[2]; +static tilemap_t *K007342_tilemap[2]; /*************************************************************************** @@ -1895,7 +1895,7 @@ static int K052109_tileflip_enable; static UINT8 K052109_irq_enabled; static INT32 K052109_dx[3], K052109_dy[3]; static UINT8 K052109_romsubbank,K052109_scrollctrl; -tilemap *K052109_tilemap[3]; +tilemap_t *K052109_tilemap[3]; @@ -4549,7 +4549,7 @@ static int K051316_bpp[MAX_K051316]; static void (*K051316_callback[MAX_K051316])(int *code,int *color,int *flags); static UINT8 *K051316_ram[MAX_K051316]; static UINT8 K051316_ctrlram[MAX_K051316][16]; -static tilemap *K051316_tilemap[MAX_K051316]; +static tilemap_t *K051316_tilemap[MAX_K051316]; /*************************************************************************** @@ -4907,7 +4907,7 @@ static int K053936_wraparound[K053936_MAX_CHIPS]; // there is another implementation of this in machine/konamigx.c (!) // why? -static void K053936_zoom_draw(int chip,UINT16 *ctrl,UINT16 *linectrl, bitmap_t *bitmap,const rectangle *cliprect,tilemap *tmap,int flags,UINT32 priority, int glfgreat_hack) +static void K053936_zoom_draw(int chip,UINT16 *ctrl,UINT16 *linectrl, bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int flags,UINT32 priority, int glfgreat_hack) { if (!tmap) return; @@ -5028,12 +5028,12 @@ if (input_code_pressed(machine, KEYCODE_D)) } -void K053936_0_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap *tmap,int flags,UINT32 priority, int glfgreat_hack) +void K053936_0_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int flags,UINT32 priority, int glfgreat_hack) { K053936_zoom_draw(0,K053936_0_ctrl,K053936_0_linectrl,bitmap,cliprect,tmap,flags,priority, glfgreat_hack); } -void K053936_1_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap *tmap,int flags,UINT32 priority, int glfgreat_hack) +void K053936_1_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int flags,UINT32 priority, int glfgreat_hack) { K053936_zoom_draw(1,K053936_1_ctrl,K053936_1_linectrl,bitmap,cliprect,tmap,flags,priority, glfgreat_hack); } @@ -5061,7 +5061,7 @@ void K053936_set_offset(int chip, int xoffs, int yoffs) static UINT8 K053251_ram[16]; static int K053251_palette_index[5]; -static tilemap *K053251_tilemaps[5]; +static tilemap_t *K053251_tilemaps[5]; static int K053251_tilemaps_set; static STATE_POSTLOAD( K053251_reset_indexes ) @@ -5081,7 +5081,7 @@ void K053251_vh_start(running_machine *machine) state_save_register_postload(machine, K053251_reset_indexes, NULL); } -void K053251_set_tilemaps(tilemap *ci0,tilemap *ci1,tilemap *ci2,tilemap *ci3,tilemap *ci4) +void K053251_set_tilemaps(tilemap_t *ci0,tilemap_t *ci1,tilemap_t *ci2,tilemap_t *ci3,tilemap_t *ci4) { K053251_tilemaps[0] = ci0; K053251_tilemaps[1] = ci1; @@ -5336,7 +5336,7 @@ READ8_HANDLER( K051733_r ) #define K056832_PAGE_WIDTH (K056832_PAGE_COLS*8) #define K056832_PAGE_COUNT 16 -static tilemap *K056832_tilemap[K056832_PAGE_COUNT]; +static tilemap_t *K056832_tilemap[K056832_PAGE_COUNT]; static bitmap_t *K056832_pixmap[K056832_PAGE_COUNT]; static UINT16 K056832_regs[0x20]; // 157/832 regs group 1 @@ -5623,7 +5623,7 @@ void K056832_vh_start(running_machine *machine, const char *gfx_memory_region, i void (*callback)(int layer, int *code, int *color, int *flags), int djmain_hack) { - tilemap *tmap; + tilemap_t *tmap; int gfx_index; int i; UINT32 total; @@ -6438,7 +6438,7 @@ static int K056832_update_linemap(running_machine *machine, bitmap_t *bitmap, in { rectangle zerorect; - tilemap *tmap; + tilemap_t *tmap; UINT32 *dirty; int all_dirty; bitmap_t* xprmap; @@ -6565,7 +6565,7 @@ void K056832_tilemap_draw(running_machine *machine, bitmap_t *bitmap, const rect int cminy, cmaxy, cminx, cmaxx; int dminy, dmaxy, dminx, dmaxx; rectangle drawrect; - tilemap *tmap; + tilemap_t *tmap; UINT16 *pScrollData; UINT16 ram16[2]; @@ -6854,7 +6854,7 @@ void K056832_tilemap_draw_dj(running_machine *machine, bitmap_t *bitmap, const r int cminy, cmaxy, cminx, cmaxx; int dminy, dmaxy, dminx, dmaxx; rectangle drawrect; - tilemap *tmap; + tilemap_t *tmap; UINT16 *pScrollData; UINT16 ram16[2]; diff --git a/src/mame/video/konamiic.h b/src/mame/video/konamiic.h index 7d9ab323c9e..46e9a81eb4c 100644 --- a/src/mame/video/konamiic.h +++ b/src/mame/video/konamiic.h @@ -63,7 +63,7 @@ The callback must put: structure (e.g. TILE_FLIPX). Note that TILE_FLIPY is handled internally by the chip so it must not be set by the callback. */ -extern tilemap *K052109_tilemap[3]; +extern tilemap_t *K052109_tilemap[3]; void K052109_vh_start(running_machine *machine,const char *gfx_memory_region,int plane_order, void (*callback)(int layer,int bank,int *code,int *color,int *flags,int *priority)); @@ -223,8 +223,8 @@ void K051316_set_offset(int chip, int xoffs, int yoffs); extern UINT16 *K053936_0_ctrl,*K053936_0_linectrl; extern UINT16 *K053936_1_ctrl,*K053936_1_linectrl; -void K053936_0_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap *tmap,int flags,UINT32 priority, int glfgreat_hack); -void K053936_1_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap *tmap,int flags,UINT32 priority, int glfgreat_hack); +void K053936_0_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int flags,UINT32 priority, int glfgreat_hack); +void K053936_1_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int flags,UINT32 priority, int glfgreat_hack); void K053936_wraparound_enable(int chip, int status); void K053936_set_offset(int chip, int xoffs, int yoffs); @@ -240,7 +240,7 @@ WRITE16_HANDLER( K053251_msb_w ); enum { K053251_CI0=0,K053251_CI1,K053251_CI2,K053251_CI3,K053251_CI4 }; int K053251_get_priority(int ci); int K053251_get_palette_index(int ci); -void K053251_set_tilemaps(tilemap *ci0,tilemap *ci1,tilemap *ci2,tilemap *ci3,tilemap *ci4); +void K053251_set_tilemaps(tilemap_t *ci0,tilemap_t *ci1,tilemap_t *ci2,tilemap_t *ci3,tilemap_t *ci4); void K053251_vh_start(running_machine *machine); diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index a531a506c05..86a9548df1d 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -1541,7 +1541,7 @@ struct _k007342_state UINT8 *colorram_0; UINT8 *colorram_1; - tilemap *tilemap[2]; + tilemap_t *tilemap[2]; int flipscreen, gfxnum, int_enabled; UINT8 regs[8]; UINT16 scrollx[2]; @@ -2103,7 +2103,7 @@ struct _k052109_state UINT8 *colorram_A; UINT8 *colorram_B; - tilemap *tilemap[3]; + tilemap_t *tilemap[3]; int tileflip_enable, gfxnum; UINT8 charrombank[4]; UINT8 charrombank_2[4]; @@ -5064,7 +5064,7 @@ struct _k051316_state { UINT8 *ram; - tilemap *tmap; + tilemap_t *tmap; int gfxnum, wraparound, bpp; int offset[2]; @@ -5415,7 +5415,7 @@ READ16_DEVICE_HANDLER( k053936_linectrl_r ) // there is another implementation of this in video/konamigx.c (!) // why? shall they be merged? -void k053936_zoom_draw( const device_config *device, bitmap_t *bitmap, const rectangle *cliprect, tilemap *tmap, int flags, UINT32 priority, int glfgreat_hack ) +void k053936_zoom_draw( const device_config *device, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int flags, UINT32 priority, int glfgreat_hack ) { k053936_state *k053936= k053936_get_safe_token(device); if (!tmap) @@ -6008,7 +6008,7 @@ static DEVICE_RESET( k051733 ) typedef struct _k056832_state k056832_state; struct _k056832_state { - tilemap *tilemap[K056832_PAGE_COUNT]; + tilemap_t *tilemap[K056832_PAGE_COUNT]; bitmap_t *pixmap[K056832_PAGE_COUNT]; UINT16 regs[0x20]; // 157/832 regs group 1 @@ -6920,7 +6920,7 @@ static int k056832_update_linemap( const device_config *device, bitmap_t *bitmap { rectangle zerorect; - tilemap *tmap; + tilemap_t *tmap; UINT32 *dirty; int all_dirty; bitmap_t* xprmap; @@ -7045,7 +7045,7 @@ void k056832_tilemap_draw( const device_config *device, bitmap_t *bitmap, const int cminy, cmaxy, cminx, cmaxx; int dminy, dmaxy, dminx, dmaxx; rectangle drawrect; - tilemap *tmap; + tilemap_t *tmap; UINT16 *p_scroll_data; UINT16 ram16[2]; @@ -7352,7 +7352,7 @@ void k056832_tilemap_draw_dj( const device_config *device, bitmap_t *bitmap, con int cminy, cmaxy, cminx, cmaxx; int dminy, dmaxy, dminx, dmaxx; rectangle drawrect; - tilemap *tmap; + tilemap_t *tmap; UINT16 *p_scroll_data; UINT16 ram16[2]; @@ -7687,7 +7687,7 @@ static DEVICE_START( k056832 ) k056832_state *k056832 = k056832_get_safe_token(device); const k056832_interface *intf = k056832_get_interface(device); running_machine *machine = device->machine; - tilemap *tmap; + tilemap_t *tmap; int i; UINT32 total; static const gfx_layout charlayout8 = @@ -10080,8 +10080,8 @@ typedef struct _k001604_state k001604_state; struct _k001604_state { const device_config *screen; - tilemap *layer_8x8[2]; - tilemap *layer_roz[2]; + tilemap_t *layer_8x8[2]; + tilemap_t *layer_roz[2]; int gfx_index[2]; UINT32 * tile_ram; @@ -10505,7 +10505,7 @@ typedef struct _k037122_state k037122_state; struct _k037122_state { const device_config *screen; - tilemap *layer[2]; + tilemap_t *layer[2]; int gfx_index; UINT32 * tile_ram; diff --git a/src/mame/video/konicdev.h b/src/mame/video/konicdev.h index 2114514e8e7..69b2eb07094 100644 --- a/src/mame/video/konicdev.h +++ b/src/mame/video/konicdev.h @@ -567,7 +567,7 @@ WRITE16_DEVICE_HANDLER( k053936_ctrl_w ); READ16_DEVICE_HANDLER( k053936_ctrl_r ); // FIXME: this is probably unused... to be checked! WRITE16_DEVICE_HANDLER( k053936_linectrl_w ); READ16_DEVICE_HANDLER( k053936_linectrl_r ); -void k053936_zoom_draw(const device_config *device, bitmap_t *bitmap, const rectangle *cliprect, tilemap *tmap, int flags, UINT32 priority, int glfgreat_hack); +void k053936_zoom_draw(const device_config *device, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int flags, UINT32 priority, int glfgreat_hack); void k053936_wraparound_enable(const device_config *device, int status); // shall we merge this into the configuration intf? void k053936_set_offset(const device_config *device, int xoffs, int yoffs); // shall we merge this into the configuration intf? diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c index 3903052ad88..d8f759435f5 100644 --- a/src/mame/video/legionna.c +++ b/src/mame/video/legionna.c @@ -9,7 +9,7 @@ UINT16 *legionna_back_data,*legionna_fore_data,*legionna_mid_data,*legionna_scrollram16,*legionna_textram; -static tilemap *background_layer,*foreground_layer,*midground_layer,*text_layer; +static tilemap_t *background_layer,*foreground_layer,*midground_layer,*text_layer; UINT16 legionna_layer_disable; /******************************************************************************/ diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 3730bed9d89..de9a0ba97f2 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -15,7 +15,7 @@ UINT8 *liberate_videoram; UINT8 *liberate_colorram; static int background_color, background_disable; -static tilemap *background_tilemap, *fix_tilemap; +static tilemap_t *background_tilemap, *fix_tilemap; static UINT8 deco16_io_ram[16]; extern UINT8 *prosoccr_charram; extern UINT8 *prosport_bg_vram; diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index 2ef1c82285f..d9a14abdd39 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -1,7 +1,7 @@ #include "driver.h" #include "includes/lkage.h" -static tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; static UINT8 bg_tile_bank, fg_tile_bank; UINT8 *lkage_scroll, *lkage_vreg; diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index 4df984fab5a..8f9f265c84d 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -38,7 +38,7 @@ size_t lockon_groundram_size; * *************************************/ -static tilemap *lockon_tilemap; +static tilemap_t *lockon_tilemap; static UINT8 ground_ctrl; static UINT16 scroll_h; static UINT16 scroll_v; diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index 48ab27d3b94..8b5a6fbf0b0 100644 --- a/src/mame/video/lordgun.c +++ b/src/mame/video/lordgun.c @@ -56,7 +56,7 @@ lordgun_gun_data lordgun_gun[2]; ***************************************************************************/ -static tilemap *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; +static tilemap_t *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; static TILE_GET_INFO( get_tile_info_0 ) { diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c index 64810582aac..7cb4a042497 100644 --- a/src/mame/video/lucky74.c +++ b/src/mame/video/lucky74.c @@ -98,7 +98,7 @@ UINT8 *lucky74_fg_videoram, *lucky74_fg_colorram, *lucky74_bg_videoram, *lucky74_bg_colorram; -static tilemap *fg_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *bg_tilemap; WRITE8_HANDLER( lucky74_fg_videoram_w ) diff --git a/src/mame/video/lvcards.c b/src/mame/video/lvcards.c index d3a58745027..e3bb46bb90d 100644 --- a/src/mame/video/lvcards.c +++ b/src/mame/video/lvcards.c @@ -10,7 +10,7 @@ UINT8 *lvcards_videoram; UINT8 *lvcards_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; PALETTE_INIT( ponttehk ) { diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c index cccd8ba0f85..d502a186ca2 100644 --- a/src/mame/video/m107.c +++ b/src/mame/video/m107.c @@ -40,7 +40,7 @@ typedef struct _pf_layer_info pf_layer_info; struct _pf_layer_info { - tilemap * tmap; + tilemap_t * tmap; UINT16 vram_base; UINT16 control[4]; }; diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c index beb5377ce97..189b67f1df7 100644 --- a/src/mame/video/m72.c +++ b/src/mame/video/m72.c @@ -7,7 +7,7 @@ UINT16 *m72_videoram1,*m72_videoram2,*majtitle_rowscrollram; UINT32 m72_raster_irq_position; static UINT16 *m72_spriteram; -static tilemap *fg_tilemap,*bg_tilemap; +static tilemap_t *fg_tilemap,*bg_tilemap; static INT32 scrollx1,scrolly1,scrollx2,scrolly2; static INT32 video_off; diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c index b2cfdc15c11..32ea857c826 100644 --- a/src/mame/video/m90.c +++ b/src/mame/video/m90.c @@ -31,7 +31,7 @@ static UINT16 *m90_spriteram; UINT16 *m90_video_data; static UINT16 m90_video_control_data[8]; -static tilemap *pf1_layer,*pf2_layer,*pf1_wide_layer,*pf2_wide_layer; +static tilemap_t *pf1_layer,*pf2_layer,*pf1_wide_layer,*pf2_wide_layer; INLINE void get_tile_info(running_machine *machine,tile_data *tileinfo,int tile_index,int layer,int page_mask) { @@ -268,7 +268,7 @@ WRITE16_HANDLER( m90_video_control_w ) COMBINE_DATA(&m90_video_control_data[offset]); } -static void markdirty(tilemap *tmap,int page,offs_t offset) +static void markdirty(tilemap_t *tmap,int page,offs_t offset) { offset -= page * 0x2000; diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index 554d83ab579..c0d157f439e 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -45,8 +45,8 @@ typedef struct _pf_layer_info pf_layer_info; struct _pf_layer_info { - tilemap * tmap; - tilemap * wide_tmap; + tilemap_t * tmap; + tilemap_t * wide_tmap; UINT16 vram_base; UINT16 control[4]; }; diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index 0f3f2db9a22..dc45890fc36 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -12,7 +12,7 @@ UINT32 *macrossp_spriteram; static UINT32 *spriteram_old,*spriteram_old2; -static tilemap *macrossp_scra_tilemap, *macrossp_scrb_tilemap,*macrossp_scrc_tilemap, *macrossp_text_tilemap; +static tilemap_t *macrossp_scra_tilemap, *macrossp_scrb_tilemap,*macrossp_scrc_tilemap, *macrossp_text_tilemap; /*** SCR A LAYER ***/ @@ -295,7 +295,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static void draw_layer(bitmap_t *bitmap, const rectangle *cliprect, int layer) { - tilemap *tm; + tilemap_t *tm; UINT32 *vr; switch (layer) diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index c079912aa13..5a7782fe7ea 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -24,10 +24,10 @@ UINT8 *madalien_edge1_pos; UINT8 *madalien_edge2_pos; UINT8 *madalien_headlight_pos; -static tilemap *tilemap_fg; +static tilemap_t *tilemap_fg; -static tilemap *tilemap_edge1[4]; -static tilemap *tilemap_edge2[4]; +static tilemap_t *tilemap_edge1[4]; +static tilemap_t *tilemap_edge2[4]; static bitmap_t *headlight_bitmap; diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index d64e8b6bc18..66fd1a8fd82 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -16,7 +16,7 @@ UINT16 *madmotor_pf2_control; UINT16 *madmotor_pf3_control; static int flipscreen; -static tilemap *madmotor_pf1_tilemap,*madmotor_pf2_tilemap,*madmotor_pf3_tilemap,*madmotor_pf3a_tilemap; +static tilemap_t *madmotor_pf1_tilemap,*madmotor_pf2_tilemap,*madmotor_pf3_tilemap,*madmotor_pf3a_tilemap; diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c index 551ce427c73..2f44b5c9781 100644 --- a/src/mame/video/mainsnk.c +++ b/src/mame/video/mainsnk.c @@ -1,7 +1,7 @@ #include "driver.h" -static tilemap *tx_tilemap; -static tilemap *bg_tilemap; +static tilemap_t *tx_tilemap; +static tilemap_t *bg_tilemap; UINT8 *mainsnk_fgram; UINT8 *mainsnk_bgram; diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index 66103b1ec47..62df7f59292 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -13,7 +13,7 @@ Video hardware driver by Uki UINT8 *markham_xscroll; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; PALETTE_INIT( markham ) { diff --git a/src/mame/video/mayumi.c b/src/mame/video/mayumi.c index 38df6ab1f36..062ff0b9183 100644 --- a/src/mame/video/mayumi.c +++ b/src/mame/video/mayumi.c @@ -10,7 +10,7 @@ Video hardware #include "driver.h" UINT8 *mayumi_videoram; -static tilemap *mayumi_tilemap; +static tilemap_t *mayumi_tilemap; static TILE_GET_INFO( get_tile_info ) { diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index 5d4346e5bd8..b1b31762ba7 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -14,7 +14,7 @@ ToDo: Fix Sprites & Rowscroll/Select for Cocktail #include "profiler.h" #include "includes/mcatadv.h" -static tilemap *mcatadv_tilemap1, *mcatadv_tilemap2; +static tilemap_t *mcatadv_tilemap1, *mcatadv_tilemap2; static UINT16 *spriteram_old, *vidregs_old; static int palette_bank1, palette_bank2; @@ -151,7 +151,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static void mcatadv_draw_tilemap_part(UINT16* current_scroll, UINT16* current_videoram1, int i, tilemap* current_tilemap, bitmap_t *bitmap, const rectangle *cliprect) +static void mcatadv_draw_tilemap_part(UINT16* current_scroll, UINT16* current_videoram1, int i, tilemap_t* current_tilemap, bitmap_t *bitmap, const rectangle *cliprect) { int flip; UINT32 drawline; diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c index f3c66678373..1924efd7d4e 100644 --- a/src/mame/video/mcr.c +++ b/src/mame/video/mcr.c @@ -11,7 +11,7 @@ INT8 mcr12_sprite_xoffs; INT8 mcr12_sprite_xoffs_flip; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /************************************* diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c index db22b194c6a..f7a207c0c35 100644 --- a/src/mame/video/mcr3.c +++ b/src/mame/video/mcr3.c @@ -31,8 +31,8 @@ UINT8 *spyhunt_alpharam; * *************************************/ -static tilemap *bg_tilemap; -static tilemap *alpha_tilemap; +static tilemap_t *bg_tilemap; +static tilemap_t *alpha_tilemap; diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index b81488b6dbd..fd6c9f113d9 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -14,8 +14,8 @@ UINT8 mcr68_sprite_clip; INT8 mcr68_sprite_xoffset; -static tilemap *bg_tilemap; -static tilemap *fg_tilemap; +static tilemap_t *bg_tilemap; +static tilemap_t *fg_tilemap; diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c index 227f48ac261..f3e93cfe81d 100644 --- a/src/mame/video/meadows.c +++ b/src/mame/video/meadows.c @@ -12,7 +12,7 @@ #define SPR_ADJUST_Y -14 -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /************************************* diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index cdde055fbaf..4592b04ee7d 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -195,7 +195,7 @@ actual code sent to the hardware. #include "includes/megasys1.h" /* Variables defined here, that have to be shared: */ -tilemap *megasys1_tmap[3]; +tilemap_t *megasys1_tmap[3]; UINT16 *megasys1_scrollram[3]; UINT16 *megasys1_objectram, *megasys1_vregs, *megasys1_ram; @@ -209,7 +209,7 @@ static int megasys1_sprite_bank; static int megasys1_screen_flag, megasys1_sprite_flag; static int megasys1_8x8_scroll_factor[3], megasys1_16x16_scroll_factor[3]; -static tilemap *megasys1_tilemap[3][2][4]; +static tilemap_t *megasys1_tilemap[3][2][4]; /* Variables defined in driver: */ static int hardware_type_z; diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index a0ca3d4d1d1..5c747a9189d 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -1,6 +1,6 @@ #include "driver.h" -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; UINT8* mermaid_videoram; UINT8* mermaid_colorram; diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 505bacd7a52..8eb5c56b492 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -22,7 +22,7 @@ /* Local variables: */ -static tilemap *bg_tilemap,*fg_tilemap; +static tilemap_t *bg_tilemap,*fg_tilemap; static UINT8 metlclsh_write_mask, *metlclsh_otherram; diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 0de0b902b06..3762b88cde8 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -69,7 +69,7 @@ static int has_zoom; UINT16 *metro_K053936_ram; -static tilemap *metro_K053936_tilemap; +static tilemap_t *metro_K053936_tilemap; static UINT16 *metro_tiletable_old; static UINT8 *dirtyindex; @@ -163,8 +163,8 @@ WRITE16_HANDLER( metro_paletteram_w ) ***************************************************************************/ -static tilemap *bg_tilemap[3]; -static tilemap *tilemap_16x16[3]; +static tilemap_t *bg_tilemap[3]; +static tilemap_t *tilemap_16x16[3]; static UINT8 *empty_tiles; /* A 2048 x 2048 virtual tilemap */ @@ -735,7 +735,7 @@ void metro_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectan ***************************************************************************/ -static void draw_tilemap(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap *tmap, UINT32 flags, UINT32 priority, +static void draw_tilemap(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, UINT32 flags, UINT32 priority, int sx, int sy, int wx, int wy) // scroll & window values { #if 1 diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index c465ea8265b..e42d48733d6 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -13,7 +13,7 @@ static int palettebank; UINT8 *mikie_videoram; UINT8 *mikie_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index d60e5d1941b..c09cf1d4d66 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -2,7 +2,7 @@ #include "includes/mjkjidai.h" static int display_enable; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; diff --git a/src/mame/video/mole.c b/src/mame/video/mole.c index 54a035cb8a8..a48e049ee15 100644 --- a/src/mame/video/mole.c +++ b/src/mame/video/mole.c @@ -10,7 +10,7 @@ static int tile_bank; static UINT16 *tileram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; PALETTE_INIT( mole ) { diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c index a3aee980bc2..de16369ec0c 100644 --- a/src/mame/video/mosaic.c +++ b/src/mame/video/mosaic.c @@ -12,7 +12,7 @@ UINT8 *mosaic_fgvideoram; UINT8 *mosaic_bgvideoram; -static tilemap *bg_tilemap,*fg_tilemap; +static tilemap_t *bg_tilemap,*fg_tilemap; diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 698834a4c58..bfb022d508d 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -10,7 +10,7 @@ UINT8 *mrdo_bgvideoram,*mrdo_fgvideoram; -static tilemap *bg_tilemap,*fg_tilemap; +static tilemap_t *bg_tilemap,*fg_tilemap; static int flipscreen; diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index f4c90a6d02d..e68c99c8201 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -10,7 +10,7 @@ UINT8 *mrjong_videoram; UINT8 *mrjong_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c index 3948251a247..5a25c304575 100644 --- a/src/mame/video/ms32.c +++ b/src/mame/video/ms32.c @@ -51,8 +51,8 @@ static int ms32_reverse_sprite_order; /********** Tilemaps **********/ -tilemap *ms32_tx_tilemap, *ms32_roz_tilemap, *ms32_bg_tilemap, *ms32_bg_tilemap_alt; -tilemap *ms32_extra_tilemap; +tilemap_t *ms32_tx_tilemap, *ms32_roz_tilemap, *ms32_bg_tilemap, *ms32_bg_tilemap_alt; +tilemap_t *ms32_extra_tilemap; static int flipscreen; diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index c695fd9b974..defb9f5e87d 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -2,7 +2,7 @@ #include "driver.h" -static tilemap *mugsmash_tilemap1, *mugsmash_tilemap2; +static tilemap_t *mugsmash_tilemap1, *mugsmash_tilemap2; extern UINT16 *mugsmash_videoram1, *mugsmash_videoram2, *mugs_spriteram; extern UINT16 *mugsmash_regs1, *mugsmash_regs2; diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c index f5b03490f78..8705d5660a8 100644 --- a/src/mame/video/mustache.c +++ b/src/mame/video/mustache.c @@ -8,7 +8,7 @@ #include "driver.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int control_byte; PALETTE_INIT(mustache) diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c index e18ed2541fe..8517b8dde15 100644 --- a/src/mame/video/mystwarr.c +++ b/src/mame/video/mystwarr.c @@ -13,7 +13,7 @@ static int layer_colorbase[6]; static int oinprion, cbparam; static int sprite_colorbase, sub1_colorbase, last_psac_colorbase, gametype; static int roz_enable, roz_rombank; -static tilemap *ult_936_tilemap; +static tilemap_t *ult_936_tilemap; // create a decoding buffer to hold decodable tiles so that the ROM test will pass by // reading the original raw data diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c index 869eed167ac..5abffe1f3da 100644 --- a/src/mame/video/namcona1.c +++ b/src/mame/video/namcona1.c @@ -21,9 +21,9 @@ UINT16 *namcona1_workram; /* private variables */ static UINT16 *shaperam; static UINT16 *cgram; -static tilemap *roz_tilemap; +static tilemap_t *roz_tilemap; static int roz_palette; -static tilemap *bg_tilemap[NAMCONA1_NUM_TILEMAPS]; +static tilemap_t *bg_tilemap[NAMCONA1_NUM_TILEMAPS]; static int tilemap_palette_bank[NAMCONA1_NUM_TILEMAPS]; static int palette_is_dirty; diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c index e94859a0ae1..47e741e7d2b 100644 --- a/src/mame/video/namcos1.c +++ b/src/mame/video/namcos1.c @@ -48,7 +48,7 @@ static UINT8 *namcos1_spriteram; static UINT8 namcos1_playfield_control[0x20]; -static tilemap *bg_tilemap[6]; +static tilemap_t *bg_tilemap[6]; static UINT8 *tilemap_maskdata; static int copy_sprites; diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c index f0d82394305..17967317fa4 100644 --- a/src/mame/video/namcos2.c +++ b/src/mame/video/namcos2.c @@ -12,7 +12,7 @@ size_t namcos2_68k_palette_size; UINT16 *namcos2_68k_roz_ram; static UINT16 namcos2_68k_roz_ctrl[0x8]; -static tilemap *tilemap_roz; +static tilemap_t *tilemap_roz; static void TilemapCB( UINT16 code, int *tile, int *mask ) @@ -74,7 +74,7 @@ struct RozParam static void DrawRozHelper( bitmap_t *bitmap, - tilemap *tmap, + tilemap_t *tmap, const rectangle *clip, const struct RozParam *rozInfo ) { diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index fc1504aa953..77842aae9eb 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -1506,7 +1506,7 @@ static void UpdatePalette(running_machine *machine) /* for System22 - ignore gam } } /* UpdatePalette */ -static tilemap *bgtilemap; +static tilemap_t *bgtilemap; static TILE_GET_INFO( TextTilemapGetInfo ) { diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c index 27e1e6fd6f0..061b9961ecf 100644 --- a/src/mame/video/namcos86.c +++ b/src/mame/video/namcos86.c @@ -12,7 +12,7 @@ UINT8 *rthunder_videoram1, *rthunder_videoram2, *rthunder_spriteram; static int tilebank; static int xscroll[4], yscroll[4]; /* scroll + priority */ -static tilemap *bg_tilemap[4]; +static tilemap_t *bg_tilemap[4]; static int backcolor; static const UINT8 *tile_address_prom; diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index 3c03eed61e1..85851c28686 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -22,7 +22,7 @@ static int tilemap_flip; static int flipscreen; static UINT8 irq_port_last; -static tilemap *background, *foreground; +static tilemap_t *background, *foreground; static const struct { diff --git a/src/mame/video/news.c b/src/mame/video/news.c index 364e52519d9..2da64ecec11 100644 --- a/src/mame/video/news.c +++ b/src/mame/video/news.c @@ -6,7 +6,7 @@ UINT8 *news_fgram; UINT8 *news_bgram; static int bgpic; -static tilemap *fg_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *bg_tilemap; diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c index 88546ad6c4f..f6851e2255c 100644 --- a/src/mame/video/ninjakd2.c +++ b/src/mame/video/ninjakd2.c @@ -11,11 +11,11 @@ static bitmap_t *sp_bitmap; // in robokid and omegaf big sprites are laid out differently in ROM static int robokid_sprites; -static tilemap* fg_tilemap; -static tilemap* bg_tilemap; -static tilemap* bg0_tilemap; -static tilemap* bg1_tilemap; -static tilemap* bg2_tilemap; +static tilemap_t* fg_tilemap; +static tilemap_t* bg_tilemap; +static tilemap_t* bg0_tilemap; +static tilemap_t* bg1_tilemap; +static tilemap_t* bg2_tilemap; static int bank_mask; static int robokid_bg0_bank = 0; @@ -302,7 +302,7 @@ WRITE8_HANDLER( robokid_bg2_videoram_w ) -static void bg_ctrl(int offset, int data, tilemap* tilemap) +static void bg_ctrl(int offset, int data, tilemap_t* tilemap) { int scrollx = tilemap_get_scrollx(tilemap, 0); int scrolly = tilemap_get_scrolly(tilemap, 0); diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c index 04b051a15e8..1f421539440 100644 --- a/src/mame/video/nitedrvr.c +++ b/src/mame/video/nitedrvr.c @@ -9,7 +9,7 @@ UINT8 *nitedrvr_hvc; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; WRITE8_HANDLER( nitedrvr_videoram_w ) { diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c index 79e068a660e..4c809556be3 100644 --- a/src/mame/video/nmk16.c +++ b/src/mame/video/nmk16.c @@ -34,14 +34,14 @@ static int videoshift; static int bioship_background_bank; static UINT8 bioship_scroll[4]; -static tilemap *bg_tilemap0; -static tilemap *bg_tilemap1; -static tilemap *bg_tilemap2; -static tilemap *bg_tilemap3; +static tilemap_t *bg_tilemap0; +static tilemap_t *bg_tilemap1; +static tilemap_t *bg_tilemap2; +static tilemap_t *bg_tilemap3; -static tilemap *tx_tilemap; +static tilemap_t *tx_tilemap; -static tilemap *fg_tilemap; // strahl +static tilemap_t *fg_tilemap; // strahl static bitmap_t *background_bitmap; // bioship /*************************************************************************** @@ -596,7 +596,7 @@ VIDEO_UPDATE( gunnail ) { int const yscroll = gunnail_scrollramy[0] + gunnail_scrollramy[y1]; int tilemap_bank_select; - tilemap* bg_tilemap = bg_tilemap0; + tilemap_t* bg_tilemap = bg_tilemap0; bgclip.min_y = y1; bgclip.max_y = y1; @@ -627,7 +627,7 @@ VIDEO_UPDATE( gunnail ) UINT16 yscroll = ((gunnail_scrollram[2]&0xff)<<8) | ((gunnail_scrollram[3]&0xff)<<0); UINT16 xscroll = ((gunnail_scrollram[0]&0xff)<<8) | ((gunnail_scrollram[1]&0xff)<<0); int tilemap_bank_select; - tilemap* bg_tilemap = bg_tilemap0; + tilemap_t* bg_tilemap = bg_tilemap0; //popmessage( "scroll %04x, %04x", yscroll,xscroll); diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index ce0a9587bf7..3438cd1dcac 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -3,7 +3,7 @@ UINT8 *nova2001_fg_videoram, *nova2001_bg_videoram; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; /************************************* diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index d9fa86e653b..4200bb18112 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -14,7 +14,7 @@ static int nycaptor_mask=0; #endif -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int char_bank,palette_bank,gfxctrl; UINT8 *nycaptor_scrlram; diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index 81f380c1917..9547d9e4b5e 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -4,7 +4,7 @@ UINT16 *ohmygod_videoram; static int spritebank; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index 6cbe549df70..628a2a0259f 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -17,7 +17,7 @@ static UINT8 *ojankohs_paletteram; static int ojankohs_gfxreg; static int ojankohs_flipscreen; static int ojankohs_scrollx, ojankohs_scrolly; -static tilemap *ojankohs_tilemap; +static tilemap_t *ojankohs_tilemap; static int ojankoc_screen_refresh; static bitmap_t *ojankoc_tmpbitmap; diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 70090945703..649bf0801bf 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -3,9 +3,9 @@ #include "driver.h" #include "includes/oneshot.h" -static tilemap *oneshot_bg_tilemap; -static tilemap *oneshot_mid_tilemap; -static tilemap *oneshot_fg_tilemap; +static tilemap_t *oneshot_bg_tilemap; +static tilemap_t *oneshot_mid_tilemap; +static tilemap_t *oneshot_fg_tilemap; /* bg tilemap */ static TILE_GET_INFO( get_oneshot_bg_tile_info ) diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index 3febf0ead94..ff9d6d54d33 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -10,7 +10,7 @@ Atari Orbit video emulation UINT8* orbit_playfield_ram; UINT8* orbit_sprite_ram; -static tilemap* bg_tilemap; +static tilemap_t* bg_tilemap; static int orbit_flip_screen; diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c index 2b951fa5207..f598578f989 100644 --- a/src/mame/video/othldrby.c +++ b/src/mame/video/othldrby.c @@ -11,7 +11,7 @@ static UINT16 *vram,*buf_spriteram,*buf_spriteram2; #define VREG_SIZE 18 static UINT16 vreg[VREG_SIZE]; -static tilemap *bg_tilemap[3]; +static tilemap_t *bg_tilemap[3]; /*************************************************************************** diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index 6c6bfd55c27..05c9dbd24d2 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -32,7 +32,7 @@ UINT8 *pacland_videoram,*pacland_videoram2,*pacland_spriteram; static UINT8 palette_bank; static const UINT8 *pacland_color_prom; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; static bitmap_t *fg_bitmap; static UINT32 *transmask[3]; diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index 890ee5364bd..8a9046cf75f 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -22,7 +22,7 @@ UINT8 *pacman_videoram; UINT8 *pacman_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 charbank; static UINT8 spritebank; static UINT8 palettebank; diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index 9b275ee6e91..40dd0be36a2 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -69,7 +69,7 @@ WRITE8_HANDLER( paradise_palette_w ) ***************************************************************************/ -static tilemap *tilemap_0,*tilemap_1,*tilemap_2; +static tilemap_t *tilemap_0,*tilemap_1,*tilemap_2; /* Background */ WRITE8_HANDLER( paradise_vram_0_w ) diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c index 11041a70ecb..77b376dba34 100644 --- a/src/mame/video/pass.c +++ b/src/mame/video/pass.c @@ -2,8 +2,8 @@ #include "driver.h" -static tilemap *pass_bg_tilemap; -static tilemap *pass_fg_tilemap; +static tilemap_t *pass_bg_tilemap; +static tilemap_t *pass_fg_tilemap; /* in drivers/pass.c */ extern UINT16 *pass_bg_videoram; diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index 0a3ba6e799f..f41985100c9 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -13,7 +13,7 @@ UINT8 *pbaction_videoram2, *pbaction_colorram2; static int scroll; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; WRITE8_HANDLER( pbaction_videoram_w ) { diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c index fcc274746e7..9e497ae7f26 100644 --- a/src/mame/video/pcktgal.c +++ b/src/mame/video/pcktgal.c @@ -1,6 +1,6 @@ #include "driver.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; PALETTE_INIT( pcktgal ) { diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c index e76fbc91ed1..bdfcf739215 100644 --- a/src/mame/video/phoenix.c +++ b/src/mame/video/phoenix.c @@ -17,7 +17,7 @@ static UINT8 cocktail_mode; static UINT8 pleiads_protection_question; static UINT8 survival_protection_value; static int survival_sid_value; -static tilemap *fg_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *bg_tilemap; static UINT8 survival_input_latches[2]; static UINT8 survival_input_readc; diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c index feed3ebb35b..1102f12ae71 100644 --- a/src/mame/video/pingpong.c +++ b/src/mame/video/pingpong.c @@ -8,7 +8,7 @@ #include "driver.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; UINT8 *pingpong_videoram; UINT8 *pingpong_colorram; diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c index 0c174dac776..fee2a8d7b59 100644 --- a/src/mame/video/pirates.c +++ b/src/mame/video/pirates.c @@ -5,7 +5,7 @@ UINT16 *pirates_tx_tileram, *pirates_spriteram; UINT16 *pirates_fg_tileram, *pirates_bg_tileram; UINT16 *pirates_scroll; -static tilemap *tx_tilemap, *fg_tilemap, *bg_tilemap; +static tilemap_t *tx_tilemap, *fg_tilemap, *bg_tilemap; /* Video Hardware */ diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index f1c43fc4109..52284827ed8 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -26,7 +26,7 @@ static int pitnrun_scroll; static int pitnrun_char_bank; static int pitnrun_color_select; static bitmap_t *tmp_bitmap[4]; -static tilemap *bg, *fg; +static tilemap_t *bg, *fg; UINT8* pitnrun_videoram2; diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index 4c687eb9aac..9ca727bae8f 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -4,7 +4,7 @@ static int pc10_bios; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; WRITE8_HANDLER( playch10_videoram_w ) { diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index 2670915b784..cd47d44fdc3 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -8,7 +8,7 @@ UINT16 *wbeachvl_rowscroll; static int bgscrollx,bgscrolly,bg_enable,bg_full_size; static int fgscrollx,fg_rowscroll_enable; -static tilemap *tx_tilemap,*fg_tilemap,*bg_tilemap; +static tilemap_t *tx_tilemap,*fg_tilemap,*bg_tilemap; static int xoffset = 0; static int yoffset = 0; diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c index a7ca7a4368a..34c13298ddf 100644 --- a/src/mame/video/plygonet.c +++ b/src/mame/video/plygonet.c @@ -13,7 +13,7 @@ /* TTL text plane stuff */ static int ttl_gfx_index; -static tilemap *ttl_tilemap, *roz_tilemap; +static tilemap_t *ttl_tilemap, *roz_tilemap; static UINT16 ttl_vram[0x800], roz_vram[0x800]; /* TTL text plane */ diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c index e7969ade026..446f05677c7 100644 --- a/src/mame/video/pokechmp.c +++ b/src/mame/video/pokechmp.c @@ -2,7 +2,7 @@ #include "driver.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; WRITE8_HANDLER( pokechmp_videoram_w ) { diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c index 6de4382978c..1173d6f856e 100644 --- a/src/mame/video/polepos.c +++ b/src/mame/video/polepos.c @@ -16,7 +16,7 @@ static UINT16 polepos_vertical_position_modifier[256]; static UINT16 road16_vscroll; -static tilemap *bg_tilemap,*tx_tilemap; +static tilemap_t *bg_tilemap,*tx_tilemap; static int polepos_chacl; int polepos_gear_bit; diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c index d2f6f82f8a2..247609b8601 100644 --- a/src/mame/video/poolshrk.c +++ b/src/mame/video/poolshrk.c @@ -11,7 +11,7 @@ UINT8* poolshrk_playfield_ram; UINT8* poolshrk_hpos_ram; UINT8* poolshrk_vpos_ram; -static tilemap* bg_tilemap; +static tilemap_t* bg_tilemap; static TILE_GET_INFO( get_tile_info ) diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index 05299a1f89e..8150613a8a1 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -20,7 +20,7 @@ static UINT8 invertmask; static UINT8 bitmap_type; enum { TYPE_SKYSKIPR, TYPE_POPEYE }; -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; static UINT8 lastflip; diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c index a641c6453e9..f5ac7de7a7e 100644 --- a/src/mame/video/portrait.c +++ b/src/mame/video/portrait.c @@ -9,7 +9,7 @@ int portrait_scroll; UINT8 *portrait_bgvideoram, *portrait_fgvideoram; -static tilemap *foreground, *background; +static tilemap_t *foreground, *background; WRITE8_HANDLER( portrait_bgvideo_write ) { diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index b331a60c6bd..b9175119964 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -45,7 +45,7 @@ UINT16 *powerins_vram_1, *powerins_vctrl_1; //UINT16 *powerins_vregs; /* Variables only used here: */ -static tilemap *tilemap_0, *tilemap_1; +static tilemap_t *tilemap_0, *tilemap_1; static int tile_bank; diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index 7f3cf1dc2f2..6c59a039cb9 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -13,7 +13,7 @@ UINT16 *prehisle_bg_videoram16; static UINT16 invert_controls; -static tilemap *bg2_tilemap, *bg_tilemap, *fg_tilemap; +static tilemap_t *bg2_tilemap, *bg_tilemap, *fg_tilemap; WRITE16_HANDLER( prehisle_bg_videoram16_w ) diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index 2c9feb45a6b..e3bd7ce25da 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -537,7 +537,7 @@ VIDEO_UPDATE( psikyo ) UINT32 layer1_ctrl = state->vregs[0x416 / 4]; UINT32 spr_ctrl = state->spritebuf2[0x1ffe / 4]; - tilemap *tmptilemap0, *tmptilemap1; + tilemap_t *tmptilemap0, *tmptilemap1; flip_screen_set(screen->machine, ~input_port_read(screen->machine, "DSW") & 0x00010000); // hardwired to a DSW bit @@ -711,7 +711,7 @@ VIDEO_UPDATE( psikyo_bootleg ) UINT32 layer1_ctrl = state->vregs[0x416 / 4]; UINT32 spr_ctrl = state->spritebuf2[0x1ffe / 4]; - tilemap *tmptilemap0, *tmptilemap1; + tilemap_t *tmptilemap0, *tmptilemap1; flip_screen_set(screen->machine, ~input_port_read(screen->machine, "DSW") & 0x00010000); // hardwired to a DSW bit diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c index fe0fbc87318..c9a9cee193c 100644 --- a/src/mame/video/psychic5.c +++ b/src/mame/video/psychic5.c @@ -33,7 +33,7 @@ static UINT8 *ps5_io_ram; static UINT8 *ps5_palette_ram; static UINT8 *psychic5_fg_videoram; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; static int bg_palette_ram_base; static int bg_palette_base; diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index de61e6b74e5..b5a1b7c6b7f 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -9,13 +9,13 @@ #include "driver.h" -static tilemap *bg_top_tilemap; -static tilemap *bg_bot_tilemap; -static tilemap *fg_tilemap; // bottom only +static tilemap_t *bg_top_tilemap; +static tilemap_t *bg_bot_tilemap; +static tilemap_t *fg_tilemap; // bottom only -static tilemap *spr1_tilemap; -static tilemap *spr1_tilemap_flipx; -static tilemap *spr2_tilemap; +static tilemap_t *spr1_tilemap; +static tilemap_t *spr1_tilemap_flipx; +static tilemap_t *spr2_tilemap; UINT8 *punchout_bg_top_videoram; UINT8 *punchout_bg_bot_videoram; @@ -262,7 +262,7 @@ static void armwrest_draw_big_sprite(bitmap_t *bitmap, const rectangle *cliprect int sx,sy; UINT32 startx,starty; int incxx,incyy; - tilemap *_tilemap; + tilemap_t *_tilemap; sx = 4096 - (punchout_spr1_ctrlram[2] + 256 * (punchout_spr1_ctrlram[3] & 0x0f)); if (sx > 2048) sx -= 4096; diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index 6ae620e17b3..5f9486968d7 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -1,6 +1,6 @@ #include "driver.h" -static tilemap *bg_tilemap,*tx_tilemap; +static tilemap_t *bg_tilemap,*tx_tilemap; static UINT16 control[2]; diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index a220ae67233..297dc54d38a 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -14,8 +14,8 @@ Video hardware static UINT8 *quizdna_bg_ram; static UINT8 *quizdna_fg_ram; -static tilemap *quizdna_bg_tilemap; -static tilemap *quizdna_fg_tilemap; +static tilemap_t *quizdna_bg_tilemap; +static tilemap_t *quizdna_fg_tilemap; static UINT8 quizdna_bg_xscroll[2]; diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c index 4b43fbd4429..398cd5670c2 100644 --- a/src/mame/video/quizpani.c +++ b/src/mame/video/quizpani.c @@ -9,7 +9,7 @@ UINT16 *quizpani_bg_videoram, *quizpani_txt_videoram; UINT16 *quizpani_scrollreg; -static tilemap *bg_tilemap, *txt_tilemap; +static tilemap_t *bg_tilemap, *txt_tilemap; static int quizpani_bgbank = 0, quizpani_txtbank = 0; diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index 374c6d4ab45..c9e9200283d 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -1,7 +1,7 @@ #include "driver.h" -static tilemap *bg_layer,*fg_layer,*tx_layer; +static tilemap_t *bg_layer,*fg_layer,*tx_layer; UINT16 *raiden_back_data,*raiden_fore_data,*raiden_scroll_ram; static int flipscreen,alternate; diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index 4c74ae084b9..d4cd86310c8 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -56,7 +56,7 @@ WRITE16_HANDLER( dai2kaku_flipscreen_w ) ***************************************************************************/ -static tilemap *tilemap_0,*tilemap_1, // Backgrounds +static tilemap_t *tilemap_0,*tilemap_1, // Backgrounds *tilemap_2; // Text diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c index 0c978831efb..0d6b7ea74e8 100644 --- a/src/mame/video/renegade.c +++ b/src/mame/video/renegade.c @@ -8,8 +8,8 @@ UINT8 *renegade_videoram2; static INT32 renegade_scrollx; -static tilemap *bg_tilemap; -static tilemap *fg_tilemap; +static tilemap_t *bg_tilemap; +static tilemap_t *fg_tilemap; WRITE8_HANDLER( renegade_videoram_w ) { diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c index ef69b3fb41d..fa2514956a8 100644 --- a/src/mame/video/retofinv.c +++ b/src/mame/video/retofinv.c @@ -14,7 +14,7 @@ UINT8 *retofinv_fg_videoram; UINT8 *retofinv_sharedram; static int fg_bank,bg_bank; -static tilemap *bg_tilemap,*fg_tilemap; +static tilemap_t *bg_tilemap,*fg_tilemap; diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index 1202bc7e698..fcb87d281ba 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -25,7 +25,7 @@ size_t rpunch_bitmapram_size; int rpunch_sprite_palette; -static tilemap *background[2]; +static tilemap_t *background[2]; static UINT16 videoflags; static UINT8 crtc_register; diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c index cf20ac0e89e..62b97a027df 100644 --- a/src/mame/video/runaway.c +++ b/src/mame/video/runaway.c @@ -7,7 +7,7 @@ #include "driver.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; UINT8* runaway_video_ram; UINT8* runaway_sprite_ram; diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index b12603494a7..cbf8cc1b14d 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -11,7 +11,7 @@ #include "video/konicdev.h" static int ttl_gfx_index; -static tilemap *ttl_tilemap, *rng_936_tilemap; +static tilemap_t *ttl_tilemap, *rng_936_tilemap; static UINT16 ttl_vram[0x1000]; static int sprite_colorbase; diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index ebbd84063ae..11b520d5905 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -13,7 +13,7 @@ UINT8 *tecfri_colorram; UINT8 *tecfri_videoram2; UINT8 *tecfri_colorram2; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; static UINT8 palette_bank; /* General */ diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c index 3f1540dcda2..8264104706e 100644 --- a/src/mame/video/sbugger.c +++ b/src/mame/video/sbugger.c @@ -4,7 +4,7 @@ extern UINT8* sbugger_videoram, *sbugger_videoram_attr; -static tilemap *sbugger_tilemap; +static tilemap_t *sbugger_tilemap; static TILE_GET_INFO( get_sbugger_tile_info ) { diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index 786438d6cc3..efc17264247 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -4,7 +4,7 @@ UINT8 *scotrsht_scroll; UINT8 *scotrsht_videoram; UINT8 *scotrsht_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int scotrsht_charbank = 0; static int scotrsht_palette_bank = 0; diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index d1f0e9f9fe4..46983febe56 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -1,12 +1,12 @@ #include "driver.h" -static tilemap *sderby_tilemap; +static tilemap_t *sderby_tilemap; extern UINT16 *sderby_videoram; -static tilemap *sderby_md_tilemap; +static tilemap_t *sderby_md_tilemap; extern UINT16 *sderby_md_videoram; -static tilemap *sderby_fg_tilemap; +static tilemap_t *sderby_fg_tilemap; extern UINT16 *sderby_fg_videoram; /* BG Layer */ diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index 865ea4f1c00..8ade553ce6a 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -17,8 +17,8 @@ static UINT8 video_control; static UINT8 video_flip; static UINT8 vblank_latch; -static tilemap *spaceod_bg_htilemap; -static tilemap *spaceod_bg_vtilemap; +static tilemap_t *spaceod_bg_htilemap; +static tilemap_t *spaceod_bg_vtilemap; static UINT16 spaceod_hcounter; static UINT16 spaceod_vcounter; static UINT8 spaceod_fixed_color; @@ -26,7 +26,7 @@ static UINT8 spaceod_bg_control; static UINT8 spaceod_bg_detect; static const UINT8 spaceod_bg_detect_tile_color = 1; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT8 bg_enable; static UINT8 bg_char_bank; static UINT16 bg_scrollx, bg_scrolly; diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c index 2b00a042c79..944e7ebd98f 100644 --- a/src/mame/video/segaic16.c +++ b/src/mame/video/segaic16.c @@ -402,8 +402,8 @@ struct tilemap_info UINT16 latched_yscroll[4]; /* latched Y scroll values */ UINT16 latched_pageselect[4]; /* latched page select values */ INT32 xoffs; /* X scroll offset */ - tilemap * tilemaps[16]; /* up to 16 tilemap pages */ - tilemap * textmap; /* a single text tilemap */ + tilemap_t * tilemaps[16]; /* up to 16 tilemap pages */ + tilemap_t * textmap; /* a single text tilemap */ struct tilemap_callback_info tmap_info[16]; /* callback info for 16 tilemap pages */ struct tilemap_callback_info textmap_info; /* callback info for a single textmap page */ void (*reset)(running_machine *machine, struct tilemap_info *info);/* reset callback */ diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c index 52a203a2df2..324b57e027f 100644 --- a/src/mame/video/segaic24.c +++ b/src/mame/video/segaic24.c @@ -82,7 +82,7 @@ enum {SYS24_TILES = 0x4000}; static UINT16 *sys24_char_ram, *sys24_tile_ram; static UINT16 sys24_tile_mask; static int sys24_char_gfx_index; -static tilemap *sys24_tile_layer[4]; +static tilemap_t *sys24_tile_layer[4]; #define XOR(a) WORD_XOR_BE(a) diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index 2f40e375641..ce565c46b0e 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -216,7 +216,7 @@ struct extents_list struct cache_entry { struct cache_entry * next; - tilemap * tmap; + tilemap_t * tmap; UINT8 page; UINT8 bank; }; @@ -741,7 +741,7 @@ WRITE32_HANDLER( multi32_mixer_1_w ) * *************************************/ -static tilemap *find_cache_entry(int page, int bank) +static tilemap_t *find_cache_entry(int page, int bank) { struct cache_entry *entry, *prev; @@ -914,7 +914,7 @@ static int compute_clipping_extents(const device_config *screen, int enable, int * *************************************/ -INLINE void get_tilemaps(int bgnum, tilemap **tilemaps) +INLINE void get_tilemaps(int bgnum, tilemap_t **tilemaps) { int tilebank, page; @@ -941,7 +941,7 @@ static void update_tilemap_zoom(const device_config *screen, struct layer_info * int clipenable, clipout, clips, clipdraw_start; bitmap_t *bitmap = layer->bitmap; struct extents_list clip_extents; - tilemap *tilemaps[4]; + tilemap_t *tilemaps[4]; UINT32 srcx, srcx_start, srcy; UINT32 srcxstep, srcystep; int dstxstep, dstystep; @@ -1094,7 +1094,7 @@ static void update_tilemap_rowscroll(const device_config *screen, struct layer_i int clipenable, clipout, clips, clipdraw_start; bitmap_t *bitmap = layer->bitmap; struct extents_list clip_extents; - tilemap *tilemaps[4]; + tilemap_t *tilemaps[4]; int rowscroll, rowselect; int xscroll, yscroll; UINT16 *table; diff --git a/src/mame/video/sei_crtc.c b/src/mame/video/sei_crtc.c index 62bc8856f7e..6d440c01363 100644 --- a/src/mame/video/sei_crtc.c +++ b/src/mame/video/sei_crtc.c @@ -59,7 +59,7 @@ List of default vregs (title screen): #include "driver.h" #include "includes/sei_crtc.h" -static tilemap *sc0_tilemap,*sc2_tilemap,*sc1_tilemap,*sc3_tilemap_0,*sc3_tilemap_1; +static tilemap_t *sc0_tilemap,*sc2_tilemap,*sc1_tilemap,*sc3_tilemap_0,*sc3_tilemap_1; UINT16 *seibucrtc_sc0vram,*seibucrtc_sc1vram,*seibucrtc_sc2vram,*seibucrtc_sc3vram; UINT16 *seibucrtc_vregs; UINT16 seibucrtc_sc0bank; diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c index 09e0ef8e958..c61ab7b60da 100644 --- a/src/mame/video/seibuspi.c +++ b/src/mame/video/seibuspi.c @@ -1,10 +1,10 @@ #include "driver.h" #include "includes/seibuspi.h" -static tilemap *text_layer; -static tilemap *back_layer; -static tilemap *mid_layer; -static tilemap *fore_layer; +static tilemap_t *text_layer; +static tilemap_t *back_layer; +static tilemap_t *mid_layer; +static tilemap_t *fore_layer; UINT32 *spi_scrollram; @@ -543,7 +543,7 @@ VIDEO_START( spi ) } #ifdef UNUSED_FUNCTION -static void set_rowscroll(tilemap *layer, int scroll, INT16* rows) +static void set_rowscroll(tilemap_t *layer, int scroll, INT16* rows) { int i; int x = spi_scrollram[scroll] & 0xffff; @@ -555,7 +555,7 @@ static void set_rowscroll(tilemap *layer, int scroll, INT16* rows) tilemap_set_scrolly(layer, 0, y); } -static void set_scroll(tilemap *layer, int scroll) +static void set_scroll(tilemap_t *layer, int scroll) { int x = spi_scrollram[scroll] & 0xffff; int y = (spi_scrollram[scroll] >> 16) & 0xffff; @@ -565,7 +565,7 @@ static void set_scroll(tilemap *layer, int scroll) #endif -static void combine_tilemap(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap *tile, int x, int y, int opaque, INT16 *rowscroll) +static void combine_tilemap(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tile, int x, int y, int opaque, INT16 *rowscroll) { int i,j; UINT16 *s; diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c index 2a8d3d0dec2..6ab4696d104 100644 --- a/src/mame/video/seicross.c +++ b/src/mame/video/seicross.c @@ -12,7 +12,7 @@ UINT8 *seicross_row_scroll; UINT8 *seicross_videoram; UINT8 *seicross_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c index d0b1b34f757..ab474f71934 100644 --- a/src/mame/video/senjyo.c +++ b/src/mame/video/senjyo.c @@ -19,7 +19,7 @@ UINT8 *senjyo_bg1videoram,*senjyo_bg2videoram,*senjyo_bg3videoram; UINT8 *senjyo_radarram; UINT8 *senjyo_bgstripesram; -static tilemap *fg_tilemap,*bg1_tilemap,*bg2_tilemap,*bg3_tilemap; +static tilemap_t *fg_tilemap,*bg1_tilemap,*bg2_tilemap,*bg3_tilemap; int is_senjyo, senjyo_scrollhack; static int senjyo_bgstripes; diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 57ebfeafaf1..ad71d0ca607 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -141,8 +141,8 @@ Note: if MAME_DEBUG is defined, pressing Z with: /* Variables only used here */ -static tilemap *tilemap_0, *tilemap_1; // Layer 0 -static tilemap *tilemap_2, *tilemap_3; // Layer 1 +static tilemap_t *tilemap_0, *tilemap_1; // Layer 0 +static tilemap_t *tilemap_2, *tilemap_3; // Layer 1 static int tilemaps_flip; /* Variables used elsewhere */ diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index 0a6438b1752..4b08b4545b2 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -1,6 +1,6 @@ #include "driver.h" -static tilemap *shadfrce_fgtilemap, *shadfrce_bg0tilemap, *shadfrce_bg1tilemap; +static tilemap_t *shadfrce_fgtilemap, *shadfrce_bg0tilemap, *shadfrce_bg1tilemap; extern UINT16 *shadfrce_fgvideoram, *shadfrce_bg0videoram, *shadfrce_bg1videoram, *shadfrce_spvideoram; extern int shadfrce_video_enable; diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index 6b51cc0a4fd..c7e3d545fc3 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -3,7 +3,7 @@ #include "driver.h" #include "cpu/z80/z80.h" -static tilemap *background; +static tilemap_t *background; UINT8 *shangkid_videoreg; int shangkid_gfx_type; diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index a775e634bbc..a6862ab4a8f 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -14,7 +14,7 @@ extern UINT8 shaolins_nmi_enable; static int palettebank; UINT8 *shaolins_videoram; UINT8 *shaolins_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index 3d70a9e13e5..c4a8988b568 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -2,7 +2,7 @@ static int gfxbank; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; WRITE8_HANDLER( sichuan2_videoram_w ) { diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index c933a9cd42e..4c0f60a5dfa 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -5,7 +5,7 @@ #include "driver.h" -static tilemap *background, *foreground; +static tilemap_t *background, *foreground; extern UINT8 *shootout_textram; diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 94447c894a6..1b919a30219 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -19,7 +19,7 @@ static UINT8 *tilerom; static int bgon, objon, staron, charon, flipon; static UINT32 hflop_74a_n, hcount_191, vcount_191, latch_374; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; WRITE8_HANDLER( sidearms_videoram_w ) { diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 45e76f8dd4a..176db47dbee 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -3,7 +3,7 @@ UINT8 *sidepckt_videoram; UINT8 *sidepckt_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int flipscreen; diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index 1e938f2a83a..b818f44fb99 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -6,7 +6,7 @@ /* Clean Up */ /* is theres a bg colour register? */ -static tilemap *fg_tilemap,*fg2_tilemap,*fg3_tilemap; +static tilemap_t *fg_tilemap,*fg2_tilemap,*fg3_tilemap; extern UINT32 *silkroad_vidram,*silkroad_vidram2,*silkroad_vidram3, *silkroad_sprram, *silkroad_regs; static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c index 0d65b852fce..fb2eb383951 100644 --- a/src/mame/video/skydiver.c +++ b/src/mame/video/skydiver.c @@ -11,7 +11,7 @@ UINT8 *skydiver_videoram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int width = 0; diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c index c4421027ec3..efd0f1f42d0 100644 --- a/src/mame/video/skykid.c +++ b/src/mame/video/skykid.c @@ -2,7 +2,7 @@ UINT8 *skykid_textram, *skykid_videoram, *skykid_spriteram; -static tilemap *bg_tilemap,*tx_tilemap; +static tilemap_t *bg_tilemap,*tx_tilemap; static UINT8 priority; static UINT16 scroll_x,scroll_y; diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index eb65f8eaf88..ec07347fb3c 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -16,7 +16,7 @@ UINT8 *slapfight_fixcolorram; UINT8 *slapfight_scrollx_lo,*slapfight_scrollx_hi,*slapfight_scrolly; static int flipscreen, slapfight_palette_bank = 0; -static tilemap *pf1_tilemap,*fix_tilemap; +static tilemap_t *pf1_tilemap,*fix_tilemap; diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c index ac9fcd8e811..0376405654c 100644 --- a/src/mame/video/snk.c +++ b/src/mame/video/snk.c @@ -26,9 +26,9 @@ UINT8 *snk_tx_videoram; UINT8 *snk_fg_videoram; UINT8 *snk_bg_videoram; -static tilemap *tx_tilemap; -static tilemap *fg_tilemap; -static tilemap *bg_tilemap; +static tilemap_t *tx_tilemap; +static tilemap_t *fg_tilemap; +static tilemap_t *bg_tilemap; static int fg_scrollx, fg_scrolly, bg_scrollx, bg_scrolly; static int sp16_scrollx, sp16_scrolly, sp32_scrollx, sp32_scrolly; static UINT8 sprite_split_point; diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c index 881e2111afd..cefdc7ebf2d 100644 --- a/src/mame/video/snk6502.c +++ b/src/mame/video/snk6502.c @@ -18,8 +18,8 @@ UINT8 *snk6502_charram; static int charbank; static int backcolor; -static tilemap *bg_tilemap; -static tilemap *fg_tilemap; +static tilemap_t *bg_tilemap; +static tilemap_t *fg_tilemap; static rgb_t palette[64]; diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 17e31f95cf6..ff50d75120c 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -17,7 +17,7 @@ Notes: UINT16* pow_fg_videoram; static int sprite_flip_axis; -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; static int flipscreen; static UINT32 fg_tile_offset; diff --git a/src/mame/video/snookr10.c b/src/mame/video/snookr10.c index ab08693d00b..a901d08e758 100644 --- a/src/mame/video/snookr10.c +++ b/src/mame/video/snookr10.c @@ -42,7 +42,7 @@ UINT8 *snookr10_videoram; UINT8 *snookr10_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; WRITE8_HANDLER( snookr10_videoram_w ) diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index 3a83904c2d4..e22257941c1 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -5,7 +5,7 @@ UINT8 *solomon_colorram; UINT8 *solomon_videoram2; UINT8 *solomon_colorram2; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; WRITE8_HANDLER( solomon_videoram_w ) { diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index 217f8c494bb..5da1325ac33 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -8,7 +8,7 @@ UINT8 *spdodgeb_videoram; static int tile_palbank; static int sprite_palbank; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; diff --git a/src/mame/video/speedatk.c b/src/mame/video/speedatk.c index c85c2eb8261..ee2ed3c749f 100644 --- a/src/mame/video/speedatk.c +++ b/src/mame/video/speedatk.c @@ -7,7 +7,7 @@ UINT8 *speedatk_videoram; UINT8 *speedatk_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /* diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c index 31af68ffbe1..711b659457d 100644 --- a/src/mame/video/speedbal.c +++ b/src/mame/video/speedbal.c @@ -11,7 +11,7 @@ UINT8 *speedbal_background_videoram; UINT8 *speedbal_foreground_videoram; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; static TILE_GET_INFO( get_tile_info_bg ) { diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c index 37083574c35..d7619163fd9 100644 --- a/src/mame/video/speedspn.c +++ b/src/mame/video/speedspn.c @@ -4,7 +4,7 @@ UINT8 *speedspn_attram; -static tilemap *speedspn_tilemap; +static tilemap_t *speedspn_tilemap; static UINT8 speedspn_display_disable = 0; static int speedspn_bank_vidram = 0; static UINT8* speedspn_vidram; diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c index 4366a74ba2f..80ce84f696b 100644 --- a/src/mame/video/splash.c +++ b/src/mame/video/splash.c @@ -15,7 +15,7 @@ UINT16 *splash_pixelram; UINT16 *roldfrog_bitmap_mode; int splash_bitmap_type; int splash_sprite_attr2_shift; -static tilemap *bg_tilemap[2]; +static tilemap_t *bg_tilemap[2]; /*************************************************************************** diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c index f06a1b6b19f..267eb9a850d 100644 --- a/src/mame/video/sprcros2.c +++ b/src/mame/video/sprcros2.c @@ -5,7 +5,7 @@ Super Cross II (JPN Ver.) #include "driver.h" -static tilemap *sprcros2_bgtilemap, *sprcros2_fgtilemap; +static tilemap_t *sprcros2_bgtilemap, *sprcros2_fgtilemap; UINT8 *sprcros2_fgvideoram, *sprcros2_spriteram, *sprcros2_bgvideoram; size_t sprcros2_spriteram_size; extern UINT8 sprcros2_m_port7; diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c index f802afbc080..4287ca28834 100644 --- a/src/mame/video/sprint2.c +++ b/src/mame/video/sprint2.c @@ -9,7 +9,7 @@ UINT8* sprint2_video_ram; -static tilemap* bg_tilemap; +static tilemap_t* bg_tilemap; static bitmap_t* helper; static int collision[2]; diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c index b80170f95ae..17883f57245 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -7,7 +7,7 @@ Atari Sprint 4 video emulation #include "driver.h" #include "audio/sprint4.h" -static tilemap* playfield; +static tilemap_t* playfield; static bitmap_t* helper; diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c index 79bc742f6bd..e79e3b97567 100644 --- a/src/mame/video/sprint8.c +++ b/src/mame/video/sprint8.c @@ -13,8 +13,8 @@ UINT8* sprint8_pos_v_ram; UINT8* sprint8_pos_d_ram; UINT8* sprint8_team; -static tilemap* tilemap1; -static tilemap* tilemap2; +static tilemap_t* tilemap1; +static tilemap_t* tilemap2; static bitmap_t* helper1; static bitmap_t* helper2; diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index 891aa52d371..3bb7f3a2650 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -10,7 +10,7 @@ UINT8 *srumbler_backgroundram,*srumbler_foregroundram; -static tilemap *bg_tilemap,*fg_tilemap; +static tilemap_t *bg_tilemap,*fg_tilemap; diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index 5fbc60041e7..080aed9f038 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -10,7 +10,7 @@ UINT16 *sshangha_pf2_data,*sshangha_pf1_data; UINT16 *sshangha_pf1_rowscroll,*sshangha_pf2_rowscroll; static UINT16 sshangha_control_0[8]; -static tilemap *pf1_8x8_tilemap,*pf1_16x16_tilemap,*pf2_tilemap; +static tilemap_t *pf1_8x8_tilemap,*pf1_16x16_tilemap,*pf2_tilemap; static int sshangha_pf1_bank,sshangha_pf2_bank,sshangha_video_control; /******************************************************************************/ diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index e19fc44893d..5d24698a11c 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -2,7 +2,7 @@ #include "driver.h" -static tilemap *sslam_bg_tilemap, *sslam_tx_tilemap, *sslam_md_tilemap; +static tilemap_t *sslam_bg_tilemap, *sslam_tx_tilemap, *sslam_md_tilemap; extern UINT16 *sslam_bg_tileram, *sslam_tx_tileram, *sslam_md_tileram; extern UINT16 *sslam_spriteram, *sslam_regs; diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index 8944be4e1cf..5ef5a3e9414 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -14,7 +14,7 @@ UINT8 *ssozumo_colorram; UINT8 *ssozumo_videoram2; UINT8 *ssozumo_colorram2; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; /**************************************************************************/ diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c index 77646ff259e..9b34d3d83b7 100644 --- a/src/mame/video/ssrj.c +++ b/src/mame/video/ssrj.c @@ -1,6 +1,6 @@ #include "driver.h" -static tilemap *tilemap1,*tilemap2,*tilemap4; +static tilemap_t *tilemap1,*tilemap2,*tilemap4; UINT8 *ssrj_vram1,*ssrj_vram2,*ssrj_vram3,*ssrj_vram4,*ssrj_scrollram; /* tilemap 1 */ diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index efdb6c7909f..205aec53553 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -208,7 +208,7 @@ VIDEO_START( eaglshot ) gfx_element_set_source(machine->gfx[1], (UINT8 *)eaglshot_gfxram); } -static tilemap *gdfs_tmap; +static tilemap_t *gdfs_tmap; static TILE_GET_INFO( get_tile_info_0 ) { diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index 77e87719f22..bb64465ef77 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -15,7 +15,7 @@ UINT16 *stadhero_pf1_data; static UINT16 *stadhero_pf2_data; UINT16 *stadhero_pf2_control_0; UINT16 *stadhero_pf2_control_1; -static tilemap *pf1_tilemap,*pf2_tilemap; +static tilemap_t *pf1_tilemap,*pf2_tilemap; static int flipscreen; /******************************************************************************/ diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index c5071848ec6..30153662e66 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -34,7 +34,7 @@ static UINT16 *LSFR; static bitmap_t *helper; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static void set_pens(colortable_t *colortable) diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c index f92f7640899..ce696cf0538 100644 --- a/src/mame/video/stfight.c +++ b/src/mame/video/stfight.c @@ -15,7 +15,7 @@ UINT8 *stfight_text_attr_ram; UINT8 *stfight_vh_latch_ram; UINT8 *stfight_sprite_ram; -static tilemap *fg_tilemap,*bg_tilemap,*tx_tilemap; +static tilemap_t *fg_tilemap,*bg_tilemap,*tx_tilemap; static int stfight_sprite_base = 0; /* diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index 3e9431f2f03..dbecf84a6cb 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -2,7 +2,7 @@ #include "driver.h" -static tilemap *stlforce_bg_tilemap, *stlforce_mlow_tilemap, *stlforce_mhigh_tilemap, *stlforce_tx_tilemap; +static tilemap_t *stlforce_bg_tilemap, *stlforce_mlow_tilemap, *stlforce_mhigh_tilemap, *stlforce_tx_tilemap; extern UINT16 *stlforce_bg_videoram, *stlforce_mlow_videoram, *stlforce_mhigh_videoram, *stlforce_tx_videoram; extern UINT16 *stlforce_bg_scrollram, *stlforce_mlow_scrollram, *stlforce_mhigh_scrollram, *stlforce_vidattrram; diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index b29271c2481..3f9b9f003e4 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -14,7 +14,7 @@ Video hardware driver by Uki UINT8 *strnskil_xscroll; static UINT8 strnskil_scrl_ctrl; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; PALETTE_INIT( strnskil ) diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index fa547dc28ae..98f549e8454 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -84,7 +84,7 @@ UINT8 suna8_unknown; For Debug: there's no tilemap, just sprites. ***************************************************************************/ #if TILEMAPS -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int tiles, rombank, page; static TILE_GET_INFO( get_tile_info ) diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index 85071f0d05b..54c5342b638 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -15,7 +15,7 @@ int pbillian_show_power; static int gfxbank; static bitmap_t *fg_bitmap[2]; static int show_bitmap; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int last_power[2]; diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c index 3e39e10826b..421fc351d9b 100644 --- a/src/mame/video/suprloco.c +++ b/src/mame/video/suprloco.c @@ -11,7 +11,7 @@ UINT8 *suprloco_videoram; UINT8 *suprloco_scrollram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int control; #define SPR_Y_TOP 0 diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index 132ee58f83a..f20e1e33038 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -27,7 +27,7 @@ static bitmap_t *tilemap_bitmapflags_higher; /* draws ROZ with linescroll OR columnscroll to 16-bit indexed bitmap */ -static void suprnova_draw_roz(bitmap_t* bitmap, bitmap_t* bitmapflags, const rectangle *cliprect, tilemap *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, int columnscroll, UINT32* scrollram) +static void suprnova_draw_roz(bitmap_t* bitmap, bitmap_t* bitmapflags, const rectangle *cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, int columnscroll, UINT32* scrollram) { //bitmap_t *destbitmap = bitmap; bitmap_t *srcbitmap = tilemap_get_pixmap(tmap); @@ -837,8 +837,8 @@ void skns_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectang } } -static tilemap *skns_tilemap_A; -static tilemap *skns_tilemap_B; +static tilemap_t *skns_tilemap_A; +static tilemap_t *skns_tilemap_B; static TILE_GET_INFO( get_tilemap_A_tile_info ) { diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c index c770a167b7a..c8d8f7d8388 100644 --- a/src/mame/video/suprridr.c +++ b/src/mame/video/suprridr.c @@ -11,9 +11,9 @@ UINT8 *suprridr_bgram; UINT8 *suprridr_fgram; -static tilemap *fg_tilemap; -static tilemap *bg_tilemap; -static tilemap *bg_tilemap_noscroll; +static tilemap_t *fg_tilemap; +static tilemap_t *bg_tilemap; +static tilemap_t *bg_tilemap_noscroll; static UINT8 flipx, flipy; diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c index 5df7028f7c8..78dcb7db133 100644 --- a/src/mame/video/system1.c +++ b/src/mame/video/system1.c @@ -92,7 +92,7 @@ static UINT8 system1_video_mode; static UINT8 videoram_bank; -static tilemap *tilemap_page[8]; +static tilemap_t *tilemap_page[8]; static UINT8 tilemap_pages; diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index bede4048c05..f35c28a3377 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -183,8 +183,8 @@ UINT16 *sys18_splittab_bg_y; UINT16 *sys18_splittab_fg_x; UINT16 *sys18_splittab_fg_y; -static tilemap *background, *foreground, *text_layer; -static tilemap *background2, *foreground2; +static tilemap_t *background, *foreground, *text_layer; +static tilemap_t *background2, *foreground2; static int old_bg_page[4],old_fg_page[4], old_tile_bank1, old_tile_bank0; static int old_bg2_page[4],old_fg2_page[4]; @@ -668,8 +668,8 @@ VIDEO_START( system18old ) *****************************************************************************************/ -static tilemap *system16a_bootleg_bg_tilemaps[2]; -static tilemap *system16a_bootleg_text_tilemap; +static tilemap_t *system16a_bootleg_bg_tilemaps[2]; +static tilemap_t *system16a_bootleg_text_tilemap; static UINT16 system16a_bootleg_tilemapselect; diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index 721c2a56c81..493eb006697 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -12,7 +12,7 @@ static int palettebank; UINT8 *tagteam_videoram; UINT8 *tagteam_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; PALETTE_INIT( tagteam ) { diff --git a/src/mame/video/taiicdev.c b/src/mame/video/taiicdev.c index ff0c4287069..16abeac715a 100644 --- a/src/mame/video/taiicdev.c +++ b/src/mame/video/taiicdev.c @@ -556,7 +556,7 @@ struct _pc080sn_state int bgscrollx[2], bgscrolly[2]; int xoffs, yoffs; - tilemap *tilemap[2]; + tilemap_t *tilemap[2]; int bg_gfx; int yinvert, dblwidth; }; @@ -1252,7 +1252,7 @@ struct _tc0080vco_state UINT16 bg1_scrollx; UINT16 bg1_scrolly; - tilemap *tilemap[3]; + tilemap_t *tilemap[3]; int bg_gfx, tx_gfx; int bg_xoffs, bg_yoffs; @@ -1965,7 +1965,7 @@ struct _tc0100scn_state int bgscrollx, bgscrolly, fgscrollx, fgscrolly; /* We keep two tilemaps for each of the 3 actual tilemaps: one at standard width, one double */ - tilemap *tilemap[3][2]; + tilemap_t *tilemap[3][2]; rectangle cliprect; int bg_gfx, tx_gfx; @@ -2371,7 +2371,7 @@ void tc0100scn_tilemap_update( const device_config *device ) tilemap_set_scrollx(tc0100scn->tilemap[1][tc0100scn->dblwidth], (j + tc0100scn->fgscrolly) & 0x1ff, tc0100scn->fgscrollx - tc0100scn->fgscroll_ram[j]); } -static void tc0100scn_tilemap_draw_fg( const device_config *device, bitmap_t *bitmap, const rectangle *cliprect, tilemap* tmap, int flags, UINT32 priority ) +static void tc0100scn_tilemap_draw_fg( const device_config *device, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t* tmap, int flags, UINT32 priority ) { tc0100scn_state *tc0100scn = tc0100scn_get_safe_token(device); const bitmap_t *src_bitmap = tilemap_get_pixmap(tmap); @@ -2585,7 +2585,7 @@ struct _tc0280grd_state { UINT16 * ram; - tilemap *tilemap; + tilemap_t *tilemap; UINT16 ctrl[8]; int gfxnum, base_color; @@ -2831,7 +2831,7 @@ struct _tc0480scp_state int pri_reg; /* We keep two tilemaps for each of the 5 actual tilemaps: one at standard width, one double */ - tilemap *tilemap[5][2]; + tilemap_t *tilemap[5][2]; int bg_gfx, tx_gfx; INT32 tile_colbase, dblwidth; int x_offs, y_offs; @@ -4803,7 +4803,7 @@ struct _tc0180vcu_state UINT16 * ram; UINT16 * scrollram; - tilemap *tilemap[3]; + tilemap_t *tilemap[3]; UINT16 bg_rambank[2], fg_rambank[2], tx_rambank; UINT8 framebuffer_page; diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index 9ea0f3a5533..e696265237a 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -5,7 +5,7 @@ UINT16 *tail2nos_bgvideoram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static int charbank,charpalette,video_enable; static UINT16 *zoomdata; diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c index f57cda4cb46..374553fd0ef 100644 --- a/src/mame/video/taito_b.c +++ b/src/mame/video/taito_b.c @@ -7,7 +7,7 @@ UINT16 *TC0180VCU_ram; UINT16 *taitob_spriteram; UINT16 *taitob_pixelram; -static tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; static UINT16 bg_rambank[2],fg_rambank[2],tx_rambank; /* framebuffer is a raw bitmap, remapped as a last step */ @@ -450,7 +450,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } -static void TC0180VCU_tilemap_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap *tmap,int plane) +static void TC0180VCU_tilemap_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int plane) { /*plane = 0 fg tilemap*/ /*plane = 1 bg tilemap*/ diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index 240bcb8b5ed..916a8a8abfe 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -212,8 +212,8 @@ Playfield tile info: #define DARIUSG_KLUDGE //#define DEBUG_F3 1 -static tilemap *pf1_tilemap,*pf2_tilemap,*pf3_tilemap,*pf4_tilemap; -static tilemap *pixel_layer,*vram_layer; +static tilemap_t *pf1_tilemap,*pf2_tilemap,*pf3_tilemap,*pf4_tilemap; +static tilemap_t *pixel_layer,*vram_layer; static UINT32 *spriteram32_buffered; static UINT32 f3_control_0[8]; static UINT32 f3_control_1[8]; @@ -1845,7 +1845,7 @@ static void get_spritealphaclip_info(void) } /* sx and sy are 16.16 fixed point numbers */ -static void get_line_ram_info(running_machine *machine, tilemap *tmap, int sx, int sy, int pos, UINT32 *f3_pf_data_n) +static void get_line_ram_info(running_machine *machine, tilemap_t *tmap, int sx, int sy, int pos, UINT32 *f3_pf_data_n) { struct f3_playfield_line_inf *line_t=&pf_line_inf[pos]; const bitmap_t *srcbitmap; @@ -2065,7 +2065,7 @@ static void get_line_ram_info(running_machine *machine, tilemap *tmap, int sx, i } } -static void get_vram_info(tilemap *vram_tilemap, tilemap *pixel_tilemap, int sx, int sy) +static void get_vram_info(tilemap_t *vram_tilemap, tilemap_t *pixel_tilemap, int sx, int sy) { const struct f3_spritealpha_line_inf *sprite_alpha_line_t=&sa_line_inf[0]; struct f3_playfield_line_inf *line_t=&pf_line_inf[4]; diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index b513590f0bd..ebc50dcb9b1 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -4,9 +4,9 @@ extern UINT8 *taitol_rambanks; -static tilemap *bg18_tilemap; -static tilemap *bg19_tilemap; -static tilemap *ch1a_tilemap; +static tilemap_t *bg18_tilemap; +static tilemap_t *bg19_tilemap; +static tilemap_t *ch1a_tilemap; static int cur_ctrl = 0; static int horshoes_gfxbank = 0; diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index 73940a855d6..7811c7595bc 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -645,7 +645,7 @@ static UINT16 *PC080SN_ram[PC080SN_MAX_CHIPS], static int PC080SN_bgscrollx[PC080SN_MAX_CHIPS][2],PC080SN_bgscrolly[PC080SN_MAX_CHIPS][2]; static int PC080SN_xoffs,PC080SN_yoffs; -static tilemap *PC080SN_tilemap[PC080SN_MAX_CHIPS][2]; +static tilemap_t *PC080SN_tilemap[PC080SN_MAX_CHIPS][2]; static int PC080SN_bg_gfx[PC080SN_MAX_CHIPS]; static int PC080SN_yinvert,PC080SN_dblwidth; @@ -1310,7 +1310,7 @@ UINT16 *TC0080VCO_chain_ram_0, *TC0080VCO_chain_ram_1, static UINT16 TC0080VCO_bg0_scrollx,TC0080VCO_bg0_scrolly, TC0080VCO_bg1_scrollx,TC0080VCO_bg1_scrolly; -static tilemap *TC0080VCO_tilemap[3]; +static tilemap_t *TC0080VCO_tilemap[3]; static int TC0080VCO_bg_gfx,TC0080VCO_tx_gfx; static int TC0080VCO_bg_xoffs,TC0080VCO_bg_yoffs; @@ -1948,7 +1948,7 @@ static int TC0100SCN_bgscrollx[TC0100SCN_MAX_CHIPS],TC0100SCN_bgscrolly[TC0100SC TC0100SCN_fgscrollx[TC0100SCN_MAX_CHIPS],TC0100SCN_fgscrolly[TC0100SCN_MAX_CHIPS]; /* We keep two tilemaps for each of the 3 actual tilemaps: one at standard width, one double */ -static tilemap *TC0100SCN_tilemap[TC0100SCN_MAX_CHIPS][3][2]; +static tilemap_t *TC0100SCN_tilemap[TC0100SCN_MAX_CHIPS][3][2]; static rectangle TC0100SCN_cliprect[TC0100SCN_MAX_CHIPS]; static int TC0100SCN_bg_gfx[TC0100SCN_MAX_CHIPS],TC0100SCN_tx_gfx[TC0100SCN_MAX_CHIPS]; @@ -2556,7 +2556,7 @@ void TC0100SCN_tilemap_update(running_machine *machine) } } -static void TC0100SCN_tilemap_draw_fg(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int chip, tilemap* tmap, int flags, UINT32 priority) +static void TC0100SCN_tilemap_draw_fg(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int chip, tilemap_t* tmap, int flags, UINT32 priority) { const bitmap_t *src_bitmap = tilemap_get_pixmap(tmap); int width_mask, height_mask, x, y, p; @@ -2639,7 +2639,7 @@ int TC0100SCN_bottomlayer(int chip) #define TC0280GRD_RAM_SIZE 0x2000 static UINT16 TC0280GRD_ctrl[8]; static UINT16 *TC0280GRD_ram; -static tilemap *TC0280GRD_tilemap; +static tilemap_t *TC0280GRD_tilemap; static int TC0280GRD_gfxnum,TC0280GRD_base_color; @@ -2798,7 +2798,7 @@ static int TC0480SCP_bgscrolly[4]; int TC0480SCP_pri_reg; /* We keep two tilemaps for each of the 5 actual tilemaps: one at standard width, one double */ -static tilemap *TC0480SCP_tilemap[5][2]; +static tilemap_t *TC0480SCP_tilemap[5][2]; static int TC0480SCP_bg_gfx,TC0480SCP_tx_gfx; static INT32 TC0480SCP_tile_colbase,TC0480SCP_dblwidth; static int TC0480SCP_x_offs,TC0480SCP_y_offs; diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index 08b670cee1c..430c1476281 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -24,7 +24,7 @@ static int taitojc_gfx_index; static UINT32 *taitojc_char_ram; static UINT32 *taitojc_tile_ram; -static tilemap *taitojc_tilemap; +static tilemap_t *taitojc_tilemap; static poly_manager *poly; diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c index 78a85ea086f..d44a6ac57f2 100644 --- a/src/mame/video/tank8.c +++ b/src/mame/video/tank8.c @@ -14,7 +14,7 @@ UINT8 *tank8_pos_v_ram; UINT8 *tank8_pos_d_ram; UINT8 *tank8_team; -static tilemap *tank8_tilemap; +static tilemap_t *tank8_tilemap; static bitmap_t *helper1; static bitmap_t *helper2; diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c index 65fcc933669..7a54fb0f426 100644 --- a/src/mame/video/tankbatt.c +++ b/src/mame/video/tankbatt.c @@ -11,7 +11,7 @@ UINT8 *tankbatt_bulletsram; size_t tankbatt_bulletsram_size; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 653d7fb9818..43e9c7014a7 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -10,9 +10,9 @@ UINT8 * tankbust_videoram; UINT8 * tankbust_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; -static tilemap *txt_tilemap; +static tilemap_t *txt_tilemap; UINT8 * tankbust_txtram; /*************************************************************************** diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c index fa9100a9a5d..5ebaf68f4a9 100644 --- a/src/mame/video/taotaido.c +++ b/src/mame/video/taotaido.c @@ -18,7 +18,7 @@ UINT16 *taotaido_bgram; static UINT16 taotaido_sprite_character_bank_select[8]; static UINT16 taotaido_video_bank_select[8]; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT16 *taotaido_spriteram_old, *taotaido_spriteram_older; static UINT16 *taotaido_spriteram2_old, *taotaido_spriteram2_older; diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c index 2d4abe12573..c24f941fb18 100644 --- a/src/mame/video/targeth.c +++ b/src/mame/video/targeth.c @@ -12,7 +12,7 @@ UINT16 *targeth_spriteram; UINT16 *targeth_vregs; UINT16 *targeth_videoram; -static tilemap *pant[2]; +static tilemap_t *pant[2]; /*************************************************************************** diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index cef58aa39bc..4da60a80472 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -1,8 +1,8 @@ #include "driver.h" #include "includes/tatsumi.h" -static tilemap *tx_layer; -static tilemap *layer0, *layer1, *layer2, *layer3; +static tilemap_t *tx_layer; +static tilemap_t *layer0, *layer1, *layer2, *layer3; static bitmap_t *temp_bitmap; @@ -970,7 +970,7 @@ static void update_cluts(running_machine *machine, int fake_palette_offset, int /**********************************************************************/ -static void draw_bg(running_machine *machine, bitmap_t *dst, tilemap *src, const UINT16* scrollx, const UINT16* scrolly, const UINT16* tilemap_ram, int tile_bank, int xscroll_offset, int yscroll_offset, int xsize, int ysize) +static void draw_bg(running_machine *machine, bitmap_t *dst, tilemap_t *src, const UINT16* scrollx, const UINT16* scrolly, const UINT16* tilemap_ram, int tile_bank, int xscroll_offset, int yscroll_offset, int xsize, int ysize) { /* Each tile (0x4000 of them) has a lookup table in ROM to build an individual 3-bit palette diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index bf66a30fc90..f2d9decae38 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -4,7 +4,7 @@ #include "driver.h" -static tilemap *tx_tilemap, *bg_tilemap, *bg2_tilemap; +static tilemap_t *tx_tilemap, *bg_tilemap, *bg2_tilemap; UINT8 *tbowl_txvideoram, *tbowl_bgvideoram, *tbowl_bg2videoram; UINT8 *tbowl_spriteram; diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index b8f5b18555a..f4e9078e1e2 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -23,10 +23,10 @@ static int sprite16; static int sprite32; static int bg; -static tilemap *tx_tilemap; +static tilemap_t *tx_tilemap; -static tilemap *bg1_tilemap; -static tilemap *bg2_tilemap; +static tilemap_t *bg1_tilemap; +static tilemap_t *bg2_tilemap; static INT32 bg1_scroll_x, bg1_scroll_y; static INT32 bg2_scroll_x, bg2_scroll_y; diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c index 42dba0b1056..da5594bdae6 100644 --- a/src/mame/video/tecmo.c +++ b/src/mame/video/tecmo.c @@ -14,7 +14,7 @@ int tecmo_video_type = 0; This is needed because there is a difference in the tile and sprite indexing. */ -static tilemap *tx_tilemap,*fg_tilemap,*bg_tilemap; +static tilemap_t *tx_tilemap,*fg_tilemap,*bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c index 7b9f5f9d8b1..30083c14636 100644 --- a/src/mame/video/tecmo16.c +++ b/src/mame/video/tecmo16.c @@ -16,7 +16,7 @@ UINT16 *tecmo16_videoram2; UINT16 *tecmo16_colorram2; UINT16 *tecmo16_charram; -static tilemap *fg_tilemap,*bg_tilemap,*tx_tilemap; +static tilemap_t *fg_tilemap,*bg_tilemap,*tx_tilemap; static bitmap_t *sprite_bitmap, *tile_bitmap_bg, *tile_bitmap_fg; static int flipscreen, game_is_riot; diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c index b021666ebd9..a1f63698ada 100644 --- a/src/mame/video/tehkanwc.c +++ b/src/mame/video/tehkanwc.c @@ -19,7 +19,7 @@ UINT8 *tehkanwc_videoram2; static UINT8 scroll_x[2]; static UINT8 led0,led1; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; WRITE8_HANDLER( tehkanwc_videoram_w ) { diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c index 53eead9cc99..8c15e8f45f3 100644 --- a/src/mame/video/terracre.c +++ b/src/mame/video/terracre.c @@ -10,7 +10,7 @@ static UINT16 xscroll; static UINT16 yscroll; -static tilemap *background, *foreground; +static tilemap_t *background, *foreground; UINT16 *amazon_videoram; diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index d3483dee8a1..87f5f8d77e0 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -134,8 +134,8 @@ READ8_HANDLER( tetrisp2_priority_r ) ***************************************************************************/ -static tilemap *tilemap_bg, *tilemap_fg, *tilemap_rot; -static tilemap *tilemap_sub_bg, *tilemap_sub_fg, *tilemap_sub_rot; +static tilemap_t *tilemap_bg, *tilemap_fg, *tilemap_rot; +static tilemap_t *tilemap_sub_bg, *tilemap_sub_fg, *tilemap_sub_rot; #define NX_0 (0x40) #define NY_0 (0x40) diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c index 0bb67c78ffe..d15c3ca62ef 100644 --- a/src/mame/video/thedeep.c +++ b/src/mame/video/thedeep.c @@ -33,7 +33,7 @@ /* Variables only used here: */ -static tilemap *tilemap_0,*tilemap_1; +static tilemap_t *tilemap_0,*tilemap_1; /* Variables & functions needed by drivers: */ diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index d2b7f3c4aa8..1e462f7e4ef 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -18,8 +18,8 @@ size_t thepit_spriteram_size; static UINT8 graphics_bank; static UINT8 thepit_flip_screen_x; static UINT8 thepit_flip_screen_y; -static tilemap *thepit_solid_tilemap; -static tilemap *thepit_tilemap; +static tilemap_t *thepit_solid_tilemap; +static tilemap_t *thepit_tilemap; static UINT8 *dummy_tile; diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c index 233b522af6b..930c4bb7c1c 100644 --- a/src/mame/video/thoop2.c +++ b/src/mame/video/thoop2.c @@ -17,7 +17,7 @@ UINT16 *thoop2_spriteram; static int sprite_count[5]; static int *sprite_table[5]; -static tilemap *pant[2]; +static tilemap_t *pant[2]; /*************************************************************************** diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 39e8efa21bc..9625b542e29 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -21,7 +21,7 @@ static UINT8 tiamc1_layers_ctrl; static UINT8 tiamc1_bg_vshift; static UINT8 tiamc1_bg_hshift; -static tilemap *bg_tilemap1, *bg_tilemap2; +static tilemap_t *bg_tilemap1, *bg_tilemap2; static rgb_t *palette; WRITE8_HANDLER( tiamc1_videoram_w ) diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index f27093eabcb..90a2b6e8fdc 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -1,7 +1,7 @@ #include "driver.h" static int bgcharbank; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; WRITE16_HANDLER( tigeroad_videoram_w ) { diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c index 69d7bb93726..1d48c9433c7 100644 --- a/src/mame/video/timelimt.c +++ b/src/mame/video/timelimt.c @@ -7,7 +7,7 @@ size_t timelimt_bg_videoram_size; /* locals */ static int scrollx, scrolly; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; /*************************************************************************** diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 2bf2e8e4166..4c19273b613 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -11,7 +11,7 @@ static int sorted_layer[3]; static int dim_c,dim_v; /* ssriders, tmnt2 */ static int lastdim,lasten; -static tilemap *roz_tilemap; +static tilemap_t *roz_tilemap; static int glfgreat_roz_rom_bank,glfgreat_roz_char_bank,glfgreat_roz_rom_mode; diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index 79f7fb429e3..6af3d097751 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -174,7 +174,7 @@ static INT32 tiles_offsety; static int toaplan1_reset; /* Hack! See toaplan1_bcu_control below */ -static tilemap *pf1_tilemap, *pf2_tilemap, *pf3_tilemap, *pf4_tilemap; +static tilemap_t *pf1_tilemap, *pf2_tilemap, *pf3_tilemap, *pf4_tilemap; /*************************************************************************** diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 7d93ad0bb1e..9025ca85faf 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -219,8 +219,8 @@ static UINT8 fg_tile_priority[2][16]; static UINT8 bg_tile_priority[2][16]; -static tilemap *top_tilemap[2], *fg_tilemap[2], *bg_tilemap[2]; -static tilemap *tx_tilemap; /* Tilemap for extra-text-layer */ +static tilemap_t *top_tilemap[2], *fg_tilemap[2], *bg_tilemap[2]; +static tilemap_t *tx_tilemap; /* Tilemap for extra-text-layer */ static int xoffset[4]; static int yoffset[4]; diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index e5b37abead7..af4754d7a9d 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -8,7 +8,7 @@ #include "driver.h" -static tilemap *background_layer,*foreground_layer,*text_layer; +static tilemap_t *background_layer,*foreground_layer,*text_layer; UINT16 *toki_background1_videoram16; UINT16 *toki_background2_videoram16; diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index d7c590032fe..f48aca82a13 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -21,7 +21,7 @@ UINT8 *tp84_palette_bank; UINT8 *tp84_flipscreen_x; UINT8 *tp84_flipscreen_y; -static tilemap *bg_tilemap, *fg_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap; /* diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c index ba208ba8cca..c0538925d6e 100644 --- a/src/mame/video/triplhnt.c +++ b/src/mame/video/triplhnt.c @@ -18,7 +18,7 @@ int triplhnt_sprite_zoom; int triplhnt_sprite_bank; static bitmap_t* helper; -static tilemap* bg_tilemap; +static tilemap_t* bg_tilemap; static TILE_GET_INFO( get_tile_info ) diff --git a/src/mame/video/trucocl.c b/src/mame/video/trucocl.c index 0db799d57c5..2dd39904850 100644 --- a/src/mame/video/trucocl.c +++ b/src/mame/video/trucocl.c @@ -36,7 +36,7 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets. UINT8 *trucocl_videoram; UINT8 *trucocl_colorram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; PALETTE_INIT( trucocl ) { diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c index 5df02d621c3..7445cf21c64 100644 --- a/src/mame/video/tryout.c +++ b/src/mame/video/tryout.c @@ -7,7 +7,7 @@ #include "driver.h" -static tilemap *fg_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *bg_tilemap; static UINT8 vram_bank; static UINT8 *tryout_vram, *tryout_vram_gfx; UINT8 *tryout_gfx_control; diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c index 714536a8ded..ae64ab89108 100644 --- a/src/mame/video/tsamurai.c +++ b/src/mame/video/tsamurai.c @@ -14,7 +14,7 @@ UINT8 *tsamurai_bg_videoram; static int bgcolor; static int textbank1, textbank2; -static tilemap *background, *foreground; +static tilemap_t *background, *foreground; /*************************************************************************** diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index dd7f843a717..9a69dcc18aa 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -20,7 +20,7 @@ to switch between 8*8 tiles and 16*16 tiles. static UINT16 tumblepb_control_0[8]; UINT16 *tumblepb_pf1_data,*tumblepb_pf2_data; -static tilemap *pf1_tilemap,*pf1_alt_tilemap,*pf2_tilemap,*pf2_alt_tilemap; +static tilemap_t *pf1_tilemap,*pf1_alt_tilemap,*pf2_tilemap,*pf2_alt_tilemap; static int flipscreen; static UINT16 bcstory_tilebank; static int sprite_xoffset; diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index 84fb86804d4..12687bec79d 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -45,7 +45,7 @@ extern UINT8 *tunhunt_ram; #define MOBSC0 0x1080 // SCAN ROM START FOR MOBJ (unused?) #define MOBSC1 0x1081 // (unused?) -static tilemap *fg_tilemap; +static tilemap_t *fg_tilemap; /****************************************************************************************/ diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c index ecaba154b07..84f8aa265b0 100644 --- a/src/mame/video/twin16.c +++ b/src/mame/video/twin16.c @@ -46,7 +46,7 @@ enum TWIN16_SPRITE_CAST_SHADOW = 0x20 }; -static tilemap *text_tilemap; +static tilemap_t *text_tilemap; WRITE16_HANDLER( twin16_text_ram_w ) { diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index e8a18b645ce..153d629fc5a 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -46,7 +46,7 @@ static INT32 scroll_y; static INT32 twincobr_display_on; static INT32 twincobr_flip_screen; -static tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; /*************************************************************************** diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index c369b88d354..af84641d507 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -8,7 +8,7 @@ Atari Ultra Tank video emulation #include "includes/ultratnk.h" #include "audio/sprint4.h" -static tilemap* playfield; +static tilemap_t* playfield; static bitmap_t* helper; diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c index f69a0b6b660..9400aa9ac4a 100644 --- a/src/mame/video/unico.c +++ b/src/mame/video/unico.c @@ -95,7 +95,7 @@ WRITE32_HANDLER( unico_palette32_w ) ***************************************************************************/ #define LAYER( _N_ ) \ -static tilemap *tilemap_##_N_; \ +static tilemap_t *tilemap_##_N_; \ \ static TILE_GET_INFO( get_tile_info_##_N_ ) \ { \ diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c index 7f03e145262..0c5a482fdc1 100644 --- a/src/mame/video/usgames.c +++ b/src/mame/video/usgames.c @@ -3,7 +3,7 @@ UINT8 *usgames_videoram,*usgames_charram; -static tilemap *usgames_tilemap; +static tilemap_t *usgames_tilemap; diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c index 3d2e705eead..2396c4b262d 100644 --- a/src/mame/video/vball.c +++ b/src/mame/video/vball.c @@ -22,7 +22,7 @@ int vball_gfxset=0; static int vb_bgprombank; static int vb_spprombank; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c index b9f493c6a71..10400d3534b 100644 --- a/src/mame/video/videopin.c +++ b/src/mame/video/videopin.c @@ -12,7 +12,7 @@ UINT8* videopin_video_ram; static int ball_x; static int ball_y; -static tilemap* bg_tilemap; +static tilemap_t* bg_tilemap; static TILEMAP_MAPPER( get_memory_offset ) diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c index 49017529793..02dfc1a0f92 100644 --- a/src/mame/video/vulgus.c +++ b/src/mame/video/vulgus.c @@ -12,7 +12,7 @@ UINT8 *vulgus_fgvideoram,*vulgus_bgvideoram; UINT8 *vulgus_scroll_low,*vulgus_scroll_high; static int vulgus_palette_bank; -static tilemap *fg_tilemap, *bg_tilemap; +static tilemap_t *fg_tilemap, *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c index cfa92812d0a..9230728d0ee 100644 --- a/src/mame/video/warpwarp.c +++ b/src/mame/video/warpwarp.c @@ -18,7 +18,7 @@ int warpwarp_ball_on; int warpwarp_ball_h,warpwarp_ball_v; int warpwarp_ball_sizex, warpwarp_ball_sizey; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static const rgb_t geebee_palette[] = diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index 2416f563e0b..78116bf064f 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -14,7 +14,7 @@ UINT8 *wc90_scroll1ylo, *wc90_scroll1yhi; UINT8 *wc90_scroll2ylo, *wc90_scroll2yhi; -static tilemap *tx_tilemap,*fg_tilemap,*bg_tilemap; +static tilemap_t *tx_tilemap,*fg_tilemap,*bg_tilemap; diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c index aa304cc3670..08debad5fe6 100644 --- a/src/mame/video/wc90b.c +++ b/src/mame/video/wc90b.c @@ -11,7 +11,7 @@ UINT8 *wc90b_scroll2y; UINT8 *wc90b_scroll_x_lo; -static tilemap *tx_tilemap,*fg_tilemap,*bg_tilemap; +static tilemap_t *tx_tilemap,*fg_tilemap,*bg_tilemap; diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index 85f65896d73..9f315019717 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -47,7 +47,7 @@ static int wecleman_bgpage[4], wecleman_fgpage[4]; static const int *wecleman_gfx_bank; /* Variables only used here: */ -static tilemap *bg_tilemap, *fg_tilemap, *txt_tilemap; +static tilemap_t *bg_tilemap, *fg_tilemap, *txt_tilemap; static struct sprite *sprite_list; static struct sprite **spr_ptr_list; diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c index 24bdb91d9c1..30824567bb5 100644 --- a/src/mame/video/welltris.c +++ b/src/mame/video/welltris.c @@ -7,7 +7,7 @@ extern UINT16 *welltris_spriteram; extern UINT16 *welltris_pixelram; extern UINT16 *welltris_charvideoram; -static tilemap *char_tilemap; +static tilemap_t *char_tilemap; static UINT8 gfxbank[8]; static UINT16 charpalettebank; static UINT16 spritepalettebank; @@ -153,7 +153,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -static void setbank(tilemap *tmap, int num, int bank) +static void setbank(tilemap_t *tmap, int num, int bank) { if (gfxbank[num] != bank) { diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index 50536e67869..39085b39fa9 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -3,7 +3,7 @@ #define TC0100SCN_GFX_NUM 1 -static tilemap *wgp_piv_tilemap[3]; +static tilemap_t *wgp_piv_tilemap[3]; UINT16 *wgp_spritemap; size_t wgp_spritemap_size; diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c index 62058d61673..d1b1d079309 100644 --- a/src/mame/video/williams.c +++ b/src/mame/video/williams.c @@ -143,7 +143,7 @@ static rgb_t blaster_color0; static UINT8 blaster_video_control; /* tilemap variables */ -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static UINT16 tilemap_xscroll; static UINT8 williams2_fg_color; diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c index 4d5e2939856..a8cbb1998fe 100644 --- a/src/mame/video/wrally.c +++ b/src/mame/video/wrally.c @@ -13,7 +13,7 @@ UINT16 *wrally_spriteram; UINT16 *wrally_vregs; UINT16 *wrally_videoram; -tilemap *wrally_pant[2]; +tilemap_t *wrally_pant[2]; /*************************************************************************** diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index 0fa7328aad7..ab1ebbe1d4a 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -10,7 +10,7 @@ UINT16 *wwfsstar_fg0_videoram, *wwfsstar_bg0_videoram; extern int wwfsstar_scrollx, wwfsstar_scrolly; -static tilemap *fg0_tilemap, *bg0_tilemap; +static tilemap_t *fg0_tilemap, *bg0_tilemap; /******************************************************************************* Write Handlers diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c index 021f6bc94dd..03349e435cc 100644 --- a/src/mame/video/wwfwfest.c +++ b/src/mame/video/wwfwfest.c @@ -9,7 +9,7 @@ #include "driver.h" #include "includes/wwfwfest.h" -static tilemap *fg0_tilemap, *bg0_tilemap, *bg1_tilemap; +static tilemap_t *fg0_tilemap, *bg0_tilemap, *bg1_tilemap; UINT16 wwfwfest_pri; UINT16 wwfwfest_bg0_scrollx, wwfwfest_bg0_scrolly, wwfwfest_bg1_scrollx, wwfwfest_bg1_scrolly; UINT16 *wwfwfest_fg0_videoram, *wwfwfest_bg0_videoram, *wwfwfest_bg1_videoram; diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c index 3a7478eba8f..a41bbb2fc3c 100644 --- a/src/mame/video/xain.c +++ b/src/mame/video/xain.c @@ -34,7 +34,7 @@ UINT8 *xain_charram, *xain_bgram0, *xain_bgram1, xain_pri; -static tilemap *char_tilemap, *bgram0_tilemap, *bgram1_tilemap; +static tilemap_t *char_tilemap, *bgram0_tilemap, *bgram1_tilemap; /*************************************************************************** diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index 090661affbb..65b7b95a404 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -14,7 +14,7 @@ UINT8 *xevious_fg_videoram,*xevious_fg_colorram; UINT8 *xevious_bg_videoram,*xevious_bg_colorram; UINT8 *xevious_sr1,*xevious_sr2,*xevious_sr3; -static tilemap *fg_tilemap,*bg_tilemap; +static tilemap_t *fg_tilemap,*bg_tilemap; static INT32 xevious_bs[2]; /*************************************************************************** diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c index eec062da235..b3ba05b03a4 100644 --- a/src/mame/video/xorworld.c +++ b/src/mame/video/xorworld.c @@ -1,6 +1,6 @@ #include "driver.h" -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /*************************************************************************** diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c index a09cd3ee140..1009dea9183 100644 --- a/src/mame/video/xxmissio.c +++ b/src/mame/video/xxmissio.c @@ -14,8 +14,8 @@ UINT8 *xxmissio_bgram; UINT8 *xxmissio_fgram; UINT8 *xxmissio_spriteram; -static tilemap *bg_tilemap; -static tilemap *fg_tilemap; +static tilemap_t *bg_tilemap; +static tilemap_t *fg_tilemap; static UINT8 xscroll; static UINT8 yscroll; static UINT8 flipscreen; diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c index e70257bc9c9..a74b3443374 100644 --- a/src/mame/video/xyonix.c +++ b/src/mame/video/xyonix.c @@ -3,7 +3,7 @@ extern UINT8 *xyonix_vidram; -static tilemap *xyonix_tilemap; +static tilemap_t *xyonix_tilemap; PALETTE_INIT( xyonix ) diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 3d693308a58..210b03bffd3 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -42,12 +42,12 @@ static YGV608 ygv608; -static tilemap *tilemap_A_cache_8[3]; -static tilemap *tilemap_A_cache_16[3]; -static tilemap *tilemap_B_cache_8[3]; -static tilemap *tilemap_B_cache_16[3]; -static tilemap *tilemap_A = NULL; -static tilemap *tilemap_B = NULL; +static tilemap_t *tilemap_A_cache_8[3]; +static tilemap_t *tilemap_A_cache_16[3]; +static tilemap_t *tilemap_B_cache_8[3]; +static tilemap_t *tilemap_B_cache_16[3]; +static tilemap_t *tilemap_A = NULL; +static tilemap_t *tilemap_B = NULL; static bitmap_t *work_bitmap = NULL; static void HandleYGV608Reset( running_machine *machine ); diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c index 8e839749412..9c71134d45e 100644 --- a/src/mame/video/zac2650.c +++ b/src/mame/video/zac2650.c @@ -12,7 +12,7 @@ static bitmap_t *spritebitmap; static int CollisionBackground; static int CollisionSprite; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; /**************************************************************/ diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c index df4bc5d3296..f370a2bf642 100644 --- a/src/mame/video/zaccaria.c +++ b/src/mame/video/zaccaria.c @@ -13,7 +13,7 @@ UINT8 *zaccaria_videoram,*zaccaria_attributesram; -static tilemap *bg_tilemap; +static tilemap_t *bg_tilemap; static const rectangle spritevisiblearea = {