From 9d033c98e79a64e30551a68dc120711f3bb16217 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 13 Aug 2009 04:42:13 +0000 Subject: [PATCH] > From: atari_ace@verizon.net > To: submit@mamedev.org > CC: atariace@hotmail.com > Subject: [patch] Introduce tilemap_private to running_machine > Date: Thu, 23 Jul 2009 18:49:08 -0700 > > Hi mamedev, > > Tilemaps in MAME are currently globally tracked. If multiple machines > with different tilemaps are ever to be supported, this needs to be > changed, which this patchset does. > > 0. This patch add tilemap_private to running_machine, adds machine to > a few apis and adds two new apis to replace the convention that tmap = > NULL => all tilemaps. > 1. This patch mechanically converts all the uses of ALL_TILEMAPS to > use the new apis. > 2. This patch removes ALL_TILEMAPS and makes tilemap_private > dynamically allocated per machine. > > ~aa --- src/emu/cpu/i4004/i4004.c | 2 +- src/emu/mame.h | 2 + src/emu/tilemap.c | 107 +++++++++++++++++++---------------- src/emu/tilemap.h | 20 ++++--- src/emu/uigfx.c | 16 +++--- src/emu/video/generic.c | 2 +- src/mame/drivers/ettrivia.c | 2 +- src/mame/drivers/goindol.c | 2 +- src/mame/drivers/karnov.c | 4 +- src/mame/drivers/m63.c | 2 +- src/mame/drivers/nmg5.c | 2 +- src/mame/drivers/olibochu.c | 2 +- src/mame/drivers/pacland.c | 2 +- src/mame/drivers/safarir.c | 2 +- src/mame/drivers/seta.c | 2 +- src/mame/drivers/sprcros2.c | 2 +- src/mame/drivers/warpwarp.c | 2 +- src/mame/includes/twincobr.h | 8 +-- src/mame/machine/twincobr.c | 4 +- src/mame/video/actfancr.c | 4 +- src/mame/video/alpha68k.c | 12 ++-- src/mame/video/argus.c | 10 ++-- src/mame/video/baraduke.c | 2 +- src/mame/video/battlex.c | 2 +- src/mame/video/bking.c | 2 +- src/mame/video/blueprnt.c | 2 +- src/mame/video/bombjack.c | 2 +- src/mame/video/carjmbre.c | 2 +- src/mame/video/cbasebal.c | 2 +- src/mame/video/cheekyms.c | 4 +- src/mame/video/combatsc.c | 2 +- src/mame/video/darkseal.c | 2 +- src/mame/video/deco32.c | 2 +- src/mame/video/dkong.c | 2 +- src/mame/video/exprraid.c | 2 +- src/mame/video/firetrk.c | 6 +- src/mame/video/flkatck.c | 4 +- src/mame/video/fromance.c | 2 +- src/mame/video/funkybee.c | 2 +- src/mame/video/ginganin.c | 2 +- src/mame/video/gotcha.c | 2 +- src/mame/video/gottlieb.c | 4 +- src/mame/video/gotya.c | 2 +- src/mame/video/gsword.c | 6 +- src/mame/video/gundealr.c | 2 +- src/mame/video/gyruss.c | 4 +- src/mame/video/hanaawas.c | 2 +- src/mame/video/holeland.c | 2 +- src/mame/video/homedata.c | 16 +++--- src/mame/video/hyperspt.c | 2 +- src/mame/video/ironhors.c | 6 +- src/mame/video/karnov.c | 4 +- src/mame/video/kingobox.c | 2 +- src/mame/video/kncljoe.c | 2 +- src/mame/video/konamiic.c | 14 ++--- src/mame/video/konamiic.h | 2 +- src/mame/video/ksayakyu.c | 2 +- src/mame/video/kyugo.c | 2 +- src/mame/video/ladybug.c | 4 +- src/mame/video/lasso.c | 6 +- src/mame/video/m62.c | 4 +- src/mame/video/madmotor.c | 2 +- src/mame/video/mario.c | 12 ++-- src/mame/video/markham.c | 2 +- src/mame/video/megasys1.c | 2 +- src/mame/video/mikie.c | 4 +- src/mame/video/mitchell.c | 4 +- src/mame/video/mrdo.c | 2 +- src/mame/video/mrjong.c | 2 +- src/mame/video/mustache.c | 4 +- src/mame/video/mystston.c | 4 +- src/mame/video/namcos1.c | 2 +- src/mame/video/namcos86.c | 2 +- src/mame/video/nemesis.c | 6 +- src/mame/video/ojankohs.c | 2 +- src/mame/video/pandoras.c | 2 +- src/mame/video/pcktgal.c | 2 +- src/mame/video/phoenix.c | 12 ++-- src/mame/video/pitnrun.c | 2 +- src/mame/video/pokechmp.c | 2 +- src/mame/video/popper.c | 4 +- src/mame/video/raiden.c | 4 +- src/mame/video/redclash.c | 2 +- src/mame/video/rockrage.c | 2 +- src/mame/video/rocnrope.c | 2 +- src/mame/video/sauro.c | 2 +- src/mame/video/sbasketb.c | 2 +- src/mame/video/segaic16.c | 2 +- src/mame/video/seta.c | 4 +- src/mame/video/shaolins.c | 4 +- src/mame/video/shisen.c | 2 +- src/mame/video/sidearms.c | 2 +- src/mame/video/sidepckt.c | 4 +- src/mame/video/slapfght.c | 2 +- src/mame/video/snk6502.c | 6 +- src/mame/video/snk68.c | 4 +- src/mame/video/solomon.c | 2 +- src/mame/video/sshangha.c | 2 +- src/mame/video/stadhero.c | 2 +- src/mame/video/strnskil.c | 2 +- src/mame/video/suna8.c | 12 ++-- src/mame/video/suprridr.c | 4 +- src/mame/video/tagteam.c | 2 +- src/mame/video/taito_b.c | 6 +- src/mame/video/taito_f3.c | 2 +- src/mame/video/taito_l.c | 2 +- src/mame/video/tetrisp2.c | 4 +- src/mame/video/tiamc1.c | 2 +- src/mame/video/tigeroad.c | 2 +- src/mame/video/tmnt.c | 2 +- src/mame/video/toaplan1.c | 4 +- src/mame/video/toypop.c | 2 +- src/mame/video/tp84.c | 4 +- src/mame/video/trackfld.c | 2 +- src/mame/video/tumbleb.c | 16 +++--- src/mame/video/twincobr.c | 8 +-- src/mame/video/ultraman.c | 6 +- src/mame/video/xxmissio.c | 4 +- src/mame/video/yiear.c | 2 +- src/mame/video/yunsung8.c | 2 +- src/mame/video/zodiack.c | 2 +- 121 files changed, 285 insertions(+), 276 deletions(-) diff --git a/src/emu/cpu/i4004/i4004.c b/src/emu/cpu/i4004/i4004.c index 78008e10ca6..8fd9a882aaf 100644 --- a/src/emu/cpu/i4004/i4004.c +++ b/src/emu/cpu/i4004/i4004.c @@ -90,7 +90,7 @@ INLINE i4004_state *get_safe_token(const device_config *device) assert(device != NULL); assert(device->token != NULL); assert(device->type == CPU); - assert(cpu_get_type(device) == CPU_4004); + assert(cpu_get_type(device) == CPU_I4004); return (i4004_state *)device->token; } diff --git a/src/emu/mame.h b/src/emu/mame.h index d9b9385dfc3..399ea8df880 100644 --- a/src/emu/mame.h +++ b/src/emu/mame.h @@ -130,6 +130,7 @@ typedef struct _timer_private timer_private; typedef struct _state_private state_private; typedef struct _memory_private memory_private; typedef struct _palette_private palette_private; +typedef struct _tilemap_private tilemap_private; typedef struct _streams_private streams_private; typedef struct _devices_private devices_private; typedef struct _input_port_private input_port_private; @@ -178,6 +179,7 @@ struct _running_machine state_private * state_data; /* internal data from state.c */ memory_private * memory_data; /* internal data from memory.c */ palette_private * palette_data; /* internal data from palette.c */ + tilemap_private * tilemap_data; /* internal data from tilemap.c */ streams_private * streams_data; /* internal data from streams.c */ devices_private * devices_data; /* internal data from devices.c */ input_port_private * input_port_data; /* internal data from inptport.c */ diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index 07fa6dc1ab3..0fe1d63cc00 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -121,14 +121,12 @@ struct _tilemap }; - -/*************************************************************************** - GLOBAL VARIABLES -***************************************************************************/ - -static tilemap * tilemap_list; -static tilemap ** tilemap_tailptr; -static int tilemap_instance; +struct _tilemap_private +{ + tilemap * list; + tilemap ** tailptr; + int instance; +}; @@ -239,12 +237,12 @@ INLINE INT32 effective_colscroll(tilemap *tmap, int index, UINT32 screen_height) indexed_tilemap - return a tilemap by index -------------------------------------------------*/ -INLINE tilemap *indexed_tilemap(int index) +INLINE tilemap *indexed_tilemap(running_machine *machine, int index) { tilemap *tmap; /* find by the tilemap index */ - for (tmap = tilemap_list; tmap != NULL; tmap = tmap->next) + for (tmap = machine->tilemap_data->list; tmap != NULL; tmap = tmap->next) if (index-- == 0) return tmap; @@ -297,9 +295,8 @@ void tilemap_init(running_machine *machine) if (screen_width != 0 && screen_height != 0) { - tilemap_list = NULL; - tilemap_tailptr = &tilemap_list; - tilemap_instance = 0; + machine->tilemap_data = auto_alloc_clear(machine, tilemap_private); + machine->tilemap_data->tailptr = &machine->tilemap_data->list; machine->priority_bitmap = auto_bitmap_alloc(machine, screen_width, screen_height, BITMAP_FORMAT_INDEXED8); add_exit_callback(machine, tilemap_exit); @@ -319,6 +316,7 @@ void tilemap_init(running_machine *machine) 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 *tmap; + int tilemap_instance = machine->tilemap_data->instance; int group; /* allocate the tilemap itself */ @@ -365,8 +363,8 @@ tilemap *tilemap_create(running_machine *machine, tile_get_info_func tile_get_in tilemap_map_pens_to_layer(tmap, group, 0, 0, TILEMAP_PIXEL_LAYER0); /* add us to the end of the list of tilemaps */ - *tilemap_tailptr = tmap; - tilemap_tailptr = &tmap->next; + *machine->tilemap_data->tailptr = tmap; + machine->tilemap_data->tailptr = &tmap->next; /* save relevant state */ state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->enable); @@ -381,7 +379,7 @@ tilemap *tilemap_create(running_machine *machine, tile_get_info_func tile_get_in state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->dx_flipped); state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->dy); state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->dy_flipped); - tilemap_instance++; + machine->tilemap_data->instance++; /* reset everything after a load */ state_save_register_postload(machine, tilemap_postload, tmap); @@ -426,21 +424,13 @@ void tilemap_set_enable(tilemap *tmap, int enable) /*------------------------------------------------- tilemap_set_flip - set a global flip for the - tilemap; ALL_TILEMAPS can be passed here as - well + tilemap -------------------------------------------------*/ void tilemap_set_flip(tilemap *tmap, UINT32 attributes) { - /* handle ALL_TILEMAPS */ - if (tmap == ALL_TILEMAPS) - { - for (tmap = tilemap_list; tmap != NULL; tmap = tmap->next) - tilemap_set_flip(tmap, attributes); - } - /* if we're changing things, force a refresh of the mappings and mark it all dirty */ - else if (tmap->attributes != attributes) + if (tmap->attributes != attributes) { tmap->attributes = attributes; mappings_update(tmap); @@ -448,6 +438,19 @@ void tilemap_set_flip(tilemap *tmap, UINT32 attributes) } +/*------------------------------------------------- + tilemap_set_flip_all - set a global flip for all + the tilemaps +-------------------------------------------------*/ + +void tilemap_set_flip_all(running_machine *machine, UINT32 attributes) +{ + tilemap *tmap; + for (tmap = machine->tilemap_data->list; tmap != NULL; tmap = tmap->next) + tilemap_set_flip(tmap, attributes); +} + + /*************************************************************************** DIRTY TILE MARKING @@ -482,22 +485,24 @@ void tilemap_mark_tile_dirty(tilemap *tmap, tilemap_memory_index memindex) void tilemap_mark_all_tiles_dirty(tilemap *tmap) { - /* handle ALL_TILEMAPS */ - if (tmap == ALL_TILEMAPS) - { - for (tmap = tilemap_list; tmap != NULL; tmap = tmap->next) - tilemap_mark_all_tiles_dirty(tmap); - } - /* mark all tiles dirty and clear the clean flag */ - else - { - tmap->all_tiles_dirty = TRUE; - tmap->all_tiles_clean = FALSE; - } + tmap->all_tiles_dirty = TRUE; + tmap->all_tiles_clean = FALSE; } +/*------------------------------------------------- + tilemap_mark_all_tiles_dirty_all - mark all the + tiles in all the tilemaps dirty +-------------------------------------------------*/ + +void tilemap_mark_all_tiles_dirty_all(running_machine *machine) +{ + tilemap *tmap; + for (tmap = machine->tilemap_data->list; tmap != NULL; tmap = tmap->next) + tilemap_mark_all_tiles_dirty(tmap); +} + /*************************************************************************** PEN-TO-LAYER MAPPING @@ -936,13 +941,13 @@ profiler_mark(PROFILER_END); tilemap_count - return the number of tilemaps -------------------------------------------------*/ -int tilemap_count(void) +int tilemap_count(running_machine *machine) { tilemap *tmap; int count = 0; /* find by the tilemap index */ - for (tmap = tilemap_list; tmap != NULL; tmap = tmap->next) + for (tmap = machine->tilemap_data->list; tmap != NULL; tmap = tmap->next) count++; return count; } @@ -953,9 +958,9 @@ int tilemap_count(void) indexed tilemap -------------------------------------------------*/ -void tilemap_size_by_index(int number, UINT32 *width, UINT32 *height) +void tilemap_size_by_index(running_machine *machine, int number, UINT32 *width, UINT32 *height) { - tilemap *tmap = indexed_tilemap(number); + tilemap *tmap = indexed_tilemap(machine, number); *width = tmap->width; *height = tmap->height; } @@ -967,9 +972,9 @@ void tilemap_size_by_index(int number, UINT32 *width, UINT32 *height) priority) -------------------------------------------------*/ -void tilemap_draw_by_index(bitmap_t *dest, int number, UINT32 scrollx, UINT32 scrolly) +void tilemap_draw_by_index(running_machine *machine, bitmap_t *dest, int number, UINT32 scrollx, UINT32 scrolly) { - tilemap *tmap = indexed_tilemap(number); + tilemap *tmap = indexed_tilemap(machine, number); blit_parameters blit; int xpos,ypos; @@ -1070,14 +1075,16 @@ TILEMAP_MAPPER( tilemap_scan_cols_flip_xy ) static void tilemap_exit(running_machine *machine) { + tilemap_private *tilemap_data = machine->tilemap_data; + /* free all the tilemaps in the list */ - while (tilemap_list != NULL) + while (tilemap_data->list != NULL) { - tilemap *next = tilemap_list->next; - tilemap_dispose(tilemap_list); - tilemap_list = next; + tilemap *next = tilemap_data->list->next; + tilemap_dispose(tilemap_data->list); + tilemap_data->list = next; } - tilemap_tailptr = NULL; + tilemap_data->tailptr = &tilemap_data->list; } @@ -1103,7 +1110,7 @@ static void tilemap_dispose(tilemap *tmap) tilemap **tmapptr; /* walk the list of tilemaps; when we find ourself, remove it */ - for (tmapptr = &tilemap_list; *tmapptr != NULL; tmapptr = &(*tmapptr)->next) + for (tmapptr = &tmap->machine->tilemap_data->list; *tmapptr != NULL; tmapptr = &(*tmapptr)->next) if (*tmapptr == tmap) { *tmapptr = tmap->next; diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index b5541e2a582..06f84c8f3a3 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -305,10 +305,6 @@ CONSTANTS ***************************************************************************/ -/* ALL_TILEMAPS may be used with: tilemap_set_flip, tilemap_mark_all_tiles_dirty */ -#define ALL_TILEMAPS NULL - - /* maximum number of groups */ #define TILEMAP_NUM_GROUPS 256 @@ -436,9 +432,12 @@ void tilemap_set_palette_offset(tilemap *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); -/* set a global flip for the tilemap; ALL_TILEMAPS can be passed here as well */ +/* set a global flip for the tilemap */ void tilemap_set_flip(tilemap *tmap, UINT32 attributes); +/* set a global flip for all tilemaps */ +void tilemap_set_flip_all(running_machine *machine, UINT32 attributes); + /* ----- dirty tile marking ----- */ @@ -446,9 +445,12 @@ void tilemap_set_flip(tilemap *tmap, UINT32 attributes); /* mark a single tile dirty based on its memory index */ void tilemap_mark_tile_dirty(tilemap *tmap, tilemap_memory_index memory_index); -/* mark all the tiles in a tilemap dirty; ALL_TILEMAPS can be passed here as well */ +/* mark all the tiles dirty in a tilemap */ void tilemap_mark_all_tiles_dirty(tilemap *tmap); +/* mark all the tiles dirty in all tilemaps */ +void tilemap_mark_all_tiles_dirty_all(running_machine *machine); + /* ----- pen-to-layer mapping ----- */ @@ -519,13 +521,13 @@ void tilemap_draw_roz_primask(bitmap_t *dest, const rectangle *cliprect, tilemap /* ----- indexed tilemap handling ----- */ /* return the number of tilemaps */ -int tilemap_count(void); +int tilemap_count(running_machine *machine); /* return the size of an indexed tilemap */ -void tilemap_size_by_index(int number, UINT32 *width, UINT32 *height); +void tilemap_size_by_index(running_machine *machine, int number, UINT32 *width, UINT32 *height); /* render an indexed tilemap with fixed characteristics (no priority) */ -void tilemap_draw_by_index(bitmap_t *dest, int number, UINT32 scrollx, UINT32 scrolly); +void tilemap_draw_by_index(running_machine *machine, bitmap_t *dest, int number, UINT32 scrollx, UINT32 scrolly); diff --git a/src/emu/uigfx.c b/src/emu/uigfx.c index 52570446f57..7dc83f658fc 100644 --- a/src/emu/uigfx.c +++ b/src/emu/uigfx.c @@ -155,7 +155,7 @@ UINT32 ui_gfx_ui_handler(running_machine *machine, UINT32 uistate) ui_gfx_state *state = &ui_gfx; /* if we have nothing, implicitly cancel */ - if (machine->config->total_colors == 0 && machine->colortable == NULL && machine->gfx[0] == NULL && tilemap_count() == 0) + if (machine->config->total_colors == 0 && machine->colortable == NULL && machine->gfx[0] == NULL && tilemap_count(machine) == 0) goto cancel; /* if we're not paused, mark the bitmap dirty */ @@ -190,7 +190,7 @@ again: case 2: /* if we have tilemaps, display them */ - if (tilemap_count() > 0) + if (tilemap_count(machine) > 0) { tilemap_handler(machine, state); break; @@ -857,7 +857,7 @@ static void tilemap_handler(running_machine *machine, ui_gfx_state *state) render_target_get_bounds(render_get_ui_target(), &targwidth, &targheight, NULL); /* get the size of the tilemap itself */ - tilemap_size_by_index(state->tilemap.which, &mapwidth, &mapheight); + tilemap_size_by_index(machine, state->tilemap.which, &mapwidth, &mapheight); if (state->tilemap.rotate & ORIENTATION_SWAP_XY) { UINT32 temp = mapwidth; mapwidth = mapheight; mapheight = temp; } @@ -909,7 +909,7 @@ static void tilemap_handler(running_machine *machine, ui_gfx_state *state) boxbounds.y1 = mapboxbounds.y1 + 0.5f * chheight; /* figure out the title and expand the outer box to fit */ - sprintf(title, "TMAP %d/%d %dx%d OFFS %d,%d", state->tilemap.which, tilemap_count() - 1, mapwidth, mapheight, state->tilemap.xoffs, state->tilemap.yoffs); + sprintf(title, "TMAP %d/%d %dx%d OFFS %d,%d", state->tilemap.which, tilemap_count(machine) - 1, mapwidth, mapheight, state->tilemap.xoffs, state->tilemap.yoffs); titlewidth = render_font_get_string_width(ui_font, chheight, render_get_ui_aspect(), title); if (boxbounds.x1 - boxbounds.x0 < titlewidth + chwidth) { @@ -963,11 +963,11 @@ static void tilemap_handle_keys(running_machine *machine, ui_gfx_state *state, i /* clamp within range */ if (state->tilemap.which < 0) state->tilemap.which = 0; - if (state->tilemap.which >= tilemap_count()) - state->tilemap.which = tilemap_count() - 1; + if (state->tilemap.which >= tilemap_count(machine)) + state->tilemap.which = tilemap_count(machine) - 1; /* cache some info in locals */ - tilemap_size_by_index(state->tilemap.which, &mapwidth, &mapheight); + tilemap_size_by_index(machine, state->tilemap.which, &mapwidth, &mapheight); /* handle zoom (minus,plus) */ if (ui_input_pressed(machine, IPT_UI_ZOOM_OUT)) @@ -1071,7 +1071,7 @@ static void tilemap_update_bitmap(running_machine *machine, ui_gfx_state *state, /* handle the redraw */ if (state->bitmap_dirty) { - tilemap_draw_by_index(state->bitmap, state->tilemap.which, state->tilemap.xoffs, state->tilemap.yoffs); + tilemap_draw_by_index(machine, state->bitmap, state->tilemap.which, state->tilemap.xoffs, state->tilemap.yoffs); /* reset the texture to force an update */ render_texture_set_bitmap(state->texture, state->bitmap, NULL, screen_texformat, palette); diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c index 63a97c843e1..4b64a9813bd 100644 --- a/src/emu/video/generic.c +++ b/src/emu/video/generic.c @@ -454,7 +454,7 @@ static void updateflip(running_machine *machine) attoseconds_t period = video_screen_get_frame_period(machine->primary_screen).attoseconds; rectangle visarea = *video_screen_get_visible_area(machine->primary_screen); - tilemap_set_flip(ALL_TILEMAPS,(TILEMAP_FLIPX & flip_screen_x) | (TILEMAP_FLIPY & flip_screen_y)); + tilemap_set_flip_all(machine,(TILEMAP_FLIPX & flip_screen_x) | (TILEMAP_FLIPY & flip_screen_y)); if (flip_screen_x) { diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index adebd2cfb6b..c563ccf65fb 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -56,7 +56,7 @@ static WRITE8_HANDLER( ettrivia_bg_w ) static WRITE8_HANDLER( ettrivia_control_w ) { - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); palreg = (data >> 1) & 3; gfx_bank = (data >> 2) & 1; diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index 89a004a7bfc..953a4d762a3 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -47,7 +47,7 @@ static WRITE8_HANDLER( goindol_bankswitch_w ) if (goindol_char_bank != ((data & 0x10) >> 4)) { goindol_char_bank = (data & 0x10) >> 4; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } flip_screen_set(space->machine, data & 0x20); diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 85566249f7b..ed962c1cdc6 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -47,7 +47,7 @@ PALETTE_INIT( karnov ); VIDEO_UPDATE( karnov ); WRITE16_HANDLER( karnov_playfield_swap_w ); WRITE16_HANDLER( karnov_videoram_w ); -void karnov_flipscreen_w(int data); +void karnov_flipscreen_w(running_machine *machine, int data); VIDEO_START( karnov ); VIDEO_START( wndrplnt ); @@ -317,7 +317,7 @@ static WRITE16_HANDLER( karnov_control_w ) case 8: /* HSHIFT (9 bits) - Top bit indicates video flip */ COMBINE_DATA(&karnov_scroll[0]); - karnov_flipscreen_w(data>>15); + karnov_flipscreen_w(space->machine, data>>15); break; case 0xa: /* VSHIFT */ diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 2ed709cd541..0ef363e421d 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -219,7 +219,7 @@ static WRITE8_HANDLER( m63_flipscreen_w ) if (flip_screen_get(space->machine) != (~data & 0x01)) { flip_screen_set(space->machine, ~data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 9f65f410e4c..ac260052071 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -266,7 +266,7 @@ static WRITE16_HANDLER( gfx_bank_w ) if( gfx_bank != (data & 3) ) { gfx_bank = data & 3; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 6e2cd1b1b6f..efa3b79606d 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -112,7 +112,7 @@ static WRITE8_HANDLER( olibochu_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x80)) { flip_screen_set(space->machine, data & 0x80); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* other bits are used, but unknown */ diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index 7944fb78a2e..e599a629231 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -202,7 +202,7 @@ static WRITE8_HANDLER( pacland_flipscreen_w ) int bit = !BIT(offset,11); /* can't use flip_screen_set(space->machine, ) because the visible area is asymmetrical */ flip_screen_set_no_update(space->machine, bit); - tilemap_set_flip(ALL_TILEMAPS,flip_screen_get(space->machine) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(space->machine,flip_screen_get(space->machine) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index 408b93f0e3e..0451904d912 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -86,7 +86,7 @@ static WRITE8_HANDLER( ram_bank_w ) { ram_bank = data & 0x01; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 085e84cc334..b83586a9c9e 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1725,7 +1725,7 @@ static WRITE16_HANDLER( usclssic_lockout_w ) port_select = (data & 0x40) >> 6; seta_tiles_offset = (data & 0x10) ? 0x4000: 0; - if (old_tiles_offset != seta_tiles_offset) tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + if (old_tiles_offset != seta_tiles_offset) tilemap_mark_all_tiles_dirty_all(space->machine); old_tiles_offset = seta_tiles_offset; seta_coin_lockout_w(space->machine, data); diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index 397ad75896d..8e4f292ddc6 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -91,7 +91,7 @@ static WRITE8_HANDLER( sprcros2_m_port7_w ) if((sprcros2_m_port7^data)&0x40) memory_set_bankptr(space->machine, 1,&RAM[0x10000+((data&0x40)<<7)]); - tilemap_set_flip( ALL_TILEMAPS,data&0x02?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); + tilemap_set_flip_all( space->machine,data&0x02?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); sprcros2_m_port7 = data; } diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index 44f39dbf472..29c9a4c1441 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -205,7 +205,7 @@ static WRITE8_HANDLER( geebee_out7_w ) break; case 5: if( geebee_bgw != (data & 1) ) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); geebee_bgw = data & 1; break; case 6: diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 545b7d53261..ca1ea4e57b1 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -47,7 +47,7 @@ extern UINT8 *twincobr_sharedram; /*----------- defined in video/twincobr.c -----------*/ -extern void twincobr_flipscreen(int flip); +extern void twincobr_flipscreen(running_machine *machine, int flip); extern void twincobr_display(int enable); READ16_HANDLER( twincobr_txram_r ); @@ -79,9 +79,9 @@ WRITE8_HANDLER( wardner_sprite_w ); WRITE8_HANDLER( wardner_CRTC_reg_sel_w ); WRITE8_HANDLER( wardner_CRTC_data_w ); -extern int twincobr_fg_rom_bank; -extern int twincobr_bg_ram_bank; -extern int wardner_sprite_hack; +extern INT32 twincobr_fg_rom_bank; +extern INT32 twincobr_bg_ram_bank; +extern INT32 wardner_sprite_hack; VIDEO_START( toaplan0 ); VIDEO_UPDATE( toaplan0 ); diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c index c094d687456..0816caaa017 100644 --- a/src/mame/machine/twincobr.c +++ b/src/mame/machine/twincobr.c @@ -230,8 +230,8 @@ static void toaplan0_control_w(running_machine *machine, int offset, int data) switch (data) { case 0x0004: twincobr_intenable = 0; break; case 0x0005: twincobr_intenable = 1; break; - case 0x0006: twincobr_flipscreen(0); break; - case 0x0007: twincobr_flipscreen(1); break; + case 0x0006: twincobr_flipscreen(machine, 0); break; + case 0x0007: twincobr_flipscreen(machine, 1); break; case 0x0008: twincobr_bg_ram_bank = 0x0000; break; case 0x0009: twincobr_bg_ram_bank = 0x1000; break; case 0x000a: twincobr_fg_rom_bank = 0x0000; break; diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c index 6d5f2eb8821..fe0d1ee8fcb 100644 --- a/src/mame/video/actfancr.c +++ b/src/mame/video/actfancr.c @@ -152,7 +152,7 @@ VIDEO_UPDATE( actfancr ) /* Draw playfield */ flipscreen=actfancr_control_2[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); tilemap_set_scrollx( pf1_tilemap,0, scrollx ); tilemap_set_scrolly( pf1_tilemap,0, scrolly ); @@ -232,7 +232,7 @@ VIDEO_UPDATE( triothep ) /* Draw playfield */ flipscreen=actfancr_control_2[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (actfancr_control_2[0]&0x4) { tilemap_set_scroll_rows(pf1_tilemap,32); diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index f0c508b841a..65017a00698 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -137,9 +137,9 @@ VIDEO_UPDATE( alpha68k_II ) static int last_bank=0; if (last_bank!=bank_base) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); last_bank=bank_base; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); bitmap_fill(bitmap,cliprect,2047); //AT @@ -275,9 +275,9 @@ VIDEO_UPDATE( alpha68k_V ) static int last_bank=0; if (last_bank!=bank_base) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); last_bank=bank_base; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); bitmap_fill(bitmap,cliprect,4095); @@ -311,9 +311,9 @@ VIDEO_UPDATE( alpha68k_V_sb ) static int last_bank=0; if (last_bank!=bank_base) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); last_bank=bank_base; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); bitmap_fill(bitmap,cliprect,4095); diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index 86b798c21b9..47cdc65d043 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -751,9 +751,9 @@ WRITE8_HANDLER( butasan_unknown_w ) Screen refresh ***************************************************************************/ -static void bg_setting(void) +static void bg_setting(running_machine *machine) { - tilemap_set_flip(ALL_TILEMAPS, argus_flipscreen ? TILEMAP_FLIPY|TILEMAP_FLIPX : 0); + tilemap_set_flip_all(machine, argus_flipscreen ? TILEMAP_FLIPY|TILEMAP_FLIPX : 0); if (!argus_flipscreen) { @@ -1206,7 +1206,7 @@ static void butasan_log_vram(void) VIDEO_UPDATE( argus ) { - bg_setting(); + bg_setting(screen->machine); /* scroll BG0 and render tile at proper position */ argus_bg0_scroll_handle(screen->machine); @@ -1222,7 +1222,7 @@ VIDEO_UPDATE( argus ) VIDEO_UPDATE( valtric ) { - bg_setting(); + bg_setting(screen->machine); if (argus_bg_status & 1) /* Backgound enable */ valtric_draw_mosaic(screen, bitmap, cliprect); @@ -1235,7 +1235,7 @@ VIDEO_UPDATE( valtric ) VIDEO_UPDATE( butasan ) { - bg_setting(); + bg_setting(screen->machine); if (argus_bg_status & 1) /* Backgound enable */ tilemap_draw(bitmap, cliprect, bg0_tilemap, 0, 0); diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index 65d9c313a6a..7a1ad0eea89 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -313,7 +313,7 @@ VIDEO_UPDATE( baraduke ) /* flip screen is embedded in the sprite control registers */ /* can't use flip_screen_set(screen->machine, ) because the visible area is asymmetrical */ flip_screen_set_no_update(screen->machine, spriteram[0x07f6] & 0x01); - tilemap_set_flip(ALL_TILEMAPS,flip_screen_get(screen->machine) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(screen->machine,flip_screen_get(screen->machine) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); set_scroll(screen->machine, 0); set_scroll(screen->machine, 1); diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index 356d2d7516f..4ec0949007c 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -63,7 +63,7 @@ WRITE8_HANDLER( battlex_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x80)) { flip_screen_set(space->machine, data & 0x80); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index 02a95b96d69..9e9cc9d659d 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -151,7 +151,7 @@ WRITE8_HANDLER( bking_cont1_w ) flip_screen_set_no_update(space->machine, data & 0x04); - tilemap_set_flip(ALL_TILEMAPS, flip_screen_get(space->machine) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tilemap_set_flip_all(space->machine, flip_screen_get(space->machine) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); controller = data & 0x02; diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index c76cc228bd4..a7347624cae 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -61,7 +61,7 @@ WRITE8_HANDLER( blueprnt_flipscreen_w ) if (gfx_bank != ((data & 0x04) >> 2)) { gfx_bank = ((data & 0x04) >> 2); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index 5ea8f2e9187..24e84804fe2 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -38,7 +38,7 @@ WRITE8_HANDLER( bombjack_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index e9a7e8273ba..7f44f72ee0e 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -40,7 +40,7 @@ PALETTE_INIT( carjmbre ) WRITE8_HANDLER( carjmbre_flipscreen_w ) { carjmbre_flipscreen = data?(TILEMAP_FLIPX|TILEMAP_FLIPY):0; - tilemap_set_flip( ALL_TILEMAPS,carjmbre_flipscreen ); + tilemap_set_flip_all( space->machine,carjmbre_flipscreen ); } WRITE8_HANDLER( carjmbre_bgcolor_w ) diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index ea92ef4cccd..d21bb5efb73 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -90,7 +90,7 @@ WRITE8_HANDLER( cbasebal_gfxctrl_w ) /* bit 1 is flip screen */ flipscreen = data & 0x02; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* bit 2 is unknown - unused? */ diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index f569ea5bdca..baaffd0a340 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -155,8 +155,8 @@ VIDEO_UPDATE( cheekyms ) int scrolly = ((*cheekyms_port_80 >> 3) & 0x07); int flip = *cheekyms_port_80 & 0x80; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); - tilemap_set_flip(ALL_TILEMAPS, flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tilemap_mark_all_tiles_dirty_all(screen->machine); + tilemap_set_flip_all(screen->machine, flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); bitmap_fill(bitmap, cliprect, 0); bitmap_fill(bitmap_buffer, cliprect, 0); diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index a6a3a1e2fd1..9b9788c5111 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -443,7 +443,7 @@ MACHINE_RESET( combasc ) WRITE8_HANDLER( combasc_pf_control_w ) { - K007121_ctrl_w(combasc_video_circuit,offset,data); + K007121_ctrl_w(space->machine,combasc_video_circuit,offset,data); if (offset == 7) tilemap_set_flip(bg_tilemap[combasc_video_circuit],(data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c index b8a90f8faee..9430936a4c8 100644 --- a/src/mame/video/darkseal.c +++ b/src/mame/video/darkseal.c @@ -279,7 +279,7 @@ VIDEO_START( darkseal ) VIDEO_UPDATE( darkseal ) { flipscreen=!(darkseal_control_0[0]&0x80); - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* Update scroll registers */ tilemap_set_scrollx( pf1_tilemap,0, darkseal_control_1[3] ); diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 21ca8292101..6a6a4a584bf 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -1233,7 +1233,7 @@ VIDEO_UPDATE( captaven ) static int last_pf3_bank; flip_screen_set(screen->machine, deco32_pf12_control[0]&0x80); - tilemap_set_flip(ALL_TILEMAPS,flip_screen_get(screen->machine) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flip_screen_get(screen->machine) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); deco32_setup_scroll(pf1_tilemap, 256,(deco32_pf12_control[5]>>0)&0xff,(deco32_pf12_control[6]>>0)&0xff,deco32_pf12_control[2],deco32_pf12_control[1],deco32_pf1_rowscroll,deco32_pf1_rowscroll+0x200); deco32_setup_scroll(pf1a_tilemap,512,(deco32_pf12_control[5]>>0)&0xff,(deco32_pf12_control[6]>>0)&0xff,deco32_pf12_control[2],deco32_pf12_control[1],deco32_pf1_rowscroll,deco32_pf1_rowscroll+0x200); diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index 6c8b6a369dd..e3b099a12f2 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -978,7 +978,7 @@ VIDEO_UPDATE( dkong ) { dkong_state *state = (dkong_state *)screen->machine->driver_data; - tilemap_set_flip(ALL_TILEMAPS, state->flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tilemap_set_flip_all(screen->machine, state->flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); tilemap_set_scrollx(state->bg_tilemap, 0, state->flip ? 0 : 0); tilemap_set_scrolly(state->bg_tilemap, 0, state->flip ? -8 : 0); diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index 5517ad88b88..73e0315029f 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -21,7 +21,7 @@ WRITE8_HANDLER( exprraid_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index bdce628302b..43454acbe8d 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -363,7 +363,7 @@ static void check_collision(int which) VIDEO_UPDATE( firetrk ) { - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); tilemap_set_scrollx(tilemap1, 0, *firetrk_scroll_x - 37); tilemap_set_scrollx(tilemap2, 0, *firetrk_scroll_x - 37); tilemap_set_scrolly(tilemap1, 0, *firetrk_scroll_y); @@ -397,7 +397,7 @@ VIDEO_UPDATE( firetrk ) VIDEO_UPDATE( superbug ) { - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); tilemap_set_scrollx(tilemap1, 0, *firetrk_scroll_x - 37); tilemap_set_scrollx(tilemap2, 0, *firetrk_scroll_x - 37); tilemap_set_scrolly(tilemap1, 0, *firetrk_scroll_y); @@ -426,7 +426,7 @@ VIDEO_UPDATE( superbug ) VIDEO_UPDATE( montecar ) { - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); tilemap_set_scrollx(tilemap1, 0, *firetrk_scroll_x - 37); tilemap_set_scrollx(tilemap2, 0, *firetrk_scroll_x - 37); tilemap_set_scrolly(tilemap1, 0, *firetrk_scroll_y); diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index b30bb305a6a..9a936498a08 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -102,12 +102,12 @@ WRITE8_HANDLER( flkatck_k007121_regs_w ) { case 0x04: /* ROM bank select */ if (data != K007121_ctrlram[0][0x04]) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); break; case 0x07: /* flip screen + IRQ control */ k007121_flip_screen = data & 0x08; - tilemap_set_flip(ALL_TILEMAPS, k007121_flip_screen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine, k007121_flip_screen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); flkatck_irq_enabled = data & 0x02; break; } diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index fc38bb7933b..aa5a9dd4b66 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -158,7 +158,7 @@ WRITE8_HANDLER( fromance_gfxreg_w ) if (flipscreen != flipscreen_old) { flipscreen_old = flipscreen; - tilemap_set_flip(ALL_TILEMAPS, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(space->machine, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } } diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index c61f4b78ad6..7946670ee02 100644 --- a/src/mame/video/funkybee.c +++ b/src/mame/video/funkybee.c @@ -59,7 +59,7 @@ WRITE8_HANDLER( funkybee_gfx_bank_w ) if (gfx_bank != (data & 0x01)) { gfx_bank = data & 0x01; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index e0050ce81d0..10afddd8e9b 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -178,7 +178,7 @@ WRITE16_HANDLER( ginganin_vregs16_w ) */ case 6: flipscreen = !(data & 1); - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); break; case 7: soundlatch_w(space, 0, data); diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c index c98028a2f59..bbfaff5829c 100644 --- a/src/mame/video/gotcha.c +++ b/src/mame/video/gotcha.c @@ -74,7 +74,7 @@ WRITE16_HANDLER( gotcha_gfxbank_w ) if (gfxbank[banksel] != ((data & 0x0f00) >> 8)) { gfxbank[banksel] = (data & 0x0f00) >> 8; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } } diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index 1116ae51cd2..52e11ef82dc 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -67,14 +67,14 @@ WRITE8_HANDLER( gottlieb_video_control_w ) if (flip_screen_x_get(space->machine) != (data & 0x02)) { flip_screen_x_set(space->machine, data & 0x02); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* bit 2 controls horizonal flip screen */ if (flip_screen_y_get(space->machine) != (data & 0x04)) { flip_screen_y_set(space->machine, data & 0x04); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* in Q*Bert Qubes only, bit 4 controls the sprite bank */ diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index de5a43ede29..17f2d8a82c9 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -90,7 +90,7 @@ WRITE8_HANDLER( gotya_video_control_w ) if (flip_screen_get(space->machine) != (data & 0x02)) { flip_screen_set(space->machine, data & 0x02); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c index bd1d260f50a..66a45ea7adf 100644 --- a/src/mame/video/gsword.c +++ b/src/mame/video/gsword.c @@ -111,7 +111,7 @@ WRITE8_HANDLER( gsword_charbank_w ) if (charbank != data) { charbank = data; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -127,7 +127,7 @@ WRITE8_HANDLER( gsword_videoctrl_w ) if (charpalbank != ((data & 0x60) >> 5)) { charpalbank = (data & 0x60) >> 5; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* bit 4 is flip screen */ @@ -135,7 +135,7 @@ WRITE8_HANDLER( gsword_videoctrl_w ) if (flipscreen != (data & 0x10)) { flipscreen = data & 0x10; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* bit 0 could be used but unknown */ diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c index 01ed954f6f0..086540aa6b6 100644 --- a/src/mame/video/gundealr.c +++ b/src/mame/video/gundealr.c @@ -124,7 +124,7 @@ WRITE8_HANDLER( yamyam_fg_scroll_w ) WRITE8_HANDLER( gundealr_flipscreen_w ) { flipscreen = data; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index 667881d3a20..b23dd0858b8 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -158,8 +158,8 @@ VIDEO_UPDATE( gyruss ) { if (cliprect->min_y == video_screen_get_visible_area(screen)->min_y) { - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); - tilemap_set_flip(ALL_TILEMAPS, (*gyruss_flipscreen & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_mark_all_tiles_dirty_all(screen->machine); + tilemap_set_flip_all(screen->machine, (*gyruss_flipscreen & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } tilemap_draw(bitmap, cliprect, gyruss_tilemap, TILEMAP_DRAW_OPAQUE, 0); diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c index 9ecfa8d26b6..3f5e8e14cc9 100644 --- a/src/mame/video/hanaawas.c +++ b/src/mame/video/hanaawas.c @@ -84,7 +84,7 @@ WRITE8_DEVICE_HANDLER( hanaawas_portB_w ) if (flip_screen_get(device->machine) != (~data & 0x80)) { flip_screen_set(device->machine, ~data & 0x80); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(device->machine); } } diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index 5a07b353398..8566b41a251 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -86,7 +86,7 @@ WRITE8_HANDLER( holeland_pal_offs_w ) { po[offset] = data & 1; palette_offset = (po[0] + (po[1] << 1)) << 4; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index 7612ab82c4d..5aa14dacb10 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -588,7 +588,7 @@ WRITE8_HANDLER( reikaids_gfx_bank_w ) if (reikaids_gfx_bank[reikaids_which] != data) { reikaids_gfx_bank[reikaids_which] = data; - tilemap_mark_all_tiles_dirty( ALL_TILEMAPS ); + tilemap_mark_all_tiles_dirty_all( space->machine ); } reikaids_which ^= 1; @@ -600,7 +600,7 @@ WRITE8_HANDLER( pteacher_gfx_bank_w ) if (pteacher_gfx_bank != data) { pteacher_gfx_bank = data; - tilemap_mark_all_tiles_dirty( ALL_TILEMAPS ); + tilemap_mark_all_tiles_dirty_all( space->machine ); } } @@ -620,7 +620,7 @@ WRITE8_HANDLER( mrokumei_blitter_bank_w ) */ if ((blitter_bank ^ data) & 0x3b) - tilemap_mark_all_tiles_dirty( ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all( space->machine); blitter_bank = data; } @@ -643,7 +643,7 @@ WRITE8_HANDLER( pteacher_blitter_bank_w ) */ if ((blitter_bank ^ data) & 0x03) - tilemap_mark_all_tiles_dirty( ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all( space->machine); blitter_bank = data; } @@ -689,7 +689,7 @@ VIDEO_UPDATE( mrokumei ) if (flags != homedata_flipscreen) { homedata_flipscreen = flags; - tilemap_mark_all_tiles_dirty( ALL_TILEMAPS ); + tilemap_mark_all_tiles_dirty_all( screen->machine ); } switch (homedata_vreg[0x3]) @@ -739,7 +739,7 @@ VIDEO_UPDATE( reikaids ) if (flags != homedata_flipscreen) { homedata_flipscreen = flags; - tilemap_mark_all_tiles_dirty( ALL_TILEMAPS ); + tilemap_mark_all_tiles_dirty_all( screen->machine ); } @@ -785,7 +785,7 @@ VIDEO_UPDATE( reikaids ) if (flags != homedata_flipscreen) { homedata_flipscreen = flags; - tilemap_mark_all_tiles_dirty( ALL_TILEMAPS ); + tilemap_mark_all_tiles_dirty_all( screen->machine ); } @@ -814,7 +814,7 @@ VIDEO_UPDATE( pteacher ) if (flags != homedata_flipscreen) { homedata_flipscreen = flags; - tilemap_mark_all_tiles_dirty( ALL_TILEMAPS ); + tilemap_mark_all_tiles_dirty_all( screen->machine ); } /* bit 2 of blitter_bank stretches characters horizontally by 3/2, diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index 56952078665..bb13c1daaa3 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -108,7 +108,7 @@ WRITE8_HANDLER( hyperspt_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index 2c9f80d5373..47d7eae794d 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -98,7 +98,7 @@ WRITE8_HANDLER( ironhors_charbank_w ) if (charbank != (data & 0x03)) { charbank = data & 0x03; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } spriterambank = data & 0x08; @@ -111,7 +111,7 @@ WRITE8_HANDLER( ironhors_palettebank_w ) if (palettebank != (data & 0x07)) { palettebank = data & 0x07; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } coin_counter_w(0, data & 0x10); @@ -127,7 +127,7 @@ WRITE8_HANDLER( ironhors_flipscreen_w ) if (flip_screen_get(space->machine) != (~data & 0x08)) { flip_screen_set(space->machine, ~data & 0x08); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* other bits are used too, but unknown */ diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 747ce94068a..1c0717745ba 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -67,10 +67,10 @@ PALETTE_INIT( karnov ) } } -void karnov_flipscreen_w(int data) +void karnov_flipscreen_w(running_machine *machine, int data) { flipscreen=data; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } static void draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index f15f8621317..91dc0f621d1 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -177,7 +177,7 @@ WRITE8_HANDLER( kingofb_f800_w ) if (flip_screen_get(space->machine) != (data & 0x80)) { flip_screen_set(space->machine, data & 0x80); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 78402069a05..822766d21c6 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -141,7 +141,7 @@ WRITE8_HANDLER( kncljoe_control_w ) set after IN0 - Coin 1 goes high AND the credit has been added */ flipscreen = data & 0x01; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? TILEMAP_FLIPX : TILEMAP_FLIPY); + tilemap_set_flip_all(space->machine,flipscreen ? TILEMAP_FLIPX : TILEMAP_FLIPY); coin_counter_w(0,data & 0x02); coin_counter_w(1,data & 0x20); diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index 7c05c8d4d7b..181959a5f82 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -1229,14 +1229,14 @@ UINT8 K007121_ctrlram[MAX_K007121][8]; static int K007121_flipscreen[MAX_K007121]; -void K007121_ctrl_w(int chip,int offset,int data) +void K007121_ctrl_w(running_machine *machine,int chip,int offset,int data) { switch (offset) { case 6: /* palette bank change */ if ((K007121_ctrlram[chip][offset] & 0x30) != (data & 0x30)) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(machine); break; case 7: K007121_flipscreen[chip] = data & 0x08; @@ -1248,12 +1248,12 @@ if ((K007121_ctrlram[chip][offset] & 0x30) != (data & 0x30)) WRITE8_HANDLER( K007121_ctrl_0_w ) { - K007121_ctrl_w(0,offset,data); + K007121_ctrl_w(space->machine,0,offset,data); } WRITE8_HANDLER( K007121_ctrl_1_w ) { - K007121_ctrl_w(1,offset,data); + K007121_ctrl_w(space->machine,1,offset,data); } @@ -1578,7 +1578,7 @@ WRITE8_HANDLER( K007342_vreg_w ) break; case 0x01: /* used for banking in Rock'n'Rage */ if (data != K007342_regs[1]) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); case 0x02: K007342_scrollx[0] = (K007342_scrollx[0] & 0xff) | ((data & 0x01) << 8); K007342_scrollx[1] = (K007342_scrollx[1] & 0xff) | ((data & 0x02) << 7); @@ -5124,7 +5124,7 @@ WRITE8_HANDLER( K053251_w ) } if (!K053251_tilemaps_set) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } else if (offset == 10) { @@ -5142,7 +5142,7 @@ WRITE8_HANDLER( K053251_w ) } if (!K053251_tilemaps_set) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } } diff --git a/src/mame/video/konamiic.h b/src/mame/video/konamiic.h index eff1c19cb4c..cab566953fd 100644 --- a/src/mame/video/konamiic.h +++ b/src/mame/video/konamiic.h @@ -8,7 +8,7 @@ void konami_rom_deinterleave_4(running_machine *machine, const char *mem_region) #define MAX_K007121 2 extern UINT8 K007121_ctrlram[MAX_K007121][8]; -void K007121_ctrl_w(int chip,int offset,int data); +void K007121_ctrl_w(running_machine *machine, int chip,int offset,int data); WRITE8_HANDLER( K007121_ctrl_0_w ); WRITE8_HANDLER( K007121_ctrl_1_w ); void K007121_sprites_draw(int chip,bitmap_t *bitmap,const rectangle *cliprect, gfx_element **gfxs, colortable_t *ctable, diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index 2d5dd669a55..e0eb4106f3d 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -26,7 +26,7 @@ WRITE8_HANDLER(ksayakyu_videoctrl_w) video_ctrl=data; flipscreen = (data&4)?(TILEMAP_FLIPX|TILEMAP_FLIPY):0; - tilemap_set_flip( ALL_TILEMAPS,flipscreen ); + tilemap_set_flip_all( space->machine,flipscreen ); tilemap_set_scrolly( ksayakyu_tilemap, 0, (data&0xe0)<<3 ); } diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index 9ddd6486718..fb8a48a8316 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -151,7 +151,7 @@ WRITE8_HANDLER( kyugo_flipscreen_w ) { flipscreen = (data & 0x01); - tilemap_set_flip(ALL_TILEMAPS, (flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY): 0)); + tilemap_set_flip_all(space->machine, (flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY): 0)); } } diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c index de2357fc2fd..432adab6643 100644 --- a/src/mame/video/ladybug.c +++ b/src/mame/video/ladybug.c @@ -164,7 +164,7 @@ WRITE8_HANDLER( ladybug_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -253,7 +253,7 @@ WRITE8_HANDLER( sraider_io_w ) if (flip_screen_get(space->machine) != (data & 0x80)) { flip_screen_set(space->machine, data & 0x80); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } sraider_grid_color = data & 0x70; diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index cdbaa0c173c..5a89580c794 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -234,7 +234,7 @@ static WRITE8_HANDLER( lasso_flip_screen_w ) flip_screen_x_set(space->machine, data & 0x01); flip_screen_y_set(space->machine, data & 0x02); - tilemap_set_flip(ALL_TILEMAPS, (flip_screen_x_get(space->machine) ? TILEMAP_FLIPX : 0) | + tilemap_set_flip_all(space->machine, (flip_screen_x_get(space->machine) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine) ? TILEMAP_FLIPY : 0)); } @@ -246,7 +246,7 @@ WRITE8_HANDLER( lasso_video_control_w ) if (gfxbank != bank) { gfxbank = bank; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } lasso_flip_screen_w(space, offset, data); @@ -260,7 +260,7 @@ WRITE8_HANDLER( wwjgtin_video_control_w ) if (gfxbank != bank) { gfxbank = bank; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } lasso_flip_screen_w(space, offset, data); diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index bc6174a590c..995c7a3cd4a 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -301,9 +301,9 @@ WRITE8_HANDLER( m62_flipscreen_w ) flipscreen = data & 0x01; if (flipscreen) - tilemap_set_flip(ALL_TILEMAPS, TILEMAP_FLIPX | TILEMAP_FLIPY); + tilemap_set_flip_all(space->machine, TILEMAP_FLIPX | TILEMAP_FLIPY); else - tilemap_set_flip(ALL_TILEMAPS, 0); + tilemap_set_flip_all(space->machine, 0); coin_counter_w(0,data & 2); coin_counter_w(1,data & 4); diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index 7cf4b402515..716f7b8cdca 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -231,7 +231,7 @@ VIDEO_UPDATE( madmotor ) flipscreen=1; else flipscreen=0; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* Setup scroll registers */ for (offs = 0;offs < 512;offs++) diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index 5062aa984ac..e709843b089 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -92,7 +92,7 @@ WRITE8_HANDLER( mario_gfxbank_w ) if (state->gfx_bank != (data & 0x01)) { state->gfx_bank = data & 0x01; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -103,7 +103,7 @@ WRITE8_HANDLER( mario_palettebank_w ) if (state->palette_bank != (data & 0x01)) { state->palette_bank = data & 0x01; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -122,10 +122,10 @@ WRITE8_HANDLER( mario_flip_w ) { state->flip = data & 0x01; if (state->flip) - tilemap_set_flip(ALL_TILEMAPS, TILEMAP_FLIPX | TILEMAP_FLIPY); + tilemap_set_flip_all(space->machine, TILEMAP_FLIPX | TILEMAP_FLIPY); else - tilemap_set_flip(ALL_TILEMAPS, 0); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_set_flip_all(space->machine, 0); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -217,7 +217,7 @@ VIDEO_UPDATE( mario ) if (t != state->monitor) { state->monitor = t; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); } tilemap_set_scrollx(state->bg_tilemap, 0, state->flip ? (HTOTAL-HBSTART) : 0); diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index 64b3354d5f3..080d6c47ce9 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -54,7 +54,7 @@ WRITE8_HANDLER( markham_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index 61afb2eaead..2ce8d25f0e5 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -968,7 +968,7 @@ VIDEO_UPDATE( megasys1 ) active_layers |= 1 << ((pri & 0xf0000) >> 16); // bottom layer can't be disabled } - tilemap_set_flip( ALL_TILEMAPS, (megasys1_screen_flag & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0 ); + tilemap_set_flip_all( screen->machine, (megasys1_screen_flag & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0 ); for (i = 0;i < 3;i++) { diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index 5157354b80c..c66b1fb57e0 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -107,7 +107,7 @@ WRITE8_HANDLER( mikie_palettebank_w ) if (palettebank != (data & 0x07)) { palettebank = data & 0x07; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -116,7 +116,7 @@ WRITE8_HANDLER( mikie_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index da789556f79..27248d72004 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -169,7 +169,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); if (flipscreen != (data & 0x04)) { flipscreen = data & 0x04; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } /* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */ @@ -204,7 +204,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); if (flipscreen != (data & 0x04)) { flipscreen = data & 0x04; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } /* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */ diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 2e0441e397d..45a3bad24e3 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -221,7 +221,7 @@ WRITE8_HANDLER( mrdo_flipscreen_w ) /* Mr. Do! so we don't emulate them */ flipscreen = data & 0x01; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index a4c147ee02e..36d6179b8a8 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -83,7 +83,7 @@ WRITE8_HANDLER( mrjong_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c index d6ebb163595..3523fd8fe4e 100644 --- a/src/mame/video/mustache.c +++ b/src/mame/video/mustache.c @@ -55,7 +55,7 @@ WRITE8_HANDLER (mustache_video_control_w) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* tile bank */ @@ -63,7 +63,7 @@ WRITE8_HANDLER (mustache_video_control_w) if ((control_byte ^ data) & 0x08) { control_byte = data; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index 1967ad4b5fb..6ad1c7e3c24 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -262,9 +262,9 @@ static VIDEO_UPDATE( mystston ) set_palette(screen->machine, state); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); tilemap_set_scrolly(state->bg_tilemap, 0, *state->scroll); - tilemap_set_flip(ALL_TILEMAPS, flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine, flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(bitmap, cliprect, screen->machine->gfx[2], flip); diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c index 1bf5579599c..28128ad7a3d 100644 --- a/src/mame/video/namcos1.c +++ b/src/mame/video/namcos1.c @@ -354,7 +354,7 @@ VIDEO_UPDATE( namcos1 ) /* flip screen is embedded in the sprite control registers */ /* can't use flip_screen_set(screen->machine, ) because the visible area is asymmetrical */ flip_screen_set_no_update(screen->machine, spriteram[0x07f6] & 1); - tilemap_set_flip(ALL_TILEMAPS,flip_screen_get(screen->machine) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flip_screen_get(screen->machine) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* background color */ diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c index b7cdddb1f59..66dac2da82b 100644 --- a/src/mame/video/namcos86.c +++ b/src/mame/video/namcos86.c @@ -347,7 +347,7 @@ VIDEO_UPDATE( namcos86 ) /* flip screen is embedded in the sprite control registers */ /* can't use flip_screen_set(screen->machine, ) because the visible area is asymmetrical */ flip_screen_set_no_update(screen->machine, spriteram[0x07f6] & 1); - tilemap_set_flip(ALL_TILEMAPS,flip_screen_get(screen->machine) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flip_screen_get(screen->machine) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); set_scroll(screen->machine, 0); set_scroll(screen->machine, 1); set_scroll(screen->machine, 2); diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index f73249ecbab..aad74fc2f68 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -105,7 +105,7 @@ WRITE16_HANDLER( nemesis_gfx_flipx_word_w ) else tilemap_flip &= ~TILEMAP_FLIPX; - tilemap_set_flip(ALL_TILEMAPS, tilemap_flip); + tilemap_set_flip_all(space->machine, tilemap_flip); } if (ACCESSING_BITS_8_15) @@ -124,7 +124,7 @@ WRITE16_HANDLER( nemesis_gfx_flipy_word_w ) else tilemap_flip &= ~TILEMAP_FLIPY; - tilemap_set_flip(ALL_TILEMAPS, tilemap_flip); + tilemap_set_flip_all(space->machine, tilemap_flip); } } @@ -150,7 +150,7 @@ WRITE16_HANDLER( salamand_control_port_word_w ) tilemap_flip &= ~TILEMAP_FLIPY; if (accessing_bits & 0x0c) - tilemap_set_flip(ALL_TILEMAPS, tilemap_flip); + tilemap_set_flip_all(space->machine, tilemap_flip); irq_port_last = data; } diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index bef8f613838..6cbe549df70 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -146,7 +146,7 @@ WRITE8_HANDLER( ojankohs_flipscreen_w ) ojankohs_flipscreen = data & 0x01; - tilemap_set_flip(ALL_TILEMAPS, ojankohs_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(space->machine, ojankohs_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); if (ojankohs_flipscreen) { ojankohs_scrollx = -0xe0; diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index 7c53296285d..dfdfb5923cb 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -136,7 +136,7 @@ WRITE8_HANDLER( pandoras_scrolly_w ) WRITE8_HANDLER( pandoras_flipscreen_w ) { flipscreen = data; - tilemap_set_flip(ALL_TILEMAPS, flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine, flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } /*************************************************************************** diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c index a3c005e590d..9194a2d5243 100644 --- a/src/mame/video/pcktgal.c +++ b/src/mame/video/pcktgal.c @@ -41,7 +41,7 @@ WRITE8_HANDLER( pcktgal_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x80)) { flip_screen_set(space->machine, data & 0x80); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c index adf3efea1e8..f9b9d188960 100644 --- a/src/mame/video/phoenix.c +++ b/src/mame/video/phoenix.c @@ -256,8 +256,8 @@ WRITE8_HANDLER( phoenix_videoreg_w ) cocktail_mode = videoram_pg_index && (input_port_read(space->machine, "CAB") & 0x01); - tilemap_set_flip(ALL_TILEMAPS, cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_set_flip_all(space->machine, cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* Phoenix has only one palette select effecting both layers */ @@ -265,7 +265,7 @@ WRITE8_HANDLER( phoenix_videoreg_w ) { palette_bank = (data >> 1) & 1; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -279,8 +279,8 @@ WRITE8_HANDLER( pleiads_videoreg_w ) cocktail_mode = videoram_pg_index && (input_port_read(space->machine, "CAB") & 0x01); - tilemap_set_flip(ALL_TILEMAPS, cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_set_flip_all(space->machine, cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_mark_all_tiles_dirty_all(space->machine); } @@ -292,7 +292,7 @@ WRITE8_HANDLER( pleiads_videoreg_w ) { palette_bank = ((data >> 1) & 3); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); logerror("Palette: %02X\n", (data & 0x06) >> 1); } diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index 3759aabc6fd..581d64e1b35 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -98,7 +98,7 @@ WRITE8_HANDLER(pitnrun_v_heed_w) WRITE8_HANDLER(pitnrun_color_select_w) { pitnrun_color_select=data; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } static void pitnrun_spotlights(running_machine *machine) diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c index 2f0e0822806..c3f352b50c8 100644 --- a/src/mame/video/pokechmp.c +++ b/src/mame/video/pokechmp.c @@ -15,7 +15,7 @@ WRITE8_HANDLER( pokechmp_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x80)) { flip_screen_set(space->machine, data & 0x80); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index 0c9ab8294f7..664404a2820 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -87,7 +87,7 @@ WRITE8_HANDLER( popper_attribram_w ) WRITE8_HANDLER( popper_flipscreen_w ) { popper_flipscreen = data; - tilemap_set_flip( ALL_TILEMAPS,popper_flipscreen?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); + tilemap_set_flip_all( space->machine,popper_flipscreen?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); tilemap_clip = *video_screen_get_visible_area(space->machine->primary_screen); @@ -107,7 +107,7 @@ WRITE8_HANDLER( popper_gfx_bank_w ) if (popper_gfx_bank != data) { popper_gfx_bank = data; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index 2d77c3e3ea3..2a0c1a3a048 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -96,7 +96,7 @@ WRITE16_HANDLER( raiden_control_w ) /* Flipscreen */ if (offset==3 && ACCESSING_BITS_0_7) { flipscreen=data&0x2; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } } @@ -107,7 +107,7 @@ WRITE16_HANDLER( raidena_control_w ) /* Flipscreen */ if (offset==3 && ACCESSING_BITS_0_7) { flipscreen=data&0x40; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } } diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index 7b628214578..ee9a92072fd 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -113,7 +113,7 @@ WRITE8_HANDLER( redclash_gfxbank_w ) if (gfxbank != (data & 0x01)) { gfxbank = data & 0x01; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c index 91d3a068bbc..da09599e067 100644 --- a/src/mame/video/rockrage.c +++ b/src/mame/video/rockrage.c @@ -81,7 +81,7 @@ WRITE8_HANDLER( rockrage_vreg_w ){ /* bits 0-1: sprite bank select */ if ((data & 0x0c) != (rockrage_vreg & 0x0c)) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); rockrage_vreg = data; } diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index a3899f5eb3a..ec5c87cae59 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -99,7 +99,7 @@ WRITE8_HANDLER( rocnrope_flipscreen_w ) if (flip_screen_get(space->machine) != (~data & 0x01)) { flip_screen_set(space->machine, ~data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index 4818dbc4bcd..bc2a58a413c 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -73,7 +73,7 @@ static const int scroll2_map_flip[8] = {0, 7, 2, 1, 4, 3, 6, 5}; WRITE8_HANDLER( sauro_palette_bank_w ) { palette_bank = (data & 0x03) << 4; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } WRITE8_HANDLER( sauro_scroll_fg_w ) diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index 36b0666f64b..aaf1ce22f50 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -115,7 +115,7 @@ WRITE8_HANDLER( sbasketb_flipscreen_w ) if (flip_screen_get(space->machine) != data) { flip_screen_set(space->machine, data); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c index aa25214e454..5036fa01844 100644 --- a/src/mame/video/segaic16.c +++ b/src/mame/video/segaic16.c @@ -1353,7 +1353,7 @@ void segaic16_tilemap_set_bank(running_machine *machine, int which, int banknum, const device_config *screen = machine->primary_screen; video_screen_update_partial(screen, video_screen_get_vpos(screen)); info->bank[banknum] = offset; - tilemap_mark_all_tiles_dirty(NULL); + tilemap_mark_all_tiles_dirty_all(machine); } } diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 7db5afc2292..a97b1da6e8b 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -426,7 +426,7 @@ WRITE16_HANDLER( twineagl_tilebank_w ) if (twineagl_tilebank[offset] != data) { twineagl_tilebank[offset] = data; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } } @@ -907,7 +907,7 @@ static VIDEO_UPDATE( seta_layers ) flip ^= tilemaps_flip; - tilemap_set_flip(ALL_TILEMAPS, flip ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0 ); + tilemap_set_flip_all(screen->machine, flip ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0 ); x_0 = seta_vctrl_0[ 0/2 ]; y_0 = seta_vctrl_0[ 2/2 ]; diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index 3a719c50bb0..03f5387b645 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -108,7 +108,7 @@ WRITE8_HANDLER( shaolins_palettebank_w ) if (palettebank != (data & 0x07)) { palettebank = data & 0x07; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -127,7 +127,7 @@ WRITE8_HANDLER( shaolins_nmi_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index 81b982f99e6..3db301a255c 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -28,7 +28,7 @@ WRITE8_HANDLER( sichuan2_bankswitch_w ) if (gfxbank != bank) { gfxbank = bank; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* bits 6-7 unknown */ diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index bfcffdd9009..1167fc071ab 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -71,7 +71,7 @@ WRITE8_HANDLER( sidearms_c804_w ) { flipon = data & 0x80; flip_screen_set(space->machine, flipon); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 077d19f429f..92b9a5ccec3 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -70,7 +70,7 @@ VIDEO_START( sidepckt ) tilemap_set_transmask(bg_tilemap,0,0xff,0x00); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(bg_tilemap,1,0x01,0xfe); /* split type 1 has pen 0 transparent in front half */ - tilemap_set_flip(ALL_TILEMAPS,TILEMAP_FLIPX); + tilemap_set_flip_all(machine,TILEMAP_FLIPX); } @@ -96,7 +96,7 @@ WRITE8_HANDLER( sidepckt_colorram_w ) WRITE8_HANDLER( sidepckt_flipscreen_w ) { flipscreen = data; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? TILEMAP_FLIPY : TILEMAP_FLIPX); + tilemap_set_flip_all(space->machine,flipscreen ? TILEMAP_FLIPY : TILEMAP_FLIPX); } diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index e0e3709064d..0fd958a31c9 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -210,7 +210,7 @@ VIDEO_UPDATE( slapfight ) { int offs; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (flipscreen) { tilemap_set_scrollx( fix_tilemap,0,296); tilemap_set_scrollx( pf1_tilemap,0,(*slapfight_scrollx_lo + 256 * *slapfight_scrollx_hi)+296 ); diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c index 698fd3baf94..3bb1f791ff4 100644 --- a/src/mame/video/snk6502.c +++ b/src/mame/video/snk6502.c @@ -136,7 +136,7 @@ WRITE8_HANDLER( snk6502_flipscreen_w ) if (charbank != bank) { charbank = bank; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* bit 7 flips screen */ @@ -144,7 +144,7 @@ WRITE8_HANDLER( snk6502_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x80)) { flip_screen_set(space->machine, data & 0x80); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } @@ -252,7 +252,7 @@ WRITE8_HANDLER( satansat_b002_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* bit 1 enables interrups */ diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 709f526e1f4..ab07c6a134e 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -137,7 +137,7 @@ WRITE16_HANDLER( pow_flipscreen16_w ) if (ACCESSING_BITS_0_7) { flipscreen = data & 0x08; - tilemap_set_flip(ALL_TILEMAPS, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(space->machine, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); sprite_flip_axis = data & 0x04; // for streetsm? though might not be present on this board @@ -154,7 +154,7 @@ WRITE16_HANDLER( searchar_flipscreen16_w ) if (ACCESSING_BITS_0_7) { flipscreen = data & 0x08; - tilemap_set_flip(ALL_TILEMAPS, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(space->machine, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); sprite_flip_axis = data & 0x04; } diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index 9db65a30e4e..19ad4cef94c 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -34,7 +34,7 @@ WRITE8_HANDLER( solomon_flipscreen_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index 6ede42253a2..624ef2c3cbe 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -173,7 +173,7 @@ VIDEO_UPDATE( sshangha ) int offs; flip_screen_set_no_update(screen->machine, sshangha_control_0[0]&0x80); - tilemap_set_flip(ALL_TILEMAPS,flip_screen_x_get(screen->machine) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flip_screen_x_get(screen->machine) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); tilemap_set_enable( pf2_tilemap, sshangha_control_0[5]&0x8000); tilemap_set_enable( pf1_8x8_tilemap, sshangha_control_0[5]&0x0080); diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index 13ab1e99a4d..23577c1f94b 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -87,7 +87,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( stadhero ) { flipscreen=stadhero_pf2_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); tilemap_set_scrollx( pf2_tilemap,0, stadhero_pf2_control_1[0] ); tilemap_set_scrolly( pf2_tilemap,0, stadhero_pf2_control_1[1] ); diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index 6d3bd6b8706..2b4f79b38e9 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -59,7 +59,7 @@ WRITE8_HANDLER( strnskil_scrl_ctrl_w ) if (flip_screen_get(space->machine) != (data & 0x08)) { flip_screen_set(space->machine, data & 0x08); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index d803c3ac81d..49882c2085c 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -416,12 +416,12 @@ VIDEO_UPDATE( suna8 ) { int max_tiles = memory_region_length(machine, "gfx1") / (0x400 * 0x20); - if (input_code_pressed_once(KEYCODE_Q)) { page--; tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); } - if (input_code_pressed_once(KEYCODE_W)) { page++; tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); } - if (input_code_pressed_once(KEYCODE_E)) { tiles--; tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); } - if (input_code_pressed_once(KEYCODE_R)) { tiles++; tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); } - if (input_code_pressed_once(KEYCODE_A)) { rombank--; tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); } - if (input_code_pressed_once(KEYCODE_S)) { rombank++; tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); } + if (input_code_pressed_once(KEYCODE_Q)) { page--; tilemap_mark_all_tiles_dirty_all(screen->machine); } + if (input_code_pressed_once(KEYCODE_W)) { page++; tilemap_mark_all_tiles_dirty_all(screen->machine); } + if (input_code_pressed_once(KEYCODE_E)) { tiles--; tilemap_mark_all_tiles_dirty_all(screen->machine); } + if (input_code_pressed_once(KEYCODE_R)) { tiles++; tilemap_mark_all_tiles_dirty_all(screen->machine); } + if (input_code_pressed_once(KEYCODE_A)) { rombank--; tilemap_mark_all_tiles_dirty_all(screen->machine); } + if (input_code_pressed_once(KEYCODE_S)) { rombank++; tilemap_mark_all_tiles_dirty_all(screen->machine); } rombank &= 0xf; page &= (suna8_text_dim > 0)?3:7; diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c index d4dff415c1c..a5fc7072418 100644 --- a/src/mame/video/suprridr.c +++ b/src/mame/video/suprridr.c @@ -101,14 +101,14 @@ PALETTE_INIT( suprridr ) WRITE8_HANDLER( suprridr_flipx_w ) { flipx = data & 1; - tilemap_set_flip(ALL_TILEMAPS, (flipx ? TILEMAP_FLIPX : 0) | (flipy ? TILEMAP_FLIPY : 0)); + tilemap_set_flip_all(space->machine, (flipx ? TILEMAP_FLIPX : 0) | (flipy ? TILEMAP_FLIPY : 0)); } WRITE8_HANDLER( suprridr_flipy_w ) { flipy = data & 1; - tilemap_set_flip(ALL_TILEMAPS, (flipx ? TILEMAP_FLIPX : 0) | (flipy ? TILEMAP_FLIPY : 0)); + tilemap_set_flip_all(space->machine, (flipx ? TILEMAP_FLIPX : 0) | (flipy ? TILEMAP_FLIPY : 0)); } diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index 7780ac169b3..1c53e2d9f5a 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -115,7 +115,7 @@ WRITE8_HANDLER( tagteam_flipscreen_w ) if (flip_screen_get(space->machine) != (data &0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c index bcb274b7eac..0364fc08ae2 100644 --- a/src/mame/video/taito_b.c +++ b/src/mame/video/taito_b.c @@ -69,7 +69,7 @@ static UINT16 TC0180VCU_ctrl[0x10] = {0}; * */ -static void taitob_video_control (UINT8 data) +static void taitob_video_control (running_machine *machine, UINT8 data) { #if 0 if (data != video_control) @@ -81,7 +81,7 @@ static void taitob_video_control (UINT8 data) if (video_control & 0x80) framebuffer_page = (~video_control & 0x40) >> 6; - tilemap_set_flip(ALL_TILEMAPS, (video_control & 0x10) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0 ); + tilemap_set_flip_all(machine, (video_control & 0x10) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0 ); } @@ -129,7 +129,7 @@ WRITE16_HANDLER( taitob_v_control_w ) } break; case 7: - taitob_video_control( (TC0180VCU_ctrl[offset]>>8) & 0xff ); + taitob_video_control( space->machine, (TC0180VCU_ctrl[offset]>>8) & 0xff ); break; default: break; diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index 1e7bb3c6606..8e14d332da9 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -3230,7 +3230,7 @@ VIDEO_UPDATE( f3 ) UINT32 sy_fix[5],sx_fix[5]; f3_skip_this_frame=0; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* Setup scroll */ sy_fix[0]=((f3_control_0[2]&0xffff0000)>> 7) + (1<<16); diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index d86cc0d5dae..b513590f0bd 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -147,7 +147,7 @@ WRITE8_HANDLER( taitol_control_w ) /* bit 4 flip screen */ flipscreen = data & 0x10; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(space->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* bit 5 display enable - handled in vh_screenrefresh() */ } diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index 34f73d044de..babe1fe710d 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -513,7 +513,7 @@ VIDEO_UPDATE( tetrisp2 ) if (flipscreen != flipscreen_old) { flipscreen_old = flipscreen; - tilemap_set_flip(ALL_TILEMAPS, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(screen->machine, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } /* Flip Screen */ @@ -597,7 +597,7 @@ VIDEO_UPDATE( rockntread ) if (flipscreen != flipscreen_old) { flipscreen_old = flipscreen; - tilemap_set_flip(ALL_TILEMAPS, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(screen->machine, flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } /* Flip Screen */ diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 1cbfd35162e..39e8efa21bc 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -50,7 +50,7 @@ WRITE8_HANDLER( tiamc1_videoram_w ) WRITE8_HANDLER( tiamc1_bankswitch_w ) { if ((data & 128) != (tiamc1_layers_ctrl & 128)) - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); tiamc1_layers_ctrl = data; } diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index b713f542d28..8be76b114b1 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -22,7 +22,7 @@ WRITE16_HANDLER( tigeroad_videoctrl_w ) if (flip_screen_get(space->machine) != (data & 0x02)) { flip_screen_set(space->machine, data & 0x02); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* bit 2 selects bg char bank */ diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 0c484fd71ae..8f3d3e7fb13 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -412,7 +412,7 @@ WRITE16_HANDLER( blswhstl_700300_w ) if (blswhstl_rombank != ((data & 0x80) >> 7)) { blswhstl_rombank = (data & 0x80) >> 7; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* other bits unknown */ diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index 8c29c506875..3dbb92bf3cd 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -442,7 +442,7 @@ WRITE16_HANDLER( rallybik_bcu_flipscreen_w ) { logerror("Setting BCU controller flipscreen port to %04x\n",data); bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */ - tilemap_set_flip(ALL_TILEMAPS, (data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); + tilemap_set_flip_all(space->machine, (data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); if (bcu_flipscreen) { scrollx_offs1 = 0x080 - 6; @@ -469,7 +469,7 @@ WRITE16_HANDLER( toaplan1_bcu_flipscreen_w ) { logerror("Setting BCU controller flipscreen port to %04x\n",data); bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */ - tilemap_set_flip(ALL_TILEMAPS, (data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); + tilemap_set_flip_all(space->machine, (data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); if (bcu_flipscreen) { scrollx_offs1 = 0x011 - 6; diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index 3aadf6cb0ac..f78b2aabcfa 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -143,7 +143,7 @@ WRITE8_HANDLER( toypop_palettebank_w ) if (palettebank != (offset & 1)) { palettebank = offset & 1; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index d5498cb04c6..d7c590032fe 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -187,12 +187,12 @@ VIDEO_UPDATE( tp84 ) if (cliprect->min_y == video_screen_get_visible_area(screen)->min_y) { - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(screen->machine); tilemap_set_scrollx(bg_tilemap, 0, *tp84_scroll_x); tilemap_set_scrolly(bg_tilemap, 0, *tp84_scroll_y); - tilemap_set_flip(ALL_TILEMAPS, ((*tp84_flipscreen_x & 0x01) ? TILEMAP_FLIPX : 0) | + tilemap_set_flip_all(screen->machine, ((*tp84_flipscreen_x & 0x01) ? TILEMAP_FLIPX : 0) | ((*tp84_flipscreen_y & 0x01) ? TILEMAP_FLIPY : 0)); } diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index ff423329196..24a2e9ee88c 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -111,7 +111,7 @@ WRITE8_HANDLER( trackfld_flipscreen_w ) if (flip_screen_get(space->machine) != data) { flip_screen_set(space->machine, data); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } } diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index f43bdb7cefb..19cc6abd66a 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -541,7 +541,7 @@ VIDEO_UPDATE( tumblepb ) int offs,offs2; flipscreen=tumblepb_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (flipscreen) offs=1; else offs=-1; if (flipscreen) offs2=-3; else offs2=-5; @@ -566,7 +566,7 @@ VIDEO_UPDATE( jumpkids ) int offs,offs2; flipscreen=tumblepb_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (flipscreen) offs=1; else offs=-1; if (flipscreen) offs2=-3; else offs2=-5; @@ -591,7 +591,7 @@ VIDEO_UPDATE( semicom ) int offs,offs2; flipscreen=tumblepb_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (flipscreen) offs=1; else offs=-1; /* fixed */ if (flipscreen) offs2=-3; else offs2=-5; /* fixed */ @@ -642,7 +642,7 @@ VIDEO_UPDATE( bcstory ) int offs,offs2; flipscreen=tumblepb_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (flipscreen) offs=1; else offs=8; /* not sure of this */ if (flipscreen) offs2=-3; else offs2=8; /* not sure of this */ @@ -667,7 +667,7 @@ VIDEO_UPDATE( semibase ) int offs,offs2; flipscreen=tumblepb_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); offs=-1; offs2=-2; @@ -694,7 +694,7 @@ VIDEO_UPDATE( sdfight ) int offs,offs2; flipscreen=tumblepb_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); offs=-1; offs2=-5; // foreground scroll.. @@ -723,7 +723,7 @@ VIDEO_UPDATE( fncywld ) int offs,offs2; flipscreen=tumblepb_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (flipscreen) offs=1; else offs=-1; if (flipscreen) offs2=-3; else offs2=-5; @@ -805,7 +805,7 @@ VIDEO_UPDATE( pangpang ) int offs,offs2; flipscreen=tumblepb_control_0[0]&0x80; - tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); + tilemap_set_flip_all(screen->machine,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); if (flipscreen) offs=1; else offs=-1; if (flipscreen) offs2=-3; else offs2=-5; diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index 2cd3b8406a7..242963cb5f1 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -17,8 +17,6 @@ #include "twincobr.h" -void twincobr_flipscreen(int flip); -void twincobr_display(int enable); static STATE_POSTLOAD( twincobr_restore_screen ); INT32 twincobr_fg_rom_bank; @@ -152,7 +150,7 @@ VIDEO_START( toaplan0 ) static STATE_POSTLOAD( twincobr_restore_screen ) { twincobr_display(twincobr_display_on); - twincobr_flipscreen(twincobr_flip_screen); + twincobr_flipscreen(machine, twincobr_flip_screen); } @@ -168,9 +166,9 @@ void twincobr_display(int enable) tilemap_set_enable(tx_tilemap, enable); } -void twincobr_flipscreen(int flip) +void twincobr_flipscreen(running_machine *machine, int flip) { - tilemap_set_flip(ALL_TILEMAPS, (flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); + tilemap_set_flip_all(machine, (flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); twincobr_flip_screen = flip; if (flip) { scroll_x = -58; diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c index 2f2f9a58190..56289524ff4 100644 --- a/src/mame/video/ultraman.c +++ b/src/mame/video/ultraman.c @@ -97,19 +97,19 @@ WRITE16_HANDLER( ultraman_gfxctrl_w ) if (bank0 != ((data & 0x02) >> 1)) { bank0 = (data & 0x02) >> 1; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); /* should mark only zoom0 */ + tilemap_mark_all_tiles_dirty_all(space->machine); /* should mark only zoom0 */ } K051316_wraparound_enable(1,data & 0x04); if (bank1 != ((data & 0x08) >> 3)) { bank1 = (data & 0x08) >> 3; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); /* should mark only zoom1 */ + tilemap_mark_all_tiles_dirty_all(space->machine); /* should mark only zoom1 */ } K051316_wraparound_enable(2,data & 0x10); if (bank2 != ((data & 0x20) >> 5)) { bank2 = (data & 0x20) >> 5; - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); /* should mark only zoom2 */ + tilemap_mark_all_tiles_dirty_all(space->machine); /* should mark only zoom2 */ } coin_counter_w(0, data & 0x40); coin_counter_w(1, data & 0x80); diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c index ddebaa646bf..a09cd3ee140 100644 --- a/src/mame/video/xxmissio.c +++ b/src/mame/video/xxmissio.c @@ -138,8 +138,8 @@ static void draw_sprites(bitmap_t *bitmap, const rectangle *cliprect, const gfx_ VIDEO_UPDATE( xxmissio ) { - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); - tilemap_set_flip(ALL_TILEMAPS, flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); + tilemap_mark_all_tiles_dirty_all(screen->machine); + tilemap_set_flip_all(screen->machine, flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); tilemap_set_scrollx(bg_tilemap, 0, xscroll * 2); tilemap_set_scrolly(bg_tilemap, 0, yscroll); diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index d6021613838..4752f9a3788 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -74,7 +74,7 @@ WRITE8_HANDLER( yiear_control_w ) if (flip_screen_get(space->machine) != (data & 0x01)) { flip_screen_set(space->machine, data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } /* bit 1 is NMI enable */ diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index d01e73d875e..d37a624c650 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -102,7 +102,7 @@ WRITE8_HANDLER( yunsung8_videoram_w ) WRITE8_HANDLER( yunsung8_flipscreen_w ) { - tilemap_set_flip(ALL_TILEMAPS, (data & 1) ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0); + tilemap_set_flip_all(space->machine, (data & 1) ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0); } diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index b041fb9ca5d..2d270d97d03 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -49,7 +49,7 @@ WRITE8_HANDLER( zodiack_flipscreen_w ) if (flip_screen_get(space->machine) != (~data & 0x01)) { flip_screen_set(space->machine, ~data & 0x01); - tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + tilemap_mark_all_tiles_dirty_all(space->machine); } }